svn merge ^/branches/released .

1 files changed, 92 insertions, 94 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/az b/xorg-server/xkeyboard-config/symbols/az
index 254cf7f8c..4227bc944 100644
--- a/xorg-server/xkeyboard-config/symbols/az
+++ b/xorg-server/xkeyboard-config/symbols/az
@@ -1,94 +1,92 @@
-// $XKeyboardConfig$
-
-// based on:
-// symbols definition for a very simple Azerbaidjani keyboard layout.
-// 2001 - Pablo Saratxaga <pablo@mandrakesoft.com>
-
-partial default alphanumeric_keys
-xkb_symbols "latin" {
-
-  include "us"
-
-  name[Group1]= "Azerbaijan";
-
-  key <TLDE> { [ grave,      asciitilde, dead_grave,  dead_tilde      ] };
-
-  key <AE03> { [ 3,          numbersign, U2166        ] };
-  key <AE06> { [ 6,          colon,      EuroSign,    periodcentered  ] };
-  key <AE07> { [ 7,          question    ] };
-
-  key <AE08> { [ 8,          asterisk,   asciicircum, dead_circumflex ] };
-  key <AE11> { [ minus,      underscore, hyphen,      emdash          ] };
-
-  key <AD02> { [ udiaeresis, Udiaeresis  ] };
-  key <AD04> { [ r,          R,          registered   ] };
-  key <AD08> { [ i,          Iabovedot   ] };
-  key <AD11> { [ odiaeresis, Odiaeresis, bracketleft, braceleft       ] };
-  key <AD12> { [ gbreve,     Gbreve,    bracketright, braceright      ] };
-
-  key <AC10> { [ idotless,   I           ] };
-  key <AC11> { [ schwa,      SCHWA       ] };
-
-  key <AB03> { [ c,          C,          copyright,      division     ] };
-  key <AB07> { [ m,          M,          periodcentered, currency     ] };
-  key <AB08> { [ ccedilla,   Ccedilla    ] };
-  key <AB09> { [ scedilla,   Scedilla    ] };
-  key <AB10> { [ period,     comma       ] };
-  // End alphanumeric section
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "cyrillic" {
-
-  name[Group1]= "Azerbaijan - Cyrillic";
-
-  key <AE02> {[ 2,                 quotedbl           ] };
-  key <AE03> {[ 3,                 numbersign         ] };
-  key <AE04> {[ 4,                 semicolon          ] };
-  key <AE06> {[ 6,                 colon              ] };
-  key <AE07> {[ 7,                 question           ] };
-  key <AE08> {[ 8,                 asterisk,   braceleft    ] };
-  key <AE09> {[ 9,                 parenleft,  bracketleft  ] };
-  key <AE10> {[ 0,                 parenright, bracketright ] };
-  key <AE11> {[ minus,             underscore, braceright   ] };
-
-  key <AD01> {[ Cyrillic_je,       Cyrillic_JE        ] };
-  key <AD02> {[ Cyrillic_u_straight, Cyrillic_U_straight ] };
-  key <AD03> {[ Cyrillic_u,        Cyrillic_U         ] };
-  key <AD04> {[ Cyrillic_ka,       Cyrillic_KA        ] };
-  key <AD05> {[ Cyrillic_ie,       Cyrillic_IE        ] };
-  key <AD06> {[ Cyrillic_en,       Cyrillic_EN        ] };
-  key <AD07> {[ Cyrillic_ghe,      Cyrillic_GHE       ] };
-  key <AD08> {[ Cyrillic_sha,      Cyrillic_SHA       ] };
-  key <AD09> {[ Cyrillic_shha,     Cyrillic_SHHA      ] };
-  key <AD10> {[ Cyrillic_ze,       Cyrillic_ZE        ] };
-  key <AD11> {[ Cyrillic_ha,       Cyrillic_HA        ] };
-  key <AD12> {[ Cyrillic_che_vertstroke, Cyrillic_CHE_vertstroke ] };
-
-  key <AC01> {[ Cyrillic_ef,       Cyrillic_EF        ] };
-  key <AC02> {[ Cyrillic_yeru,     Cyrillic_YERU      ] };
-  key <AC03> {[ Cyrillic_ve,       Cyrillic_VE        ] };
-  key <AC04> {[ Cyrillic_a,        Cyrillic_A         ] };
-  key <AC05> {[ Cyrillic_pe,       Cyrillic_PE        ] };
-  key <AC06> {[ Cyrillic_er,       Cyrillic_ER        ] };
-  key <AC07> {[ Cyrillic_o,        Cyrillic_O         ] };
-  key <AC08> {[ Cyrillic_el,       Cyrillic_EL        ] };
-  key <AC09> {[ Cyrillic_de,       Cyrillic_DE        ] };
-  key <AC10> {[ Cyrillic_zhe,      Cyrillic_ZHE       ] };
-  key <AC11> {[ Cyrillic_ka_vertstroke,Cyrillic_KA_vertstroke ] };
-
-  key <AB01> {[ Cyrillic_schwa,    Cyrillic_SCHWA     ] };
-  key <AB02> {[ Cyrillic_che,      Cyrillic_CHE       ] };
-  key <AB03> {[ Cyrillic_es,       Cyrillic_ES        ] };
-  key <AB04> {[ Cyrillic_em,       Cyrillic_EM        ] };
-  key <AB05> {[ Cyrillic_i,        Cyrillic_I         ] };
-  key <AB06> {[ Cyrillic_te,       Cyrillic_TE        ] };
-  key <AB07> {[ Cyrillic_ghe_bar,  Cyrillic_GHE_bar   ] };
-  key <AB08> {[ Cyrillic_be,       Cyrillic_BE        ] };
-  key <AB09> {[ Cyrillic_o_bar,    Cyrillic_O_bar     ] };
-  key <AB10> {[ period,            comma              ] };
-
-  // End alphanumeric section
-};
+// based on:

+// symbols definition for a very simple Azerbaidjani keyboard layout.

+// 2001 - Pablo Saratxaga <pablo@mandrakesoft.com>

+

+partial default alphanumeric_keys

+xkb_symbols "latin" {

+

+  include "us"

+

+  name[Group1]= "Azerbaijan";

+

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

+

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

+  key <AE06> { [ 6,          colon,      EuroSign,    periodcentered  ] };

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

+

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

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

+

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

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

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

+  key <AD11> { [ odiaeresis, Odiaeresis, bracketleft, braceleft       ] };

+  key <AD12> { [ gbreve,     Gbreve,    bracketright, braceright      ] };

+

+  key <AC10> { [ idotless,   I           ] };

+  key <AC11> { [ schwa,      SCHWA       ] };

+

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

+  key <AB07> { [ m,          M,          periodcentered, currency     ] };

+  key <AB08> { [ ccedilla,   Ccedilla    ] };

+  key <AB09> { [ scedilla,   Scedilla    ] };

+  key <AB10> { [ period,     comma       ] };

+  // End alphanumeric section

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "cyrillic" {

+

+  name[Group1]= "Azerbaijan - Cyrillic";

+

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

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

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

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

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

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

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

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

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

+

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

+  key <AD02> {[ Cyrillic_u_straight, Cyrillic_U_straight ] };

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

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

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

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

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

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

+  key <AD09> {[ Cyrillic_shha,     Cyrillic_SHHA      ] };

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

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

+  key <AD12> {[ Cyrillic_che_vertstroke, Cyrillic_CHE_vertstroke ] };

+

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

+  key <AC02> {[ Cyrillic_yeru,     Cyrillic_YERU      ] };

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

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

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

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

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

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

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

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

+  key <AC11> {[ Cyrillic_ka_vertstroke,Cyrillic_KA_vertstroke ] };

+

+  key <AB01> {[ Cyrillic_schwa,    Cyrillic_SCHWA     ] };

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

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

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

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

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

+  key <AB07> {[ Cyrillic_ghe_bar,  Cyrillic_GHE_bar   ] };

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

+  key <AB09> {[ Cyrillic_o_bar,    Cyrillic_O_bar     ] };

+  key <AB10> {[ period,            comma              ] };

+

+  // End alphanumeric section

+};