xkeyboard-config/symbols Makefile.am, 1.60, 1.61 cs, 1.7, NONE me, NONE, 1.1 rs, NONE, 1.1

Committed by: svu

Update of /cvs/xkeyboard-config/xkeyboard-config/symbols
In directory kemper:/tmp/cvs-serv6407/symbols

Modified Files:
	Makefile.am 
Added Files:
	me rs 
Removed Files:
	cs 
Log Message:
splitting Serbia and Montenegro, b.fd.o#12390

Index: Makefile.am
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/Makefile.am,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Makefile.am	26 Sep 2007 23:43:29 -0000	1.60
+++ Makefile.am	4 Oct 2007 21:46:57 -0000	1.61
@@ -8,7 +8,7 @@
 bg br ba \
 bt by braille \
 ca cd \
-ch cn cs cz \
+ch cn cz \
 de dk \
 ee es et epo \
 fi fo fr \
@@ -19,11 +19,11 @@
 kg kh kr kz \
 la latam latin \
 lk lt lv \
-ma mao mk \
+ma mao me mk \
 mm mn mt mv \
 ng nl no np \
 pc pk pl pt \
-ro ru \
+ro rs ru \
 se si sk \
 sy th \
 tj tr \

--- cs DELETED ---

--- NEW FILE: me ---
// Montenegro keyboard mapping
//
// Initially, a copy of Serbian variants
//
// $XKeyboardConfig: xkeyboard-config/symbols/me,v 1.1 2007-10-04 21:46:58 svu Exp $

default partial alphanumeric_keys
xkb_symbols "basic" {
  include "rs(basic)"
  name[Group1]= "Montenegro";
};


partial alphanumeric_keys
xkb_symbols "latin" {
  include "rs(latin)"
  name[Group1]= "Montenegro - Latin";
};


partial alphanumeric_keys
xkb_symbols "yz" {
  include "rs(yz)"
  name[Group1]= "Montenegro - Z and ZHE swapped";
};

partial alphanumeric_keys
xkb_symbols "latinunicode" {
  include "rs(latinunicode)"
  name[Group1]= "Montenegro - Latin Unicode";
};

partial alphanumeric_keys
xkb_symbols "latinyz" {
  include "rs(latinyz)"
  name[Group1]= "Montenegro - Latin qwerty";
};

partial alphanumeric_keys
xkb_symbols "latinunicodeyz" {
  include "rs(latinunicodeyz)"
  name[Group1]= "Montenegro - Latin Unicode qwerty";
};

xkb_symbols "alternatequotes" {
  include "rs(alternatequotes)"
  name[Group1]= "Montenegro - With guillemets";
};

xkb_symbols "latinalternatequotes" {
  include "rs(latinalternatequotes)"
  name[Group1]= "Montenegro - Latin with guillemets";
};

--- NEW FILE: rs ---
// Bosnian, Croatian, Serbian and Slovenian XKB keyboard mapping
// (derived from "Danube" D.2)
//
// Danube D.2 from 2003-05-12 is available at http://srpski.org/dunav/
//
// Original authors:
//  Danilo Segan (Данило Шеган) <[email protected]>
//  Chusslove Illich (Часлав Илић) <[email protected]>
//
// Danilo Segan <[email protected]>:
// - Modified for inclusion in XFree86
// - Further modifications on 2005-08-18 to support Bosnian, Croatian
//   and Slovenian in xkeyboard-config
//  
// $XKeyboardConfig: xkeyboard-config/symbols/rs,v 1.1 2007-10-04 21:46:58 svu Exp $

default partial alphanumeric_keys
xkb_symbols "basic" {

  name[Group1]= "Serbia";

  include "rs(level3)"
  include "rs(common)"
  include "rs(cyralpha)"
  include "level3(ralt_switch)"
};


partial alphanumeric_keys
xkb_symbols "latin" {

  name[Group1]= "Serbia - Latin";

  include "latin(type3)"
  include "rs(latalpha)"
  include "rs(level3)"
  include "rs(common)"
  include "level3(ralt_switch)"
};


