Synchronised line endinge with release branch

1 files changed, 150 insertions, 150 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/nl b/xorg-server/xkeyboard-config/symbols/nl
index 4130817ee..4c94a65b2 100644
--- a/xorg-server/xkeyboard-config/symbols/nl
+++ b/xorg-server/xkeyboard-config/symbols/nl
@@ -1,150 +1,150 @@
-// Basic layout based on converted file, from keytable file to xkb/symbols/ file

-// with mk_xkb by root@linux.chanae.stben.be Tue Sep 30 00:53:29 MET DST 1997

-

-// Converted from the nl-latin.map of the Linux kbd package by

-// Pablo Saratxaga <srtxg@f2219.n293.z2.fidonet.org>

-

-// Official layout by Benno Schulenberg <bensberg@justemail.net>, January 2007,

-// based on http://www.xs4all.nl/~koospol/public/Xmodmap-nl-deadkeys.gz

-

-

-default partial alphanumeric_keys

-xkb_symbols "basic" {

-

-    include "latin"

-

-    name[Group1]="Dutch";

-

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

-    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};

-    key <AE07>	{ [         7, underscore,     sterling, seveneighths ]	};

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

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

-    key <AE10>	{ [         0, apostrophe,       degree,    trademark ]	};

-    key <AE11>	{ [     slash,   question,    backslash, questiondown ]	};

-    key <AE12>	{ [    degree, dead_tilde, dead_cedilla,  dead_ogonek ]	};

-

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

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

-    key <AD06>	{ [         y,          Y,   ydiaeresis,          yen ]	};

-    key <AD07>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};

-    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};

-    key <AD09>	{ [         o,          O,       ograve,       Ograve ]	};

-    key <AD10>	{ [         p,          P,    paragraph,        THORN ]	};

-    key <AD11>	{ [dead_diaeresis, dead_circumflex, asciitilde, asciicircum]	};

-    key <AD12>	{ [  asterisk,        bar,   dead_tilde,  dead_macron ]	};

-

-    key <AC01>	{ [         a,          A,       aacute,       Aacute ]	};

-    key <AC04>	{ [         f,          F,  ordfeminine,  ordfeminine ]	};

-    key <AC10>	{ [      plus,  plusminus,   dead_acute, dead_doubleacute ] };

-    key <AC11>	{ [dead_acute, dead_grave,   apostrophe,        grave ] };

-    key <TLDE>	{ [        at,    section,      notsign,      notsign ]	};

-

-    key <BKSL>	{ [      less,    greater,   dead_grave,   dead_breve ]	};

-    key <AB06>	{ [         n,          N,       ntilde,       Ntilde ]	};

-    key <AB07>	{ [         m,          M,     Greek_mu,    masculine ]	};

-    key <AB08>	{ [     comma,  semicolon,      cedilla, guillemotleft]	};

-    key <AB09>	{ [    period,      colon, periodcentered, guillemotright ] };

-    key <AB10>	{ [     minus,      equal,       hyphen, dead_abovedot]	};

-

-    key <LSGT>	{ [bracketright, bracketleft,       bar,    brokenbar ]	};

-

