svn merge ^/branches/released .

1 files changed, 199 insertions, 199 deletions

diff --git a/xorg-server/xkbdata.src/symbols/is b/xorg-server/xkbdata.src/symbols/is
index fcf199bb4..7debc94d5 100644
--- a/xorg-server/xkbdata.src/symbols/is
+++ b/xorg-server/xkbdata.src/symbols/is
@@ -1,199 +1,199 @@
-// $XKeyboardConfig$
-
-// based on
-// XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is
-//     fixes by Olafur Osvaldsson - oli@isnic.is
-//
-// $XFree86: xc/programs/xkbcomp/symbols/is,v 1.3 2002/11/26 01:57:25 dawes Exp $
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin(type4)"
-
-    name[Group1]="Iceland";
-
-    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
-    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
-    key <AE11>	{ [odiaeresis, Odiaeresis,    backslash, questiondown ]	};
-    key <AE12>	{ [     minus, underscore,     ccedilla,  dead_ogonek ]	};
-
-    key <AD11>	{ [       eth,        ETH, dead_diaeresis, dead_abovering ] };
-    key <AD12>	{ [apostrophe,   question,   asciitilde,  dead_macron ]	};
-
-    key <AC10>	{ [        ae,         AE,  asciicircum, dead_doubleacute ] };
-    key <AC11>	{ [dead_acute, dead_circumflex, dead_circumflex ] };
-    key <TLDE>	{ [    degree,  diaeresis,      notsign,      notsign ]	};
-
-    key <BKSL>	{ [      plus,   asterisk,        grave,   dead_breve ]	};
-    key <AB10>	{ [     thorn,      THORN, dead_belowdot, dead_abovedot ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // modify the basic Icelandic layout to use Sun dead keys
-
-    include "is(basic)"
-
-    name[Group1]="Iceland - Sun dead keys";
-
-    key <TLDE>	{ [SunFA_Circum,     degree,      notsign,    notsign ]	};
-    key <AE12>	{ [SunFA_Acute, SunFA_Grave, SunFA_Cedilla, SunFA_Cedilla ] };
-    key <AD11>	{ [udiaeresis, Udiaeresis, SunFA_Diaeresis, SunFA_Diaeresis ] };
-    key <AD12>	{ [      plus,   asterisk,  SunFA_Tilde,  dead_macron ]	};
-    key <AC10>	{ [odiaeresis, Odiaeresis,  SunFA_Acute,  SunFA_Acute ]	};
-    key <AC11>	{ [adiaeresis, Adiaeresis, SunFA_Circum, SunFA_Circum ]	};
-    key <BKSL>	{ [numbersign,      acute,  SunFA_Grave,  SunFA_Grave ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // modify the basic Icelandic layout to not have any dead keys
-
-    include "is(basic)"
-
-    name[Group1]="Iceland - Eliminate dead keys";
-
-    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
-    key <AE12>	{ [apostrophe,      grave,      cedilla,      cedilla ]	};
-    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};
-    key <AD12>	{ [      plus,   asterisk,   asciitilde,       macron ]	};
-    key <AC10>	{ [odiaeresis, Odiaeresis,        acute,        acute ]	};
-    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,  asciicircum ]	};
-    key <BKSL>	{ [numbersign,      acute,        grave,        grave ]	};
-    key <AB10>	{ [     thorn,      THORN, dead_belowdot,    abovedot ]	};
-};
-
-// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-//
-// = HISTORY
-// * 2004-09-28:
-//   Initial cleanroom writing of the keymap, I just booted Mac OS X, opened
-//   TextEdit.app and wrote down what the value produced by each key was when I
-//   pressed it, a for a, A for shift + a, å for lalt + a etc and made the
-//   keymap from that information
-//
-// * 2006-01-14:
-//   Revised the comments in the file
-//
-// = NOTES
-// * 20 characters in this keymap have no named character defined in
-//   include/keysymdef.h and as a result their Unicode code points in
-//   hexadecimal are listed here, these can be generated with the following
-//   perl command:
-//     $ perl -CA -e 'printf "U%x\n", ord shift' Æ
-//   and converted back like:
-//     $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6
-// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X
-//   keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it
-//   has no assigned code point in Unicode, the code point Apple uses for it is
-//   U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF)
-// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it
-//   should work on other Apple laptop models which use the same keyboard
-//   layout. It will probably work on standard sized keyboards with little or
-//   no modification but it might not support them fully, please report if
-//   you're able to get it running with such a keyboard
-
-// Copied from macintosh_vndr/is
-partial alphanumeric_keys
-xkb_symbols "mac" {
-    name[Group1]= "Iceland - Macintosh";
-
-	//-- Row 5 (E) --//
-	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};
-	key <AE01> {	[	1,		exclam, 	exclamdown,	VoidSymbol	]	};
-	key <AE02> {	[	2,		quotedbl, 	at,		VoidSymbol	]	};
-	key <AE03> {	[	3,		numbersign, 	U2122,		sterling	]	};
-	key <AE04> {	[	4,		dollar, 	U00A2,		EuroSign	]	};
-	key <AE05> {	[	5,		percent, 	U2030,		infinity	]	};
-	key <AE06> {	[	6,		ampersand, 	asciicircum,	U2044		]	};
-	key <AE07> {	[	7,		slash, 	backslash,	U00F7		]	};
-	key <AE08> {	[	8,		parenleft, 	bracketleft,	braceleft	]	};
-	key <AE09> {	[	9,		parenright, 	bracketright,	braceright	]	};
-	key <AE10> {	[	0,		equal, 	U2260,		U2248		]	};
-	key <AE11> {	[	odiaeresis,	Odiaeresis, 	oslash,		Ooblique	]	};
-	key <AE12> {	[	minus,		underscore, 	endash,		emdash		]	};
-
-	
-	//-- Row 4 (D) --//
-	key <AD01> {	[	q,		Q, 	paragraph,	VoidSymbol	]	};
-	key <AD02> {	[	w,		W, 	U2211,		VoidSymbol	]	};
-	key <AD03> {	[	e,		E, 	dead_grave,	VoidSymbol	]	};
-	key <AD04> {	[	r,		R, 	registered,	VoidSymbol	]	};
-	key <AD05> {	[	t,		T, 	degree,		VoidSymbol	]	};
-	key <AD06> {	[	y,		Y, 	yen,		VoidSymbol	]	};
-	key <AD07> {	[	u,		U, 	dead_diaeresis,	VoidSymbol	]	};
-	key <AD08> {	[	i,		I, 	U0131,		U00AA		]	};
-	key <AD09> {	[	o,		O, 	dead_circumflex,U00BA		]	};
-	key <AD10> {	[	p,		P, 	Greek_pi,	Greek_PI	]	};
-	key <AD11> {	[	eth,		Eth, 	U201e,		U201c		]	};
-	key <AD12> {	[	apostrophe,	question, 	questiondown,	U00B7		]	};
-	
-	
-	//-- Row 3 (C) --//
-	key <AC01> {	[	a,		A, 	aring,		Aring		]	};
-	key <AC02> {	[	s,		S, 	ssharp,		abovedot	]	};
-	key <AC03> {	[	d,		D, 	U2202,		U2DA		]	};
-	key <AC04> {	[	f,		F, 	U192,		macron		]	};
-	key <AC05> {	[	g,		G, 	copyright,	breve		]	};
-	key <AC06> {	[	h,		H, 	bar,		VoidSymbol	]	};
-	key <AC07> {	[	j,		J, 	U2206,		U2dd		]	};
-	key <AC08> {	[	k,		K, 	U00AC,		VoidSymbol	]	};
-	key <AC09> {	[	l,		L, 	U2026,		caron		]	};
-	key <AC10> {	[	ae,		AE, 	oe,		OE		]	};
-	key <AC11> {	[	dead_acute,	dead_diaeresis, 	U201A,		U2018		]	};
-	key <BKSL> {	[	plus,		asterisk, 	U2022,		plusminus	]	};
-	
-	
-	//-- Row 2  (B) --//
-	key <LSGT> {	[	less,		greater, 	section,	UF8FF		]	};
-	key <AB01> {	[	z,		Z, 	U3A9,		VoidSymbol	]	};
-	key <AB02> {	[	x,		X, 	asciitilde,	VoidSymbol	]	};
-	key <AB03> {	[	c,		C, 	ccedilla,	Ccedilla	]	};
-	key <AB04> {	[	v,		V, 	U221A,		U25CA		]	};
-	key <AB05> {	[	b,		B, 	U222B,		VoidSymbol	]	};
-	key <AB06> {	[	n,		N, 	dead_tilde,	VoidSymbol	]	};
-	key <AB07> {	[	m,		M, 	U00B5,		VoidSymbol	]	};
-	key <AB08> {	[	comma,		semicolon, 	lessthanequal,	guillemotleft	]	};
-	key <AB09> {	[	period,		colon, 	greaterthanequal,guillemotright	]	};
-	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};
-
-    include "level3(ralt_switch)"
-};
-
-// This is a modified version of the English Dvorak layout that allows
-// you to type all Icelandic letters under X. It's not a full attempt at
-// nationalizing the layout as e.g. the Norwegian, Swedish and French
-// layouts which modify the primary keys of the basic Dvorak layout
-// extensively.
-
-// Rather it's a simple modification of 5 keys of the US Dvorak layout,
-// it adds Germanic/Icelandic style quotation marks („“), eth (ðÐ), ae
-// (æÆ), endash and emdash (–—) and thorn (þÞ). These keys aren't used in
-// the US version making this IS version a superset of it.
-
-// Maybe someone else will make a "full" attempt at an Icelandic layout
-// but I was mostly interested in continuing to type English comfortably
-// as a primary function while being able to type the full Icelandic
-// alphabet as a secondary function.
-//     -- Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
-// Icelandic Dvorak
-partial alphanumeric_keys 
-xkb_symbols "dvorak" {
-    name[Group1]= "Iceland - Dvorak";
-
-    include "us(dvorak)"
-
-    key <AD11> { [      slash,  question,    U201e,   U201c   ] };
-    key <AC06> { [       d,     D,           eth,     ETH     ] };
-    key <AC10> { [       s,     S,           ae,      AE      ] };
-    key <AC11> { [   minus,     underscore,  endash,  emdash  ] };
-    key <AB10> { [       z,     Z,           thorn,   Thorn   ] };
-
-    include "level3(ralt_switch)"
-};
+// $XKeyboardConfig$