partial alphanumeric_keys
xkb_symbols "yz" {
  // Cyrillic_zhe and Cyrillic_ze swapped.

  name[Group1]= "Serbia - Z and ZHE swapped";

  include "rs(basic)"

  key <AD06> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // y
  key <AB01> {   [ Cyrillic_ze,         Cyrillic_ZE,    any,any ]   }; // z
};

partial hidden alphanumeric_keys
xkb_symbols "common" {
  // "Common" keys: keys which are same for both latin and cyrillic keyboards

  key.type[Group1] = "FOUR_LEVEL";

  key <TLDE> {   [ quoteleft,           asciitilde,    any,any ]   }; //
  key <AE01> {   [ 1,                   exclam,        any,any ]   }; //
  key <AE02> {   [ 2,                   quotedbl,      any,any ]   }; //
  key <AE03> {   [ 3,                   numbersign,    any,any ]   }; //
  key <AE04> {   [ 4,                   dollar,        any,any ]   }; //
  key <AE05> {   [ 5,                   percent,       any,any ]   }; //
  key <AE06> {   [ 6,                   ampersand,     any,any ]   }; //
  key <AE07> {   [ 7,                   slash,         any,any ]   }; //
  key <AE08> {   [ 8,                   parenleft,     any,any ]   }; //
  key <AE09> {   [ 9,                   parenright,    any,any ]   }; //
  key <AE10> {   [ 0,                   equal,         any,any ]   }; //
  key <AE11> {   [ apostrophe,          question,      any,any ]   }; //
  key <AE12> {   [ plus,                asterisk,      any,any ]   }; //

  key <AB08> {   [ comma,               semicolon,     any,any ]   }; //
  key <AB09> {   [ period,              colon,         any,any ]   }; //
  key <AB10> {   [ minus,               underscore,    any,any ]   }; //

  include "kpdl(comma)"
};

partial hidden alphanumeric_keys
xkb_symbols "cyralpha" {

  key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";

  key <AD01> {   [ Cyrillic_lje,        Cyrillic_LJE,   any,any ]   }; // q
  key <AD02> {   [ Cyrillic_nje,        Cyrillic_NJE,   any,any ]   }; // w
  key <AD03> {   [ Cyrillic_ie,         Cyrillic_IE,    any,any ]   }; // e
  key <AD04> {   [ Cyrillic_er,         Cyrillic_ER,    any,any ]   }; // r
  key <AD05> {   [ Cyrillic_te,         Cyrillic_TE,    any,any ]   }; // t
  key <AD06> {   [ Cyrillic_ze,         Cyrillic_ZE,    any,any ]   }; // y
  key <AD07> {   [ Cyrillic_u,          Cyrillic_U,     any,any ]   }; // u
  key <AD08> {   [ Cyrillic_i,          Cyrillic_I,     any,any ]   }; // i
  key <AD09> {   [ Cyrillic_o,          Cyrillic_O,     any,any ]   }; // o
  key <AD10> {   [ Cyrillic_pe,         Cyrillic_PE,    any,any ]   }; // p
  key <AD11> {   [ Cyrillic_sha,        Cyrillic_SHA,   any,any ]   }; // [ {
  key <AD12> {   [ Serbian_dje,         Serbian_DJE,    any,any ]   }; // ] }

  key <AC01> {   [ Cyrillic_a,          Cyrillic_A,     any,any ]   }; // a
  key <AC02> {   [ Cyrillic_es,         Cyrillic_ES,    any,any ]   }; // s
  key <AC03> {   [ Cyrillic_de,         Cyrillic_DE,    any,any ]   }; // d
  key <AC04> {   [ Cyrillic_ef,         Cyrillic_EF,    any,any ]   }; // f
  key <AC05> {   [ Cyrillic_ghe,        Cyrillic_GHE,   any,any ]   }; // g
  key <AC06> {   [ Cyrillic_ha,         Cyrillic_HA,    any,any ]   }; // h
  key <AC07> {   [ Cyrillic_je,         Cyrillic_JE,    any,any ]   }; // j
  key <AC08> {   [ Cyrillic_ka,         Cyrillic_KA,    any,any ]   }; // k
  key <AC09> {   [ Cyrillic_el,         Cyrillic_EL,    any,any ]   }; // l
  key <AC10> {   [ Cyrillic_che,        Cyrillic_CHE,   any,any ]   }; // ; :
  key <AC11> {   [ Serbian_tshe,        Serbian_TSHE,   any,any ]   }; // ' "
  key <BKSL> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // \ |

  key <AB01> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // z
  key <AB02> {   [ Cyrillic_dzhe,       Cyrillic_DZHE,  any,any ]   }; // x
  key <AB03> {   [ Cyrillic_tse,        Cyrillic_TSE,   any,any ]   }; // c
  key <AB04> {   [ Cyrillic_ve,         Cyrillic_VE,    any,any ]   }; // v
  key <AB05> {   [ Cyrillic_be,         Cyrillic_BE,    any,any ]   }; // b
  key <AB06> {   [ Cyrillic_en,         Cyrillic_EN,    any,any ]   }; // n
  key <AB07> {   [ Cyrillic_em,         Cyrillic_EM,    any,any ]   }; // m
};


