svn merge ^/branches/released .

1 files changed, 65 insertions, 67 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/mk b/xorg-server/xkeyboard-config/symbols/mk
index c69439c5d..c8acb1e39 100644
--- a/xorg-server/xkeyboard-config/symbols/mk
+++ b/xorg-server/xkeyboard-config/symbols/mk
@@ -1,67 +1,65 @@
-
-// based on keyboard map:
-// Author: Damjan Georgievski <penguinista AT mail.net.mk>
-// Revision: 1.5
-// $XKeyboardConfig$
-
-partial default alphanumeric_keys
-xkb_symbols "basic" { 
-    name[Group1]= "Macedonia";
-
-    key <AB01> { [     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key <AC02> { [     Cyrillic_es,     Cyrillic_ES	]	};
-    key <AC01> { [      Cyrillic_a,      Cyrillic_A	]	};
-    key <AD01> { [    Cyrillic_lje,    Cyrillic_LJE	]	};
-    key <AD02> { [    Cyrillic_nje,    Cyrillic_NJE	]	};
-    key <AB03> { [    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key <AB02> { [   Cyrillic_dzhe,   Cyrillic_DZHE	]	};
-    key <AC03> { [     Cyrillic_de,     Cyrillic_DE	]	};
-    key <AD03> { [     Cyrillic_ie,     Cyrillic_IE	]	};
-    key <AB04> { [     Cyrillic_ve,     Cyrillic_VE	]	};
-    key <AC04> { [     Cyrillic_ef,     Cyrillic_EF	]	};
-    key <AD05> { [     Cyrillic_te,     Cyrillic_TE	]	};
-    key <AD04> { [     Cyrillic_er,     Cyrillic_ER	]	};
-    key <AB06> { [     Cyrillic_en,     Cyrillic_EN	]	};
-    key <AB05> { [     Cyrillic_be,     Cyrillic_BE	]	};
-    key <AC06> { [     Cyrillic_ha,     Cyrillic_HA	]	};
-    key <AC05> { [    Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key <AD06> { [   Macedonia_dse,   Macedonia_DSE	]	};
-    key <AB07> { [     Cyrillic_em,     Cyrillic_EM	]	};
-    key <AC07> { [     Cyrillic_je,     Cyrillic_JE	]	};
-    key <AD07> { [      Cyrillic_u,      Cyrillic_U	]	};
-    key <AC08> { [     Cyrillic_ka,     Cyrillic_KA	]	};
-    key <AD08> { [      Cyrillic_i,      Cyrillic_I	]	};
-    key <AD09> { [      Cyrillic_o,      Cyrillic_O	]	};
-    key <AC09> { [     Cyrillic_el,     Cyrillic_EL	]	};
-    key <AC10> { [    Cyrillic_che,    Cyrillic_CHE	]	};
-    key <AD10> { [     Cyrillic_pe,     Cyrillic_PE	]	};
-    key <AC11> { [   Macedonia_kje,   Macedonia_KJE	]	};
-    key <AD11> { [    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key <AD12> { [   Macedonia_gje,   Macedonia_GJE	]	};
-    key <BKSL> { [    Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key <AE12> { [           equal,            plus	]	};
-    key <AE11> { [           minus,      underscore	]	};
-    key <TLDE> { [      dead_grave,      asciitilde	]	};
-    key <AE01> { [               1,          exclam	]	};
-    key <AE02> { [               2, doublelowquotemark	]	};
-    key <AE03> { [               3, leftdoublequotemark	]	};
-    key <AE04> { [               4,          dollar	]	};
-    key <AE05> { [               5,         percent	]	};
-    key <AE06> { [               6,     asciicircum	]	};
-    key <AE07> { [               7,       ampersand	]	};
-    key <AE08> { [               8,        asterisk	]	};
-    key <AE09> { [               9,       parenleft	]	};
-    key <AE10> { [               0,      parenright	]	};
-    key <AB08> { [           comma,       semicolon	]	};
-    key <AB09> { [          period,           colon	]	};
-    key <AB10> { [           slash,        question	]	};
- 
-    include "kpdl(comma)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    include "mk(basic)"
-    name[Group1]= "Macedonia - Eliminate dead keys";
-    key <TLDE> { [           grave,      asciitilde ]   };
-};
+// based on keyboard map:

+// Author: Damjan Georgievski <penguinista AT mail.net.mk>

+// Revision: 1.5

+

+partial default alphanumeric_keys

+xkb_symbols "basic" { 

+    name[Group1]= "Macedonia";

+

+    key <AB01> { [     Cyrillic_ze,     Cyrillic_ZE	]	};

+    key <AC02> { [     Cyrillic_es,     Cyrillic_ES	]	};

+    key <AC01> { [      Cyrillic_a,      Cyrillic_A	]	};

+    key <AD01> { [    Cyrillic_lje,    Cyrillic_LJE	]	};

+    key <AD02> { [    Cyrillic_nje,    Cyrillic_NJE	]	};

+    key <AB03> { [    Cyrillic_tse,    Cyrillic_TSE	]	};

+    key <AB02> { [   Cyrillic_dzhe,   Cyrillic_DZHE	]	};

+    key <AC03> { [     Cyrillic_de,     Cyrillic_DE	]	};

+    key <AD03> { [     Cyrillic_ie,     Cyrillic_IE	]	};

+    key <AB04> { [     Cyrillic_ve,     Cyrillic_VE	]	};

+    key <AC04> { [     Cyrillic_ef,     Cyrillic_EF	]	};

+    key <AD05> { [     Cyrillic_te,     Cyrillic_TE	]	};

+    key <AD04> { [     Cyrillic_er,     Cyrillic_ER	]	};

+    key <AB06> { [     Cyrillic_en,     Cyrillic_EN	]	};

+    key <AB05> { [     Cyrillic_be,     Cyrillic_BE	]	};

+    key <AC06> { [     Cyrillic_ha,     Cyrillic_HA	]	};

+    key <AC05> { [    Cyrillic_ghe,    Cyrillic_GHE	]	};

+    key <AD06> { [   Macedonia_dse,   Macedonia_DSE	]	};

+    key <AB07> { [     Cyrillic_em,     Cyrillic_EM	]	};

+    key <AC07> { [     Cyrillic_je,     Cyrillic_JE	]	};

+    key <AD07> { [      Cyrillic_u,      Cyrillic_U	]	};

+    key <AC08> { [     Cyrillic_ka,     Cyrillic_KA	]	};

+    key <AD08> { [      Cyrillic_i,      Cyrillic_I	]	};

+    key <AD09> { [      Cyrillic_o,      Cyrillic_O	]	};

+    key <AC09> { [     Cyrillic_el,     Cyrillic_EL	]	};

+    key <AC10> { [    Cyrillic_che,    Cyrillic_CHE	]	};

+    key <AD10> { [     Cyrillic_pe,     Cyrillic_PE	]	};

+    key <AC11> { [   Macedonia_kje,   Macedonia_KJE	]	};

+    key <AD11> { [    Cyrillic_sha,    Cyrillic_SHA	]	};

+    key <AD12> { [   Macedonia_gje,   Macedonia_GJE	]	};

+    key <BKSL> { [    Cyrillic_zhe,    Cyrillic_ZHE	]	};

+    key <AE12> { [           equal,            plus	]	};

+    key <AE11> { [           minus,      underscore	]	};

+    key <TLDE> { [      dead_grave,      asciitilde	]	};

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

+    key <AE02> { [               2, doublelowquotemark	]	};

+    key <AE03> { [               3, leftdoublequotemark	]	};

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

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

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

+    key <AE07> { [               7,       ampersand	]	};

+    key <AE08> { [               8,        asterisk	]	};

+    key <AE09> { [               9,       parenleft	]	};

+    key <AE10> { [               0,      parenright	]	};

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

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

+    key <AB10> { [           slash,        question	]	};

+ 

+    include "kpdl(comma)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "nodeadkeys" {

+    include "mk(basic)"

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

+    key <TLDE> { [           grave,      asciitilde ]   };

+};