+

+// based on

+// XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is

+//     fixes by Olafur Osvaldsson - oli@isnic.is

+//

+// $XFree86: xc/programs/xkbcomp/symbols/is,v 1.3 2002/11/26 01:57:25 dawes Exp $

+

+default partial alphanumeric_keys

+xkb_symbols "basic" {

+

+    include "latin(type4)"

+

+    name[Group1]="Iceland";

+

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

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

+    key <AE11>	{ [odiaeresis, Odiaeresis,    backslash, questiondown ]	};

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

+

+    key <AD11>	{ [       eth,        ETH, dead_diaeresis, dead_abovering ] };

+    key <AD12>	{ [apostrophe,   question,   asciitilde,  dead_macron ]	};

+

+    key <AC10>	{ [        ae,         AE,  asciicircum, dead_doubleacute ] };

+    key <AC11>	{ [dead_acute, dead_circumflex, dead_circumflex ] };

+    key <TLDE>	{ [    degree,  diaeresis,      notsign,      notsign ]	};

+

+    key <BKSL>	{ [      plus,   asterisk,        grave,   dead_breve ]	};

+    key <AB10>	{ [     thorn,      THORN, dead_belowdot, dead_abovedot ] };

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "Sundeadkeys" {

+

+    // modify the basic Icelandic layout to use Sun dead keys

+

+    include "is(basic)"

+

+    name[Group1]="Iceland - Sun dead keys";

+

+    key <TLDE>	{ [dead_circumflex,     degree,      notsign,    notsign ]	};

+    key <AE12>	{ [dead_acute, dead_grave, dead_cedilla, dead_cedilla ] };

+    key <AD11>	{ [udiaeresis, Udiaeresis, dead_diaeresis, dead_diaeresis ] };

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

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

+    key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_circumflex ]	};

