svn merge ^/branches/released .

1 files changed, 76 insertions, 79 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
index 56ef85bf6..a2ac773e7 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
@@ -1,79 +1,76 @@
-// $XConsortium: dk /main/3 1996/08/31 12:19:29 kaleb $
-// $XFree86: xc/programs/xkbcomp/symbols/dk,v 3.3.2.1 1999/12/20 12:56:01 hohndel Exp $
-partial alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a Danish keyboard with dead key support
-    // and all of ISO-8859-1 characters available.
-
-    include "latin"
-    name[Group1]= "Denmark - Mac";
-
-    key <TLDE> {	[  onehalf,         section,    threequarters,       paragraph	]};
-    key <LSGT> {	[     less,         greater,        backslash,         notsign	]};
-    key <SPCE> {	[    space,           space,     nobreakspace,    nobreakspace	]};
-    key <AE01> {	[        1,          exclam,       exclamdown,     onesuperior	]};
-    key <AE02> {	[        2,        quotedbl,               at,     twosuperior	]};
-    key <AE03> {	[        3,      numbersign,         sterling,   threesuperior	]};
-    key <AE04> {	[        4,        EuroSign,           dollar,      onequarter	]};
-    key <AE05> {	[        5,         percent,         NoSymbol,            cent	]};
-    key <AE06> {	[        6,       ampersand,              yen,        NoSymbol	]};
-    key <AE07> {	[        7,           slash,        braceleft,        division	]};
-    key <AE08> {	[        8,       parenleft,      bracketleft,   guillemotleft	]};
-    key <AE09> {	[        9,      parenright,     bracketright,  guillemotright	]};
-    key <AE10> {	[        0,           equal,       braceright,          degree	]};
-    key <AB08> {	[    comma,       semicolon,     dead_cedilla,     dead_ogonek	]};
-    key <AB09> {	[   period,           colon,   periodcentered,   dead_abovedot	]};
-    key <AB03> {	[        c,               C,        copyright,        NoSymbol	]};
-    key <AB10> {	[    minus,      underscore,           hyphen,          macron	]};
-    key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};
-    key <AC03> {        [        d,               D,              eth,             ETH      ]};
-    key <AD03> {        [        e,               E,         EuroSign,            cent      ]};
-    key <AD04> {        [        r,               R,       registered,        NoSymbol      ]};
-    key <AD05> {        [        t,               T,            thorn,           THORN      ]};
-    key <AD08> {        [        i,               I,         NoSymbol,        NoSymbol      ]};
-    key <AD09> {        [        o,               O,               oe,              OE      ]};
-    key	<AC10> {	[	ae,               AE	]};
-    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};
-    key <AC11> {	[   oslash,        Ooblique 	]};
-    key <BKSL> {	[ apostrophe,        asterisk, dead_doubleacute,        multiply	]};
-    key <AD11> {	[    aring,           Aring 	]};
-    key <AE12> {   	[ dead_acute,      dead_grave,              bar,       brokenbar	]};
-    key <AD12> {   	[ dead_diaeresis, dead_circumflex,       dead_tilde,      dead_caron      ]};
-
-    // End alphanumeric section
-
-    include "eurosign(e)"
-    include "level3(ralt_switch)"
-};
-
-
-partial default alphanumeric_keys 
-xkb_symbols "full" {
-    include "iso9995-3(full)"
-    include "dk(basic)"
-};
-
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "macintosh_vndr/dk(basic)"
-    name[Group1]= "Denmark - Mac, eliminate dead keys";
-
-    key <AE12> {	[           acute,           grave,              bar,          ogonek	]	};
-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "macbookpro" {
-
-    include "level3(win_switch)"
-    include "macintosh_vndr/dk(basic)"
-
-    name[Group1]= "Denmark - Mac, MacBook Pro";
-
-    key <BKSL>  { [apostrophe, asterisk,        at,        at ] };
-    key <TLDE>  { [    dollar,  section,    dollar,    dollar ] };
-};
-
+partial alphanumeric_keys 

+xkb_symbols "basic" {

+

+    // Describes the differences between a very simple en_US

+    // keyboard and a Danish keyboard with dead key support

+    // and all of ISO-8859-1 characters available.

+

+    include "latin"

+    name[Group1]= "Denmark - Mac";

+

+    key <TLDE> {	[  onehalf,         section,    threequarters,       paragraph	]};

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

+    key <SPCE> {	[    space,           space,     nobreakspace,    nobreakspace	]};

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

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

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

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

+    key <AE05> {	[        5,         percent,         NoSymbol,            cent	]};

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

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

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

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

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

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

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

+    key <AB03> {	[        c,               C,        copyright,        NoSymbol	]};

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

+    key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};

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

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

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

+    key <AD05> {        [        t,               T,            thorn,           THORN      ]};

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

+    key <AD09> {        [        o,               O,               oe,              OE      ]};

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

+    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};

+    key <AC11> {	[   oslash,        Ooblique 	]};

+    key <BKSL> {	[ apostrophe,        asterisk, dead_doubleacute,        multiply	]};

+    key <AD11> {	[    aring,           Aring 	]};

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

+    key <AD12> {   	[ dead_diaeresis, dead_circumflex,       dead_tilde,      dead_caron      ]};

+

+    // End alphanumeric section

+

+    include "eurosign(e)"

+    include "level3(ralt_switch)"

+};

+

+

+partial default alphanumeric_keys 

+xkb_symbols "full" {

+    include "iso9995-3(full)"

+    include "dk(basic)"

+};

+

+

+partial alphanumeric_keys 

+xkb_symbols "nodeadkeys" {

+    include "macintosh_vndr/dk(basic)"

+    name[Group1]= "Denmark - Mac, eliminate dead keys";

+

+    key <AE12> {	[           acute,           grave,              bar,          ogonek	]	};

+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "macbookpro" {

+

+    include "level3(win_switch)"

+    include "macintosh_vndr/dk(basic)"

+

+    name[Group1]= "Denmark - Mac, MacBook Pro";

+

+    key <BKSL>  { [apostrophe, asterisk,        at,        at ] };

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

+};