Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/configs/linux-dri
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitable.h
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mesa/drivers/dri/Makefile.template
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_format.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/dix/window.c
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xquartz/darwin.h
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xquartz/pbproxy/app-main.m
	xorg-server/hw/xquartz/pbproxy/pbproxy.h
	xorg-server/hw/xquartz/pbproxy/x-selection.m
	xorg-server/hw/xquartz/xpr/xpr.h
	xorg-server/hw/xquartz/xpr/xprEvent.c
	xorg-server/hw/xquartz/xpr/xprScreen.c
	xorg-server/include/privates.h
	xorg-server/include/protocol-versions.h
	xorg-server/test/Makefile.am
	xorg-server/xfixes/cursor.c
	xorg-server/xfixes/xfixes.c
	xorg-server/xkeyboard-config/configure.in
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in
	xorg-server/xkeyboard-config/symbols/de
	xorg-server/xkeyboard-config/symbols/lk
	xorg-server/xkeyboard-config/symbols/ru

4 files changed, 356 insertions, 337 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/cm b/xorg-server/xkeyboard-config/symbols/cm
index 1757ae05b..0bca38ef7 100644
--- a/xorg-server/xkeyboard-config/symbols/cm
+++ b/xorg-server/xkeyboard-config/symbols/cm
@@ -1,331 +1,331 @@
-// ========== Cameroon Keyboards ==========

-// ****** For Instructions, see "Use of Cameroon Keyboards" section	below ******

-

-

-// The XKB versions of these keyboards were developed by Matthew Lee, Jenni Beadle, and Bruce Cox of SIL Cameroon in association with Going Komputya, Uwe Yung of the Goethe Institute, Yaoundé, and Centre ANACLAC.  

-

-// Cameroon is officially a bilingual country, using French and English, but there are over 270 minority languages.  

-

-// * Cameroon Français is an exact copy of the French France keyboard intended for AZERTY users.

-// * Cameroon is an exact copy of the Basic US Keyboard. I can not currently name this "Cameroon English" due to a limitation of XKB.

-// * Cameroon QWERTY and Cameroon AZERTY are based largely on SIL Cameroon's Keyman and Microsoft keyboards of the same style already in wide use.  These keyboards are designed to allow the user to type any of Cameroon's 270+ languages and dialects that use the approved orthography.  This Approved Orthography was adopted in 1979 by the National Committee for the Unification and Harmonisation of Alphabets of Camerooninan Languages. 

-// * Cameroon Dvorak is described below.

-

-// ===== Use of Cameroon Keyboards =====

-

-// == Fonts ==

-// These keyboards are fully Unicode (5.1), so we recommend using a good unicode font for diacritics to position correctly. Recommended fonts are: ttf-sil-charis, ttf-sil-doulos, ttf-sil-gentium and ttf-sil-andika (All of which are free for Linux, Mac, and Windows).

-

-

-// == Cameroon AZERTY ==

-// Cameroon AZERTY uses the French France (AZERTY) layout, as french keyboards are widely used here. While this keyboard is designed for Cameroonian orthography, it still is possible but not recommended, to type French with minimal discomfort using this keyboard.

-// Cameroon AZERTY uses the "!" (exclamation) key as the "Cameroon" key. Pressing this key before another key allows you to access the special letters and diacritics needed in Cameroonian orthography.

-// For example, press "!" then "a" and get "ɛ" (small epsilon). "!" then "Shift" + "a" (A) will get an "Ɛ" (capital epsilon). Press the "!" key twice to get a "!".

-// If you prefer, you can hold the AltGr (and/or Shift) key to access the same letters, but we have found this to be much more awkward in practice. If you really don't like our Cameroon key, simply comment out "include "cm(exclamation_switch)"" and the exclamation key will return to normal.

-// All Diacritics (with the exception of French Trema and Circumflex) must be typed (in order of stacking) after the letter.

-

-

-// == Cameroon QWERTY ==

-// Cameroon QWERTY uses the US QWERTY layout, as US keyboards are also widely used here. While this keyboard is designed for Cameroonian orthography, it is possible, but not recommended, to type English with minimal discomfort using this keyboard.

-// Cameroon QWERTY uses the ";" (semicolon) key as the "Cameroon" key.	Pressing this key before another key allows you to access the special letters and diacritics needed in Cameroonian orthography.

-// For example, press ";" then "a" and get "ɛ" (small epsilon). ";" then "Shift" + "a" (A) will get an "Ɛ" (capital epsilon). Press ";" twice to get a ";", or press Shift + ; (:) twice to get a ":" (colon).

-// If you prefer, you can hold the AltGr (and/or Shift) key to access the same letters, but we have found this to be much more awkward in practice. If you really don't like our Cameroon key, simply comment out "include "cm(semicolon_switch)"" and the semicolon key will return to normal.

-// All Diacritics must be typed (in order of stacking) after the letter.

-

-

-// == Cameroon Dvorak ==

-// Cameroon Dvorak is uses a similar system to Cameroon QWERTY.

-

-default

-partial alphanumeric_keys

-xkb_symbols "basic" {

-

-	name[Group1]="English (Cameroon)";

-

-	// Alphanumeric section

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

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

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

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

-	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 <AE11> { [ minus, underscore ] };

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

-

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

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

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

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

-	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> { [ bracketleft, braceleft ] };

-	key <AD12> { [ bracketright, braceright ] };

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

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

-	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> { [ semicolon, colon ] };

-	key <AC11> { [ apostrophe, quotedbl ] };

-

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

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

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

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

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

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

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

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

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

-	key <AB10> { [ slash, U003F ] };

-

-	key <BKSL> { [ backslash, bar ] };

-	// End alphanumeric section

-};

-

-partial alphanumeric_keys

-xkb_symbols "french"