partial hidden alphanumeric_keys
xkb_symbols "latalpha" {

  key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";

  key <AD11> {   [ scaron,              Scaron,        any,any ]   }; //
  key <AD12> {   [ dstroke,             Dstroke,       any,any ]   }; //

  key <AC10> {   [ ccaron,              Ccaron,        any,any ]   }; //
  key <AC11> {   [ cacute,              Cacute,        any,any ]   }; //
  key <BKSL> {   [ zcaron,              Zcaron,        any,any ]   }; //

};

partial hidden alphanumeric_keys
xkb_symbols "twoletter" {
  // These are letters which are written in latin transcription with two-characters.

  key <AD01> {   type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC",
                 [ U1C9,                U1C8,         any,   U1C7 ]   }; // q
  key <AD02> {   type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC",
                 [ U1CC,                U1CB,         any,   U1CA ]   }; // w
  key <AB02> {   type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC",
                 [ U1C6,                U1C5,         any,   U1C4 ]   }; // x

  // Also replace letter Y with Zcaron, since Y is of no use any longer
  key <AB01> {   [ zcaron,              Zcaron,        any,any ]   }; //
};

partial hidden alphanumeric_keys
xkb_symbols "level3" {
  key <TLDE> {   [ any,any,     notsign,             notsign     ]   }; // ` ~
  key <AE01> {   [ any,any,     dead_tilde,          asciitilde  ]   }; // 1 !
  key <AE02> {   [ any,any,     dead_caron,          caron 	 ]   }; // 2 @
  key <AE03> {   [ any,any,     dead_circumflex,     asciicircum ]   }; // 3 #
  key <AE04> {   [ any,any,     dead_breve,          breve 	 ]   }; // 4 $
  key <AE05> {   [ any,any,     dead_abovering,      degree	 ]   }; // 5 %
  key <AE06> {   [ any,any,     dead_ogonek,         ogonek	 ]   }; // 6 ^
  key <AE07> {   [ any,any,     dead_grave,          grave 	 ]   }; // 7 &
  key <AE08> {   [ any,any,     dead_abovedot,       abovedot 	 ]   }; // 8 *
  key <AE09> {   [ any,any,     dead_acute,          apostrophe  ]   }; // 9 (
  key <AE10> {   [ any,any,     dead_doubleacute,    doubleacute ]   }; // 0 )
  key <AE11> {   [ any,any,     dead_diaeresis,      diaeresis 	 ]   }; // - _
  key <AE12> {   [ any,any,     dead_cedilla,        cedilla 	 ]   }; // = +

  key <AD01> {   [ any,any,     backslash,           Greek_OMEGA ]   }; // q
  key <AD02> {   [ any,any,     bar,                 Lstroke 	 ]   }; // w
  key <AD03> {   [ any,any,     EuroSign,            EuroSign 	 ]   }; // e
  key <AD04> {   [ any,any,     paragraph,           registered  ]   }; // r
  key <AD05> {   [ any,any,     tslash,              Tslash 	 ]   }; // t // ALPHABETIC
  key <AD06> {   [ any,any,     leftarrow,           yen 	 ]   }; // y
  key <AD07> {   [ any,any,     downarrow,           uparrow 	 ]   }; // u
  key <AD08> {   [ any,any,     rightarrow,          idotless 	 ]   }; // i
  key <AD09> {   [ any,any,     oslash,              Ooblique 	 ]   }; // o // ALPHABETIC
  key <AD10> {   [ any,any,     thorn,               THORN 	 ]   }; // p // ALPHABETIC
  key <AD11> {   [ any,any,     division,            dead_abovering ]   }; // [
  key <AD12> {   [ any,any,     multiply,            dead_macron ]   }; // ]

  key <AC01> {   [ any,any,     ae,            	     AE               ]   }; // a // ALPHABETIC
  key <AC02> {   [ any,any,     doublelowquotemark,  guillemotright   ]   }; // s
  key <AC03> {   [ any,any,     leftdoublequotemark, guillemotleft    ]   }; // d
  key <AC04> {   [ any,any,     bracketleft,         ordfeminine      ]   }; // f
  key <AC05> {   [ any,any,     bracketright,        ENG 	      ]   }; // g
  key <AC06> {   [ any,any,     hstroke,             Hstroke 	      ]   }; // h // ALPHABETIC
  key <AC07> {   [ any,any,     NoSymbol,            NoSymbol 	      ]   }; // j
  key <AC08> {   [ any,any,     lstroke,             ampersand 	      ]   }; // k
  key <AC09> {   [ any,any,     lstroke,             Lstroke 	      ]   }; // l
  key <AC10> {   [ any,any,     dead_acute,          dead_doubleacute ]   }; // ;
  key <AC11> {   [ any,any,     ssharp,              dead_caron       ]   }; // '
  key <BKSL> {   [ any,any,     currency,            dead_breve       ]   }; // \

  key <AB01> {   [ any,any,     leftsinglequotemark, guillemotright   ]   }; // z
  key <AB02> {   [ any,any,     rightsinglequotemark,guillemotleft    ]   }; // x
  key <AB03> {   [ any,any,     cent,                copyright 	      ]   }; // c
  key <AB04> {   [ any,any,     at,                  grave 	      ]   }; // v
  key <AB05> {   [ any,any,     braceleft,           apostrophe       ]   }; // b
  key <AB06> {   [ any,any,     braceright,          braceright       ]   }; // n
  key <AB07> {   [ any,any,     asciicircum,         masculine 	      ]   }; // m
  key <AB08> {   [ any,any,     less,                multiply 	      ]   }; // , <
  key <AB09> {   [ any,any,     greater,             division 	      ]   }; // . >
  key <AB10> {   [ any,any,     emdash,              endash   	      ]   }; // / ?

};

