From 32ee4f080b9ab82c6e81e2bf226ae6da8b981557 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Tue, 2 Feb 2010 23:40:20 +0000 Subject: [PATCH] big patch for sun kbd type6 Provided by Javier Acosta --- rules/base.ml_s.part | 12 +- symbols/sun_vndr/Makefile.am | 13 +- symbols/sun_vndr/ara | 117 +++++++++++++++ symbols/sun_vndr/be | 99 +++++++++++++ symbols/sun_vndr/br | 102 +++++++++++++ symbols/sun_vndr/ca | 98 +++++++++++++ symbols/sun_vndr/ch | 134 +++++++++++++++++ symbols/sun_vndr/cs | 53 ------- symbols/sun_vndr/cz | 149 +++++++++++++------ symbols/sun_vndr/de | 178 +++++++++++++++------- symbols/sun_vndr/dk | 187 ++++++++++++++++------- symbols/sun_vndr/ee | 118 +++++++++++++++ symbols/sun_vndr/es | 189 ++++++++++++++++-------- symbols/sun_vndr/fi | 114 ++++++++++---- symbols/sun_vndr/fr | 145 +++++++++--------- symbols/sun_vndr/gb | 124 +++++++++++----- symbols/sun_vndr/gr | 141 ++++++++++++++---- symbols/sun_vndr/hu | 88 ----------- symbols/sun_vndr/it | 178 +++++++++++++++------- symbols/sun_vndr/jp | 67 ++++++--- symbols/sun_vndr/ko | 57 ------- symbols/sun_vndr/kr | 98 +++++++++++++ symbols/sun_vndr/lt | 168 +++++++++++++-------- symbols/sun_vndr/lv | 161 +++++++++++++------- symbols/sun_vndr/nl | 197 ++++++++++++++++++------- symbols/sun_vndr/no | 180 ++++++++++++++++------- symbols/sun_vndr/pl | 143 ++++++++++++------ symbols/sun_vndr/pt | 189 ++++++++++++++++-------- symbols/sun_vndr/ro | 118 +++++++++++++++ symbols/sun_vndr/ru | 140 +++++++++++++----- symbols/sun_vndr/se | 327 +++++++++++++++++++++++++++++++++-------- symbols/sun_vndr/sk | 110 ++++++++++++++ symbols/sun_vndr/solaris | 98 +++++++++---- symbols/sun_vndr/sw | 167 --------------------- symbols/sun_vndr/tr | 170 ++++++++++----------- symbols/sun_vndr/tuv | 73 ++++++--- symbols/sun_vndr/tw | 86 +++++++---- symbols/sun_vndr/ua | 118 +++++++++++++++ symbols/sun_vndr/us | 343 ++++++++++++++++++++++++++----------------- symbols/sun_vndr/usb | 26 ---- 40 files changed, 3676 insertions(+), 1599 deletions(-) create mode 100644 symbols/sun_vndr/ara create mode 100644 symbols/sun_vndr/be create mode 100644 symbols/sun_vndr/br create mode 100644 symbols/sun_vndr/ca create mode 100644 symbols/sun_vndr/ch delete mode 100644 symbols/sun_vndr/cs create mode 100644 symbols/sun_vndr/ee delete mode 100644 symbols/sun_vndr/hu delete mode 100644 symbols/sun_vndr/ko create mode 100644 symbols/sun_vndr/kr create mode 100644 symbols/sun_vndr/ro create mode 100644 symbols/sun_vndr/sk delete mode 100644 symbols/sun_vndr/sw create mode 100644 symbols/sun_vndr/ua delete mode 100644 symbols/sun_vndr/usb diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part index 1c16b6b..723cfb1 100644 --- a/rules/base.ml_s.part +++ b/rules/base.ml_s.part @@ -7,12 +7,12 @@ sun4 * = latin+sun_vndr/us(type4)+%l%(v) sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2 sun5 * = latin+sun_vndr/us(type5)+%l%(v) - sun6 us = sun_vndr/us(type6) - sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic) - sun6 * = sun_vndr/us(type6)+%l%(v) - sun6euro us = sun_vndr/us(type6) - sun6euro en_US = sun_vndr/us(type6)+iso9995-3(basic) - sun6euro * = sun_vndr/us(type6)+%l%(v) + sun6 us = pc+sun_vndr/us(type6) + sun6 en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) + sun6 * = pc+sun_vndr/us(type6)+%l%(v) + sun6euro us = pc+sun_vndr/us(type6) + sun6euro en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) + sun6euro * = pc+sun_vndr/us(type6)+%l%(v) pc98 nec_vndr/jp = nec_vndr/jp(pc98) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old en_US = macintosh_vndr/us(oldmac) diff --git a/symbols/sun_vndr/Makefile.am b/symbols/sun_vndr/Makefile.am index db036de..cc4c5b6 100644 --- a/symbols/sun_vndr/Makefile.am +++ b/symbols/sun_vndr/Makefile.am @@ -1,9 +1,10 @@ symbolsdir = $(xkb_base)/symbols/sun_vndr dist_symbols_DATA = \ - cs cz de dk es \ - fi fr gb gr hu \ - it jp ko lt lv \ - nl no pl pt ru \ - se solaris sw tr tuv \ - tw us usb + ara be br ca ch \ + cz de dk ee es \ + fi fr gb gr it \ + jp kr lt lv nl \ + no pl pt ro ru \ + se sk solaris tr tuv \ + tw ua us diff --git a/symbols/sun_vndr/ara b/symbols/sun_vndr/ara new file mode 100644 index 0000000..a5a29aa --- /dev/null +++ b/symbols/sun_vndr/ara @@ -0,0 +1,117 @@ +// +// 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]= "Arabic"; + + key { [ Arabic_thal, Arabic_shadda, grave, asciitilde ] }; + key { [ 1, exclam, 1, exclam ] }; + key { [ 2, at, 2, at ] }; + key { [ 3, numbersign, 3, numbersign ] }; + key { [ 4, dollar, 4, dollar ] }; + key { [ 5, percent, 5, percent ] }; + key { [ 6, asciicircum, 6, asciicircum ] }; + key { [ 7, ampersand, 7, ampersand ] }; + key { [ 8, asterisk, 8, asterisk ] }; + key { [ 9, parenright, 9, parenright ] }; + key { [ 0, parenleft, 0, parenleft ] }; + key { [ minus, underscore, minus, underscore ] }; + key { [ equal, plus, equal, plus ] }; + + key { [ Arabic_dad, Arabic_fatha, q, Q ] }; + key { [ Arabic_sad, Arabic_fathatan, w, W ] }; + key { [ Arabic_theh, Arabic_damma, e, E ] }; + key { [ Arabic_qaf, Arabic_dammatan, r, R ] }; + key { [ Arabic_feh, 0x100fef9, t, T ] }; + key { [ Arabic_ghain, Arabic_hamzaunderalef, y, Y ] }; + key { [ Arabic_ain, grave, u, U ] }; + key { [ Arabic_ha, division, i, I ] }; + key { [ Arabic_khah, multiply, o, O ] }; + key { [ Arabic_hah, Arabic_semicolon, p, P ] }; + key { [ Arabic_jeem, greater, bracketleft, braceleft ] }; + key { [ Arabic_dal, less, bracketright, braceright ] }; + + key { [ Arabic_sheen, Arabic_kasra, a, A ] }; + key { [ Arabic_seen, Arabic_kasratan, s, S ] }; + key { [ Arabic_yeh, bracketright, d, D ] }; + key { [ Arabic_beh, bracketleft, f, F ] }; + key { [ Arabic_lam, 0x100fef7, g, G ] }; + key { [ Arabic_alef, Arabic_hamzaonalef, h, H ] }; + key { [ Arabic_teh, Arabic_tatweel, j, J ] }; + key { [ Arabic_noon, Arabic_comma, k, K ] }; + key { [ Arabic_meem, slash, l, L ] }; + key { [ Arabic_kaf, colon, semicolon, colon ] }; + key { [ Arabic_tah, quotedbl, apostrophe, quotedbl ] }; + key { [ backslash, bar, backslash, bar ] }; + + key { [ bar, brokenbar, bar, brokenbar ] }; + key { [Arabic_hamzaonyeh, asciitilde, z, Z ] }; + key { [ Arabic_hamza, Arabic_sukun, x, X ] }; + key { [Arabic_hamzaonwaw, braceright, c, C ] }; + key { [ Arabic_ra, braceleft, v, V ] }; + key { [ 0x100fefb, 0x100fef5, b, B ] }; + key { [Arabic_alefmaksura, Arabic_maddaonalef, n, N ] }; + key { [Arabic_tehmarbuta, apostrophe, m, M ] }; + key { [ Arabic_waw, comma, comma, less ] }; + key { [ Arabic_zain, period, period, greater ] }; + key { [ Arabic_zah, Arabic_question_mark, slash, question ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ara(type6)" +}; + diff --git a/symbols/sun_vndr/be b/symbols/sun_vndr/be new file mode 100644 index 0000000..8c1226a --- /dev/null +++ b/symbols/sun_vndr/be @@ -0,0 +1,99 @@ +// +// 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]="Belgium"; + + key { [twosuperior, threesuperior ] }; + key { [ ampersand, 1, bar ] }; + key { [ eacute, 2, at ] }; + key { [ quotedbl, 3, numbersign ] }; + key { [apostrophe, 4 ] }; + key { [ parenleft, 5 ] }; + key { [ section, 6, asciicircum ] }; + key { [ egrave, 7 ] }; + key { [ exclam, 8 ] }; + key { [ ccedilla, 9, braceleft ] }; + key { [ agrave, 0, braceright ] }; + key { [parenright, degree ] }; + key { [ minus, underscore ] }; + + key { [ a, A ] }; + key { [ z, Z ] }; + key { [ e, E, EuroSign ] }; + key { [ o, O ] }; + key { [dead_circumflex, dead_diaeresis, bracketleft ] }; + key { [ dollar, asterisk, bracketright ] }; + + key { [ q, Q ] }; + key { [ m, M ] }; + key { [ ugrave, percent, dead_acute ] }; + key { [ mu, sterling, dead_grave ] }; + + key { [ less, greater, backslash ] }; + key { [ w, W ] }; + key { [ comma, question ] }; + key { [ semicolon, period ] }; + key { [ colon, slash ] }; + key { [ equal, plus, dead_tilde ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/be(type6)" +}; + diff --git a/symbols/sun_vndr/br b/symbols/sun_vndr/br new file mode 100644 index 0000000..a5e17e9 --- /dev/null +++ b/symbols/sun_vndr/br @@ -0,0 +1,102 @@ +// +// 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]="Brazil"; + + key { [ apostrophe, quotedbl, notsign ] }; + key { [ 1, exclam, onesuperior, exclamdown ] }; + key { [ 2, at, twosuperior, onehalf ] }; + key { [ 3, numbersign, threesuperior, threequarters ] }; + key { [ 4, dollar, sterling, onequarter ] }; + key { [ 5, percent, cent ] }; + key { [ 6, dead_diaeresis, notsign, diaeresis ] }; + key { [ 7, ampersand, braceleft ] }; + key { [ 8, asterisk, bracketleft ] }; + key { [ 9, parenleft, bracketright ] }; + key { [ 0, parenright, braceright ] }; + key { [ minus, underscore, backslash ] }; + key { [ equal, plus, section ] }; + + key { [ e, E, EuroSign ] }; + key { [ r, R, registered ] }; + key { [ dead_acute, dead_grave, acute, grave ] }; + key { [ bracketleft, braceleft, ordfeminine ] }; + + key { [ ccedilla, Ccedilla, exclamdown ] }; + key { [ dead_tilde, dead_circumflex, asciitilde, asciicircum ] }; + key { [ bracketright, braceright, masculine ] }; + key { [ bracketright, braceright, masculine ] }; + + key { [ slash, bar, degree ] }; + key { [ z, Z, guillemotleft ] }; + key { [ x, X, guillemotright ] }; + key { [ c, C, copyright ] }; + key { [ m, M, mu ] }; + key { [ comma, less, question ] }; + key { [ period, greater, questiondown ] }; + key { [ semicolon, colon ] }; + key { [ slash, question, degree, questiondown ] }; + + key { [ KP_Decimal ] }; + key { [ KP_Delete, comma ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/br(type6)" +}; + diff --git a/symbols/sun_vndr/ca b/symbols/sun_vndr/ca new file mode 100644 index 0000000..c7b5fb8 --- /dev/null +++ b/symbols/sun_vndr/ca @@ -0,0 +1,98 @@ +// +// 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]="Canada Bilingual"; + + key { [ slash, bar, backslash ]}; + key { [ 1, exclam, plusminus ]}; + key { [ 2, at ]}; + key { [ 3, numbersign, sterling ]}; + key { [ 4, dollar, cent ]}; + key { [ 5, percent, currency ]}; + key { [ 6, question, notsign ]}; + key { [ 7, ampersand, braceleft ]}; + key { [ 8, asterisk, braceright ]}; + key { [ 9, parenleft, bracketleft ]}; + key { [ 0, parenright, bracketright ]}; + key { [ minus, underscore, onehalf ]}; + key { [ equal, plus, notsign ]}; + + key { [ e, E, EuroSign ]}; + key { [ o, O, section ]}; + key { [ p, P, paragraph ]}; + key { [ dead_circumflex, dead_diaeresis, dead_grave ]}; + key { [ ccedilla, Ccedilla, asciitilde ]}; + + key { [ semicolon, colon, degree ]}; + key { [ egrave, Egrave, braceleft ]}; + key { [ agrave, Agrave, braceright ]}; + key { [ agrave, Agrave, braceright ]}; + + key { [ uacute, Uacute ]}; + key { [ z, Z, guillemotleft ]}; + key { [ x, X, guillemotright ]}; + key { [ m, M, mu ]}; + key { [ comma, quoteright, less ]}; + key { [ period, quotedbl, greater ]}; + key { [ eacute, Eacute, quoteleft ]}; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ca(type6)" +}; + diff --git a/symbols/sun_vndr/ch b/symbols/sun_vndr/ch new file mode 100644 index 0000000..df4ae80 --- /dev/null +++ b/symbols/sun_vndr/ch @@ -0,0 +1,134 @@ +// +// 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 "de_type6" { + + name[Group1]= "Switzerland - German"; + + key { [ section, degree ] }; + key { [ 1, plus, bar ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, asterisk, numbersign ] }; + key { [ 4, ccedilla, asciicircum ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, notsign ] }; + key { [ 7, slash, brokenbar ] }; + key { [ 8, parenleft, cent ] }; + key { [ 9, parenright ] }; + key { [ 0, equal, quoteleft ] }; + key { [ quoteright, question, dead_acute ] }; + key { [ dead_circumflex, dead_grave, dead_tilde ] }; + + key { [ e, E, EuroSign ] }; + key { [ z, Z ] }; + key { [ udiaeresis, egrave, bracketleft ] }; + key { [ dead_diaeresis, exclam, bracketright ] }; + + key { [ odiaeresis, eacute ] }; + key { [ adiaeresis, agrave, braceleft ] }; + key { [ dollar, sterling, braceright ] }; + + key { [ less, greater, backslash ] }; + key { [ y, Y ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + + +partial alphanumeric_keys +xkb_symbols "fr_type6" { + + name[Group1]= "Switzerland - French, Sun type 6"; + + key { [ section, degree ] }; + key { [ 1, plus, bar ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, asterisk, numbersign ] }; + key { [ 4, ccedilla, asciicircum ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, notsign ] }; + key { [ 7, slash, brokenbar ] }; + key { [ 8, parenleft, cent ] }; + key { [ 9, parenright ] }; + key { [ 0, equal, quoteleft ] }; + key { [ quoteright, question, dead_acute ] }; + key { [ dead_circumflex, dead_grave, dead_tilde ] }; + + key { [ e, E, EuroSign ] }; + key { [ z, Z ] }; + key { [ egrave, udiaeresis, bracketleft ] }; + key { [ dead_diaeresis, exclam, bracketright ] }; + + key { [ eacute, odiaeresis ] }; + key { [ agrave, adiaeresis, braceleft ] }; + key { [ dollar, sterling, braceright ] }; + + key { [ less, greater, backslash ] }; + key { [ y, Y ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ch(de_type6)" +}; + diff --git a/symbols/sun_vndr/cs b/symbols/sun_vndr/cs deleted file mode 100644 index ed46dcf..0000000 --- a/symbols/sun_vndr/cs +++ /dev/null @@ -1,53 +0,0 @@ -// $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(type5)" - include "cz" - - // A few keys are different - - - key { [ quoteleft, asciitilde ] }; -// key { [ ecaron, 2 ], [ at ] }; -// key { [ scaron, 3 ], [ numbersign ] }; -// key { [ ccaron, 4 ], [ dollar ] }; -// key { [ rcaron, 5 ], [ percent ] }; -// key { [ zcaron, 6 ], [ asciicircum ] }; -// key { [ yacute, 7 ], [ ampersand ] }; -// key { [ aacute, 8 ], [ asterisk ] }; - key { [ iacute, 9 ], [ braceleft ] }; - key { [ eacute, 0 ], [ braceright ] }; - - key { [ e, E ] }; - key { [ uacute, slash ], [ bracketleft ] }; - key { [ parenright, parenleft], [ bracketright ] }; - - key { [ s, S ], [ ssharp, ssharp ] }; - key { [ SunFA_Diaeresis, backslash ] }; - - key { [ backslash, bar ] }; - -}; - diff --git a/symbols/sun_vndr/cz b/symbols/sun_vndr/cz index ed46dcf..10f6ded 100644 --- a/symbols/sun_vndr/cz +++ b/symbols/sun_vndr/cz @@ -1,53 +1,106 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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(type5)" - include "cz" - - // A few keys are different - - - key { [ quoteleft, asciitilde ] }; -// key { [ ecaron, 2 ], [ at ] }; -// key { [ scaron, 3 ], [ numbersign ] }; -// key { [ ccaron, 4 ], [ dollar ] }; -// key { [ rcaron, 5 ], [ percent ] }; -// key { [ zcaron, 6 ], [ asciicircum ] }; -// key { [ yacute, 7 ], [ ampersand ] }; -// key { [ aacute, 8 ], [ asterisk ] }; - key { [ iacute, 9 ], [ braceleft ] }; - key { [ eacute, 0 ], [ braceright ] }; - - key { [ e, E ] }; - key { [ uacute, slash ], [ bracketleft ] }; - key { [ parenright, parenleft], [ bracketright ] }; - - key { [ s, S ], [ ssharp, ssharp ] }; - key { [ SunFA_Diaeresis, backslash ] }; - - key { [ backslash, bar ] }; - +// 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]="Czech"; + + key { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; + key { [ plus, 1, exclam, asciitilde ] }; + key { [ ecaron, 2, at, dead_caron ] }; + key { [ scaron, 3, numbersign, dead_circumflex ] }; + key { [ ccaron, 4, dollar, dead_breve ] }; + key { [ rcaron, 5, percent, dead_abovering ] }; + key { [ zcaron, 6, asciicircum, dead_ogonek ] }; + key { [ yacute, 7, ampersand, grave ] }; + key { [ aacute, 8, asterisk, dead_abovedot ] }; + key { [ iacute, 9, parenleft, dead_acute ] }; + key { [ eacute, 0, parenright, dead_doubleacute ] }; + key { [ equal, percent, dead_diaeresis, backslash ] }; + key { [ dead_acute, dead_caron, dead_cedilla, minus ] }; + + key { [ q, Q, backslash ] }; + key { [ w, W, bar ] }; + key { [ e, E, EuroSign ] }; + key { [ z, Z ] }; + key { [ uacute, slash, division ] }; + key { [parenright, parenleft, multiply ] }; + + key { [ s, S, dstroke ] }; + key { [ d, D, Dstroke ] }; + key { [ f, F, bracketleft ] }; + key { [ g, G, bracketright ] }; + key { [ k, K, lstroke ] }; + key { [ l, L, Lstroke ] }; + key { [ uring, quotedbl, dollar ] }; + key { [ section, exclam, ssharp, currency ] }; + key { [ dead_diaeresis, apostrophe, backslash, bar ] }; + + key { [ backslash, asterisk, slash, brokenbar ] }; + key { [ y, Y, less ] }; + key { [ x, X, greater, numbersign ] }; + key { [ v, V, at ] }; + key { [ b, B, braceleft ] }; + key { [ n, N, braceright ] }; + key { [ comma, question, less ] }; + key { [ period, colon, greater ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/cz(type6)" }; diff --git a/symbols/sun_vndr/de b/symbols/sun_vndr/de index 230e0ca..bd13440 100644 --- a/symbols/sun_vndr/de +++ b/symbols/sun_vndr/de @@ -1,65 +1,141 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// +// 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, 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: +// 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. // -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. +// 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. // -// 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. +// 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]="Germany"; + key { [ asciicircum, degree ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, section, threesuperior ] }; + key { [ 4, dollar ] }; + key { [ 6, ampersand, section ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ ssharp, question, backslash ] }; + key { [ dead_acute, dead_grave ] }; + key { [ q, Q, at ] }; + key { [ e, E, EuroSign ] }; + key { [ z, Z ] }; + key { [ udiaeresis, Udiaeresis ] }; + key { [ plus, asterisk, asciitilde ] }; + key { [ odiaeresis, Odiaeresis ] }; + key { [ adiaeresis, Adiaeresis ] }; + key { [ y, Y ] }; + key { [ m, M, mu ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ numbersign, apostrophe, grave ] }; + key { [ less, greater, bar ] }; + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; +partial alphanumeric_keys xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // A few keys are different - key { [ less, braceleft ] }; - - key { [ greater, braceright ] }; - key { [ Delete ] }; - - key { [ 1, plus ], [exclam ] }; - key { [ 2, quotedbl ], [at ] }; - key { [ 3, asterisk ], [numbersign ] }; - key { [ 4, ccedilla ], [cent ] }; - key { [ 5, percent ], [asciitilde ] }; - key { [ 6, ampersand ], [section ] }; - key { [ 7, slash ], [bar ] }; - key { [ 8, parenleft ], [degree ] }; - key { [ 9, parenright ], [backslash ] }; - key { [ 0, equal ], [asciicircum ] }; - Key { [ quoteright, question ], [quoteleft ] }; - key { [ SunFA_Circum, SunFA_Grave ] }; - key { [ e, E ], [EuroSign ] }; - key { [ Z ] }; - key { [ udiaeresis, egrave ] }; - key { [ SunFA_Diaeresis, SunFA_Acute ] }; - key { [ odiaeresis, eacute ] }; - key { [ adiaeresis, agrave ] }; - key { [ dollar, SunFA_Tilde ], [sterling ] }; - key { [ bracketright, bracketleft ], [ backslash ] }; - key { [ Y ] }; - key { [ M, NoSymbol ], [mu ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ SunAltGraph ] }; - key { [ SunCompose ] }; + name[Group1]="Germany - Sun type 4"; + key { [ less, braceleft ] }; + key { [ greater, braceright ] }; + key { [ Delete ] }; + + key { [ 1, plus, exclam ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 3, asterisk, numbersign, sterling ] }; + key { [ 4, ccedilla, cent ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, section ] }; + key { [ 7, slash, bar ] }; + key { [ 8, parenleft, degree ] }; + key { [ 9, parenright, backslash ] }; + key { [ 0, equal, asciicircum ] }; + Key { [ quoteright, question, quoteleft ] }; + key { [ dead_circumflex, dead_grave ] }; + + key { [ e, E, EuroSign, EuroSign ] }; + key { [ z, Z, leftarrow, yen ] }; + key { [ udiaeresis, egrave, dead_diaeresis, dead_abovering ] }; + key { [ dead_diaeresis, dead_acute ] }; + + key { [ s, S ] }; + key { [ j, J, dead_belowdot, dead_abovedot ] }; + key { [ odiaeresis, eacute, dead_doubleacute, dead_belowdot ] }; + key { [ adiaeresis, agrave, dead_circumflex, dead_caron ] }; + key { [ dollar, dead_tilde, sterling ] }; + + key { [ y, Y, guillemotright ] }; + key { [ x, X, guillemotleft ] }; + key { [ v, V, doublelowquotemark, singlelowquotemark ] }; + key { [ b, B, leftdoublequotemark, leftsinglequotemark ] }; + key { [ n, N, rightdoublequotemark, rightsinglequotemark ] }; + key { [ m, M, mu ] }; + key { [ comma, semicolon, periodcentered, multiply ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" }; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/de(type6)" +}; + diff --git a/symbols/sun_vndr/dk b/symbols/sun_vndr/dk index 87c0997..fbef4e2 100644 --- a/symbols/sun_vndr/dk +++ b/symbols/sun_vndr/dk @@ -1,71 +1,148 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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. // -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. + +// +// 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. // -// 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. +// 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]="Denmark"; + + key { [ onehalf, section ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, asciicircum ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question ] }; + key { [ dead_acute, dead_grave, bar ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key { [ apostrophe, asterisk, grave ] }; + key { [ ae, AE ] }; + key { [ oslash, Ooblique ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ less, greater, backslash ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + +partial alphanumeric_keys xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // A few keys are different - key { [ onehalf, section ] }; - key { [ asciitilde, asciicircum ] }; - key { [ 2, quotedbl ], [ at ] }; - key { [ 3, numbersign ], [ sterling ] }; - key { [ 4, currency ], [ dollar ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash ], [ braceleft ] }; - key { [ 8, parenleft ], [ bracketleft] }; - key { [ 9, parenright ], [ bracketright] }; - key { [ 0, equal ], [ braceright ] }; - key { [ plus, question ] }; - key { [ SunFA_Acute, SunFA_Grave], [ bar ] }; - key { [ e, E ], [ EuroSign ] }; - key { [ Aring ] }; - key { [ SunFA_Diaeresis, SunFA_Circum], [SunFA_Tilde] }; - key { [ Caps_Lock ] }; - key { [ AE ] }; - key { [ Ooblique ] }; - key { [ quoteright, asterisk ], [ quoteleft ] }; - key { [ less, greater ], [ backslash ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ Control_L ] }; - key { [ SunAltGraph ] }; - key { [ SunCompose ] }; + name[Group1]="Denmark - Sun type 4"; + key { [ onehalf, section ] }; + key { [ asciitilde, asciicircum ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question ] }; + key { [ dead_acute, dead_grave, bar ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key { [ Caps_Lock ] }; + key { [ ae, AE ] }; + key { [ ooblique, Ooblique ] }; + key { [ quoteright, asterisk, quoteleft ] }; + key { [ less, greater, backslash ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ Control_L ] }; + key { [ SunAltGraph ] }; + key { [ SunCompose ] }; + include "level3(ralt_switch)" + include "kpdl(comma)" }; + +partial alphanumeric_keys xkb_symbols "type5" { - include "dk" - - key { [ 5, percent ], [asciitilde ]}; - key { [ 6, ampersand ], [asciicircum ]}; - key { [ 7, slash ], [ braceleft ]}; - key { [ 8, parenleft ], [ bracketleft ]}; - key { [ 9, parenright ], [ bracketright ]}; - key { [ 0, equal ], [ braceright ]}; - key { [ quoteright, asterisk ], [ quoteleft ]}; - + + include "sun_vndr/dk(type4)" + + name[Group1]="Denmark - Sun type 5"; + + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, asciicircum ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ quoteright, asterisk, quoteleft ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + }; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/dk(type6)" +}; + diff --git a/symbols/sun_vndr/ee b/symbols/sun_vndr/ee new file mode 100644 index 0000000..863c2ad --- /dev/null +++ b/symbols/sun_vndr/ee @@ -0,0 +1,118 @@ +// +// 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]="Estonia"; + + + key { [ dead_caron, dead_tilde, notsign, notsign ] }; + key { [ 1, exclam, onesuperior, exclamdown ] }; + key { [ 2, quotedbl, at, oneeighth ] }; + key { [ 3, numbersign, sterling, sterling ] }; + key { [ 4, currency, dollar, dollar ] }; + key { [ 5, percent, onehalf, threeeighths ] }; + key { [ 6, ampersand, notsign, fiveeighths ] }; + key { [ 7, slash, braceleft, seveneighths ] }; + key { [ 8, parenleft, bracketleft, trademark ] }; + key { [ 9, parenright, bracketright, plusminus ] }; + key { [ 0, equal, braceright, degree ] }; + key { [ plus, question, backslash, questiondown ] }; + key { [ dead_acute, dead_grave, grave, apostrophe ] }; + + key { [ q, Q, at, Greek_OMEGA ] }; + key { [ w, W, lstroke, Lstroke ] }; + key { [ e, E, EuroSign, cent ] }; + key { [ r, R, paragraph, registered ] }; + key { [ t, T, tslash, Tslash ] }; + key { [ y, Y, leftarrow, yen ] }; + key { [ u, U, downarrow, uparrow ] }; + key { [ i, I, rightarrow, idotless ] }; + key { [ o, O, oslash, Ooblique ] }; + key { [ p, P, thorn, THORN ] }; + key { [ udiaeresis, Udiaeresis, dead_diaeresis,dead_abovering ] }; + key { [ otilde, Otilde, section, dead_macron ] }; + + key { [ a, A, ae, AE ] }; + key { [ s, S, ssharp, section ] }; + key { [ d, D, eth, ETH ] }; + key { [ f, F, dstroke, ordfeminine ] }; + key { [ g, G, eng, ENG ] }; + key { [ h, H, hstroke, Hstroke ] }; + key { [ j, J, j, J ] }; + key { [ k, K, kra, ampersand ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ odiaeresis, Odiaeresis, dead_acute, dead_doubleacute ] }; + key { [ adiaeresis, Adiaeresis, asciicircum, dead_caron ] }; + key { [ backslash, bar, degree, brokenbar ] }; + + key { [ apostrophe, asterisk, onehalf, dead_breve ] }; + key { [ z, Z, zcaron, Zcaron ] }; + key { [ x, X, guillemotright, greater ] }; + key { [ c, C, cent, copyright ] }; + key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; + key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; + key { [ n, N, ncedilla, Ncedilla ] }; + key { [ m, M, mu, masculine ] }; + key { [ comma, semicolon, less, multiply ] }; + key { [ period, colon, greater, division ] }; + key { [ minus, underscore, dead_belowdot, dead_abovedot ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ee(type6)" +}; + diff --git a/symbols/sun_vndr/es b/symbols/sun_vndr/es index fc2b442..3f8e032 100644 --- a/symbols/sun_vndr/es +++ b/symbols/sun_vndr/es @@ -1,85 +1,146 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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 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 +// 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. // -// 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. +// 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]="Spain"; -partial + key { [ masculine, ordfeminine, backslash ] }; + key { [ less, greater ] }; + key { [ 1, exclam, bar ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, periodcentered, numbersign ] }; + key { [ 4, dollar, asciicircum ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, notsign ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright ] }; + key { [ 0, equal ] }; + key { [ apostrophe, question, grave ] }; + key { [ exclamdown, questiondown ] }; + key { [ e, E, EuroSign ] }; + key { [ dead_grave, dead_circumflex, bracketleft ] }; + key { [ plus, asterisk, bracketright ] }; + key { [ ntilde, Ntilde ] }; + key { [ dead_acute, dead_diaeresis, braceleft ] }; + key { [ ccedilla, Ccedilla, braceright ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys xkb_symbols "type4" { - key { [ bracketleft, braceleft ], [ guillemotleft ] }; - key { [ bracketright, braceright ], [ guillemotright ] }; - key { [ 2, quotedbl ], [ at ] }; - key { [ 3, periodcentered ], [ numbersign ] }; - key { [ 5, percent ], [ degree ] }; - key { [ 6, ampersand ], [ notsign ] }; + + name[Group1]="Spain - Sun type 4"; + + key { [ bracketleft, braceleft, guillemotleft ] }; + key { [ bracketright, braceright, guillemotright ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, periodcentered, numbersign ] }; + key { [ 5, percent, degree ] }; + key { [ 6, ampersand, notsign ] }; key { [ 7, slash ] }; - key { [ 8, parenleft ] }; - key { [ 9, parenright ], [ backslash ] }; - key { [ 0, equal ], [ bar ] }; - key { [ quoteright, question ], [ quoteleft ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright, backslash ] }; + key { [ 0, equal, bar ] }; + key { [ quoteright, question, quoteleft ] }; key { [ exclamdown, questiondown ] }; - key { [ e, E ], [ EuroSign ] }; - key { [ o, O ], [ masculine ] }; - key { [ SunFA_Grave, SunFA_Circum ], [ asciicircum ] }; - key { [ plus, asterisk ], [ asciitilde ] }; - key { [ a, A ], [ ordfeminine ] }; - key { [ Ntilde ] }; - key { [ SunFA_Acute, SunFA_Diaeresis ] }; - key { [ Ccedilla ] }; + key { [ e, E, EuroSign ] }; + key { [ o, O, masculine ] }; + key { [ dead_grave, dead_circumflex, asciicircum ] }; + key { [ plus, asterisk, asciitilde ] }; + key { [ a, A, ordfeminine ] }; + key { [ ntilde, Ntilde ] }; + key { [ dead_acute, dead_diaeresis ] }; + key { [ ccedilla, Ccedilla ] }; key { [ Alt_R ] }; key { [ Caps_Lock ] }; key { [ Control_L ] }; - key { [ less, greater ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; + key { [ less, greater ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + }; + -partial +partial alphanumeric_keys xkb_symbols "type5" { - include "es" + include "sun_vndr/es(type4)" - key { [ 3, periodcentered ], [ numbersign ] }; - key { [ 4, dollar ], [ asciicircum ] }; - key { [ 5, percent ], [ asciitilde ] }; - key { [ 7, slash ], [ braceleft ]}; - key { [ 8, parenleft ], [ bracketleft ]}; - key { [ 9, parenright ], [ bracketright ]}; - key { [ 0, equal ], [ braceright ]}; - key { [ quoteright, question ], [ quoteleft ] }; - - key { [ SunFA_Grave, SunFA_Circum ], [ bracketleft ] }; - - key { [ SunFA_Acute, SunFA_Diaeresis ], [ braceleft ] }; + name[Group1]="Spain - Sun type 5"; + + key { [ 3, periodcentered, numbersign ] }; + key { [ 4, dollar, asciicircum ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 7, slash, braceleft ]}; + key { [ 8, parenleft, bracketleft ]}; + key { [ 9, parenright, bracketright ]}; + key { [ 0, equal, braceright ]}; + key { [ quoteright, question, quoteleft ] }; + key { [ dead_grave, dead_circumflex, bracketleft ] }; + key { [ dead_acute, dead_diaeresis, braceleft ] }; + + include "level3(ralt_switch)" }; -partial -xkb_symbols "type6" { - include "es(Sundeadkeys)" - key { [ 4, dollar ], [ asciicircum ] }; - key { [ 5, percent ], [ asciitilde ] }; - key { [ 7, slash ], [ braceleft ]}; - key { [ 8, parenleft ], [ bracketleft ]}; - key { [ 9, parenright ], [ bracketright ]}; - key { [ 0, equal ], [ braceright ]}; - key { [ quoteright, question ], [ quoteleft ] }; +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/es(type6)" }; + diff --git a/symbols/sun_vndr/fi b/symbols/sun_vndr/fi index 84756d4..2b203e1 100644 --- a/symbols/sun_vndr/fi +++ b/symbols/sun_vndr/fi @@ -1,36 +1,90 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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 "fi" - // A few keys are different - key { [ plus, question ], - [ backslash ] }; - key { [ diaeresis, asciicircum ], - [ asciitilde ] }; - key { [ apostrophe, asterisk ], - [ quoteleft ] }; +// 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]="Finland"; + + key { [ section, onehalf ] }; + key { [ 1, exclam ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question, backslash ] }; + key { [ dead_acute, dead_grave ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, asciicircum, asciitilde ] }; + key { [ odiaeresis, Odiaeresis ] }; + key { [ adiaeresis, Adiaeresis ] }; + key { [ apostrophe, asterisk, quoteleft ] }; + key { [ less, greater, bar ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/fi(type6)" }; diff --git a/symbols/sun_vndr/fr b/symbols/sun_vndr/fr index 7aa23a7..b705f16 100644 --- a/symbols/sun_vndr/fr +++ b/symbols/sun_vndr/fr @@ -1,86 +1,97 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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. // -// 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. +// 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 // -// NOTE: -// These are the French keyboard symbols -// French Swiss symbols are in sw - -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - - key { [ bracketleft, braceleft ] }; - key { [ bracketright, braceright ] }; - key { [ Delete ] }; - - key { [ ampersand, 1 ], [ ] }; - key { [ eacute, 2 ], [ twosuperior ] }; - key { [ quotedbl, 3 ], [ threesuperior ] }; - key { [ quoteright, 4 ] }; - key { [ parenleft, 5 ] }; - key { [ section, 6 ], [ asciicircum ] }; - key { [ egrave, 7 ] }; - key { [ exclam, 8 ], [ sterling ] }; - key { [ ccedilla, 9 ], [ backslash ] }; - key { [ agrave, 0 ] }; - Key { [ parenright, degree ], [ asciitilde ] }; - key { [ minus, underscore ], [ numbersign ] }; - - key { [ a, A ] }; - key { [ z, Z ] }; - key { [ e, E ], [EuroSign ] }; - key { [ SunFA_Circum, SunFA_Diaeresis ] }; - key { [ quoteleft, dollar ], [ at ] }; - - key { [ q, Q ] }; - key { [ m, M ], [ mu ] }; - key { [ ugrave, percent ] }; - key { [ asterisk, bar ], [ currency ] }; - key { [ less, greater ] }; - key { [ w, W ] }; +partial default alphanumeric_keys +xkb_symbols "type6" { - key { [ comma, question ] }; - key { [ semicolon, period ] }; - key { [ colon, slash ] }; - key { [ equal, plus ] }; + name[Group1]="France"; - key { [ SunAltGraph ] }; - key { [ Caps_Lock ] }; + key { [ twosuperior ] }; + key { [ ampersand, 1 ] }; + key { [ eacute, 2, asciitilde ] }; + key { [ quotedbl, 3, numbersign ] }; + key { [ apostrophe, 4, braceleft ] }; + key { [ parenleft, 5, bracketleft ] }; + key { [ minus, 6, bar ] }; + key { [ egrave, 7, grave ] }; + key { [ underscore, 8, backslash ] }; + key { [ ccedilla, 9, asciicircum ] }; + key { [ agrave, 0, at ] }; + key { [ parenright, degree, bracketright ] }; + key { [ equal, plus, braceright ] }; + key { [ a, A ] }; + key { [ z, Z ] }; + key { [ e, E, EuroSign ] }; + key { [ dead_circumflex, dead_diaeresis ] }; + key { [ dollar, sterling, currency ] }; + key { [ q, Q ] }; + key { [ m, M ] }; + key { [ ugrave, percent ] }; + key { [ asterisk, mu ] }; -}; + key { [ less, greater ] }; + key { [ w, W ] }; + key { [ comma, question ] }; + key { [ semicolon, period ] }; + key { [ colon, slash ] }; + key { [ exclam, section ] }; -xkb_symbols "type5" { - include "fr" + include "level3(ralt_switch)" - key { [ less, greater ] }; }; -xkb_symbols "type6" { - include "sun_vndr/us(type6)" - include "fr" - key { [ less, greater ] }; +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/fr(type6)" }; diff --git a/symbols/sun_vndr/gb b/symbols/sun_vndr/gb index 3cb25fc..8fa7145 100644 --- a/symbols/sun_vndr/gb +++ b/symbols/sun_vndr/gb @@ -1,47 +1,103 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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. +// 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. // -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // A few keys are different - key { [ 1, exclam ], [brokenbar ] }; - key { [ 3, sterling ], [numbersign ] }; - key { [ 4, dollar ], [EuroSign ] }; - key { [ minus, underscore ], [notsign ] }; - key { [ e, E ], [EuroSign ] }; +// +// 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]="United Kingdom"; + + key { [ quoteleft, notsign, brokenbar ] }; + + key { [ 2, quotedbl ] }; + key { [ 3, sterling ] }; + key { [ 4, dollar, EuroSign ] }; + key { [ numbersign, asciitilde ] }; + key { [ apostrophe, at ] }; + key { [ backslash, bar ] }; + + include "level3(ralt_switch)" }; -partial + +partial alphanumeric_keys xkb_symbols "type5" { - include "gb(Sundeadkeys)" - key { [ quoteleft, notsign ], [ brokenbar ] }; - key { [ e, E ], [ EuroSign ] }; + name[Group1]="United Kingdom - Sun type 5"; + + key { [ quoteleft, notsign, brokenbar ] }; + key { [ e, E, EuroSign ] }; + + include "level3(ralt_switch)" + }; -partial -xkb_symbols "type6" { - include "sun_vndr/gb(type5)" + +partial alphanumeric_keys +xkb_symbols "type4" { + + name[Group1]="United Kingdom - Sun type 4"; + + key { [ 1, exclam, brokenbar ] }; + key { [ 3, sterling, numbersign ] }; + key { [ 4, dollar, EuroSign ] }; + key { [ minus, underscore, notsign ] }; + key { [ e, E, EuroSign ] }; + + include "level3(ralt_switch)" + }; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/gb(type6)" +}; + diff --git a/symbols/sun_vndr/gr b/symbols/sun_vndr/gr index ba78175..04fcdb0 100644 --- a/symbols/sun_vndr/gr +++ b/symbols/sun_vndr/gr @@ -1,33 +1,118 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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 { [ 4, dollar ], [ EuroSign ] }; - key { [ e, E], [ EuroSign ] }; - key { [ dead_acute, dead_diaeresis ] }; - key { [ backslash, bar ] }; +// 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]="Greece"; + + + key { [ grave, asciitilde, onehalf ] }; + key { [ 1, exclam ] }; + key { [ 2, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, dollar, EuroSign ] }; + key { [ 5, percent, EuroSign ] }; + key { [ 6, asciicircum, notsign ] }; + key { [ 7, ampersand ] }; + key { [ 8, asterisk ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright, degree ] }; + key { [ minus, underscore, plusminus ] }; + key { [ equal, plus ] }; + + key { [ semicolon, colon, periodcentered ] }; + key { [ Greek_finalsmallsigma, periodcentered, Greek_SIGMA ] }; + key { [ Greek_epsilon, Greek_EPSILON, EuroSign ] }; + key { [ Greek_rho, Greek_RHO, registered ] }; + key { [ Greek_tau, Greek_TAU ] }; + key { [ Greek_upsilon, Greek_UPSILON ] }; + key { [ Greek_theta, Greek_THETA ] }; + key { [ Greek_iota, Greek_IOTA ] }; + key { [ Greek_omicron, Greek_OMICRON ] }; + key { [ Greek_pi, Greek_PI ] }; + key { [ bracketleft, braceleft, guillemotleft ] }; + key { [ bracketright, braceright, guillemotright ] }; + + key { [ Greek_alpha, Greek_ALPHA ] }; + key { [ Greek_sigma, Greek_SIGMA ] }; + key { [ Greek_delta, Greek_DELTA ] }; + key { [ Greek_phi, Greek_PHI ] }; + key { [ Greek_gamma, Greek_GAMMA ] }; + key { [ Greek_eta, Greek_ETA ] }; + key { [ Greek_xi, Greek_XI ] }; + key { [ Greek_kappa, Greek_KAPPA ] }; + key { [ Greek_lamda, Greek_LAMDA ] }; + key { [ dead_acute, dead_diaeresis ] }; + key { [ apostrophe, quotedbl ] }; + key { [ backslash, bar, brokenbar ] }; + + key { [ guillemotleft, guillemotright, brokenbar ] }; + key { [ Greek_zeta, Greek_ZETA ] }; + key { [ Greek_chi, Greek_CHI ] }; + key { [ Greek_psi, Greek_PSI, copyright ] }; + key { [ Greek_omega, Greek_OMEGA ] }; + key { [ Greek_beta, Greek_BETA ] }; + key { [ Greek_nu, Greek_NU ] }; + key { [ Greek_mu, Greek_MU ] }; + key { [ comma, less, guillemotleft ] }; + key { [ period, greater, guillemotright ] }; + key { [ slash, question ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/gr(type6)" }; diff --git a/symbols/sun_vndr/hu b/symbols/sun_vndr/hu deleted file mode 100644 index f14a72f..0000000 --- a/symbols/sun_vndr/hu +++ /dev/null @@ -1,88 +0,0 @@ -// $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]="Hungarian"; - - key { [ 0, section ] }; - key { [ 1, apostrophe ] }; - key { [ 2, quotedbl ] }; - key { [ 3, plus ], - [ numbersign ] }; - key { [ 4, exclam ], - [ dollar ] }; - key { [ 6, slash ], - [ asciicircum ] }; - key { [ 7, equal ], - [ braceleft ] }; - key { [ 8, parenleft ], - [ bracketleft ] }; - key { [ 9, parenright ], - [ bracketright ] }; - key { [ odiaeresis, Odiaeresis ], - [ braceright ] }; - key { [ udiaeresis, Udiaeresis ], - [ backslash ] }; - key { [ oacute, Oacute ], - [ asciitilde ] }; - - key { [ q, Q ], - [ at ] }; - key { [ z, Z ] }; - key { [ odoubleacute, Odoubleacute ] }; - key { [ uacute, Uacute ] }; - - key { [ s, S ], - [ ssharp ] }; - key { [ k, K ], - [ ampersand ] }; - key { [ eacute, Eacute ], - [ semicolon ] }; - key { [ aacute, Aacute ], - [ adiaeresis, Adiaeresis ] }; - key { [ udoubleacute, Udoubleacute ] }; - - key { [ iacute, Iacute ], - [ bar ] }; - key { [ y, Y ], - [ less ] }; - key { [ x, X ], - [ greater ] }; - key { [ c, C ], - [ quoteleft ] }; - key { [ comma, question ], - [ asterisk ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - // End alphanumeric section -}; - diff --git a/symbols/sun_vndr/it b/symbols/sun_vndr/it index 9be87ce..9648291 100644 --- a/symbols/sun_vndr/it +++ b/symbols/sun_vndr/it @@ -1,71 +1,141 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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. // -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. + +// +// 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] // -// 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. +// CDDL HEADER END // + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Italy"; + + key { [ less, greater ] }; + key { [ backslash, bar ] }; + key { [ 2, quotedbl ] }; + key { [ 3, sterling ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft, braceleft ] }; + key { [ 9, parenright, braceright ] }; + key { [ 0, equal ] }; + key { [ apostrophe, question, grave ] }; + key { [ igrave, asciicircum ] }; + key { [ e, E, EuroSign ] }; + key { [ egrave, eacute, bracketleft, dead_abovering ] }; + key { [ plus, asterisk, bracketright ] }; + key { [ ugrave, section, asciitilde ] }; + key { [ ograve, ccedilla, at ] }; + key { [ agrave, degree, numbersign ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys xkb_symbols "type4" { - key { [ bracketleft, braceleft ], [ guillemotleft ] }; - key { [ bracketright, braceright ], [ guillemotright ] }; - key { [ 2, quotedbl ], [ twosuperior ] }; - key { [ 3, sterling ], [ threesuperior ] }; - key { [ 6, ampersand ], [ notsign ] }; - key { [ 7, slash ] }; - key { [ 8, parenleft ] }; - key { [ 9, parenright ], [ backslash ] }; - key { [ 0, equal ], [ bar ] }; - key { [ quoteright, question ], [ quoteleft ] }; - key { [ igrave, asciicircum ] }; - - key { [ egrave, eacute ] }; - key { [ plus, asterisk ], [ asciitilde ] }; - - key { [ ograve, ccedilla ], [ at ] }; - key { [ agrave, degree ], [ numbersign ] }; - key { [ ugrave, section ] }; - - key { [ less, greater ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - - - key { [ Alt_L ] }; - key { [ SunCompose ] }; - key { [ SunAltGraph ] }; - key { [ Caps_Lock ] }; - key { [ Control_L ] }; + name[Group1]="Italy - Sun type 4"; + + key { [ bracketleft, braceleft, guillemotleft ] }; + key { [ bracketright, braceright, guillemotright ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, sterling, threesuperior ] }; + key { [ 6, ampersand, notsign ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright, backslash ] }; + key { [ 0, equal, bar ] }; + key { [ quoteright, question, quoteleft ] }; + key { [ igrave, asciicircum ] }; + + key { [ egrave, eacute ] }; + key { [ plus, asterisk, asciitilde ] }; + + key { [ ograve, ccedilla, at ] }; + key { [ agrave, degree, numbersign ] }; + key { [ ugrave, section ] }; + + key { [ less, greater ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + + key { [ Alt_L ] }; + key { [ SunCompose ] }; + key { [ SunAltGraph ] }; + key { [ Caps_Lock ] }; + key { [ Control_L ] }; + + include "level3(ralt_switch)" }; + +partial alphanumeric_keys xkb_symbols "type5" { - include "it" - key { [ 8, parenleft ], [ braceleft ] }; - key { [ 9, parenright ], [ braceright ] }; + name[Group1]="Italy - Sun type 5"; + + key { [ 8, parenleft, braceleft ] }; + key { [ 9, parenright, braceright ] }; + key { [ ugrave, section, asciitilde ] }; + + include "level3(ralt_switch)" - key { [ ugrave, section ], [ asciitilde ] }; }; + -partial -xkb_symbols "type6" { - include "sun_vndr/it(type5)" +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/it(type6)" }; + diff --git a/symbols/sun_vndr/jp b/symbols/sun_vndr/jp index b3a6859..14f1971 100644 --- a/symbols/sun_vndr/jp +++ b/symbols/sun_vndr/jp @@ -1,25 +1,31 @@ // $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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. +// 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. // // $TOG: us /main/5 1998/02/10 13:45:06 kaleb $ // @@ -45,6 +51,27 @@ // // US/ASCII layout for a Type 4 Sun keyboard +// +// 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 +// + xkb_symbols "basic" { // Alphanumeric section key { [ 1, exclam ], [ kana_NU ] }; @@ -785,8 +812,8 @@ partial xkb_symbols "type7" { include "sun_vndr/jp(type6)" key { [ 0, asciitilde ], [ kana_WA, kana_WO ] }; - key { [ Henkan_Mode ] }; + key { [ Henkan_Mode ] }; key { [ Kana_Lock, Mode_switch ] }; - key { [ Alt_R ] }; + key { [ Alt_R, Alt_R ] }; }; diff --git a/symbols/sun_vndr/ko b/symbols/sun_vndr/ko deleted file mode 100644 index acc568f..0000000 --- a/symbols/sun_vndr/ko +++ /dev/null @@ -1,57 +0,0 @@ -// $XdotOrg: $ -// -// Copyright 2005 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. -// -// -// Korean layout for a Type 4 Sun keyboard -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - - key { [ backslash, bar ], [ brokenbar ] }; - - key { [ Hangul ] }; - key { [ Linefeed ] }; - key { [ Hangul_Hanja ] }; - -}; - -// Korean layout for a Type 5 Sun keyboard -xkb_symbols "type5" { -// include "sun_vndr/us(type5basic)" - - // A few keys are different - key { [ Hangul ] }; - key { [ Hangul_Hanja ] }; - key { [ backslash, bar ], [ brokenbar ] }; -}; - -// Korean layout for a Type 6 Sun keyboard -partial -xkb_symbols "type6" { -// include "sun_vndr/us(type5basic)" - - // A few keys are different - key { [ Hangul ] }; - key { [ Hangul_Hanja ] }; - key { [ backslash, bar ], [ brokenbar ] }; -}; - diff --git a/symbols/sun_vndr/kr b/symbols/sun_vndr/kr new file mode 100644 index 0000000..5713721 --- /dev/null +++ b/symbols/sun_vndr/kr @@ -0,0 +1,98 @@ +// +// 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 +// + +// Korean layout for a Type 6 Sun keyboard +partial +xkb_symbols "type6" { + + // A few keys are different + key { [ Hangul ] }; + key { [ Hangul_Hanja ] }; + key { [ Hangul ] }; + key { [ Hangul_Hanja ] }; + key { [ backslash, bar, brokenbar ] }; + + include "level3(ralt_switch)" + +}; + + +// Korean layout for a Type 4 Sun keyboard +xkb_symbols "type4" { + + key { [ backslash, bar, brokenbar ] }; + + key { [ Hangul ] }; + key { [ Linefeed ] }; + key { [ Hangul_Hanja ] }; + + include "level3(ralt_switch)" + +}; + +// Korean layout for a Type 5 Sun keyboard +xkb_symbols "type5" { + + // A few keys are different + key { [ Hangul ] }; + key { [ Hangul_Hanja ] }; + key { [ backslash, bar, brokenbar ] }; + + include "level3(ralt_switch)" + +}; + + +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/kr(type6)" +}; + diff --git a/symbols/sun_vndr/lt b/symbols/sun_vndr/lt index 8a8d54a..bba9643 100644 --- a/symbols/sun_vndr/lt +++ b/symbols/sun_vndr/lt @@ -1,75 +1,119 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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. // -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. + +// +// 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. // -// 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. +// 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] // -// $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $ -default partial alphanumeric_keys -xkb_symbols "type5" { +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Hungarian keyboard. + name[Group1]="Lithuania"; - // Alphanumeric section - name[group1]="Lithuanian"; - key { [ quoteright, asciitilde ], - [ quoteleft, caron ] }; - key { [ 2, quotedbl ], - [ at ] }; - key { [ 3, slash ], - [ numbersign ] }; - key { [ 4, semicolon ], - [ dollar ] }; - key { [ 5, colon ], - [ percent ] }; - key { [ 6, comma ], - [ asciicircum ] }; - key { [ 7, period ], - [ ampersand ] }; - key { [ 8, question ], - [ asterisk ] }; - key { [ 9, parenleft ], - [ bracketleft, braceleft ] }; - key { [ 0, parenright ], - [ bracketright, braceright ] }; - key { [ aogonek, Aogonek ], - [ q, Q ] }; - key { [ zcaron, Zcaron ], - [ w, W ] }; - key { [ iogonek, Iogonek ] }; - key { [ ogonek ] }; - key { [ uogonek, Uogonek ] }; - key { [ eabovedot, Eabovedot ] }; - key { [ asciicircum, quoteright ] }; - key { [ backslash, bar ] }; - key { [ umacron, Umacron ], - [ x, X ] }; - key { [ ccaron, Ccaron ], - [ less ] }; - key { [ scaron, Scaron ], - [ greater ] }; - key { [ eogonek, Eogonek ] }; + key { [ quoteleft, asciitilde, notsign, brokenbar ] }; + key { [ aogonek, Aogonek, 1, exclam ] }; + key { [ ccaron, Ccaron, 2, at ] }; + key { [ eogonek, Eogonek, 3, numbersign ] }; + key { [ eabovedot, Eabovedot, 4, dollar ] }; + key { [ iogonek, Iogonek, 5, percent ] }; + key { [ scaron, Scaron, 6, asciicircum ] }; + key { [ uogonek, Uogonek, 7, ampersand ] }; + key { [ umacron, Umacron, 8, asterisk ] }; + key { [ doublelowquotemark, parenleft, 9, parenleft ] }; + key { [ leftdoublequotemark, parenright, 0, parenright ] }; + key { [ minus, underscore, backslash, questiondown ] }; + key { [ zcaron, Zcaron, equal, plus ] }; + + key { [ q, Q, at, Greek_OMEGA ] }; + key { [ w, W, lstroke, Lstroke ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, paragraph, registered ] }; + key { [ t, T, tslash, Tslash ] }; + key { [ y, Y, leftarrow, yen ] }; + key { [ u, U, downarrow, uparrow ] }; + key { [ i, I, rightarrow, idotless ] }; + key { [ o, O, oslash, Ooblique ] }; + key { [ p, P, thorn, THORN ] }; + key { [ bracketleft, braceleft, dead_diaeresis, dead_abovering ] }; + key { [ bracketright, braceright, dead_tilde, dead_macron ] }; + + key { [ a, A, ae, AE ] }; + key { [ s, S, ssharp, section ] }; + key { [ d, D, eth, ETH ] }; + key { [ f, F, dstroke, ordfeminine ] }; + key { [ g, G, eng, ENG ] }; + key { [ h, H, hstroke, Hstroke ] }; + key { [ j, J ] }; + key { [ k, K, kra, ampersand ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ semicolon, colon, dead_acute, dead_doubleacute ] }; + key { [ apostrophe, quotedbl, dead_circumflex, dead_caron ] }; + key { [ backslash, bar, dead_grave, dead_breve ] }; + + key { [ backslash, bar, dead_grave, dead_breve ] }; + key { [ z, Z, guillemotleft, less ] }; + key { [ x, X, guillemotright, greater ] }; + key { [ c, C, cent, copyright ] }; + key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; + key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; + key { [ n, N ] }; + key { [ m, M, mu, masculine ] }; + key { [ comma, less, ampersand, multiply ] }; + key { [ period, greater, periodcentered, division ] }; + key { [ slash, question, dead_belowdot, dead_abovedot ] }; + + include "level3(ralt_switch)" + +}; - // End alphanumeric section +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/lt(type6)" }; diff --git a/symbols/sun_vndr/lv b/symbols/sun_vndr/lv index cb5f97c..f550837 100644 --- a/symbols/sun_vndr/lv +++ b/symbols/sun_vndr/lv @@ -1,69 +1,118 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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. // -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. + +// +// 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. // -// 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. +// 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 "type5" { +partial default alphanumeric_keys +xkb_symbols "type6" { - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Latvian keyboard. + name[Group1]="Latvia"; - // Alphanumeric section - name[group1]="Latvian"; + key { [ grave, asciitilde, acute, asciitilde ] }; + key { [ 1, exclam, onesuperior, exclamdown ] }; + key { [ 2, at, twosuperior, oneeighth ] }; + key { [ 3, numbersign, threesuperior, sterling ] }; + key { [ 4, dollar, EuroSign, cent ] }; + key { [ 5, percent, onehalf, threeeighths ] }; + key { [ 6, asciicircum, threequarters, fiveeighths ] }; + key { [ 7, ampersand, braceleft, seveneighths ] }; + key { [ 8, asterisk, bracketleft, trademark ] }; + key { [ 9, parenleft, bracketright, plusminus ] }; + key { [ 0, parenright, braceright, degree ] }; + key { [ minus, underscore, backslash, questiondown ] }; + key { [ equal, plus, endash, emdash ] }; + + key { [ q, Q, q, Q ] }; + key { [ w, W, w, W ] }; + key { [ e, E, emacron, Emacron ] }; + key { [ r, R, rcedilla, Rcedilla ] }; + key { [ t, T, t, T ] }; + key { [ y, Y, y, Y ] }; + key { [ u, U, umacron, Umacron ] }; + key { [ i, I, imacron, Imacron ] }; + key { [ o, O, omacron, Omacron ] }; + key { [ p, P, p, P ] }; + key { [ bracketleft, braceleft, guillemotleft, leftdoublequotemark ] }; + key { [ bracketright, braceright, guillemotright, rightdoublequotemark ] }; + + key { [ a, A, amacron, Amacron ] }; + key { [ s, S, scaron, Scaron ] }; + key { [ d, D, d, D ] }; + key { [ f, F, f, F ] }; + key { [ g, G, gcedilla, Gcedilla ] }; + key { [ h, H, h, H ] }; + key { [ j, J, j, J ] }; + key { [ k, K, kcedilla, Kcedilla ] }; + key { [ l, L, lcedilla, Lcedilla ] }; + key { [ semicolon, colon, semicolon, colon ] }; + key { [ apostrophe, quotedbl, leftdoublequotemark, doublelowquotemark ] }; + key { [ backslash, bar, degree, brokenbar ] }; + + key { [ backslash, bar, grave, breve ] }; + key { [ z, Z, zcaron, Zcaron ] }; + key { [ x, X, x, X ] }; + key { [ c, C, ccaron, Ccaron ] }; + key { [ v, V, v, V ] }; + key { [ b, B, b, B ] }; + key { [ n, N, ncedilla, Ncedilla ] }; + key { [ m, M, m, M ] }; + key { [ comma, less, horizconnector, multiply ] }; + key { [ period, greater, periodcentered, division ] }; + key { [ slash, question, slash, abovedot ] }; + + include "level3(ralt_switch)" + +}; - key { [ 4, dollar ], - [ section ] }; - key { [ 8, asterisk ], - [ multiply ] }; - key { [ e, E ], - [ emacron, Emacron ] }; - key { [ r, R ], - [ rcedilla, Rcedilla ] }; - key { [ u, U ], - [ umacron, Umacron ] }; - key { [ i, I ], - [ imacron, Imacron ] }; - key { [ o, O ], - [ omacron, Omacron ] }; - key { [ a, A ], - [ amacron, Amacron ] }; - key { [ s, S ], - [ scaron, Scaron ] }; - key { [ g, G ], - [ gcedilla, Gcedilla ] }; - key { [ k, K ], - [ kcedilla, Kcedilla ] }; - key { [ l, L ], - [ lcedilla, Lcedilla ] }; - key { [ degree, bar ] }; - key { [ backslash, bar ] }; - key { [ z, Z ], - [ zcaron, Zcaron ] }; - key { [ c, C ], - [ ccaron, ccaron ] }; - key { [ n, N ], - [ ncedilla, Ncedilla ] }; - // End alphanumeric section +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/lv(type6)" }; diff --git a/symbols/sun_vndr/nl b/symbols/sun_vndr/nl index f6564d1..a895beb 100644 --- a/symbols/sun_vndr/nl +++ b/symbols/sun_vndr/nl @@ -1,62 +1,149 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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. +// 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" { - 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 ] }; - + + 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, SunFA_Tilde, SunFA_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)" }; diff --git a/symbols/sun_vndr/no b/symbols/sun_vndr/no index aad44cc..cc8419c 100644 --- a/symbols/sun_vndr/no +++ b/symbols/sun_vndr/no @@ -1,71 +1,145 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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. // -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. + +// +// 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] // -// 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. +// CDDL HEADER END // +partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Norway"; + + key { [ bar, section ] }; + key { [ less, greater ] }; + key { [ apostrophe, asterisk, grave ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, asciicircum ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question ] }; + key { [ backslash, dead_grave, dead_acute ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key { [ oslash, Oslash ] }; + key { [ ae, AE ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + +partial alphanumeric_keys xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // A few keys are different - - key { [ bar, section ] }; - key { [ asciitilde, asciicircum] }; - key { [ 2, quotedbl ], [at ] }; - key { [ 3, numbersign ], [sterling ] }; - key { [ 4, currency ], [dollar ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash ], [braceleft ] }; - key { [ 8, parenleft ], [bracketleft ] }; - key { [ 9, parenright ], [bracketright] }; - key { [ 0, equal ], [braceright ] }; - key { [ plus, question ] }; - key { [ backslash, SunFA_Grave], [SunFA_Acute] }; - key { [ e, E ], [EuroSign ] }; - key { [ Aring ] }; - key { [ SunFA_Diaeresis, SunFA_Circum],[SunFA_Tilde] }; - key { [ Caps_Lock ] }; - key { [ Ooblique ] }; - key { [ AE ] }; - key { [ quoteright, asterisk ], [quoteleft ] }; - key { [ less, greater ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ Control_L ] }; + + name[Group1]="Norway - Sun type 4"; + + key { [ bar, section ] }; + key { [ asciitilde, asciicircum] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question ] }; + key { [ backslash, dead_grave, dead_acute ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key { [ Caps_Lock ] }; + key { [ Ooblique ] }; + key { [ ae, AE ] }; + key { [ quoteright, asterisk, quoteleft ] }; + key { [ less, greater ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ Control_L ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" }; + +partial alphanumeric_keys xkb_symbols "type5" { - include "no" + + name[Group1]="Norway - Sun type 5"; + + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, asciicircum ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketright ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; - key { [ 5, percent ], [asciitilde ]}; - key { [ 6, ampersand ], [asciicircum ]}; - key { [ 7, slash ], [ braceleft ]}; - key { [ 8, parenleft ], [ bracketright ]}; - key { [ 9, parenright ], [ bracketright ]}; - key { [ 0, equal ], [ braceright ]}; + key { [ quoteright, asterisk, quoteleft ] }; + key { [ less, greater ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" - key { [ quoteright, asterisk ], [ quoteleft ]}; - key { [ less, greater ] }; }; +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/no(type6)" +}; diff --git a/symbols/sun_vndr/pl b/symbols/sun_vndr/pl index deb5819..e4d13b3 100644 --- a/symbols/sun_vndr/pl +++ b/symbols/sun_vndr/pl @@ -1,51 +1,102 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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 { [ quoteleft, asciitilde], [ degree, degree ] }; - key { [ 2, quotedbl ], [ at ] }; - key { [ 3, colon ], [ numbersign ] }; - key { [ 4, question ], [ dollar ] }; - key { [ 6, plus ], [ asciicircum ] }; - key { [ 7, underscore ], [ ampersand ] }; - key { [ 8, parenleft ], [ asterisk ] }; - key { [ 9, parenright ] }; - key { [ 0, equal ] }; - key { [ zabovedot, Zabovedot ] }; - key { [ dead_ogonek, Aacute ] }; - key { [ oacute, zacute ], [ bracketleft, braceleft ] }; - key { [ slash, section ], [ bracketright, braceright ] }; - key { [ s, S ], [ ssharp ] }; - key { [ k, K ], [ ampersand ] }; - key { [ lstroke, Lstroke ] }; - key { [ aogonek, eogonek ], [ quoteright ] }; - key { [ backslash, semicolon ], [ currency, bar ] }; - key { [ less, greater ] }; - key { [ comma, sacute ], [ less ] }; - key { [ period, nacute ], [ greater ] }; - key { [ minus, cacute ] }; +// 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 { [ grave, asciitilde ] }; + key { [ 1, exclam ] }; + key { [ 2, at ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, asciicirum ] }; + key { [ 7, ampersand ] }; + key { [ 8, asterisk ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright ] }; + key { [ minus, underscore ] }; + key { [ equal, plus ] }; + + key { [ e, E, eogonek, Eogonek ] }; + key { [ u, U, EuroSign ] }; + key { [ o, O, oacute, Oacute ] }; + key { [ bracketleft, braceleft ] }; + key { [ bracketright, braceright ] }; + + key { [ a, A, aogonek, Aogonek ] }; + key { [ s, S, sacute, Sacute ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ semicolon, colon ] }; + key { [ apostrophe, quotedbl ] }; + key { [ backslash, bar, brokenbar ] }; + + key { [ less, greater, bar, brokenbar ] }; + key { [ z, Z, zabovedot, Zabovedot ] }; + key { [ x, X, zacute, Zacute ] }; + key { [ c, C, cacute, Cacute ] }; + key { [ n, N, nacute, Nacute ] }; + key { [ comma, less ] }; + key { [ period, greater ] }; + key { [ slash, question ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/pl(type6)" }; diff --git a/symbols/sun_vndr/pt b/symbols/sun_vndr/pt index a88c682..8d21d76 100644 --- a/symbols/sun_vndr/pt +++ b/symbols/sun_vndr/pt @@ -1,82 +1,143 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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. // -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. + +// +// 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. // -// 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. +// 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]="Portugal"; + + key { [ less, greater ] }; + key { [ backslash, bar ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, dollar, section ] }; + key { [ 5, percent, asciitilde ] }; + key { [ 6, ampersand, asciicircum ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ quoteright, question, quoteleft ] }; + key { [ guillemotleft, guillemotright ] }; + key { [ e, E, EuroSign ] }; + key { [ plus, asterisk, dead_diaeresis ] }; + key { [ dead_acute, dead_grave ] }; + key { [ dead_tilde, dead_circumflex ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ masculine, ordfeminine ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys xkb_symbols "type4" { - //this is a Portugal4 keyboard - - key { [ bracketleft, braceleft], [guillemotleft] }; - key { [ bracketright, braceright], [guillemotright] }; - key { [ 2, quotedbl ], [at ] }; - key { [ 3, numbersign ], [sterling ] }; - key { [ 4, dollar ], [section ] }; - key { [ 6, ampersand ], [notsign ] }; - key { [ 7, slash ] }; - key { [ 8, parenleft ] }; - key { [ 9, parenright ], [backslash ] }; - key { [ 0, equal ], [bar ] }; - key { [ quoteright, question ], [quoteleft ] }; - key { [ exclamdown, questiondown] }; - key { [ e, E ], [EuroSign ] }; - key { [ SunFA_Diaeresis, asterisk], [plus ] }; - key { [ SunFA_Acute, SunFA_Grave], [asciitilde] }; - key { [ Caps_Lock ] }; - key { [ Ccedilla ] }; - key { [ masculine, ordfeminine] }; - key { [ SunFA_Tilde, SunFA_Circum], [asciicircum] }; - key { [ less, greater ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ Control_L ] }; + + name[Group1]="Portugal - Sun type 4"; + + key { [ bracketleft, braceleft, guillemotleft] }; + key { [ bracketright, braceright, guillemotright] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, dollar, section ] }; + key { [ 6, ampersand, notsign ] }; + key { [ 7, slash ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright, backslash ] }; + key { [ 0, equal, bar ] }; + key { [ quoteright, question, quoteleft ] }; + key { [ exclamdown, questiondown ] }; + key { [ e, E, EuroSign ] }; + key { [ dead_diaeresis, asterisk, plus ] }; + key { [ dead_acute, dead_grave, asciitilde ] }; + key { [ Caps_Lock ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ masculine, ordfeminine] }; + key { [ dead_tilde, dead_circumflex, asciicircum ] }; + key { [ less, greater ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + key { [ Control_L ] }; + + include "level3(ralt_switch)" }; + +partial alphanumeric_keys xkb_symbols "type5" { - include "pt" + + name[Group1]="Portugal - Sun type 5"; - key { [ backslash, bar ] }; - key { [ 5, percent ], [asciitilde ]}; - key { [ 6, ampersand ], [asciicircum ]}; - key { [ 7, slash ], [ braceleft ]}; - key { [ 8, parenleft ], [ bracketleft ]}; - key { [ 9, parenright ], [ bracketright ]}; - key { [ 0, equal ], [ braceright ]}; - key { [ quoteright, question ], [quoteleft ]}; + key { [ backslash, bar ] }; + key { [ 5, percent, asciitilde ]}; + key { [ 6, ampersand, asciicircum ]}; + key { [ 7, slash, braceleft ]}; + key { [ 8, parenleft, bracketleft ]}; + key { [ 9, parenright, bracketright ]}; + key { [ 0, equal, braceright ]}; + key { [ quoteright, question, quoteleft ]}; - key { [ plus, asterisk ], [SunFA_Diaeresis ]}; + key { [ plus, asterisk, dead_diaeresis ]}; -}; + include "level3(ralt_switch)" -partial -xkb_symbols "type6" { - include "pt(sundeadkeys)" +}; - key { [ 5, percent ], [asciitilde ]}; - key { [ 6, ampersand ], [asciicircum ]}; - key { [ 7, slash ], [ braceleft ]}; - key { [ 8, parenleft ], [ bracketleft ]}; - key { [ 9, parenright ], [ bracketright ]}; - key { [ 0, equal ], [ braceright ]}; - key { [ quoteright, question ], [quoteleft ]}; +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/pt(type6)" }; + diff --git a/symbols/sun_vndr/ro b/symbols/sun_vndr/ro new file mode 100644 index 0000000..df4026f --- /dev/null +++ b/symbols/sun_vndr/ro @@ -0,0 +1,118 @@ +// +// 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]="Romania"; + + + key { [ grave, asciitilde, grave, asciitilde ] }; + key { [ 1, exclam, dead_tilde ] }; + key { [ 2, at, dead_caron ] }; + key { [ 3, numbersign, dead_circumflex ] }; + key { [ 4, dollar, dead_breve ] }; + key { [ 5, percent, dead_abovering ] }; + key { [ 6, asciicircum, dead_ogonek ] }; + key { [ 7, ampersand, dead_grave ] }; + key { [ 8, asterisk, dead_abovedot ] }; + key { [ 9, parenleft, dead_acute ] }; + key { [ 0, parenright, dead_doubleacute ] }; + key { [ minus, underscore, dead_diaeresis, endash ] }; + key { [ equal, plus, dead_cedilla, plusminus ] }; + + key { [ q, Q, acircumflex, Acircumflex ] }; + key { [ w, W, ssharp ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, r, R ] }; + key { [ t, T, 0x100021b, 0x100021a ] }; + key { [ y, Y, y, Y ] }; + key { [ u, U, u, U ] }; + key { [ i, I, icircumflex, Icircumflex ] }; + key { [ o, O, o, O ] }; + key { [ p, P, section ] }; + key { [ bracketleft, braceleft, doublelowquotemark ] }; + key { [ bracketright, braceright, rightdoublequotemark ] }; + + key { [ a, A, abreve, Abreve ] }; + key { [ s, S, 0x1000219, 0x1000218 ] }; + key { [ d, D, dstroke, Dstroke ] }; + key { [ f, F, f, F ] }; + key { [ g, G, g, G ] }; + key { [ h, H, h, H ] }; + key { [ j, J, j, J ] }; + key { [ k, K, k, K ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ semicolon, colon, semicolon, colon ] }; + key { [ apostrophe, quotedbl, apostrophe, quotedbl ] }; + key { [ backslash, bar, backslash, brokenbar ] }; + + key { [ backslash, bar, backslash, brokenbar ] }; + key { [ z, Z, z, Z ] }; + key { [ x, X, x, X ] }; + key { [ c, C, copyright ] }; + key { [ v, V, v, V ] }; + key { [ b, B, b, B ] }; + key { [ n, N, n, N ] }; + key { [ m, M, m, M ] }; + key { [ comma, less, guillemotleft, multiply ] }; + key { [ period, greater, guillemotright, division ] }; + key { [ slash, question, slash, question ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ro(type6)" +}; + diff --git a/symbols/sun_vndr/ru b/symbols/sun_vndr/ru index 101cad7..5c33209 100644 --- a/symbols/sun_vndr/ru +++ b/symbols/sun_vndr/ru @@ -1,46 +1,112 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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 "ru" - // A few keys are different - key { [ backslash, bar ], - [ slash, question ] }; - key { [ slash, question ], - [ ediaeresis, Ediaeresis ] }; +// 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 +// -// layout for a Sun Type 6 Russian keyboard -partial +partial alphanumeric_keys xkb_symbols "type6" { - include "sun_vndr/ru(basic)" - key { [ 3, numbersign ], - [ 3, numerosign ] }; - key { [ 4, dollar ], - [ 4, percent ] }; + name[Group1]= "Russia"; + + key.type[group1]="FOUR_LEVEL"; + + + key { [ 1, exclam ] }; + key { [ 2, quotedbl, 2, at ] }; + key { [ 3, numerosign, 3, numbersign ] }; + key { [ 4, percent, 4, dollar ] }; + key { [ 5, colon, 5, percent ] }; + key { [ 7, period, 7, ampersand ] }; + key { [ 8, semicolon, 8, asterisk ] }; + key { [ slash, question, backslash, bar ] }; + key { [ ediaeresis, Ediaeresis, slash, question ] }; + key { [ backslash, bar ] }; + + key { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q ] }; + key { [ Cyrillic_tse, Cyrillic_TSE, w, W ] }; + key { [ Cyrillic_u, Cyrillic_U, e, E ] }; + key { [ Cyrillic_ka, Cyrillic_KA, r, R ] }; + key { [ Cyrillic_ie, Cyrillic_IE, t, T ] }; + key { [ Cyrillic_en, Cyrillic_EN, y, Y ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE, u, U ] }; + key { [ Cyrillic_sha, Cyrillic_SHA, i, I ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA, o, O ] }; + key { [ Cyrillic_ze, Cyrillic_ZE, p, P ] }; + key { [ Cyrillic_ha, Cyrillic_HA, bracketleft, braceleft ] }; + key { [Cyrillic_hardsign,Cyrillic_HARDSIGN, bracketright, braceright ] }; + key { [ Cyrillic_ef, Cyrillic_EF, a, A ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU, s, S ] }; + key { [ Cyrillic_ve, Cyrillic_VE, d, D ] }; + key { [ Cyrillic_a, Cyrillic_A, f, F ] }; + key { [ Cyrillic_pe, Cyrillic_PE, g, G ] }; + key { [ Cyrillic_er, Cyrillic_ER, h, H ] }; + key { [ Cyrillic_o, Cyrillic_O, j, J ] }; + key { [ Cyrillic_el, Cyrillic_EL, k, K ] }; + key { [ Cyrillic_de, Cyrillic_DE, l, L ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE, semicolon, colon ] }; + key { [ Cyrillic_e, Cyrillic_E, apostrophe, quotedbl ] }; + key { [ Cyrillic_ya, Cyrillic_YA, z, Z ] }; + key { [ Cyrillic_che, Cyrillic_CHE, x, X ] }; + key { [ Cyrillic_es, Cyrillic_ES, c, C ] }; + key { [ Cyrillic_em, Cyrillic_EM, v, V ] }; + key { [ Cyrillic_i, Cyrillic_I, b, B ] }; + key { [ Cyrillic_te, Cyrillic_TE, n, N ] }; + key { [Cyrillic_softsign,Cyrillic_SOFTSIGN, m, M ] }; + key { [ Cyrillic_be, Cyrillic_BE, comma, less ] }; + key { [ Cyrillic_yu, Cyrillic_YU, period, greater ] }; + + include "level3(ralt_switch)" - key { [ backslash, bar ] }; }; + + +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ru(type6)" +}; + diff --git a/symbols/sun_vndr/se b/symbols/sun_vndr/se index 3daf125..169b30c 100644 --- a/symbols/sun_vndr/se +++ b/symbols/sun_vndr/se @@ -1,75 +1,280 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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. // -// 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. +// CDDL HEADER START // -xkb_symbols "type4" { - key { [ section, onehalf ] }; - key { [ asciitilde, asciicircum ] }; - key { [ 2, quotedbl ], [ at ] }; - key { [ 3, numbersign ], [ sterling ] }; - key { [ 4, currency ], [ dollar ] }; - key { [ 5, percent ], [ degree ] }; - key { [ 6, ampersand ], [ notsign ] }; - key { [ 7, slash ], [ braceleft ] }; - key { [ 8, parenleft ], [ bracketleft ]}; - key { [ 9, parenright ], [ bracketright ] }; - key { [ 0, equal ], [ braceright ] }; - key { [ plus, question ], [ backslash ] }; - key { [ SunFA_Acute, SunFA_Grave ] }; - - key { [ e, E ], [ EuroSign ] }; - key { [ Aring ] }; - key { [ SunFA_Diaeresis, SunFA_Circum ], [ SunFA_Tilde ] }; - - key { [ Odiaeresis ] }; - key { [ Adiaeresis ] }; - key { [ quoteright, asterisk ], [ quoteleft ]}; - - key { [ Caps_Lock ] }; - key { [ Control_L ] }; - key { [ less, greater ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; -}; +// 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]="Sweden"; + key { [ section, onehalf ] }; + key { [ less, greater, bar ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, sterling ] }; + key { [ 4, currency, dollar ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question, backslash ] }; + key { [ dead_acute, dead_grave ] }; + key { [ e, E, EuroSign ] }; + key { [ aring, Aring ] }; + key { [ dead_diaeresis, asciicircum, asciitilde ] }; + key { [ odiaeresis, Odiaeresis ] }; + key { [ adiaeresis, Adiaeresis ] }; + key { [ apostrophe, asterisk, grave ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore ] }; + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + +// Swedish layout for a Type 5/5c Sun keyboard xkb_symbols "type5" { - include "se" + include "sun_vndr/us(type5)+se(basic)" + + // Begin alphanumeric section + // These two are not supposed to be dead. + // A few others supposedly ARE dead, but don't care for now. + key { [ apostrophe, asterisk ], [ grave ] }; + key { [ ], [ asciitilde ] }; + + key { [ Shift_R ] }; + + key { [ Alt_L ] }; + key { [ Mode_switch ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ Multi_key ] }; + // End alphanumeric section + + // Begin "Function" section + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ], [ SunF36] }; + key { [ F12 ], [ SunF37] }; + key { [ Cancel ], [ F11 ] }; + key { [ Redo ], [ F12 ] }; + key { [ SunProps ], [ F13 ] }; + key { [ Undo ], [ F14 ] }; + key { [ SunFront ], [ F15 ] }; + key { [ SunCopy ], [ F16 ] }; + key { [ SunOpen ], [ F17 ] }; + key { [ SunPaste ], [ F18 ] }; + key { [ Find ], [ F19 ] }; + key { [ SunCut ], [ F20 ] }; + // End "Function" section + + // Begin "Editing" section + key { [ Print ], [ Sys_Req, SunSys_Req ] }; + key { [ Scroll_Lock ] }; + key { [ Pause ], [ Break ] }; + key { [ Left ] }; + key { [ Right ] }; + key { [ Up ] }; + key { [ Down ] }; + + key { [ Delete ] }; + key { [ Insert ] }; + key { [ Prior ] }; + key { [ Next ] }; + key { [ Home ] }; + key { [ End ] }; + key { [ Help ] }; + // End "Editing" section + + // Begin "Keypad" section + key { [ Num_Lock ] }; + key { [ KP_Divide ], [ F25 ] }; + key { [ KP_Multiply ], [ F26 ] }; + key { [ KP_Subtract ] }; + + key { [ KP_Home, KP_7 ], [ F27 ] }; + key { [ KP_Up, KP_8 ], [ F28 ] }; + key { [ KP_Prior, KP_9 ], [ F29 ] }; + key { [ KP_Add ] }; - key { [ section, onehalf ] }; - key { [ 7, slash ], [ braceleft ] }; - key { [ 8, parenleft ], [ bracketleft ]}; - key { [ 9, parenright ], [ bracketright ] }; - key { [ 0, equal ], [ braceright ] }; - key { [ plus, question ], [ backslash ] }; + key { [ KP_Left, KP_4 ], [ F30 ] }; + key { [ KP_Begin, KP_5 ], [ F31 ] }; + key { [ KP_Right, KP_6 ], [ F32 ] }; - key { [ SunFA_Diaeresis, asciicircum ], [ asciitilde ] }; - key { [ quoteright, asterisk ], [ quoteleft ]}; + key { [ KP_End, KP_1 ], [ F33 ] }; + key { [ KP_Down, KP_2 ], [ F34 ] }; + key { [ KP_Next, KP_3 ], [ F35 ] }; + key { [ KP_Enter ] }; + + key { [ KP_Insert, KP_0 ] }; + key { [ KP_Delete, KP_Decimal ] }; + // End "Keypad" section, + + // Begin "four keys up on the right" + key { [ SunAudioMute, SunVideoDegauss ] }; + key { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; + key { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; + key { [ SunPowerSwitch, SunPowerSwitchShift ] }; + // End "four keys up on the right" + + // Begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; + modifier_map Mod4 { Alt_L }; + // End modifier mappings }; - -partial -xkb_symbols "type6" { - include "se(Sundeadkeys)" - key { [ SunFA_Diaeresis, asciicircum ], [ asciitilde, caron ] }; +// Swedish layout for a Type 4 Sun keyboard +xkb_symbols "type4" { + include "sun_vndr/us(type4basic)+se(basic)" + + // Begin alphanumeric section + // These two are not supposed to be dead. + // A few others supposedly ARE dead, but don't care for now. + key { [ apostrophe, asterisk ], [ grave ] }; + key { [ ], [ asciitilde ] }; + + key { [ asciitilde, asciicircum ] }; + + key { [ Shift_R ] }; + + key { [ Alt_L ] }; + key { [ Mode_switch ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + key { [ Multi_key ] }; + // End alphanumeric section + + // Begin "Function" section + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ], [ SunF36] }; + key { [ F12 ], [ SunF37] }; + key { [ Cancel ], [ F11 ] }; + key { [ Redo ], [ F12 ] }; + key { [ SunProps ], [ F13 ] }; + key { [ Undo ], [ F14 ] }; + key { [ SunFront ], [ F15 ] }; + key { [ SunCopy ], [ F16 ] }; + key { [ SunOpen ], [ F17 ] }; + key { [ SunPaste ], [ F18 ] }; + key { [ Find ], [ F19 ] }; + key { [ SunCut ], [ F20 ] }; + // End "Function" section + + // Begin "Editing" section + key { [ Linefeed ] }; + key { [ Delete ] }; + key { [ Print ], [ Sys_Req, SunSys_Req ] }; + key { [ Scroll_Lock ] }; + key { [ Pause ], [ Break ] }; + key { [ Help ] }; + // End "Editing" section + + // Begin "Keypad" section + key { [ Num_Lock ] }; + key { [ KP_Equal ] }; + key { [ KP_Divide ], [ F25 ] }; + key { [ KP_Multiply ], [ F26 ] }; + key { [ KP_Subtract ] }; + + key { [ KP_Home, KP_7 ], [ F27 ] }; + key { [ KP_Up, KP_8 ], [ F28 ] }; + key { [ KP_Prior, KP_9 ], [ F29 ] }; + key { [ KP_Add ] }; + + key { [ KP_Left, KP_4 ], [ F30 ] }; + key { [ KP_Begin, KP_5 ], [ F31 ] }; + key { [ KP_Right, KP_6 ], [ F32 ] }; + + key { [ KP_End, KP_1 ], [ F33 ] }; + key { [ KP_Down, KP_2 ], [ F34 ] }; + key { [ KP_Next, KP_3 ], [ F35 ] }; + key { [ KP_Enter ] }; + + key { [ KP_Insert, KP_0 ] }; + key { [ KP_Delete, KP_Decimal ] }; + // End "Keypad" section, + + // Begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod1 { Alt_L }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; + modifier_map Mod4 { Meta_L }; + modifier_map Mod5 { Meta_R }; + // End modifier mappings }; + + +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/se(type6)" +}; + diff --git a/symbols/sun_vndr/sk b/symbols/sun_vndr/sk new file mode 100644 index 0000000..ca8aa7d --- /dev/null +++ b/symbols/sun_vndr/sk @@ -0,0 +1,110 @@ +// +// 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]="Slovakia"; + + + key { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; + key { [ plus, 1, exclam, asciitilde ] }; + key { [ lcaron, 2, at, dead_caron ] }; + key { [ scaron, 3, numbersign, dead_circumflex ] }; + key { [ ccaron, 4, dollar, dead_breve ] }; + key { [ tcaron, 5, percent, dead_abovering ] }; + key { [ zcaron, 6, asciicircum, dead_ogonek ] }; + key { [ yacute, 7, ampersand, grave ] }; + key { [ aacute, 8, asterisk, dead_abovedot ] }; + key { [ iacute, 9, parenleft, apostrophe ] }; + key { [ eacute, 0, parenright, dead_doubleacute ] }; + key { [ equal, percent, dead_diaeresis, backslash ] }; + key { [ dead_acute, dead_caron, dead_cedilla, minus ] }; + + key { [ q, Q, backslash ] }; + key { [ w, W, bar ] }; + key { [ e, E, EuroSign ] }; + key { [ z, Z ] }; + key { [ p, P, apostrophe ] }; + key { [ uacute, slash, division ] }; + key { [ adiaeresis, parenleft, multiply ] }; + + key { [ s, S, dstroke ] }; + key { [ d, D, Dstroke ] }; + key { [ f, F, bracketleft ] }; + key { [ g, G, bracketright ] }; + key { [ k, K, lstroke ] }; + key { [ l, L, Lstroke ] }; + key { [ ocircumflex, quotedbl, dollar ] }; + key { [ section, exclam, ssharp ] }; + key { [ ncaron, parenright, currency, currency ] }; + key { [ ncaron, parenright, backslash, bar ] }; + + key { [ backslash, bar, slash, brokenbar ] }; + key { [ y, Y, less ] }; + key { [ x, X, greater, numbersign ] }; + key { [ c, C, ampersand ] }; + key { [ v, V, at ] }; + key { [ b, B, braceleft ] }; + key { [ n, N, braceright ] }; + key { [ comma, question, less ] }; + key { [ period, colon, greater ] }; + key { [ minus, underscore, asterisk ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/sk(type6)" +}; + diff --git a/symbols/sun_vndr/solaris b/symbols/sun_vndr/solaris index c99f04f..c435744 100644 --- a/symbols/sun_vndr/solaris +++ b/symbols/sun_vndr/solaris @@ -1,36 +1,61 @@ //------------------------------------------------------------------------- // -// Copyright 2005 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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 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 +// 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. // -// 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. +// 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. // //------------------------------------------------------------------------- // -// ident "@(#)solaris 1.7 05/11/08 SMI" + +// +// 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 map provides backwards compatibility with Sun keyboards from // long ago and the key mappings still used in Solaris Xsun today partial default -xkb_symbols "defaults" { +xkb_symbols "defaults_common" { // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards // and the names have stuck (you can spot a longtime Sun admin when you @@ -81,22 +106,37 @@ xkb_symbols "defaults" { key { [ SunAudioMute, SunVideoDegauss ] }; key { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; key { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; - key { [ SunPowerSwitch, SunPowerSwitchShift ] }; + key { [ XF86Sleep, XF86Hibernate ] }; - key { [ Alt_L ] }; - // key { [ Mode_switch ] }; - // key { [ Mode_switch ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Multi_key ] }; +// key { [ Alt_L ] }; +// key { [ Meta_L ] }; +// key { [ Meta_R ] }; +// key { [ Multi_key ] }; +}; + +partial default +xkb_symbols "defaults" { + include "sun_vndr/solaris(defaults_common)" +// key { [ Mode_switch ] }; +// key { [ Mode_switch ] }; // begin modifier mappings +// modifier_map Shift { Shift_R, Shift_L }; +// modifier_map Mod1 { Alt_L }; +// modifier_map Mod2 { Num_Lock }; +// modifier_map Mod3 { Alt_R, Mode_switch }; +// modifier_map Mod4 { Meta_L, Meta_R }; +}; + +partial default +xkb_symbols "defaults_type7jp" { + include "sun_vndr/solaris(defaults_common)" + // begin modifier mappings modifier_map Shift { Shift_R, Shift_L }; - modifier_map Mod1 { Alt_L }; - modifier_map Mod2 { Alt_R, Mode_switch }; - modifier_map Mod3 { Num_Lock }; + modifier_map Mod1 { Alt_L , Alt_R}; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; modifier_map Mod4 { Meta_L, Meta_R }; - }; // Map the keys to the actual key names instead of the ancient Sun function diff --git a/symbols/sun_vndr/sw b/symbols/sun_vndr/sw deleted file mode 100644 index ecf52fc..0000000 --- a/symbols/sun_vndr/sw +++ /dev/null @@ -1,167 +0,0 @@ -// $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 "type4de" { - include "sun_vndr/us(type4basic)" - // A few keys are different - key { [ less, braceleft ] }; - - key { [ greater, braceright ] }; - key { [ Delete ] }; - - key { [ 1, plus ], [exclam ] }; - key { [ 2, quotedbl ], [at ] }; - key { [ 3, asterisk ], [numbersign ] }; - key { [ 4, ccedilla ], [cent ] }; - key { [ 5, percent ], [asciitilde ] }; - key { [ 6, ampersand ], [section ] }; - key { [ 7, slash ], [bar ] }; - key { [ 8, parenleft ], [degree ] }; - key { [ 9, parenright ], [backslash ] }; - key { [ 0, equal ], [asciicircum ] }; - Key { [ quoteright, question ], [quoteleft ] }; - key { [ SunFA_Circum, SunFA_Grave ] }; - key { [ e, E ], [EuroSign ] }; - key { [ Z ] }; - key { [ udiaeresis, egrave ] }; - key { [ SunFA_Diaeresis, SunFA_Acute ] }; - key { [ odiaeresis, eacute ] }; - key { [ adiaeresis, agrave ] }; - key { [ dollar, SunFA_Tilde ], [sterling ] }; - key { [ bracketright, bracketleft ], [ backslash ] }; - key { [ Y ] }; - key { [ M, NoSymbol ], [mu ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ SunAltGraph ] }; - key { [ SunCompose ] }; - -}; - -xkb_symbols "type4fr" { - include "sun_vndr/us(type4basic)" - // A few keys are different - key { [ less, braceleft ] }; - - key { [ greater, braceright ] }; - key { [ Delete ] }; - - key { [ 1, plus ], [exclam ] }; - key { [ 2, quotedbl ], [at ] }; - key { [ 3, asterisk ], [numbersign ] }; - key { [ 4, ccedilla ], [cent ] }; - key { [ 5, percent ], [asciitilde ] }; - key { [ 6, ampersand ], [section ] }; - key { [ 7, slash ], [bar ] }; - key { [ 8, parenleft ], [degree ] }; - key { [ 9, parenright ], [backslash ] }; - key { [ 0, equal ], [asciicircum ] }; - Key { [ quoteright, question ], [quoteleft ] }; - key { [ SunFA_Circum, SunFA_Grave ] }; - key { [ e, E ], [EuroSign ] }; - key { [ Z ] }; - key { [ egrave, udiaeresis ] }; - key { [ SunFA_Diaeresis, SunFA_Acute ] }; - key { [ eacute, odiaeresis ] }; - key { [ agrave, adiaeresis ] }; - key { [ dollar, SunFA_Tilde ], [sterling ] }; - key { [ bracketright, bracketleft ], [ backslash ] }; - key { [ Y ] }; - key { [ M, NoSymbol ], [mu ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ SunAltGraph ] }; - key { [ SunCompose ] }; - - - -}; - -xkb_symbols "type5fr" { - - key { [ section, degree ] }; - - key { [ 1, plus ], [bar ]}; - key { [ 2, quotedbl ], [at ] }; - key { [ 3, asterisk ], [numbersign ] }; - key { [ 4, ccedilla ], [asciicircum ] }; - key { [ 5, percent ], [asciitilde ] }; - key { [ 6, ampersand ], [section ] }; - key { [ 7, slash ], [bar ] }; - key { [ 8, parenleft ], [degree ] }; - key { [ 9, parenright ], [backslash ] }; - key { [ 0, equal ], [quoteleft ] }; - Key { [ quoteright, question ], [SunFA_Acute ] }; - key { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde ]}; - key { [ e, E ], [EuroSign ] }; - key { [ z, Z ] }; - key { [ egrave, udiaeresis ], [ bracketleft ]}; - key { [ SunFA_Diaeresis, exclam], [ bracketright ]}; - - key { [ eacute, odiaeresis ] }; - key { [ agrave, adiaeresis ], [ braceleft ]}; - key { [ dollar, sterling ], [ braceright ]}; - - key { [ less, greater ], [ backslash ]}; - key { [ y, Y ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - -}; - -xkb_symbols "type5de" { - - key { [ section, degree ] }; - - key { [ 1, plus ], [bar ]}; - key { [ 2, quotedbl ], [at ] }; - key { [ 3, asterisk ], [numbersign ] }; - key { [ 4, ccedilla ], [asciicircum ] }; - key { [ 5, percent ], [asciitilde ] }; - key { [ 6, ampersand ], [section ] }; - key { [ 7, slash ], [bar ] }; - key { [ 8, parenleft ], [degree ] }; - key { [ 9, parenright ], [backslash ] }; - key { [ 0, equal ], [quoteleft ] }; - Key { [ quoteright, question ], [SunFA_Acute ] }; - key { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde ]}; - key { [ e, E ], [EuroSign ] }; - key { [ z, Z ] }; - key { [ udiaeresis, egrave ], [ bracketleft ]}; - key { [ SunFA_Diaeresis, exclam], [ bracketright ]}; - - key { [ odiaeresis, eacute ] }; - key { [ adiaeresis, agrave ], [ braceleft ]}; - key { [ dollar, sterling ], [ braceright ]}; - - key { [ less, greater ], [ backslash ]}; - key { [ y, Y ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - -}; - diff --git a/symbols/sun_vndr/tr b/symbols/sun_vndr/tr index 7e6d4bf..5096e04 100644 --- a/symbols/sun_vndr/tr +++ b/symbols/sun_vndr/tr @@ -1,113 +1,93 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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. // -// 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. +// 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 // -xkb_symbols "basic" { - include "sun_vndr/tr(type6Q)" -}; - -xkb_symbols "type6Q" { - - key { [ quotedbl, eacute ], [ asciitilde ]}; - key { [ 2, quoteright ] }; - key { [ 3, asciicircum ], [ numbersign ]}; - key { [ 4, plus ], [ dollar ]}; - key { [ 6, ampersand ] }; - key { [ 7, slash ], [ braceleft ]}; - key { [ 8, parenleft ], [ bracketright ]}; - key { [ 9, parenright ], [ bracketright ]}; - key { [ 0, equal ], [ braceright ]}; - key { [ asterisk, question ], [ backslash ]}; - key { [ minus, underscore ] }; - - key { [ q, Q ], [ at ]}; - key { [ gbreve, Gbreve ], [ gbreve, Gbreve ]}; - key { [ udiaeresis, Udiaeresis], [ asciitilde, Udiaeresis ]}; - key { [ scedilla, Scedilla ], [ comma ]}; - key { [ Iabovedot, Iabovedot ], [ Iabovedot, Iabovedot ]}; - key { [ comma, semicolon ], [ quoteleft ]}; - key { [ less, greater ], [ bar ]}; - key { [ odiaeresis, Odiaeresis], [ odiaeresis, Odiaeresis ]}; - key { [ ccedilla, Ccedilla ], [ ccedilla, Ccedilla ]}; - key { [ period, colon ], [ quotedbl ]}; - -}; +partial alphanumeric_keys +xkb_symbols "type6" { -xkb_symbols "type6F" { + name[Group1]="Turkey - (Q)"; + key { [ quotedbl, eacute ] }; + key { [ 1, exclam ] }; + key { [ 2, apostrophe ] }; + key { [ 3, asciicircum, numbersign ] }; + key { [ 4, plus, dollar ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ asterisk, question, backslash ] }; + key { [ minus, underscore ] }; - key { [ plus ,asterisk ], [plusminus ]}; - key { [ 1 ,exclam ], [onesuperior ]}; - key { [ 2 ,quotedbl ], [twosuperior ]}; - key { [ 3 ,asciicircum ], [numbersign ]}; - key { [ 4 ,dollar ], [onequarter ]}; - key { [ 5 ,percent ], [onehalf ]}; - key { [ 6 ,ampersand ], [threequarters ]}; - key { [ 7 ,quoteright ], [braceleft ]}; - key { [ 8 ,parenleft ], [bracketleft ]}; - key { [ 9 ,parenright ], [bracketright ]}; - key { [ 0 ,equal ], [braceright ]}; - key { [ slash ,question ], [backslash ]}; - key { [ minus ,underscore ], [bar ]}; + key { [ q, Q, at ] }; + key { [ e, E, EuroSign ] }; + key { [ idotless, I ] }; + key { [ gbreve, Gbreve ] }; + key { [udiaeresis, Udiaeresis, asciitilde ] }; - key { [ f ,F ], [at ]}; - key { [ g ,G ]}; - key { [ gbreve ,Gbreve ], [gbreve, Gbreve ]}; - key { [ idotless ,I ], [paragraph ]}; - key { [ o ,O ]}; - key { [ d ,D ], [yen ]}; - key { [ r ,R ]}; - key { [ n ,N ]}; - key { [ h ,H ], [degree ]}; - key { [ p ,P ], [sterling ]}; - key { [ q ,Q ], [diaeresis ]}; - key { [ w ,W ], [asciitilde ]}; - key { [ x ,X ], [quoteleft ]}; + key { [ scedilla, Scedilla, acute ] }; + key { [ i, Iabovedot ] }; + key { [ comma, semicolon, grave ] }; - key { [ u ,U ], [AE ]}; - key { [ i ,Iabovedot ], [ssharp ]}; - key { [ e ,E ]}; - key { [ a ,A ]}; - key { [ udiaeresis,Udiaeresis]}; - key { [ t ,T ]}; - key { [ k ,K ]}; - key { [ m ,M ]}; - key { [ y ,Y ], [quoteright ]}; - key { [ scedilla ,Scedilla ], [numbersign, Scedilla ]}; + key { [ less, greater, bar ] }; + key { [odiaeresis, Odiaeresis ] }; + key { [ ccedilla, Ccedilla ] }; + key { [ period, colon ] }; - key { [ less, greater ], [bar ]}; - key { [ j ,J ], [less ]}; - key { [ odiaeresis ,Odiaeresis ], [greater ]}; - key { [ v ,V ], [cent ]}; - key { [ c ,C ]}; - key { [ ccedilla ,Ccedilla ], [ccedilla, Ccedilla ]}; - key { [ z ,Z ]}; - key { [ s ,S ], [mu ]}; - key { [ b ,B ], [multiply ]}; - key { [ period ,colon ], [division ]}; - key { [ comma ,semicolon ]}; + include "level3(ralt_switch)" +}; +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/tr(type6)" }; diff --git a/symbols/sun_vndr/tuv b/symbols/sun_vndr/tuv index d047f33..941e8e1 100644 --- a/symbols/sun_vndr/tuv +++ b/symbols/sun_vndr/tuv @@ -1,25 +1,31 @@ // $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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. +// 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. // // $TOG: us /main/5 1998/02/10 13:45:06 kaleb $ // @@ -44,6 +50,29 @@ //from The Open Group. // // US/ASCII layout for a Type 4 Sun keyboard + +// +// 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 +// + + xkb_symbols "type4basic" { include "us(basic)" @@ -117,8 +146,8 @@ xkb_symbols "type4basic" { // begin modifier mappings modifier_map Shift { Shift_R, Shift_L }; modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Mode_switch }; - modifier_map Mod3 { Num_Lock }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; modifier_map Mod4 { Alt_L }; }; @@ -218,8 +247,8 @@ xkb_symbols "type5basic" { // begin modifier mappings modifier_map Shift { Shift_R }; modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Alt_R }; - modifier_map Mod3 { Num_Lock }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Alt_R }; modifier_map Mod4 { Alt_L }; }; diff --git a/symbols/sun_vndr/tw b/symbols/sun_vndr/tw index 736c242..fca6f3c 100644 --- a/symbols/sun_vndr/tw +++ b/symbols/sun_vndr/tw @@ -1,35 +1,69 @@ -// $XdotOrg: $ // -// Copyright 2005 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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. // -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. + +// +// 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. // -// 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. +// 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 +// + +// Taiwanese layout for a Type 6 Sun keyboard +partial +xkb_symbols "type6" { + // A few keys are different from US layout - only those are shown here + key { [ Henkan_Mode ] }; + key { [ backslash, bar, brokenbar ] }; + +}; + + // Taiwanese layout for a Type 4 Sun keyboard + xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - key { [ backslash, bar ], [ brokenbar ] }; + key { [ backslash, bar, brokenbar ] }; -// key { [ Hangul ] }; -// key { [ Linefeed ] }; key { [ Henkan_Mode ] }; }; @@ -39,15 +73,7 @@ xkb_symbols "type5" { // A few keys are different key { [ Henkan_Mode ] }; - key { [ backslash, bar ], [ brokenbar ] }; - -}; + key { [ backslash, bar, brokenbar ] }; -// Taiwanese layout for a Type 6 Sun keyboard -partial -xkb_symbols "type6" { - // A few keys are different from US layout - only those are shown here - key { [ Henkan_Mode ] }; - key { [ backslash, bar ], [ brokenbar ] }; }; diff --git a/symbols/sun_vndr/ua b/symbols/sun_vndr/ua new file mode 100644 index 0000000..09c5f44 --- /dev/null +++ b/symbols/sun_vndr/ua @@ -0,0 +1,118 @@ +// +// 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]="Ukraine"; + + + key { [ grave, asciitilde, apostrophe, asciitilde ] }; + key { [ 1, exclam, 1, exclam ] }; + key { [ 2, at, 2, quotedbl ] }; + key { [ 3, numbersign, 3, numbersign ] }; + key { [ 4, dollar, 4, asterisk ] }; + key { [ 5, percent, 5, colon ] }; + key { [ 6, asciicircum, 6, comma ] }; + key { [ 7, ampersand, 7, period ] }; + key { [ 8, asterisk, 8, semicolon ] }; + key { [ 9, parenleft, 9, parenleft ] }; + key { [ 0, parenright, 0, parenright ] }; + key { [ minus, underscore, minus, underscore ] }; + key { [ equal, plus, equal, plus ] }; + + key { [ q, Q, Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ w, W, Cyrillic_tse, Cyrillic_TSE ] }; + key { [ e, E, Cyrillic_u, Cyrillic_U ] }; + key { [ r, R, Cyrillic_ka, Cyrillic_KA ] }; + key { [ t, T, Cyrillic_ie, Cyrillic_IE ] }; + key { [ y, Y, Cyrillic_en, Cyrillic_EN ] }; + key { [ u, U, Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ i, I, Cyrillic_sha, Cyrillic_SHA ] }; + key { [ o, O, Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [ p, P, Cyrillic_ze, Cyrillic_ZE ] }; + key { [ bracketleft, braceleft, Cyrillic_ha, Cyrillic_HA ] }; + key { [ bracketright, braceright, Ukrainian_yi, Ukrainian_YI ] }; + + key { [ a, A, Cyrillic_ef, Cyrillic_EF ] }; + key { [ s, S, Ukrainian_i, Ukrainian_I ] }; + key { [ d, D, Cyrillic_ve, Cyrillic_VE ] }; + key { [ f, F, Cyrillic_a, Cyrillic_A ] }; + key { [ g, G, Cyrillic_pe, Cyrillic_PE ] }; + key { [ h, H, Cyrillic_er, Cyrillic_ER ] }; + key { [ j, J, Cyrillic_o, Cyrillic_O ] }; + key { [ k, K, Cyrillic_el, Cyrillic_EL ] }; + key { [ l, L, Cyrillic_de, Cyrillic_DE ] }; + key { [ semicolon, colon, Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ apostrophe, quotedbl, Ukrainian_ie, Ukrainian_IE ] }; + key { [ backslash, bar, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + + key { [ less, greater, slash, bar ] }; + key { [ z, Z, Cyrillic_ya, Cyrillic_YA ] }; + key { [ x, X, Cyrillic_che, Cyrillic_CHE ] }; + key { [ c, C, Cyrillic_es, Cyrillic_ES ] }; + key { [ v, V, Cyrillic_em, Cyrillic_EM ] }; + key { [ n, N, Cyrillic_te, Cyrillic_TE ] }; + key { [ b, B, Cyrillic_i, Cyrillic_I ] }; + key { [ m, M, Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; + key { [ comma, less, Cyrillic_be, Cyrillic_BE ] }; + key { [ period, greater, Cyrillic_yu, Cyrillic_YU ] }; + key { [ slash, question, slash, question ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ua(type6)" +}; + diff --git a/symbols/sun_vndr/us b/symbols/sun_vndr/us index f85cec9..bb0fa35 100644 --- a/symbols/sun_vndr/us +++ b/symbols/sun_vndr/us @@ -1,28 +1,31 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// 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, 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: +// 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. // -// 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: us /main/5 1998/02/10 13:45:06 kaleb $ -// Sun: @(#)us 1.5 03/04/21 SMI // //Copyright 1996, 1998 The Open Group // @@ -45,8 +48,28 @@ //from The Open Group. // +// +// 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 +// + // Symbols shared by all Sun Keyboard layouts -hidden xkb_symbols "sunbasic" { include "srvr_ctrl(xfree86)" @@ -60,130 +83,178 @@ xkb_symbols "sunbasic" { include "pc(editing)" include "keypad(x11)" + key { [ Escape ] }; + + // the extra key on most European keyboards + key { [ less, greater, bar, brokenbar ] }; + + // these keys are common to almost all layouts + key { [ backslash, bar ] }; + key { [ space ] }; + + key { [ BackSpace ] }; + key { [ Tab, ISO_Left_Tab ] }; + key { [ Return ] }; + + key { [ Num_Lock, Pointer_EnableKeys ] }; + + key { [ Multi_key ] }; + // End alphanumeric section + + key { [ Shift_L ] }; + key { [ Control_L ] }; + + key { [ Shift_R ] }; + key { [ Control_R ] }; + + + // begin modifier mappings + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Control{ Control_L, Control_R }; + modifier_map Mod2 { Num_Lock }; + + // Fake keys for virtual<->real modifiers mapping + key { [ ISO_Level3_Shift ] }; + key { [ Mode_switch ] }; + modifier_map Mod5 { , }; + + key { [ NoSymbol, Alt_L ] }; + key { [ Alt_L, Alt_L ] }; + key { [ Meta_L ] }; + key { [ Meta_R ] }; + modifier_map Mod1 { Alt_L }; + modifier_map Mod4 { Meta_L, Meta_R }; + +// key { [ Alt_L ] }; +// key { [ Mode_switch ] }; +// key { [ Meta_L ] }; +// key { [ Meta_R ] }; + include "sun_vndr/us(left_funkeys)" include "capslock(capslock)" //include "capslock(shiftlock)" - key { [ Shift_L ] }; - key { [ Shift_R ] }; - key { [ Alt_L ] }; - key { [ Mode_switch ] }; - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Control_L ] }; - key { [ Control_R ] }; - key { [ Multi_key ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ Return ] }; - - key { [ Escape ] }; - - key { [ Num_Lock, Pointer_EnableKeys ] }; - key { [ space ] }; - - key { [ BackSpace ] }; - - // By default, we use the same symbols as other XKB implementations - // for greater compatibility & AccessX MouseKeys support, but it is - // different than the traditional Sun key mappings that date back to the - // Sun Type 2 keyboard, in which the right side numpad were "R" function - // keys. To restore the original behavior, uncomment the section below - // that lists the R key mappings. -// key { [ R7, R7 ], [ KP_7, Home ] }; + +// This default section uses the same symbols as other XKB implementations +// for greater compatibility & AccessX MouseKeys support, but it is +// different than the traditional Sun key mappings that date back to the +// Sun Type 2 keyboard, in which the right side numpad were "R" function +// keys. To restore the original behavior, comment out this section and +// uncomment the section below that lists the R key mappings. + key { [ KP_Divide ] }; + key { [ KP_Multiply ] }; + key { [ KP_Subtract ] }; + + key { [ KP_Home, KP_7 ] }; + key { [ KP_Up, KP_8 ] }; + key { [ KP_Prior, KP_9 ] }; + key { [ KP_Add ] }; + + key { [ KP_Left, KP_4 ] }; + key { [ KP_Begin, KP_5 ] }; + key { [ KP_Right, KP_6 ] }; + + key { [ KP_End, KP_1 ] }; + key { [ KP_Down, KP_2 ] }; + key { [ KP_Next, KP_3 ] }; + key { [ KP_Enter ] }; + + key { [ KP_Insert, KP_0 ] }; + key { [ KP_Delete, KP_Decimal ] }; + +// End New Keypad section - Begin Sun traditional Keypad section + +// key { [ R7, R7 ], [ KP_7, Home ] }; // key { [ Up, R8 ], [ KP_8 ] }; -// key { [ R9, R9 ], [ KP_9, Prior ] }; -// key { [ KP_Add ] }; +// key { [ R9, R9 ], [ KP_9, Prior ] }; +// key { [ KP_Add ] }; // -// key { [ Left, R10 ], [ KP_4 ] }; -// key { [ R11, R11 ], [ KP_5 ] }; -// key { [ Right, R12 ], [ KP_6 ] }; +// key { [ Left, R10 ], [ KP_4 ] }; +// key { [ R11, R11 ], [ KP_5 ] }; +// key { [ Right, R12 ], [ KP_6 ] }; // -// key { [ R13, R13 ], [ KP_1, End ] }; -// key { [ Down, R14 ], [ KP_2 ] }; -// key { [ R15, R15 ], [ KP_3, Next ] }; -// key { [ KP_Enter ] }; -// key { [ KP_Insert, KP_Insert], [ KP_0 ] }; -// key { [ Delete, Delete ], [ KP_Decimal ] }; - - // End "Keypad" section - - modifier_map Control { Control_L, Control_R }; - modifier_map Shift { Shift_R, Shift_L }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Mode_switch }; - modifier_map Mod3 { Num_Lock }; - modifier_map Mod4 { Alt_L }; +// key { [ R13, R13 ], [ KP_1, End ] }; +// key { [ Down, R14 ], [ KP_2 ] }; +// key { [ R15, R15 ], [ KP_3, Next ] }; +// key { [ KP_Enter ] }; +// key { [ KP_Insert, KP_Insert], [ KP_0 ] }; +// key { [ Delete, Delete ], [ KP_Decimal ] }; + +// End "Keypad" section + }; -hidden + xkb_symbols "left_funkeys" { // Suppliment to inet(evdev) for added functionality of left-funkeys - key { [ NoSymbol ], [ L1, L1 ] }; - key { [ NoSymbol ], [ L2, L2 ] }; - key { [ NoSymbol ], [ L3, L3 ] }; - key { [ NoSymbol ], [ L4, L4 ] }; - key { [ NoSymbol ], [ L5, L5 ] }; - key { [ NoSymbol ], [ L6, L6 ] }; - key { [ NoSymbol ], [ L7, L7 ] }; - key { [ NoSymbol ], [ L8, L8 ] }; - key { [ NoSymbol ], [ L9, L9 ] }; - key { [ NoSymbol ], [ L10, L10 ] }; + //key { [ NoSymbol ], [ L1, L1 ] }; + //key { [ NoSymbol ], [ L2, L2 ] }; + //key { [ NoSymbol ], [ L3, L3 ] }; + //key { [ NoSymbol ], [ L4, L4 ] }; + //key { [ NoSymbol ], [ L5, L5 ] }; + //key { [ NoSymbol ], [ L6, L6 ] }; + //key { [ NoSymbol ], [ L7, L7 ] }; + //key { [ NoSymbol ], [ L8, L8 ] }; + //key { [ NoSymbol ], [ L9, L9 ] }; + //key { [ NoSymbol ], [ L10, L10 ] }; // The above symbols were chosen for better compatibility withother xkb // mappings. The old mappings are kepy below in case someone needs them - //key { [ L1, L1 ], [ SunStop ] }; - //key { [ L2, L2 ], [ SunAgain ] }; - //key { [ L3, L3 ], [ SunProps ] }; - //key { [ L4, L4 ], [ SunUndo ] }; - //key { [ L5, L5 ], [ SunFront ] }; - //key { [ L6, L6 ], [ SunCopy ] }; - //key { [ L7, L7 ], [ SunOpen ] }; - //key { [ L8, L8 ], [ SunPaste ] }; - //key { [ L9, L9 ], [ SunFind ] }; - //key { [ L10, L10 ], [ SunCut ] }; + key { [ L1, L1, SunStop ] }; + key { [ L2, L2, SunAgain ] }; + key { [ L3, L3, SunProps ] }; + key { [ L4, L4, SunUndo ] }; + key { [ L5, L5, SunFront ] }; + key { [ L6, L6, SunCopy ] }; + key { [ L7, L7, SunOpen ] }; + key { [ L8, L8, SunPaste ] }; + key { [ L9, L9, SunFind ] }; + key { [ L10, L10, SunCut ] }; }; hidden xkb_symbols "volumekeys" { // Suppliment to inet(evdev) for added functionality of audio keys - key { [ NoSymbol, SunVideoDegauss ] }; - key { [ NoSymbol, XF86MonBrightnessDown ] }; - key { [ NoSymbol, XF86MonBrightnessUp ] }; + key { [ NoSymbol, SunVideoDegauss ] }; + key { [ NoSymbol, XF86MonBrightnessDown ] }; + key { [ NoSymbol, XF86MonBrightnessUp ] }; // The above symbols were chosen for better compatibility withother xkb // mappings. The old mappings are kepy below in case someone needs them - //key { [ SunAudioMute, SunVideoDegauss ] }; - //key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; - //key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; - //key { [ SunPowerSwitch, SunPowerSwitchShift ] }; + //key { [ SunAudioMute, SunVideoDegauss ] }; + //key { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; + //key { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; + //key { [ SunPowerSwitch, SunPowerSwitchShift ] }; }; + // US/ASCII layout for a Type 4 Sun keyboard xkb_symbols "type4basic" { include "sun_vndr/us(sunbasic)" // A few alphanumeric keys are different - key { [ 4, dollar ], [ EuroSign ] }; - key { [ 5, percent ], [ EuroSign ] }; - key { [ e, E ], [ EuroSign ] }; + key { [ 4, dollar, EuroSign ] }; + key { [ 5, percent, EuroSign ] }; + key { [ e, E, EuroSign ] }; key { [ Linefeed ] }; // Begin "Editing" section - key { [ R2, R2 ], [ Print ] }; - key { [ R3, R3 ], [ Scroll_Lock, Break ] }; - key { [ R1, R1 ], [ Pause ] }; + key { [ R2, R2, Print ] }; + key { [ R3, R3, Scroll_Lock, Break ] }; + key { [ R1, R1, Pause ] }; // End "Editing" section, begin "Keypad" - key { [ R4, KP_Equal ], [ KP_Equal ] }; + key { [ R4, KP_Equal, KP_Equal ] }; + }; xkb_symbols "type4" { include "sun_vndr/us(type4basic)" - key { [ backslash, bar ], [ brokenbar ] }; + key { [ backslash, bar, brokenbar ] }; }; // US/ASCII layout for a Type 5 Sun keyboard @@ -192,9 +263,9 @@ xkb_symbols "type5basic" { include "sun_vndr/us(volumekeys)" // Begin "Editing" section - key { [ R2, R2 ], [ Print, SunSys_Req ] }; - key { [ R3, R3 ], [ Scroll_Lock ] }; - key { [ R1, R1 ], [ Pause, Break ] }; + key { [ R2, R2, Print, SunSys_Req ] }; + key { [ R3, R3, Scroll_Lock ] }; + key { [ R1, R1, Pause, Break ] }; // End "Editing" section }; @@ -202,10 +273,10 @@ xkb_symbols "type5" { include "sun_vndr/us(type5basic)" // A few alphanumeric keys are different - key { [ 4, dollar ], [ EuroSign ] }; - key { [ 5, percent ], [ EuroSign ] }; - key { [ e, E ], [ EuroSign ] }; - key { [ backslash, bar ], [ brokenbar ] }; + key { [ 4, dollar, EuroSign ] }; + key { [ 5, percent, EuroSign ] }; + key { [ e, E , EuroSign ] }; + key { [ backslash, bar, brokenbar ] }; }; // US/ASCII layout for a Type 5 Sun keyboard @@ -217,46 +288,48 @@ xkb_symbols "type5hobo" { include "sun_vndr/us(type5hobobasic)" // A few alphanumeric keys are different - key { [ 4, dollar ], [ EuroSign ] }; - key { [ 5, percent ], [ EuroSign ] }; - key { [ e, E ], [ EuroSign ] }; - key { [ backslash, bar ], [ brokenbar ] }; + key { [ 4, dollar, EuroSign ] }; + key { [ 5, percent, EuroSign ] }; + key { [ e, E, EuroSign ] }; + key { [ backslash, bar, brokenbar ] }; // Here is the hobo keypad: - key { [ 7, ampersand ], [ NoSymbol, NoSymbol ], [ KP_7 ] }; - key { [ 8, asterisk ], [ NoSymbol, NoSymbol ], [ KP_8 ] }; - key { [ 9, parenleft ], [ NoSymbol, NoSymbol ], [ KP_9 ] }; - key { [ 0, parenright], [ NoSymbol, NoSymbol ], [ KP_Multiply] }; + key { [ 7, ampersand, NoSymbol, NoSymbol, KP_7 ] }; + key { [ 8, asterisk, NoSymbol, NoSymbol, KP_8 ] }; + key { [ 9, parenleft, NoSymbol, NoSymbol, KP_9 ] }; + key { [ 0, parenright, NoSymbol, NoSymbol, KP_Multiply] }; - key { [ u, U ], [ NoSymbol, NoSymbol ], [ KP_4 ] }; - key { [ i, I ], [ NoSymbol, NoSymbol ], [ KP_5 ] }; - key { [ o, O ], [ NoSymbol, NoSymbol ], [ KP_6 ] }; - key { [ p, P ], [ NoSymbol, NoSymbol ], [ KP_Subtract]}; + key { [ u, U, NoSymbol, NoSymbol, KP_4 ] }; + key { [ i, I, NoSymbol, NoSymbol, KP_5 ] }; + key { [ o, O, NoSymbol, NoSymbol, KP_6 ] }; + key { [ p, P, NoSymbol, NoSymbol, KP_Subtract] }; - key { [ j, J ], [ NoSymbol, NoSymbol ], [ KP_1 ] }; - key { [ k, K ], [ NoSymbol, NoSymbol ], [ KP_2 ] }; - key { [ l, L ], [ NoSymbol, NoSymbol ], [ KP_3 ] }; - key { [ semicolon, colon], [ NoSymbol, NoSymbol], [ KP_Add ] }; + key { [ j, J, NoSymbol, NoSymbol, KP_1 ] }; + key { [ k, K, NoSymbol, NoSymbol, KP_2 ] }; + key { [ l, L, NoSymbol, NoSymbol, KP_3 ] }; + key { [ semicolon, colon, NoSymbol, NoSymbol, KP_Add ] }; - key { [ Return ], [ NoSymbol, NoSymbol], [ KP_Enter ] }; + key { [ Return, NoSymbol, NoSymbol, KP_Enter ] }; - key { [ m, M ], [ NoSymbol, NoSymbol ], [ KP_0 ] }; + key { [ m, M, NoSymbol, NoSymbol, KP_0 ] }; - key { [ period, greater], [ NoSymbol, NoSymbol], [ KP_Decimal] }; - key { [ slash, question], [ NoSymbol, NoSymbol], [ KP_Divide ] }; + key { [ period, greater, NoSymbol, NoSymbol, KP_Decimal] }; + key { [ slash, question, NoSymbol, NoSymbol, KP_Divide ] }; }; + xkb_symbols "type6" { include "sun_vndr/us(sunbasic)" include "sun_vndr/us(volumekeys)" include "eurosign(4)" + include "level3(ralt_switch)" - key { [ SunSys_Req ]}; - key { [ less, greater, bar, brokenbar ] }; - + key { [ SunSys_Req ]}; }; + + xkb_symbols "pc101" { include "us(pc101)" key { [ Mode_switch, Meta_R ] }; diff --git a/symbols/sun_vndr/usb b/symbols/sun_vndr/usb deleted file mode 100644 index 84648dd..0000000 --- a/symbols/sun_vndr/usb +++ /dev/null @@ -1,26 +0,0 @@ -// Additional keys for Sun USB keyboard - -xkb_symbols "sun_usb" { - - key { [ Cancel ], [ F11 ] }; - key { [ Redo ], [ F12 ] }; - key { [ SunProps ], [ F13 ] }; - key { [ Undo ], [ F14 ] }; - key { [ SunFront ], [ F15 ] }; - key { [ SunCopy ], [ F16 ] }; - key { [ SunOpen ], [ F17 ] }; - key { [ SunPaste ], [ F18 ] }; - key { [ Find ], [ F19 ] }; - key { [ SunCut ], [ F20 ] }; - key { [ Help ] }; - - key { [ SunAudioMute, SunVideoDegauss ] }; - key { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; - key { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; - key { [ SunPowerSwitch, SunPowerSwitchShift ] }; - - key { [ Meta_L ] }; - key { [ Meta_R ] }; - key { [ Multi_key ] }; -}; - -- 2.7.4