-{

-	name[Group1]="French (Cameroon)";

-	include "latin"

-

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

-	key <AE02> { [ eacute, 2, asciitilde, oneeighth ] };

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

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

-	key <AE05> { [ parenleft, 5, bracketleft, threeeighths ] };

-	key <AE06> { [ minus, 6, bar, fiveeighths ] };

-	key <AE07> { [ egrave, 7, grave, seveneighths ] };

-	key <AE08> { [underscore, 8, backslash, trademark ] };

-	key <AE09> { [ ccedilla, 9, asciicircum, plusminus ] };

-	key <AE10> { [ agrave, 0, at, degree ] };

-	key <AE11> { [parenright, degree, bracketright, questiondown ] };

-	key <AE12> { [ equal, plus, braceright, dead_ogonek ] };

-

-	key <AD01> { [ a, A, ae, AE ] };

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

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

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

-	key <AD12> { [ dollar, sterling, currency, dead_macron ] };

-

-	key <AC01> { [ q, Q, at, Greek_OMEGA ] };

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

-	key <AC11> { [ ugrave, percent, dead_circumflex, dead_caron] };

-	key <TLDE> { [twosuperior, asciitilde, notsign, notsign ] };

-

-	key <BKSL> { [ asterisk, mu, dead_grave, dead_breve ] };

-	key <AB01> { [ w, W, lstroke, Lstroke ] };

-	key <AB07> { [ comma, U003F, dead_acute, dead_doubleacute ] };

-	key <AB08> { [ semicolon, period, horizconnector, multiply ] };

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

-	key <AB10> { [ exclam, section, dead_belowdot, dead_abovedot ] };

-

-	include "level3(ralt_switch)"

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "azerty"

-{

-	name[Group1] = "French (Cameroon azerty)";

-	include "level3(ralt_switch)"

-	include "cm(basic)"

-	key <AB01> { [ w, W, U1E85, U1E84 ] };	//  SMALL LETTER W,  CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS

-	key <AB02> { [ x, X, U2039, U203A ] };	// SMALL LETTER X, CAPITAL LETTER X, SINGLE LEFT-POINTING ANGLE QUOTATION MARK, SINGLE RIGHT-POINTING ANGLE QUOTATION MARK

-	key <AB03> { [ c, C, U0327, copyright ] };	// SMALL LETTER C, CAPITAL LETTER C, COMBINING CEDILLA, COPYRIGHT SIGN

-	key <AB04> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER

-	key <AB05> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK

-	key <AB06> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG

-	key <AB07> { [ U002C, U003F, NoSymbol, U00D7 ] };	// COMMA, QUESTION MARK, , MULTIPLY

-	key <AB08> { [ semicolon, period, dead_acute, dead_grave ] };	// SEMICOLON, PERIOD

-	key <AB09> { [ colon, slash, U0323 ] };	// COLON, SLASH, COMBINING DOT BELOW

-	key <AB10> { [ exclam, U00A7 ] };	// EXCLAMATION MARK, SECTION SIGN

-	key <AC01> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH

-	key <AC02> { [ s, S, U201C, U201D ] };	// SMALL LETTER S, CAPITAL LETTER S, LEFT DOUBLE QUOTES, RIGHT DOUBLE QUOTES 

-	key <AC03> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK

-	key <AC04> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE

-	key <AC05> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)

-	key <AC06> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA

-	key <AC07> { [ j, J, leftarrow, U2122 ] };	//SMALL LETTER J, CAPITAL LETTER J, LEFT ARROW, TRADE MARK SIGN

-	key <AC08> { [ k, K, downarrow, uparrow ] };	// SMALL LETTER K, CAPITAL LETTER K, DOWN ARROW, UP ARROW

-	key <AC09> { [ l, L, rightarrow, U00A3 ] };	// SMALL LETTER L, CAPITAL LETTER L, RIGHT ARROW, POUND STERLING

-	key <AC10> { [ m, M, U00F9, U00B5 ] };	// SMALL LETTER M, CAPITAL LETTER M, SMALL LETTER U WITH GRAVE, MICRO SYMBOL

-	key <AC11> { [ U0300, U0302, U1DC5, U1DC4 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, COMBINING LOW-MID TONE, COMBINING MID-HIGH TONE

-	key <AD01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E

-	key <AD02> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER

-	key <AD03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA

-	key <AD04> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN

-	key <AD05> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE

-	key <AD06> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK

-	key <AD07> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR

-	key <AD08> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR

-	key <AD09> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O

-	key <AD10> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR

-	key <AD11> { [ U0301, U030C, dead_circumflex, dead_diaeresis ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, DEAD CIRCUMFLEX, DEAD DIAERESIS

-	key <AD12> { [ U0330, U0303, U0304, U030D ] };	// COMBINING TILDE (NASAL) BELOW, COMBINING TILDE (NASAL), COMBINING MID TONE, COMBINING VERTICAL LINE ABOVE

-	key <AE01> { [ U0026, KP_1, U00B9, U2018 ] };	// AMPERSAND, 1, SUPERSCRIPT 1, LEFT SINGLE QUOTE

-	key <AE02> { [ eacute, KP_2, asciitilde, U2019 ] };	// SMALL LETTER E WITH ACUTE, 2, TILDE, RIGHT SINGLE QUOTE

-	key <AE03> { [ U0022, KP_3, U0025 ] };	// QUOTATION MARK, 3, PERCENT SIGN

-	key <AE04> { [ U0027, KP_4, U007B ] };	// APOSTROPHE, 4, LEFT CURLY BRACKET

-	key <AE05> { [ U0028, KP_5, U005B, numbersign ] };	// LEFT PARENTHESIS, 5, LEFT SQUARE BRACKET, NUMBER SIGN

-	key <AE06> { [ U002D, KP_6, U007C ] };	// HYPHEN/MINUS, 6, BAR

-	key <AE07> { [ U00E8, KP_7, U0300 ] };	// SMALL LETTER E WITH GRAVE, 7, COMBINING GRAVE

-	key <AE08> { [ underscore, KP_8, backslash, U20D6 ] };	// UNDERSCORE, 8, BACKSLASH, COMBINING LEFT ARROW ABOVE

-	key <AE09> { [ ccedilla, KP_9, U005E] };	// SMALL LETTER C WITH CEDILLA, 9, CIRCUMFLEX

-	key <AE10> { [ U00E0, KP_0, at, U20D7 ] };	// SMALL LETTER A WITH GRAVE

-	key <AE11> { [ U0029, U00B0, U005D ] };	// RIGHT PARENTHESIS, DEGREE, RIGHT SQUARE BRACKET

-	key <AE12> { [ U003D, U002B, U007D, U00B1 ] };	// EQUAL SIGN, PLUS SIGN, RIGHT CURLY BRACKET, PLUS-MINUS SIGN

-	key <BKSL> { [ U1DC6, U1DC7, KP_Multiply, U00A4 ] };	//  COMBINING MID-LOW, COMBINING HIGH-MID, MULTIPLY, CURRENCY SIGN

-	key <LSGT> { [ U003C, U003E, U00AB, U00BB ] };	// LESS THAN, GREATER THAN, LEFT GUILLEMET, RIGHT GUILLEMET

-	key <TLDE> { [ U0024, U20AC, U00B2, U00B3 ] };	// DOLLAR, EURO, SUPERSCRIPT 2, SUPERSCRIPT 3

-	include "cm(exclamation_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "qwerty"

-{

-	name[Group1] = "English (Cameroon qwerty)";

-	include "level3(ralt_switch)"

-	include "cm(basic)"

-	key <AB01> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER

-	key <AB02> { [ x, X ] };	// SMALL LETTER X, CAPITAL LETTER X

-	key <AB03> { [ c, C, NoSymbol, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, , COPYRIGHT

-	key <AB04> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER

-	key <AB05> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK

-	key <AB06> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG

-	key <AB07> { [ m, M, NoSymbol, U2122 ] };	// SMALL LETTER M, CAPITAL LETTER M, , TRADEMARK SIGN

-	key <AB08> { [ U002C, U003C, U2039, U00AB ] };	// COMMA, LESS THAN SIGN, LEFT SINGLE GUILLEMET, LEFT DOUBLE GUILLEMET

-	key <AB09> { [ U002E, U003E, U203A, U00BB ] };    // PERIOD, GREATER THAN SIGN, RIGHT SINGLE GUILLEMET, RIGHT DOUBLE GUILLEMET

-	key <AB10> { [ U002F, U003F, U00F7 ] };    // SLASH, QUESTION MARK, DIVISION SIGN

-	key <AC01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E

-	key <AC02> { [ s, S ] };	// SMALL LETTER S, CAPITAL LETTER S

-	key <AC03> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK

-	key <AC04> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE

-	key <AC05> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)

-	key <AC06> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA

-	key <AC07> { [ j, J, U0330, U0323 ] };	// SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW

-	key <AC08> { [ k, K, U1DC5, U1DC7 ] };	// SMALL LETTER K, CAPITAL LETTER K, COMBINING LOW-MID TONE, COMBINING HIGH-MID

-	key <AC09> { [ l, L, U1DC6, U1DC4 ] };	// SMALL LETTER L, CAPITAL LETTER L, COMBINING MID-LOW, COMBINING MID-HIGH TONE

-	key <AC10> { [ U003B, U003A ] };	// SEMICOLON, COLON

-	key <AC11> { [ U0300, U0302, U0027, U0022 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, APOSTROPHE, QUOTATION MARK

-	key <AD01> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH

-	key <AD02> { [ w, W, U1E85, U1E84 ] };	// SMALL LETTER W, CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS

-	key <AD03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA

-	key <AD04> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN

-	key <AD05> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE

-	key <AD06> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK

-	key <AD07> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR

-	key <AD08> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR

-	key <AD09> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O

-	key <AD10> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR

-	key <AD11> { [ U0301, U030C, U005B, U007B ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, LEFT SQUARE BRACKET, LEFT CURLY BRACKET

-	key <AD12> { [ U0327, U0308, U005D, U007D ] };	// COMBINING CEDILLA, COMBINING DIAERESIS, RIGHT SQUARE BRACKET, RIGHT CURLY BRACKET

-	key <AE01> { [ U0031, U0021, U00BC ] };	// 1, EXCLAMATION POINT, ONE QUARTER

-	key <AE02> { [ U0032, U0040, U00BD ] };	//2, AT SYMBOL, ONE HALF

-	key <AE03> { [ U0033, U0023, U00BE ] };	// 3, NUMBER SIGN, THREE QUARTERS

-	key <AE04> { [ U0034, U0024, NoSymbol, U20AC ] };	// 4, DOLLAR, , EURO SIGN

-	key <AE08> { [ U0038, U002A, NoSymbol, U00D7 ] };	// 8, ASTERISK, , MATH MULTIPLY

-	key <AE09> { [ U0039, U0028, U2018, U201C ] };	// 9, LEFT PARENTHESIS, LEFT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK

-	key <AE10> { [ U0030, U0029, U2019, U201D ] };	// 0, RIGHT PARENTHESIS, RIGHT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK

-	key <AE11> { [ U002D, U005F, U0304 ] };	// MINUS, UNDERSCORE, COMBINING MID TONE, COMBINING MID TONE

-	key <AE12> { [ U003D, U002B, NoSymbol, U00B1 ] };	// EQUAL, PLUS, , PLUS-MINUS

-	key <BKSL> { [ U005C, U007C ] };	// BACKSLASH, BAR

-	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE

-	include "cm(semicolon_switch)"

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "dvorak"

-{

-	name[Group1] = "English (Cameroon Dvorak)";

-	include "level3(ralt_switch)"

-	include "us(dvorak)"

-	key <AB01> { [ semicolon, colon ] };	// SEMICOLON, COLON

-	key <AB02> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH

-	key <AB03> { [ j, J, U0330, U0323 ] };	// SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW

-	key <AB04> { [ k, K, U1DC5, U1DC7 ] };	// SMALL LETTER K, CAPITAL LETTER K, COMBINING LOW-MID TONE, COMBINING HIGH-MID

-	key <AB05> { [ x, X ] };	// SMALL LETTER X, CAPITAL LETTER X

-	key <AB06> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK

-	key <AB07> { [ m, M, NoSymbol, U2122 ] };	// SMALL LETTER M, CAPITAL LETTER M, , TRADEMARK SIGN

-	key <AB08> { [ w, W, U1E85, U1E84 ] };	// SMALL LETTER W, CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS

-	key <AB09> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER

-	key <AB10> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER

-	key <AC01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E

-	key <AC02> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O

-	key <AC03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA

-	key <AC04> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR

-	key <AC05> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR

-	key <AC06> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK

-	key <AC07> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA

-	key <AC08> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE

-	key <AC09> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG

-	key <AC10> { [ s, S ] };	// SMALL LETTER S, CAPITAL LETTER S

-	key <AC11> { [ minus, underscore, U0304 ] };	// MINUS, UNDERSCORE, COMBINING MID TONE

-	key <AD01> { [ U0300, U0302, U0027, U0022 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, APOSTROPHE, QUOTATION MARK

-	key <AD02> { [ comma, less, U2039, U00AB ] };	// COMMA, LESS THAN SIGN, LEFT SINGLE GUILLEMET, LEFT DOUBLE GUILLEMET

-	key <AD03> { [ period, greater, U203A, U00BB ] };	// PERIOD, GREATER THAN SIGN, RIGHT SINGLE GUILLEMET, RIGHT DOUBLE GUILLEMET

-	key <AD04> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR

-	key <AD05> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK

-	key <AD06> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE

-	key <AD07> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)

-	key <AD08> { [ c, C, NoSymbol, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, , COPYRIGHT

-	key <AD09> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN

-	key <AD10> { [ l, L, U1DC6, U1DC4 ] };	// SMALL LETTER L, CAPITAL LETTER L, COMBINING MID-LOW, COMBINING MID-HIGH TONE

-	key <AD11> { [ slash, U003F, U00F7, U0294 ] };	// SLASH, QUESTION MARK, DIVISION SIGN, GLOTTAL STOP

-	key <AD12> { [ equal, plus, NoSymbol, plusminus ] };	// EQUAL, PLUS, , PLUS-MINUS

-	key <AE01> { [ KP_1, exclam, U00BC ] };	// 1, EXCLAMATION POINT, ONE QUARTER

-	key <AE02> { [ KP_2, at, U00BD ] };	// 2, AT SYMBOL, ONE HALF

-	key <AE03> { [ KP_3, numbersign, U00BE ] };	// 3, NUMBER SIGN, THREE QUARTERS

-	key <AE04> { [ KP_4, dollar, NoSymbol, U20AC ] };	// 4, DOLLAR, , EURO SIGN

-	key <AE05> { [ KP_5, percent ] };	// 5, PERCENT

-	key <AE06> { [ KP_6, asciicircum ] };	// 6, CARET

-	key <AE07> { [ KP_7, ampersand ] };	// 7, AMPERSAND

-	key <AE08> { [ KP_8, asterisk, NoSymbol, multiply ] };	// 8, ASTERISK, , MULTIPLY

-	key <AE09> { [ KP_9, parenleft, leftsinglequotemark, leftdoublequotemark ] };	// 9, LEFT PARENTHESIS, LEFT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK

-	key <AE10> { [ KP_0, parenright, rightsinglequotemark, rightdoublequotemark ] };	// 0, RIGHT PARENTHESIS, RIGHT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK

-	key <AE11> { [ U0301, U030C, U005B, U007B ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, LEFT SQUARE BRACKET, LEFT CURLY BRACKET

-	key <AE12> { [ U0327, dead_diaeresis, U005D, braceright ] };	// COMBINING CEDILLA, DEAD DIAERESIS, RIGHT SQUARE BRACKET, RIGHT CURLY BRACKET

-	key <BKSL> { [ backslash, bar ] };	// BACKSLASH, BAR

-	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE

-	include "cm(semicolon_switch_dvorak)"

-};

-

-// The following code creates the "Cameroon key" phenomenon.

-

-partial modifier_keys

-xkb_symbols "semicolon_switch" {

-	key <AC10> {

-	symbols[Group1] = [ ISO_Level3_Latch,	colon,	semicolon,	colon ]};

-	modifier_map Mod5	{ ISO_Level3_Latch };

-};

-

-partial modifier_keys

-xkb_symbols "exclamation_switch" {

-	key <AB10> {

-	symbols[Group1] = [ ISO_Level3_Latch,	U00A7,	exclam,	U00A7 ]

-	};

-	modifier_map Mod5	{ ISO_Level3_Latch };

-};

-

-partial modifier_keys

-xkb_symbols "semicolon_switch_dvorak" {

-	key <AB01> {

-	symbols[Group1] = [ ISO_Level3_Latch,	colon,	semicolon,	colon ]

-	};

-modifier_map Mod5	{ ISO_Level3_Latch };

-};

-

+// ========== Cameroon Keyboards ==========
+// ****** For Instructions, see "Use of Cameroon Keyboards" section	below ******
+
+
+// The XKB versions of these keyboards were developed by Matthew Lee, Jenni Beadle, and Bruce Cox of SIL Cameroon in association with Going Komputya, Uwe Yung of the Goethe Institute, Yaoundé, and Centre ANACLAC.  
+
+// Cameroon is officially a bilingual country, using French and English, but there are over 270 minority languages.  
+
+// * Cameroon Français is an exact copy of the French France keyboard intended for AZERTY users.
+// * Cameroon is an exact copy of the Basic US Keyboard. I can not currently name this "Cameroon English" due to a limitation of XKB.
+// * Cameroon QWERTY and Cameroon AZERTY are based largely on SIL Cameroon's Keyman and Microsoft keyboards of the same style already in wide use.  These keyboards are designed to allow the user to type any of Cameroon's 270+ languages and dialects that use the approved orthography.  This Approved Orthography was adopted in 1979 by the National Committee for the Unification and Harmonisation of Alphabets of Camerooninan Languages. 
+// * Cameroon Dvorak is described below.
+
+// ===== Use of Cameroon Keyboards =====
+
+// == Fonts ==
+// These keyboards are fully Unicode (5.1), so we recommend using a good unicode font for diacritics to position correctly. Recommended fonts are: ttf-sil-charis, ttf-sil-doulos, ttf-sil-gentium and ttf-sil-andika (All of which are free for Linux, Mac, and Windows).
+
+
+// == Cameroon AZERTY ==
+// Cameroon AZERTY uses the French France (AZERTY) layout, as french keyboards are widely used here. While this keyboard is designed for Cameroonian orthography, it still is possible but not recommended, to type French with minimal discomfort using this keyboard.
+// Cameroon AZERTY uses the "!" (exclamation) key as the "Cameroon" key. Pressing this key before another key allows you to access the special letters and diacritics needed in Cameroonian orthography.
+// For example, press "!" then "a" and get "ɛ" (small epsilon). "!" then "Shift" + "a" (A) will get an "Ɛ" (capital epsilon). Press the "!" key twice to get a "!".
+// If you prefer, you can hold the AltGr (and/or Shift) key to access the same letters, but we have found this to be much more awkward in practice. If you really don't like our Cameroon key, simply comment out "include "cm(exclamation_switch)"" and the exclamation key will return to normal.
+// All Diacritics (with the exception of French Trema and Circumflex) must be typed (in order of stacking) after the letter.
+
+
+// == Cameroon QWERTY ==
+// Cameroon QWERTY uses the US QWERTY layout, as US keyboards are also widely used here. While this keyboard is designed for Cameroonian orthography, it is possible, but not recommended, to type English with minimal discomfort using this keyboard.
+// Cameroon QWERTY uses the ";" (semicolon) key as the "Cameroon" key.	Pressing this key before another key allows you to access the special letters and diacritics needed in Cameroonian orthography.
+// For example, press ";" then "a" and get "ɛ" (small epsilon). ";" then "Shift" + "a" (A) will get an "Ɛ" (capital epsilon). Press ";" twice to get a ";", or press Shift + ; (:) twice to get a ":" (colon).
+// If you prefer, you can hold the AltGr (and/or Shift) key to access the same letters, but we have found this to be much more awkward in practice. If you really don't like our Cameroon key, simply comment out "include "cm(semicolon_switch)"" and the semicolon key will return to normal.
+// All Diacritics must be typed (in order of stacking) after the letter.
+
+
+// == Cameroon Dvorak ==
+// Cameroon Dvorak is uses a similar system to Cameroon QWERTY.
+
+default
+partial alphanumeric_keys
+xkb_symbols "basic" {
+
+	name[Group1]="English (Cameroon)";
+
+	// Alphanumeric section
+	key <TLDE> { [ grave, asciitilde ] };
+	key <AE01> { [ 1, exclam ] };
+	key <AE02> { [ 2, at ] };
+	key <AE03> { [ 3, numbersign ] };
+	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 <AE11> { [ minus, underscore ] };
+	key <AE12> { [ equal, plus ] };
+
+	key <AD01> { [ q, Q ] };
+	key <AD02> { [ w, W ] };
+	key <AD03> { [ e, E ] };
+	key <AD04> { [ r, R ] };
+	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> { [ bracketleft, braceleft ] };
+	key <AD12> { [ bracketright, braceright ] };
+	key <AC01> { [ a, A ] };
+	key <AC02> { [ s, S ] };
+	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> { [ semicolon, colon ] };
+	key <AC11> { [ apostrophe, quotedbl ] };
+
+	key <AB01> { [ z, Z ] };
+	key <AB02> { [ x, X ] };
+	key <AB03> { [ c, C ] };
+	key <AB04> { [ v, V ] };
+	key <AB05> { [ b, B ] };
+	key <AB06> { [ n, N ] };
+	key <AB07> { [ m, M ] };
+	key <AB08> { [ comma, less ] };
+	key <AB09> { [ period, greater ] };
+	key <AB10> { [ slash, U003F ] };
+
+	key <BKSL> { [ backslash, bar ] };
+	// End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "french"
+{
+	name[Group1]="French (Cameroon)";
+	include "latin"
+
+	key <AE01> { [ ampersand, 1, onesuperior, exclamdown ] };
+	key <AE02> { [ eacute, 2, asciitilde, oneeighth ] };
+	key <AE03> { [ quotedbl, 3, numbersign, sterling ] };
+	key <AE04> { [apostrophe, 4, braceleft, dollar ] };
+	key <AE05> { [ parenleft, 5, bracketleft, threeeighths ] };
+	key <AE06> { [ minus, 6, bar, fiveeighths ] };
+	key <AE07> { [ egrave, 7, grave, seveneighths ] };
+	key <AE08> { [underscore, 8, backslash, trademark ] };
+	key <AE09> { [ ccedilla, 9, asciicircum, plusminus ] };
+	key <AE10> { [ agrave, 0, at, degree ] };
+	key <AE11> { [parenright, degree, bracketright, questiondown ] };
+	key <AE12> { [ equal, plus, braceright, dead_ogonek ] };
+
+	key <AD01> { [ a, A, ae, AE ] };
+	key <AD02> { [ z, Z, guillemotleft, less ] };
+	key <AD03> { [ e, E, EuroSign, cent ] };
+	key <AD11> { [dead_circumflex, dead_diaeresis, dead_diaeresis, dead_abovering ] };
+	key <AD12> { [ dollar, sterling, currency, dead_macron ] };
+
+	key <AC01> { [ q, Q, at, Greek_OMEGA ] };
+	key <AC10> { [ m, M, mu, masculine ] };
+	key <AC11> { [ ugrave, percent, dead_circumflex, dead_caron] };
+	key <TLDE> { [twosuperior, asciitilde, notsign, notsign ] };
+
+	key <BKSL> { [ asterisk, mu, dead_grave, dead_breve ] };
+	key <AB01> { [ w, W, lstroke, Lstroke ] };
+	key <AB07> { [ comma, U003F, dead_acute, dead_doubleacute ] };
+	key <AB08> { [ semicolon, period, horizconnector, multiply ] };
+	key <AB09> { [ colon, slash, periodcentered, division ] };
+	key <AB10> { [ exclam, section, dead_belowdot, dead_abovedot ] };
+
+	include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "azerty"
+{
+	name[Group1] = "Cameroon Multilingual (azerty)";
+	include "level3(ralt_switch)"
+	include "cm(basic)"
+	key <AB01> { [ w, W, U1E85, U1E84 ] };	//  SMALL LETTER W,  CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS
+	key <AB02> { [ x, X, U2039, U203A ] };	// SMALL LETTER X, CAPITAL LETTER X, SINGLE LEFT-POINTING ANGLE QUOTATION MARK, SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+	key <AB03> { [ c, C, U0327, copyright ] };	// SMALL LETTER C, CAPITAL LETTER C, COMBINING CEDILLA, COPYRIGHT SIGN
+	key <AB04> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER
+	key <AB05> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK
+	key <AB06> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG
+	key <AB07> { [ U002C, U003F, NoSymbol, U00D7 ] };	// COMMA, QUESTION MARK, , MULTIPLY
+	key <AB08> { [ semicolon, period, dead_acute, dead_grave ] };	// SEMICOLON, PERIOD
+	key <AB09> { [ colon, slash, U0323 ] };	// COLON, SLASH, COMBINING DOT BELOW
+	key <AB10> { [ exclam, U00A7 ] };	// EXCLAMATION MARK, SECTION SIGN
+	key <AC01> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH
+	key <AC02> { [ s, S, U201C, U201D ] };	// SMALL LETTER S, CAPITAL LETTER S, LEFT DOUBLE QUOTES, RIGHT DOUBLE QUOTES 
+	key <AC03> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK
+	key <AC04> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE
+	key <AC05> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
+	key <AC06> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
+	key <AC07> { [ j, J, leftarrow, U2122 ] };	//SMALL LETTER J, CAPITAL LETTER J, LEFT ARROW, TRADE MARK SIGN
+	key <AC08> { [ k, K, downarrow, uparrow ] };	// SMALL LETTER K, CAPITAL LETTER K, DOWN ARROW, UP ARROW
+	key <AC09> { [ l, L, rightarrow, U00A3 ] };	// SMALL LETTER L, CAPITAL LETTER L, RIGHT ARROW, POUND STERLING
+	key <AC10> { [ m, M, U00F9, U00B5 ] };	// SMALL LETTER M, CAPITAL LETTER M, SMALL LETTER U WITH GRAVE, MICRO SYMBOL
+	key <AC11> { [ U0300, U0302, U1DC5, U1DC4 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, COMBINING LOW-MID TONE, COMBINING MID-HIGH TONE
+	key <AD01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E
+	key <AD02> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER
+	key <AD03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA
+	key <AD04> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN
+	key <AD05> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE
+	key <AD06> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK
+	key <AD07> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR
+	key <AD08> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR
+	key <AD09> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O
+	key <AD10> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR
+	key <AD11> { [ U0301, U030C, dead_circumflex, dead_diaeresis ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, DEAD CIRCUMFLEX, DEAD DIAERESIS
+	key <AD12> { [ U0330, U0303, U0304, U030D ] };	// COMBINING TILDE (NASAL) BELOW, COMBINING TILDE (NASAL), COMBINING MID TONE, COMBINING VERTICAL LINE ABOVE
+	key <AE01> { [ U0026, KP_1, U00B9, U2018 ] };	// AMPERSAND, 1, SUPERSCRIPT 1, LEFT SINGLE QUOTE
+	key <AE02> { [ eacute, KP_2, asciitilde, U2019 ] };	// SMALL LETTER E WITH ACUTE, 2, TILDE, RIGHT SINGLE QUOTE
+	key <AE03> { [ U0022, KP_3, U0025 ] };	// QUOTATION MARK, 3, PERCENT SIGN
+	key <AE04> { [ U0027, KP_4, U007B ] };	// APOSTROPHE, 4, LEFT CURLY BRACKET
+	key <AE05> { [ U0028, KP_5, U005B, numbersign ] };	// LEFT PARENTHESIS, 5, LEFT SQUARE BRACKET, NUMBER SIGN
+	key <AE06> { [ U002D, KP_6, U007C ] };	// HYPHEN/MINUS, 6, BAR
+	key <AE07> { [ U00E8, KP_7, U0300 ] };	// SMALL LETTER E WITH GRAVE, 7, COMBINING GRAVE
+	key <AE08> { [ underscore, KP_8, backslash, U20D6 ] };	// UNDERSCORE, 8, BACKSLASH, COMBINING LEFT ARROW ABOVE
+	key <AE09> { [ ccedilla, KP_9, U005E] };	// SMALL LETTER C WITH CEDILLA, 9, CIRCUMFLEX
+	key <AE10> { [ U00E0, KP_0, at, U20D7 ] };	// SMALL LETTER A WITH GRAVE
+	key <AE11> { [ U0029, U00B0, U005D ] };	// RIGHT PARENTHESIS, DEGREE, RIGHT SQUARE BRACKET
+	key <AE12> { [ U003D, U002B, U007D, U00B1 ] };	// EQUAL SIGN, PLUS SIGN, RIGHT CURLY BRACKET, PLUS-MINUS SIGN
+	key <BKSL> { [ U1DC6, U1DC7, KP_Multiply, U00A4 ] };	//  COMBINING MID-LOW, COMBINING HIGH-MID, MULTIPLY, CURRENCY SIGN
+	key <LSGT> { [ U003C, U003E, U00AB, U00BB ] };	// LESS THAN, GREATER THAN, LEFT GUILLEMET, RIGHT GUILLEMET
+	key <TLDE> { [ U0024, U20AC, U00B2, U00B3 ] };	// DOLLAR, EURO, SUPERSCRIPT 2, SUPERSCRIPT 3
+	include "cm(exclamation_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "qwerty"
+{
+	name[Group1] = "Cameroon Multilingual (qwerty)";
+	include "level3(ralt_switch)"
+	include "cm(basic)"
+	key <AB01> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER
+	key <AB02> { [ x, X ] };	// SMALL LETTER X, CAPITAL LETTER X
+	key <AB03> { [ c, C, NoSymbol, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, , COPYRIGHT
+	key <AB04> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER
+	key <AB05> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK
+	key <AB06> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG
+	key <AB07> { [ m, M, NoSymbol, U2122 ] };	// SMALL LETTER M, CAPITAL LETTER M, , TRADEMARK SIGN
+	key <AB08> { [ U002C, U003C, U2039, U00AB ] };	// COMMA, LESS THAN SIGN, LEFT SINGLE GUILLEMET, LEFT DOUBLE GUILLEMET
+	key <AB09> { [ U002E, U003E, U203A, U00BB ] };    // PERIOD, GREATER THAN SIGN, RIGHT SINGLE GUILLEMET, RIGHT DOUBLE GUILLEMET
+	key <AB10> { [ U002F, U003F, U00F7 ] };    // SLASH, QUESTION MARK, DIVISION SIGN
+	key <AC01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E
+	key <AC02> { [ s, S ] };	// SMALL LETTER S, CAPITAL LETTER S
+	key <AC03> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK
+	key <AC04> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE
+	key <AC05> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
+	key <AC06> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
+	key <AC07> { [ j, J, U0330, U0323 ] };	// SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW
+	key <AC08> { [ k, K, U1DC5, U1DC7 ] };	// SMALL LETTER K, CAPITAL LETTER K, COMBINING LOW-MID TONE, COMBINING HIGH-MID
+	key <AC09> { [ l, L, U1DC6, U1DC4 ] };	// SMALL LETTER L, CAPITAL LETTER L, COMBINING MID-LOW, COMBINING MID-HIGH TONE
+	key <AC10> { [ U003B, U003A ] };	// SEMICOLON, COLON
+	key <AC11> { [ U0300, U0302, U0027, U0022 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, APOSTROPHE, QUOTATION MARK
+	key <AD01> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH
+	key <AD02> { [ w, W, U1E85, U1E84 ] };	// SMALL LETTER W, CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS
+	key <AD03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA
+	key <AD04> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN
+	key <AD05> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE
+	key <AD06> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK
+	key <AD07> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR
+	key <AD08> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR
+	key <AD09> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O
+	key <AD10> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR
+	key <AD11> { [ U0301, U030C, U005B, U007B ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, LEFT SQUARE BRACKET, LEFT CURLY BRACKET
+	key <AD12> { [ U0327, U0308, U005D, U007D ] };	// COMBINING CEDILLA, COMBINING DIAERESIS, RIGHT SQUARE BRACKET, RIGHT CURLY BRACKET
+	key <AE01> { [ U0031, U0021, U00BC ] };	// 1, EXCLAMATION POINT, ONE QUARTER
+	key <AE02> { [ U0032, U0040, U00BD ] };	//2, AT SYMBOL, ONE HALF
+	key <AE03> { [ U0033, U0023, U00BE ] };	// 3, NUMBER SIGN, THREE QUARTERS
+	key <AE04> { [ U0034, U0024, NoSymbol, U20AC ] };	// 4, DOLLAR, , EURO SIGN
+	key <AE08> { [ U0038, U002A, NoSymbol, U00D7 ] };	// 8, ASTERISK, , MATH MULTIPLY
+	key <AE09> { [ U0039, U0028, U2018, U201C ] };	// 9, LEFT PARENTHESIS, LEFT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK
+	key <AE10> { [ U0030, U0029, U2019, U201D ] };	// 0, RIGHT PARENTHESIS, RIGHT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK
+	key <AE11> { [ U002D, U005F, U0304 ] };	// MINUS, UNDERSCORE, COMBINING MID TONE, COMBINING MID TONE
+	key <AE12> { [ U003D, U002B, NoSymbol, U00B1 ] };	// EQUAL, PLUS, , PLUS-MINUS
+	key <BKSL> { [ U005C, U007C ] };	// BACKSLASH, BAR
+	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE
+	include "cm(semicolon_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "dvorak"
+{
+	name[Group1] = "English (Cameroon Dvorak)";
+	include "level3(ralt_switch)"
+	include "us(dvorak)"
+	key <AB01> { [ semicolon, colon ] };	// SEMICOLON, COLON
+	key <AB02> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH
+	key <AB03> { [ j, J, U0330, U0323 ] };	// SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW
+	key <AB04> { [ k, K, U1DC5, U1DC7 ] };	// SMALL LETTER K, CAPITAL LETTER K, COMBINING LOW-MID TONE, COMBINING HIGH-MID
+	key <AB05> { [ x, X ] };	// SMALL LETTER X, CAPITAL LETTER X
+	key <AB06> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK
+	key <AB07> { [ m, M, NoSymbol, U2122 ] };	// SMALL LETTER M, CAPITAL LETTER M, , TRADEMARK SIGN
+	key <AB08> { [ w, W, U1E85, U1E84 ] };	// SMALL LETTER W, CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS
+	key <AB09> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER
+	key <AB10> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER
+	key <AC01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E
+	key <AC02> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O
+	key <AC03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA
+	key <AC04> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR
+	key <AC05> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR
+	key <AC06> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK
+	key <AC07> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
+	key <AC08> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE
+	key <AC09> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG
+	key <AC10> { [ s, S ] };	// SMALL LETTER S, CAPITAL LETTER S
+	key <AC11> { [ minus, underscore, U0304 ] };	// MINUS, UNDERSCORE, COMBINING MID TONE
+	key <AD01> { [ U0300, U0302, U0027, U0022 ] };	// COMBINING LOW TONE, COMBINING FALLING TONE, APOSTROPHE, QUOTATION MARK
+	key <AD02> { [ comma, less, U2039, U00AB ] };	// COMMA, LESS THAN SIGN, LEFT SINGLE GUILLEMET, LEFT DOUBLE GUILLEMET
+	key <AD03> { [ period, greater, U203A, U00BB ] };	// PERIOD, GREATER THAN SIGN, RIGHT SINGLE GUILLEMET, RIGHT DOUBLE GUILLEMET
+	key <AD04> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR
+	key <AD05> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK
+	key <AD06> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE
+	key <AD07> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
+	key <AD08> { [ c, C, NoSymbol, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, , COPYRIGHT
+	key <AD09> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN
+	key <AD10> { [ l, L, U1DC6, U1DC4 ] };	// SMALL LETTER L, CAPITAL LETTER L, COMBINING MID-LOW, COMBINING MID-HIGH TONE
+	key <AD11> { [ slash, U003F, U00F7, U0294 ] };	// SLASH, QUESTION MARK, DIVISION SIGN, GLOTTAL STOP
+	key <AD12> { [ equal, plus, NoSymbol, plusminus ] };	// EQUAL, PLUS, , PLUS-MINUS
+	key <AE01> { [ KP_1, exclam, U00BC ] };	// 1, EXCLAMATION POINT, ONE QUARTER
+	key <AE02> { [ KP_2, at, U00BD ] };	// 2, AT SYMBOL, ONE HALF
+	key <AE03> { [ KP_3, numbersign, U00BE ] };	// 3, NUMBER SIGN, THREE QUARTERS
+	key <AE04> { [ KP_4, dollar, NoSymbol, U20AC ] };	// 4, DOLLAR, , EURO SIGN
+	key <AE05> { [ KP_5, percent ] };	// 5, PERCENT
+	key <AE06> { [ KP_6, asciicircum ] };	// 6, CARET
+	key <AE07> { [ KP_7, ampersand ] };	// 7, AMPERSAND
+	key <AE08> { [ KP_8, asterisk, NoSymbol, multiply ] };	// 8, ASTERISK, , MULTIPLY
+	key <AE09> { [ KP_9, parenleft, leftsinglequotemark, leftdoublequotemark ] };	// 9, LEFT PARENTHESIS, LEFT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK
+	key <AE10> { [ KP_0, parenright, rightsinglequotemark, rightdoublequotemark ] };	// 0, RIGHT PARENTHESIS, RIGHT SINGLE QUOTE MARK, LEFT DOUBLE QUOTE MARK
+	key <AE11> { [ U0301, U030C, U005B, U007B ] };	// COMBINING HIGH TONE, COMBINING RISING TONE, LEFT SQUARE BRACKET, LEFT CURLY BRACKET
+	key <AE12> { [ U0327, dead_diaeresis, U005D, braceright ] };	// COMBINING CEDILLA, DEAD DIAERESIS, RIGHT SQUARE BRACKET, RIGHT CURLY BRACKET
+	key <BKSL> { [ backslash, bar ] };	// BACKSLASH, BAR
+	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE
+	include "cm(semicolon_switch_dvorak)"
+};
+
+// The following code creates the "Cameroon key" phenomenon.
+
+partial modifier_keys
+xkb_symbols "semicolon_switch" {
+	key <AC10> {
+	symbols[Group1] = [ ISO_Level3_Latch,	colon,	semicolon,	colon ]};
+	modifier_map Mod5	{ ISO_Level3_Latch };
+};
+
+partial modifier_keys
+xkb_symbols "exclamation_switch" {
+	key <AB10> {
+	symbols[Group1] = [ ISO_Level3_Latch,	U00A7,	exclam,	U00A7 ]
+	};
+	modifier_map Mod5	{ ISO_Level3_Latch };
+};
+
+partial modifier_keys
+xkb_symbols "semicolon_switch_dvorak" {
+	key <AB01> {
+	symbols[Group1] = [ ISO_Level3_Latch,	colon,	semicolon,	colon ]
+	};
+modifier_map Mod5	{ ISO_Level3_Latch };
+};
+
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index d87140f45..170abb183 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -594,3 +594,23 @@ xkb_symbols "htcdream" {
 

         include "level3(alt_switch)"

 };

+

+partial alphanumeric_keys

+xkb_symbols "us" {

+    include "us"

+

+    name[Group1]="German (US keyboard with German letters)";

+

+    key <AC01> { [           a,          A, adiaeresis, Adiaeresis ] };

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

+    key <AC10> { [   semicolon,      colon, odiaeresis, Odiaeresis ] };

+    key <AC11> { [  apostrophe,   quotedbl, adiaeresis, Adiaeresis ] };

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

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

+    key <AD09> { [           o,          O, odiaeresis, Odiaeresis ] };

+    key <AD11> { [ bracketleft,  braceleft, udiaeresis, Udiaeresis ] };

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

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

+

+    include "level3(ralt_switch)"

+};

diff --git a/xorg-server/xkeyboard-config/symbols/lk b/xorg-server/xkeyboard-config/symbols/lk
index ee929ba01..c4fd2ae50 100644
--- a/xorg-server/xkeyboard-config/symbols/lk
+++ b/xorg-server/xkeyboard-config/symbols/lk
@@ -1,6 +1,6 @@
 // X Keyboard Extension file for Sinhala (Sri Lanka) (2004-04-22)

 // Maintainer  : Harshula Jayasuriya <harshula@gmail.com>

-// Last Updated: 2011-03-20

+// Last Updated: 2011-05-25

 // This is a phonetic static mapping for a standard US-English keyboard

 // (qwerty)

 // http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html

@@ -32,8 +32,7 @@ partial default alphanumeric_keys
 xkb_symbols "sin_phonetic" {

 

   include "us"

-// it is default - no details in the name

-  name[Group1] = "Sinhala";

+  name[Group1] = "Sinhala (phonetic)";

   key.type[Group1] = "FOUR_LEVEL";

 

   // q - p

diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index 4ed77447a..a3ee40e71 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -589,8 +589,8 @@ xkb_symbols "chu"
 

 

 // RUU (Russian-Ukrainian United keyboard layout).

-// Modified Russian standart keyboard with third level contains ukrainian

-// and belorusian alphabetic letters and commonly used Unicode symbols.

+// Modified Russian standart keyboard with third level contains Ukrainian

+// and Belorusian alphabetic letters and commonly used Unicode symbols.

 // Description http://wiki.opennet.ru/RUU [russian]

 // Vasyĺ V. Vercynśkyj <fuckel@ukr.net>

 // Last Changes 2011/05/11

@@ -618,7 +618,7 @@ partial alphanumeric_keys
 xkb_symbols "ruu" {

     include "ru(common)"

 

-    name[Group1]= "Russian (with UKR and BEL layout)";

+    name[Group1]= "Russian (with Ukrainian-Belorussian layout)";

 

     key <TLDE> {    [	U2019,		apostrophe,	U0301,		asciitilde	]	};	// Apostrophe and Stress symbol

     key <AE01> {    [	1,		exclam,		U00F7,		U2248		]	};	// Division Sign and Almost Equal To