+    key <BKSL>	{ [numbersign,      acute,  dead_grave,  dead_grave ]	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "nodeadkeys" {

+

+    // modify the basic Icelandic layout to not have any dead keys

+

+    include "is(basic)"

+

+    name[Group1]="Iceland - Eliminate dead keys";

+

+    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};

+    key <AE12>	{ [apostrophe,      grave,      cedilla,      cedilla ]	};

+    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};

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

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

+    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,  asciicircum ]	};

+    key <BKSL>	{ [numbersign,      acute,        grave,        grave ]	};

+    key <AB10>	{ [     thorn,      THORN, dead_belowdot,    abovedot ]	};

+};

+

+// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>

+//

+// = HISTORY

+// * 2004-09-28:

+//   Initial cleanroom writing of the keymap, I just booted Mac OS X, opened

+//   TextEdit.app and wrote down what the value produced by each key was when I

+//   pressed it, a for a, A for shift + a, å for lalt + a etc and made the

+//   keymap from that information

+//

+// * 2006-01-14:

+//   Revised the comments in the file

+//

+// = NOTES

+// * 20 characters in this keymap have no named character defined in

+//   include/keysymdef.h and as a result their Unicode code points in

+//   hexadecimal are listed here, these can be generated with the following

+//   perl command:

+//     $ perl -CA -e 'printf "U%x\n", ord shift' Æ

+//   and converted back like:

+//     $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6

+// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X

+//   keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it

+//   has no assigned code point in Unicode, the code point Apple uses for it is

+//   U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF)

+// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it

+//   should work on other Apple laptop models which use the same keyboard

+//   layout. It will probably work on standard sized keyboards with little or

+//   no modification but it might not support them fully, please report if

