svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 121 insertions, 0 deletions

diff --git a/xorg-server/xkbdata.src/symbols/be b/xorg-server/xkbdata.src/symbols/be
index 6e22f8a11..b3c4e53e5 100644
--- a/xorg-server/xkbdata.src/symbols/be
+++ b/xorg-server/xkbdata.src/symbols/be
@@ -27,6 +27,7 @@ xkb_symbols "basic" {
     key <AD01>	{ [         a,          A,           at,  Greek_OMEGA ]	};
     key <AD02>	{ [         z,          Z,      lstroke,      Lstroke ]	};
     key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+    key <AD09>  { [         o,          O,           oe,           OE ] }; // o O œ Œ
     key <AD11>	{ [dead_circumflex, dead_diaeresis,  bracketleft, dead_abovering ] };
     key <AD12>	{ [    dollar,   asterisk, bracketright,  dead_macron ]	};
 
@@ -46,6 +47,126 @@ xkb_symbols "basic" {
     include "level3(ralt_switch)"
 };
 
+
+// Variant of the fr(oss) layout for Belgium
+// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ ³ ≤ │ 1 ≥ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ™ │ 7 È │ 8 ¡ │ 9 Ç │ 0 À │ ° Ø │ _ ± ┃ ⌫ Retour┃
+// │ ² ¹ │ & | │ é @ │ " # │ ' ¸ │ ( ˇ │ § ^ │ è ` │ ! ~ │ ç { │ à } │ ) ø │ - ‑ ┃  arrière┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
+// ┃       ┃ A Æ │ Z  │ E ¢ │ R Ê │ T Þ │ Y Ÿ │ U Û │ I Î │ O Œ │ P Ô │ ¨ ˚ │ * ̨ ┃Entrée ┃
+// ┃Tab ↹  ┃ a æ │ z â │ e € │ r ê │ t þ │ y ÿ │ u û │ i î │ o œ │ p ô │ ^ [ │ $ ] ┃   ⏎   ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
+// ┃        ┃ Q Ä │ S „ │ D Ë │ F ‚ │ G ¥ │ H Ð │ J Ü │ K Ï │ L Ł │ M Ö │ % Ù │ £ ̄ ┃      ┃
+// ┃Maj ⇬   ┃ q ä │ s ß │ d ë │ f ‘ │ g ’ │ h ð │ j ü │ k ï │ l ł │ m ö │ ù ' │ µ ` ┃      ┃
+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
+// ┃       ┃ > ≠ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N → │ ? … │ . . │ / ∕ │ + − ┃             ┃
+// ┃Shift ⇧┃ < \ │ w « │ x » │ c © │ v ⍽ │ b ↓ │ n ¬ │ , ¿ │ ; × │ : ÷ │ = ~ ┃Shift ⇧      ┃
+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
+// ┃       ┃       ┃       ┃ ␣              Espace insécable ⍽ ┃       ┃       ┃       ┃
+// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace                        ␣ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+partial alphanumeric_keys
+xkb_symbols "oss" {
+
+    include "fr(oss)"
+    include "be(oss_frbe)"
+
+    name[Group1]="Belgium - Alternative";
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_frbe" {
+    // First row
+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,         lessthanequal ] }; // ² ³ ¹ ≤ 
+    key <AE01>	{ [        ampersand,                1,                  bar,      greaterthanequal ] }; // & 1 | ≥
+    key <AE02>	{ [           eacute,                2,                   at,                Eacute ] }; // é 2 @ É
+    key <AE04>	{ [       apostrophe,                4,         dead_cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
+    key <AE05>	{ [        parenleft,                5,           dead_caron,             0x1002013 ] }; // ( 5 ˇ – (tiret demi-cadratin)
+    key <AE06>	{ [          section,                6,          asciicircum,             trademark ] }; // § 6 ^ ™
+    key <AE08>	{ [           exclam,                8,           asciitilde,            exclamdown ] }; // ! 8 ~ ¡
+    key <AE09>	{ [         ccedilla,                9,            braceleft,              Ccedilla ] }; // ç 9 { Ç
+    key <AE10>	{ [           agrave,                0,           braceright,                Agrave ] }; // à 0 } À
+    key <AE11>	{ [       parenright,           degree,               oslash,              Ooblique ] }; // ) ° ø Ø 
+    key <AE12>	{ [            minus,       underscore,            0x1002011,             plusminus ] }; // - _ - (tiret insécable) ±
+
+    // Second row
+    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈  [ ˚
+    key <AD12>	{ [           dollar,         asterisk,         bracketright,           dead_ogonek ] }; // $ * ] ̨
+
+    // Third row
+    key <AC09>  { [                l,                L,          dead_stroke ] }; // l L ł Ł
+    key <BKSL>	{ [              mu,          sterling,           dead_grave,           dead_macron ] }; // µ £ ` ̄
+
+    // Fourth row
+    key <LSGT>  { [             less,          greater,            backslash,              notequal ] }; // < > \ ≠
+    key <AB10>  { [            equal,             plus,           dead_tilde,             0x1002212 ] }; // = + ~ −
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "oss_latin9" {
+
+    // Restricts the be(oss) layout to latin9 symbols
+
+    include "fr(oss_latin9)"
+    include "be(oss_frbe)"
+    include "keypad(oss_latin9)"
+
+    name[Group1]="Belgium - Alternative, latin-9 only";
+
+    // First row
+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,                  less ] }; // ² ³ ¹ < 
+    key <AE01>	{ [        ampersand,                1,                  bar,               greater ] }; // & 1 | >
+    key <AE04>	{ [       apostrophe,                4,         dead_cedilla,                 minus ] }; // ' 4 ¸ -
+    key <AE05>	{ [        parenleft,                5,           dead_caron,                 minus ] }; // ( 5 ˇ -
+    key <AE06>	{ [          section,                6,          asciicircum,           asciicircum ] }; // § 6 ^ ^
+    key <AE12>	{ [            minus,       underscore,                minus,             plusminus ] }; // - _ - ±
+
+    // Second row
+    key <AD12>	{ [           dollar,         asterisk,         bracketright,          dead_cedilla ] }; // $ * ] ¸
+
+    // Third row
+    key <AC09>  { [                l,                L,                    l,                     L ] }; // l L l L
+    key <BKSL>	{ [              mu,          sterling,           dead_grave,       dead_circumflex ] }; // µ £ ` ^
+
+    // Fourth row
+    key <LSGT>  { [             less,          greater,            backslash,                 equal ] }; // < > \ =
+    key <AB10>  { [            equal,             plus,           dead_tilde,                 minus ] }; // = + ~ -
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "oss_Sundeadkeys" {
+
+    // Modifies the basic be(oss) layout to use the Sun dead keys
+
+    include "be(oss)"
+
+    // First row
+    key <AE04>	{ [       apostrophe,                4,        SunFA_Cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
+
+    // Second row
+    key <AD11>	{ [     SunFA_Circum,  SunFA_Diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈ [ ˚
+
+    //Third row
+    key <AC11>	{ [           ugrave,          percent,          SunFA_Acute,                Ugrave ] }; // ù % ' Ù
+    key <BKSL>	{ [              mu,          sterling,          SunFA_Grave,           dead_macron ] }; // µ £ ` ̄
+
+    // Fourth row
+    key <AB10>  { [            equal,             plus,          SunFA_Tilde,             0x1002212 ] }; // = + ~ −
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_sundeadkeys" {
+
+    include "be(oss_Sundeadkeys)"
+
+    name[Group1]="Belgium - Alternative, Sun dead keys";
+};
+
+
 partial alphanumeric_keys
 xkb_symbols "iso-alternate" {
     include "be(basic)"