diff -Naur xkeyboard-config-0.9-4.REF/rules/base.lst xkeyboard-config-0.9-4.Dvorak-FR/rules/base.lst --- xkeyboard-config-0.9-4.REF/rules/base.lst 2006-10-07 23:22:17.000000000 +0200 +++ xkeyboard-config-0.9-4.Dvorak-FR/rules/base.lst 2006-10-27 10:43:38.000000000 +0200 @@ -301,7 +301,9 @@ latin9 fr: (Legacy) Alternative latin9_nodeadkeys fr: (Legacy) Alternative, eliminate dead keys latin9_sundeadkeys fr: (Legacy) Alternative, Sun dead keys - dvorak fr: Dvorak + bepo fr: Bepo, ergonomic, Dvorak way + bepo_latin9 fr: Bepo, ergonomic, Dvorak way, latin-9 only + dvorak fr: (Legacy) Dvorak mac fr: Macintosh generic gh: Multilingual akan gh: Akan diff -Naur xkeyboard-config-0.9-4.REF/rules/base.xml.in xkeyboard-config-0.9-4.Dvorak-FR/rules/base.xml.in --- xkeyboard-config-0.9-4.REF/rules/base.xml.in 2006-10-02 20:42:40.000000000 +0200 +++ xkeyboard-config-0.9-4.Dvorak-FR/rules/base.xml.in 2006-10-27 11:26:57.000000000 +0200 @@ -1576,8 +1576,20 @@ + bepo + <_description>Bepo, ergonomic, Dvorak way + + + + + bepo_latin9 + <_description>Bepo, ergonomic, Dvorak way, latin-9 only + + + + dvorak - <_description>Dvorak + <_description>(Legacy) Dvorak diff -Naur xkeyboard-config-0.9-4.REF/symbols/fr xkeyboard-config-0.9-4.Dvorak-FR/symbols/fr --- xkeyboard-config-0.9-4.REF/symbols/fr 2006-10-04 21:29:26.000000000 +0200 +++ xkeyboard-config-0.9-4.Dvorak-FR/symbols/fr 2006-10-27 11:26:20.000000000 +0200 @@ -429,13 +429,122 @@ key { [ asciicircum, diaeresis, asciitilde, quoteright ] }; }; +// Bépo : Improved ergonomic french keymap using Dvorak method. +// Built by community on 'Dvorak Fr' mailing list : +// dvorak-fr@gpl.insa-lyon.fr and on its wiki : http://gpl.insa-lyon.fr/Dvorak-Fr/ . +// XOrg integration in 2006 by Frédéric Boiteux +// +// Bépo layout (6.2.1.1 version) for a pc105 keyboard (french) : +// ┌────┐ +// │ S A│ S = Shift, A = AltGr + Shift +// │ s a│ s = normal, a = AltGr +// └────┘ +// +// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ +// │ $ │ 1 ¹ │ 2 ² │ 3 ³ │ 4 ° │ 5 ˚ │ 6 │ 7 │ 8 │ 9 │ 0 │ ^ │ µ ┃ ⌫ Retour┃ +// │ @ # │ _ { │ " } │ « < │ » > │ ( [ │ ) ] │ + ± │ - ¬ │ * × │ / ÷ │ = ¯ │ % ┃ arrière┃ +// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫ +// ┃ ┃ B │ É ˊ │ P ¶ │ O Œ │ È ` │ Ç │ V │ D Ð │ L │ F │ J │ Z ┃Entrée ┃ +// ┃Tab ↹ ┃ b | │ é & │ p § │ o œ │ è ` │ ç │ v │ d ð │ l £ │ f ª │ j │ z ┃ ⏎ ┃ +// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃ +// ┃ ┃ A Æ │ U Ù │ I ˇ │ E │ ? │ C ¢ │ T Þ │ S │ N │ R │ M │ ! ┃ ┃ +// ┃Maj ⇬ ┃ a æ │ u ù │ i ̈ │ e € │ , ¿ │ c © │ t þ │ s ß │ n │ r ® │ m º │ ˆ ¡ ┃ ┃ +// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫ +// ┃ ┃ ù │ À ˜ │ H │ Y │ : · │ K │ ; │ Q │ G │ X │ W ┃ ┃ +// ┃Shift ⇧┃ ê / │ à ~ │ h ! │ y ¥ │ . \ │ k │ ' │ q │ g │ x │ w ┃Shift ⇧ ┃ +// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛ +// ┃ ┃ ┃ ┃ ⍽ Espace insécable ␣ ┃ ┃ ┃ ┃ +// ┃Ctrl ┃Meta ┃Alt ┃ ␣ Espace ␣ ┃AltGr ⇮┃Menu ┃Ctrl ┃ +// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛ +partial alphanumeric_keys +xkb_symbols "bepo" { + + include "keypad(oss)" + + name[Group1]= "France - Bepo, ergonomic, Dvorak way"; + + // First row + key { [ at, dollar, numbersign ] }; // @ $ # + key { [ underscore, 1, braceleft, onesuperior ] }; // _ 1 { ¹ + key { [ quotedbl, 2, braceright, twosuperior ] }; // " 2 } ² + key { [ guillemotleft, 3, less, threesuperior ] }; // « 3 < ³ + key { [ guillemotright, 4, greater, degree ] }; // » 4 > ° + key { [ parenleft, 5, bracketleft, dead_abovering ] }; // ( 5 [ ˚ + key { [ parenright, 6, bracketright ] }; // ) 6 ] + key { [ plus, 7, plusminus ] }; // + 7 ± + key { [ minus, 8, notsign ] }; // - 8 ¬ + key { [ asterisk, 9, multiply ] }; // * 9 × + key { [ slash, 0, division ] }; // / 0 ÷ + key { [ equal, asciicircum, macron ] }; // = ^ ¯ + key { [ percent, mu ] }; // % µ + + // Second row + key { [ b, B, bar ] }; // b B | + key { [ eacute, Eacute, ampersand, dead_acute ] }; // é É & ˊ + key { [ p, P, section, paragraph ] }; // p P § ¶ + key { [ o, O, oe, OE ] }; // o O œ Œ + key { [ egrave, Egrave, grave, dead_grave ] }; // è È ` ` + key { [ ccedilla, Ccedilla ] }; // ç Ç + key { [ v, V ] }; // v V + key { [ d, D, eth, ETH ] }; // d D ð Ð + key { [ l, L, sterling ] }; // l L £ + key { [ f, F, ordfeminine ] }; // f F ª + key { [ j, J ] }; // j J + key { [ z, Z ] }; // z Z + + // Third row + key { [ a, A, ae, AE ] }; // a A æ Æ + key { [ u, U, ugrave, Ugrave ] }; // u U ù Ù + key { [ i, I, dead_diaeresis, dead_caron ] }; // i I ̈ ˇ + key { [ e, E, EuroSign ] }; // e E € + key { [ comma, question, questiondown ] }; // , ? ¿ + key { [ c, C, copyright, cent ] }; // c C © ¢ + key { [ t, T, thorn, Thorn ] }; // t T þ Þ + key { [ s, S, ssharp ] }; // s S ß + key { [ n, N ] }; // n N + key { [ r, R, registered ] }; // r R ® + key { [ m, M, masculine ] }; // m M º + key { [ dead_circumflex, exclam, exclamdown ] }; // ^ ! ¡ + + // Fourth row + key { [ ecircumflex, ugrave, slash ] }; // ê ù / + key { [ agrave, Agrave, asciitilde, dead_tilde ] }; // à À ~ ~ + key { [ h, H, exclam ] }; // h H ! + key { [ y, Y, yen ] }; // y Y ¥ + key { [ period, colon, backslash, periodcentered ] }; // . : \ · + key { [ k, K ] }; // k K + key { [ apostrophe, semicolon ] }; // ' ; + key { [ q, Q, oslash, Ooblique ] }; // q Q ø Ø + key { [ g, G ] }; // g G + key { [ x, X ] }; // x X + key { [ w, W ] }; // w W + + key { [ space, nobreakspace, space, space ] }; // ␣ ⍽ (espace insécable) ␣ ␣ + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "bepo_latin9" { + + // Restricts the fr(bepo) layout to latin9 symbols + + include "keypad(oss_latin9)" + include "fr(bepo)" + + name[Group1]="France - Bepo, ergonomic, Dvorak way, latin-9 only"; + + // at now, no difference (oss keypad excepted), but will change ! +}; + + // Keymap Dvorak pour le Français // par Josselin Mouette . partial alphanumeric_keys xkb_symbols "dvorak" { - name[Group1]= "France - Dvorak"; + name[Group1]= "France - (Legacy) Dvorak"; key { [ oe, OE, ae, AE ] }; diff -Naur xkeyboard-config-0.9-4.REF/symbols/symbols.dir xkeyboard-config-0.9-4.Dvorak-FR/symbols/symbols.dir --- xkeyboard-config-0.9-4.REF/symbols/symbols.dir 2006-10-27 08:04:43.000000000 +0200 +++ xkeyboard-config-0.9-4.Dvorak-FR/symbols/symbols.dir 2006-10-27 08:20:53.000000000 +0200 @@ -157,6 +157,8 @@ --p----- a------- fo(nodeadkeys) --p----- a------- fr(Sundeadkeys) -dp----- a------- fr(basic) +--p----- a------- fr(bepo) +--p----- a------- fr(bepo_latin9) --p----- a------- fr(dvorak) --p----- a------- fr(latin9) --p----- a------- fr(latin9_Sundeadkeys)