+//   you're able to get it running with such a keyboard

+

+// Copied from macintosh_vndr/is

+partial alphanumeric_keys

+xkb_symbols "mac" {

+    name[Group1]= "Iceland - Macintosh";

+

+	//-- Row 5 (E) --//

+	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};

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

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

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

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

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

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

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

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

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

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

+	key <AE11> {	[	odiaeresis,	Odiaeresis, 	oslash,		Ooblique	]	};

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

+

+	

+	//-- Row 4 (D) --//

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

+	key <AD02> {	[	w,		W, 	U2211,		VoidSymbol	]	};

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

+	key <AD04> {	[	r,		R, 	registered,	VoidSymbol	]	};

+	key <AD05> {	[	t,		T, 	degree,		VoidSymbol	]	};

+	key <AD06> {	[	y,		Y, 	yen,		VoidSymbol	]	};

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

+	key <AD08> {	[	i,		I, 	U0131,		U00AA		]	};

+	key <AD09> {	[	o,		O, 	dead_circumflex,U00BA		]	};

+	key <AD10> {	[	p,		P, 	Greek_pi,	Greek_PI	]	};

+	key <AD11> {	[	eth,		Eth, 	U201e,		U201c		]	};

+	key <AD12> {	[	apostrophe,	question, 	questiondown,	U00B7		]	};

+	

+	

+	//-- Row 3 (C) --//

+	key <AC01> {	[	a,		A, 	aring,		Aring		]	};

+	key <AC02> {	[	s,		S, 	ssharp,		abovedot	]	};

+	key <AC03> {	[	d,		D, 	U2202,		U2DA		]	};

+	key <AC04> {	[	f,		F, 	U192,		macron		]	};

+	key <AC05> {	[	g,		G, 	copyright,	breve		]	};

+	key <AC06> {	[	h,		H, 	bar,		VoidSymbol	]	};

+	key <AC07> {	[	j,		J, 	U2206,		U2dd		]	};

+	key <AC08> {	[	k,		K, 	U00AC,		VoidSymbol	]	};

+	key <AC09> {	[	l,		L, 	U2026,		caron		]	};

+	key <AC10> {	[	ae,		AE, 	oe,		OE		]	};

+	key <AC11> {	[	dead_acute,	dead_diaeresis, 	U201A,		U2018		]	};

+	key <BKSL> {	[	plus,		asterisk, 	U2022,		plusminus	]	};

+	

+	

+	//-- Row 2  (B) --//

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

+	key <AB01> {	[	z,		Z, 	U3A9,		VoidSymbol	]	};

+	key <AB02> {	[	x,		X, 	asciitilde,	VoidSymbol	]	};

+	key <AB03> {	[	c,		C, 	ccedilla,	Ccedilla	]	};

+	key <AB04> {	[	v,		V, 	U221A,		U25CA		]	};

+	key <AB05> {	[	b,		B, 	U222B,		VoidSymbol	]	};

+	key <AB06> {	[	n,		N, 	dead_tilde,	VoidSymbol	]	};

+	key <AB07> {	[	m,		M, 	U00B5,		VoidSymbol	]	};

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

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

+	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};

+

+    include "level3(ralt_switch)"

+};

+

+// This is a modified version of the English Dvorak layout that allows

+// you to type all Icelandic letters under X. It's not a full attempt at

+// nationalizing the layout as e.g. the Norwegian, Swedish and French

+// layouts which modify the primary keys of the basic Dvorak layout

+// extensively.

+

+// Rather it's a simple modification of 5 keys of the US Dvorak layout,

+// it adds Germanic/Icelandic style quotation marks („“), eth (ðÐ), ae

+// (æÆ), endash and emdash (–—) and thorn (þÞ). These keys aren't used in

+// the US version making this IS version a superset of it.

+

+// Maybe someone else will make a "full" attempt at an Icelandic layout

+// but I was mostly interested in continuing to type English comfortably

+// as a primary function while being able to type the full Icelandic

+// alphabet as a secondary function.

+//     -- Ævar Arnfjörð Bjarmason <avar@cpan.org>

+

+// Icelandic Dvorak

+partial alphanumeric_keys 

+xkb_symbols "dvorak" {

+    name[Group1]= "Iceland - Dvorak";

+

+    include "us(dvorak)"

+

+    key <AD11> { [      slash,  question,    U201e,   U201c   ] };

+    key <AC06> { [       d,     D,           eth,     ETH     ] };

+    key <AC10> { [       s,     S,           ae,      AE      ] };

+    key <AC11> { [   minus,     underscore,  endash,  emdash  ] };

+    key <AB10> { [       z,     Z,           thorn,   Thorn   ] };

+

+    include "level3(ralt_switch)"

+};