-    include "level3(ralt_switch)"

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "std" {

-

-    name[Group1]= "Dutch (standard)";

-

-    key <TLDE>  { [             at,        section,        notsign ] };

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

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

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

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

-    key <AE05>  { [              5,        percent,        onehalf ] };

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

-    key <AE07>  { [              7,     underscore,       sterling ] };

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

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

-    key <AE10>  { [              0,     apostrophe                 ] };

-    key <AE11>  { [          slash,       question,      backslash ] };

-    key <AE12>  { [         degree,     dead_tilde,   dead_cedilla ] };

-

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

-    key <AD02>  { [              w,              W                 ] };

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

-    key <AD04>  { [              r,              R,      paragraph ] };

-    key <AD05>  { [              t,              T                 ] };

-    key <AD06>  { [              y,              Y                 ] };

-    key <AD07>  { [              u,              U                 ] };

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

-    key <AD09>  { [              o,              O                 ] };

-    key <AD10>  { [              p,              P                 ] };

-    key <AD11>  { [ dead_diaeresis, dead_circumflex                ] };

-    key <AD12>  { [       asterisk,            bar                 ] };

-    key <BKSL>  { [           less,        greater                 ] };

-

-    key <AC01>  { [              a,              A                 ] };

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

-    key <AC03>  { [              d,              D                 ] };

-    key <AC04>  { [              f,              F                 ] };

-    key <AC05>  { [              g,              G                 ] };

-    key <AC06>  { [              h,              H                 ] };

-    key <AC07>  { [              j,              J                 ] };

-    key <AC08>  { [              k,              K                 ] };

-    key <AC09>  { [              l,              L                 ] };

-    key <AC10>  { [           plus,      plusminus                 ] };

-    key <AC11>  { [     dead_acute,     dead_grave                 ] };

-

-    key <LSGT>  { [   bracketright,    bracketleft,            bar ] };

-    key <AB01>  { [              z,              Z,  guillemotleft ] };

-    key <AB02>  { [              x,              X, guillemotright ] };

-    key <AB03>  { [              c,              C,           cent ] };

-    key <AB04>  { [              v,              V                 ] };

-    key <AB05>  { [              b,              B                 ] };

-    key <AB06>  { [              n,              N                 ] };

-    key <AB07>  { [              m,              M,             mu ] };

-    key <AB08>  { [          comma,      semicolon                 ] };

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

-    key <AB10>  { [          minus,          equal                 ] };

-

-    include "level3(ralt_switch)"

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "Sundeadkeys" {

-

-    // For naming consistency

-

-    include "nl(basic)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "sundeadkeys" {

-

-     // For naming consistency

-

-    include "nl(Sundeadkeys)"

-    name[Group1]="Dutch (Sun dead keys)";

-};

-

-// Copied from macintosh_vndr/nl

-partial alphanumeric_keys 

-xkb_symbols "mac" {

-

-    // Describes the differences between a very simple mac_US

-    // keyboard and a very simple netherland keybaord

-

-    include "latin"

-

-    name[Group1]= "Dutch (Macintosh)";

-

-    include "level3(ralt_switch)"

-

-// do just nothing

-

-};

+// Basic layout based on converted file, from keytable file to xkb/symbols/ file
+// with mk_xkb by root@linux.chanae.stben.be Tue Sep 30 00:53:29 MET DST 1997
+
+// Converted from the nl-latin.map of the Linux kbd package by
+// Pablo Saratxaga <srtxg@f2219.n293.z2.fidonet.org>
+
+// Official layout by Benno Schulenberg <bensberg@justemail.net>, January 2007,
+// based on http://www.xs4all.nl/~koospol/public/Xmodmap-nl-deadkeys.gz
+
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="Dutch";
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
+    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
+    key <AE07>	{ [         7, underscore,     sterling, seveneighths ]	};
+    key <AE08>	{ [         8,  parenleft,    braceleft,  bracketleft ]	};
+    key <AE09>	{ [         9, parenright,   braceright, bracketright ]	};
+    key <AE10>	{ [         0, apostrophe,       degree,    trademark ]	};
+    key <AE11>	{ [     slash,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [    degree, dead_tilde, dead_cedilla,  dead_ogonek ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,         cent ] };
+    key <AD05>	{ [         t,          T,        thorn,        THORN ]	};
+    key <AD06>	{ [         y,          Y,   ydiaeresis,          yen ]	};
+    key <AD07>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};
+    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};
+    key <AD09>	{ [         o,          O,       ograve,       Ograve ]	};
+    key <AD10>	{ [         p,          P,    paragraph,        THORN ]	};
+    key <AD11>	{ [dead_diaeresis, dead_circumflex, asciitilde, asciicircum]	};
+    key <AD12>	{ [  asterisk,        bar,   dead_tilde,  dead_macron ]	};
+
+    key <AC01>	{ [         a,          A,       aacute,       Aacute ]	};
+    key <AC04>	{ [         f,          F,  ordfeminine,  ordfeminine ]	};
+    key <AC10>	{ [      plus,  plusminus,   dead_acute, dead_doubleacute ] };
+    key <AC11>	{ [dead_acute, dead_grave,   apostrophe,        grave ] };
+    key <TLDE>	{ [        at,    section,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [      less,    greater,   dead_grave,   dead_breve ]	};
+    key <AB06>	{ [         n,          N,       ntilde,       Ntilde ]	};
+    key <AB07>	{ [         m,          M,     Greek_mu,    masculine ]	};
+    key <AB08>	{ [     comma,  semicolon,      cedilla, guillemotleft]	};
+    key <AB09>	{ [    period,      colon, periodcentered, guillemotright ] };
+    key <AB10>	{ [     minus,      equal,       hyphen, dead_abovedot]	};
+
+    key <LSGT>	{ [bracketright, bracketleft,       bar,    brokenbar ]	};
+
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "std" {
+
+    name[Group1]= "Dutch (standard)";
+
+    key <TLDE>  { [             at,        section,        notsign ] };
+    key <AE01>  { [              1,         exclam,    onesuperior ] };
+    key <AE02>  { [              2,       quotedbl,    twosuperior ] };
+    key <AE03>  { [              3,     numbersign,  threesuperior ] };
+    key <AE04>  { [              4,         dollar,     onequarter ] };
+    key <AE05>  { [              5,        percent,        onehalf ] };
+    key <AE06>  { [              6,      ampersand,  threequarters ] };
+    key <AE07>  { [              7,     underscore,       sterling ] };
+    key <AE08>  { [              8,      parenleft,      braceleft ] };
+    key <AE09>  { [              9,     parenright,     braceright ] };
+    key <AE10>  { [              0,     apostrophe                 ] };
+    key <AE11>  { [          slash,       question,      backslash ] };
+    key <AE12>  { [         degree,     dead_tilde,   dead_cedilla ] };
+
+    key <AD01>  { [              q,              Q                 ] };
+    key <AD02>  { [              w,              W                 ] };
+    key <AD03>  { [              e,              E,       EuroSign ] };
+    key <AD04>  { [              r,              R,      paragraph ] };
+    key <AD05>  { [              t,              T                 ] };
+    key <AD06>  { [              y,              Y                 ] };
+    key <AD07>  { [              u,              U                 ] };
+    key <AD08>  { [              i,              I                 ] };
+    key <AD09>  { [              o,              O                 ] };
+    key <AD10>  { [              p,              P                 ] };
+    key <AD11>  { [ dead_diaeresis, dead_circumflex                ] };
+    key <AD12>  { [       asterisk,            bar                 ] };
+    key <BKSL>  { [           less,        greater                 ] };
+
+    key <AC01>  { [              a,              A                 ] };
+    key <AC02>  { [              s,              S,         ssharp ] };
+    key <AC03>  { [              d,              D                 ] };
+    key <AC04>  { [              f,              F                 ] };
+    key <AC05>  { [              g,              G                 ] };
+    key <AC06>  { [              h,              H                 ] };
+    key <AC07>  { [              j,              J                 ] };
+    key <AC08>  { [              k,              K                 ] };
+    key <AC09>  { [              l,              L                 ] };
+    key <AC10>  { [           plus,      plusminus                 ] };
+    key <AC11>  { [     dead_acute,     dead_grave                 ] };
+
+    key <LSGT>  { [   bracketright,    bracketleft,            bar ] };
+    key <AB01>  { [              z,              Z,  guillemotleft ] };
+    key <AB02>  { [              x,              X, guillemotright ] };
+    key <AB03>  { [              c,              C,           cent ] };
+    key <AB04>  { [              v,              V                 ] };
+    key <AB05>  { [              b,              B                 ] };
+    key <AB06>  { [              n,              N                 ] };
+    key <AB07>  { [              m,              M,             mu ] };
+    key <AB08>  { [          comma,      semicolon                 ] };
+    key <AB09>  { [         period,          colon, periodcentered ] };
+    key <AB10>  { [          minus,          equal                 ] };
+
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // For naming consistency
+
+    include "nl(basic)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+     // For naming consistency
+
+    include "nl(Sundeadkeys)"
+    name[Group1]="Dutch (Sun dead keys)";
+};
+
+// Copied from macintosh_vndr/nl
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple netherland keybaord
+
+    include "latin"
+
+    name[Group1]= "Dutch (Macintosh)";
+
+    include "level3(ralt_switch)"
+
+// do just nothing
+
+};