diff -uNr xkeyboard-config-0.8.orig/rules/base.xml.in xkeyboard-config-0.8/rules/base.xml.in
--- xkeyboard-config-0.8.orig/rules/base.xml.in 2006-09-18 19:55:35.000000000 +0200
+++ xkeyboard-config-0.8/rules/base.xml.in 2006-09-18 19:55:46.000000000 +0200
@@ -1325,24 +1325,48 @@
- latin9
+ oss
<_description>Alternative
- latin9_nodeadkeys
+ oss_latin9
+ <_description>Alternative, latin-9 only
+
+
+
+
+ oss_nodeadkeys
<_description>Alternative, eliminate dead keys
- latin9_sundeadkeys
+ oss_sundeadkeys
<_description>Alternative, Sun dead keys
+ latin9
+ <_description>(Legacy) Alternative
+
+
+
+
+ latin9_nodeadkeys
+ <_description>(Legacy) Alternative, eliminate dead keys
+
+
+
+
+ latin9_sundeadkeys
+ <_description>(Legacy) Alternative, Sun dead keys
+
+
+
+
dvorak
<_description>Dvorak
diff -uNr xkeyboard-config-0.8.orig/symbols/fr xkeyboard-config-0.8/symbols/fr
--- xkeyboard-config-0.8.orig/symbols/fr 2006-09-18 19:55:35.000000000 +0200
+++ xkeyboard-config-0.8/symbols/fr 2006-09-18 20:05:59.000000000 +0200
@@ -81,6 +81,181 @@
key { [ exclam, section, dead_belowdot, abovedot ] };
};
+
+// Unicode French derivative
+// Loose refactoring of the historic Linux French keyboard layout
+//
+// Copyright © 2006 Nicolas Mailhot
+//
+// Credits (fr-latin1, fr-latin0, fr-latin9)
+// © 199x-1996 René Cougnenc ✝
+// © 1997-2002 Guylhem Aznar
+// © 2003-2006 Nicolas Mailhot
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ Ø ¸ │ 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 "latin"
+ include "level3(ralt_switch)"
+ include "keypad(oss)"
+
+ name[Group1]="France - Alternative";
+
+ // First row
+ key { [ oslash, Ooblique, dead_grave, dead_cedilla ] }; // ø Ø ` ¸
+ key { [ ampersand, 1, dead_acute, dead_caron ] }; // & 1 ´ ˇ
+ key { [ eacute, 2, asciitilde, Eacute ] }; // é 2 ~ É
+ key { [ quotedbl, 3, numbersign, 0x1002011 ] }; // " 3 # ‑ (tiret insécable)
+ key { [ apostrophe, 4, braceleft, 0x1002013 ] }; // ' 4 { – (tiret demi-cadratin)
+ key { [ parenleft, 5, bracketleft, 0x1002014 ] }; // ( 5 } — (tiret cadratin)
+ key { [ minus, 6, bar, brokenbar ] }; // - 6 | ¦
+ key { [ egrave, 7, grave, Egrave ] }; // è 7 ` È
+ key { [ underscore, 8, backslash, trademark ] }; // _ 8 \ ™
+ key { [ ccedilla, 9, asciicircum, Ccedilla ] }; // ç 9 ^ Ç
+ key { [ agrave, 0, at, Agrave ] }; // à 0 @ À
+ key { [ parenright, degree, bracketright, notequal ] }; // ) ° ] ≠
+ key { [ equal, plus, braceright, plusminus ] }; // = + } ±
+
+ // Second row
+ key { [ a, A, ae, AE ] }; // a A æ Æ
+ key { [ z, Z, acircumflex, Acircumflex ] }; // z Z â Â
+ key { [ e, E, EuroSign, cent ] }; // e E € ¢
+ key { [ r, R, ecircumflex, Ecircumflex ] }; // r R ê Ê
+ key { [ t, T, thorn, THORN ] }; // t T þ Þ
+ key { [ y, Y, ydiaeresis, Ydiaeresis ] }; // y Y ÿ Ÿ
+ key { [ u, U, ucircumflex, Ucircumflex ] }; // u U û Û
+ key { [ i, I, icircumflex, Icircumflex ] }; // i I î Î
+ key { [ o, O, oe, OE ] }; // o O œ Œ
+ key { [ p, P, ocircumflex, Ocircumflex ] }; // p P ô Ô
+ key { [ dead_circumflex, dead_diaeresis, dead_tilde, dead_abovering ] }; // ^ ̈ ̃ ˚
+ key { [ dollar, sterling, dead_macron, dead_breve ] }; // $ £ ̄ ̆
+
+ // Third row
+ key { [ q, Q, adiaeresis, Adiaeresis ] }; // q Q ä Ä
+ key { [ s, S, ssharp, doublelowquotemark ] }; // s S ß „
+ key { [ d, D, ediaeresis, Ediaeresis ] }; // d D ë Ë
+ key { [ f, F, leftsinglequotemark, quoteleft ] }; // f F ‘ `
+ key { [ g, G, rightsinglequotemark, quoteright ] }; // g G ’ '
+ key { [ h, H, eth, ETH ] }; // h H ð Ð
+ key { [ j, J, udiaeresis, Udiaeresis ] }; // j J ü Ü
+ key { [ k, K, idiaeresis, Idiaeresis ] }; // k K ï Ï
+ key { [ l, L, 0x1000140, 0x100013F ] }; // l L ŀ Ŀ
+ key { [ m, M, onesuperior, masculine ] }; // m M ¹ º
+ key { [ ugrave, percent, twosuperior, Ugrave ] }; // ù % ² Ù
+ key { [ asterisk, mu, threesuperior, yen ] }; // * µ ³ ¥
+
+ // Fourth row
+ key { [ less, greater, lessthanequal, greaterthanequal ] }; // < > ≤ ≥
+ key { [ w, W, guillemotleft, leftdoublequotemark ] }; // w W « “
+ key { [ x, X, guillemotright, rightdoublequotemark ] }; // x X » ”
+ key { [ c, C, copyright, registered ] }; // c C © ®
+ key { [ v, V, 0x100202F, leftarrow ] }; // v V ⍽ ← (espace fine insécable)
+ key { [ b, B, downarrow, uparrow ] }; // b B ↓ ↑
+ key { [ n, N, notsign, rightarrow ] }; // n N ¬ →
+ key { [ comma, question, questiondown, 0x1002026 ] }; // , ? ¿ …
+ key { [ semicolon, period, multiply, 0x10022C5 ] }; // ; . × ⋅
+ key { [ colon, slash, division, 0x1002215 ] }; // : / ÷ ∕
+ key { [ exclam, section, exclamdown, 0x1002212 ] }; // ! § ¡ −
+
+ // Make nobreakspace harder to hit
+ key { [ space, space, space, nobreakspace ] }; // ␣ ␣ ␣ ⍽ (espace insécable)
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_latin9" {
+
+ // Restricts the fr(oss) layout to latin9 symbols
+
+ include "fr(oss)"
+ include "keypad(oss_latin9)"
+
+ name[Group1]="France - Alternative, latin-9 only";
+
+ // First row
+ key { [ quotedbl, 3, numbersign, minus ] }; // " 3 # -
+ key { [ apostrophe, 4, braceleft, minus ] }; // ' 4 { -
+ key { [ parenleft, 5, bracketleft, underscore ] }; // ( 5 } _
+ key { [ underscore, 8, backslash, backslash ] }; // _ 8 \ \
+ key { [ dollar, sterling, dead_macron, dead_macron ] }; // $ £ ̄ ̄
+
+ // Third row
+ key { [ s, S, ssharp, guillemotleft ] }; // s S ß «
+ key { [ f, F, apostophe, quoteleft ] }; // f F ' `
+ key { [ g, G, apostrophe, quoteright ] }; // g G ' '
+ key { [ minus, 6, bar, bar ] }; // - 6 | |
+ key { [ l, L, periodcentered, periodcentered ] }; // l L · ·
+
+ // Fourth row
+ key { [ less, greater, less, greater ] }; // < > < >
+ key { [ w, W, guillemotleft, guillemotleft ] }; // w W « «
+ key { [ x, X, guillemotright, guillemotright ] }; // x X » »
+ key { [ v, V, nobreakspace, less ] }; // v V ⍽ < (espace insécable)
+ key { [ b, B, minus, asciicircum ] }; // b B - ^
+ key { [ n, N, notsign, greater ] }; // n N ¬ >
+ key { [ comma, question, questiondown, period ] }; // , ? ¿ .
+ key { [ semicolon, period, multiply, periodcentered ] }; // ; . × ·
+ key { [ colon, slash, division, slash ] }; // : / ÷ /
+ key { [ exclam, section, exclamdown, minus ] }; // ! § ¡ -
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_Sundeadkeys" {
+
+ // Modifies the basic fr(oss) layout to use the Sun dead keys
+
+ include "fr(oss)"
+
+ // First row
+ key { [ oslash, Ooblique, SunFA_Grave, SunFA_Cedilla ] }; // ø Ø ` ¸
+ key { [ ampersand, 1, SunFA_Acute, dead_caron ] }; // & 1 ´ ˇ
+
+ // Second row
+ key { [ SunFA_Circum, SunFA_Diaeresis, SunFA_Tilde, dead_abovering ] }; // ^ ̈ ̃ ˚
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_sundeadkeys" {
+
+ include "fr(oss_Sundeadkeys)"
+
+ name[Group1]="France - Alternative, Sun dead keys";
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_nodeadkeys" {
+
+ // Modifies the basic fr(oss) layout to eliminate all dead keys
+
+ include "fr(oss)"
+
+ name[Group1]="France - Alternative, eliminate dead keys";
+
+ // First row
+ key { [ oslash, Ooblique, grave, dead_cedilla ] }; // ø Ø ` ¸
+ key { [ ampersand, 1, acute, caron ] }; // & 1 ´ ˇ
+
+ // Second row
+ key { [ asciicircum, diaeresis, asciitilde, Aring ] }; // ^ ̈ ~ Å
+ key { [ dollar, sterling, macron, breve ] }; // $ £ ̄ ˘
+};
+
+
// Historic Linux French keyboard layout (fr-latin9)
// Copyright (c) 199x, 2002 Rene Cougnenc (original work)
// Guylhem Aznar (maintainer)
@@ -146,14 +321,13 @@
//
// AltGr (1) puis e : é
// Shift+AltGr (1) puis e : É ...
-
partial alphanumeric_keys
xkb_symbols "latin9" {
include "latin"
- name[Group1]="France - Alternative";
+ name[Group1]="France - (Legacy) Alternative";
key { [ oe, OE, leftdoublequotemark, rightdoublequotemark ] };
key { [ ampersand, 1, dead_acute, periodcentered ] };
@@ -234,7 +408,7 @@
include "fr(latin9_Sundeadkeys)"
- name[Group1]="France - Alternative, Sun dead keys";
+ name[Group1]="France - (Legacy) Alternative, Sun dead keys";
};
partial alphanumeric_keys
@@ -244,7 +418,7 @@
include "fr(latin9)"
- name[Group1]="France - Alternative, eliminate dead keys";
+ name[Group1]="France - (Legacy) Alternative, eliminate dead keys";
key { [ ampersand, 1, apostrophe, periodcentered ] };
key { [ egrave, 7, grave, Egrave ] };
Les fichiers binaires xkeyboard-config-0.8.orig/symbols/.keypad.swp et xkeyboard-config-0.8/symbols/.keypad.swp sont différents.