partial alphanumeric_keys
xkb_symbols "latinunicode" {
  // This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj
  // as single character). You get the title form with AltGr+Shift.

  name[Group1]= "Serbia - Latin Unicode";

  include "rs(latin)"
  include "rs(twoletter)"
};

partial alphanumeric_keys
xkb_symbols "latinyz" {
  // For those who insist on using "english-position" Z and Y.

  name[Group1]= "Serbia - Latin qwerty";

  include "rs(latin)"

  key <AD06> {   [ y,                   Y,             any,any ]   }; // y
  key <AB01> {   [ z,                   Z,             any,any ]   }; // z
};

partial alphanumeric_keys
xkb_symbols "latinunicodeyz" {
  // Unicode, ZHE and Z swapped.

  name[Group1]= "Serbia - Latin Unicode qwerty";

  include "rs(latinunicode)"

  key <AD06> {   [ zcaron,              Zcaron,        any,any ]   }; // y
  key <AB01> {   [ z,                   Z,             any,any ]   }; // z
};

xkb_symbols "alternatequotes" {
  // Another acceptable »pair of quotes« for Serbian 

  name[Group1]= "Serbia - With guillemets";

  include "rs(basic)"

  key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
  key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
};

xkb_symbols "latinalternatequotes" {
  // Another acceptable »pair of quotes« for Serbian 

  name[Group1]= "Serbia - Latin with guillemets";

  include "rs(latin)"

  key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
  key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
};

_______________________________________________
xlibs-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xlibs-commit