diff -uNr xkeyboard-config-0.8.orig/docs/README.enhancing xkeyboard-config-0.8/docs/README.enhancing --- xkeyboard-config-0.8.orig/docs/README.enhancing 2005-09-21 23:29:24.000000000 +0200 +++ xkeyboard-config-0.8/docs/README.enhancing 2006-09-13 22:13:03.000000000 +0200 @@ -293,6 +293,12 @@ Lock+LevelThree modifiers apply the symbol from the third level is taken. This also, shift-cancels-caps variant. + SIMPLE_FOUR_LEVEL_KEYPAD + Is similar to FOUR_LEVEL_KEYPAD scheme but only uses LevelThree + and Numlock, not confusing users with two modifiers (Numlock and + Shift) fighting each other + Primary modifier is NumLock, secondary LevelThree + Besides that, there are several schemes for special purposes: PC_BREAK diff -uNr xkeyboard-config-0.8.orig/po/fr.po xkeyboard-config-0.8/po/fr.po --- xkeyboard-config-0.8.orig/po/fr.po 2006-03-04 18:41:23.000000000 +0100 +++ xkeyboard-config-0.8/po/fr.po 2006-09-13 22:06:59.000000000 +0200 @@ -179,6 +179,9 @@ msgid "Alternative" msgstr "Autre" +msgid "Alternative with unicode additions" +msgstr "Autre, avec des suppléments unicode" + #: ../rules/base.xml.in.h:41 msgid "Alternative international (former us_intl)" msgstr "International (auparavant us_intl)" diff -uNr xkeyboard-config-0.8.orig/rules/base xkeyboard-config-0.8/rules/base --- xkeyboard-config-0.8.orig/rules/base 2006-02-28 00:14:28.000000000 +0100 +++ xkeyboard-config-0.8/rules/base 2006-09-11 21:03:25.000000000 +0200 @@ -251,6 +251,8 @@ * yu = pc(pc105)+srp $pcmodels fr-latin9 = pc(%m)+fr(latin9) * fr-latin9 = pc(pc105)+fr(latin9) + $pcmodels fr-unicode = pc(%m)+fr(unicode) + * fr-unicode = pc(pc105)+fr(unicode) $pcmodels us_intl = pc(%m)+us(alt-intl) * us_intl = pc(pc105)+us(alt-intl) $pcmodels ben(basic) = pc(%m)+in(ben) @@ -409,6 +411,8 @@ * yu = pc(pc105)+srp%(v[1]) $pcmodels fr-latin9 = pc(%m)+fr(latin9)%(v[1]) * fr-latin9 = pc(pc105)+fr(latin9)%(v[1]) + $pcmodels fr-unicode = pc(%m)+fr(unicode)%(v[1]) + * fr-unicode = pc(pc105)+fr(unicode)%(v[1]) $pcmodels us_intl = pc(%m)+us(alt-intl)%(v[1]) * us_intl = pc(pc105)+us(alt-intl)%(v[1]) $pcmodels ben(basic) = pc(%m)+in(ben) @@ -610,6 +614,7 @@ tml = +in(tam)%(v[2]):2 yu = +srp%(v[2]):2 fr-latin9 = +fr(latin9)%(v[2]):2 + fr-unicode = +fr(unicode)%(v[2]):2 us_intl = +us(alt-intl)%(v[2]):2 ben(basic) = +in(ben):2 ben(probhat) = +in(ben_probhat):2 @@ -679,6 +684,7 @@ tml = +in(tam)%(v[3]):3 yu = +srp%(v[3]):3 fr-latin9 = +fr(latin9)%(v[3]):3 + fr-unicode = +fr(unicode)%(v[3]):3 us_intl = +us(alt-intl)%(v[3]):3 ben(basic) = +in(ben):3 ben(probhat) = +in(ben_probhat):3 @@ -748,6 +754,7 @@ tml = +in(tam)%(v[4]):4 yu = +srp%(v[4]):4 fr-latin9 = +fr(latin9)%(v[4]):4 + fr-unicode = +fr(unicode)%(v[4]):4 us_intl = +us(alt-intl)%(v[4]):4 ben(basic) = +in(ben):4 ben(probhat) = +in(ben_probhat):4 diff -uNr xkeyboard-config-0.8.orig/rules/base.lst xkeyboard-config-0.8/rules/base.lst --- xkeyboard-config-0.8.orig/rules/base.lst 2006-03-04 18:45:00.000000000 +0100 +++ xkeyboard-config-0.8/rules/base.lst 2006-09-13 23:16:20.000000000 +0200 @@ -260,6 +260,7 @@ latin9 fr: Alternative latin9_nodeadkeys fr: Alternative, eliminate dead keys latin9_sundeadkeys fr: Alternative, Sun dead keys + unicode fr:Alternative with unicode additions dvorak fr: Dvorak generic gh: Multilingual akan gh: Akan 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-02-26 17:12:33.000000000 +0100 +++ xkeyboard-config-0.8/rules/base.xml.in 2006-09-13 22:05:49.000000000 +0200 @@ -1331,6 +1331,12 @@ + unicode + <_description>Alternative with unicode additions + + + + latin9_nodeadkeys <_description>Alternative, eliminate dead keys diff -uNr xkeyboard-config-0.8.orig/symbols/fr xkeyboard-config-0.8/symbols/fr --- xkeyboard-config-0.8.orig/symbols/fr 2005-09-28 00:15:11.000000000 +0200 +++ xkeyboard-config-0.8/symbols/fr 2006-09-14 21:48:53.000000000 +0200 @@ -107,45 +107,45 @@ // (If you can't read it you probably have no business changing this file anyway:) // // Les accents circonflexes des principales voyelles sont obtenus avec -// la touche Alt_Gr, les trmas sont obtenus par Alt_Gr + Shift. +// la touche Alt_Gr, les trémas sont obtenus par Alt_Gr + Shift. // // ____ _________ _____________ _______ -// | S A| S = Shift, A = AltGr + Shift | Imprime | Arrt dfil | Pause | +// | S A| S = Shift, A = AltGr + Shift | Imprime | Arrêt défil | Pause | // | s a| s = normal, a = AltGr | Exec | | Halte | -// +// ¯¯¯¯ ¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯ // ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ _______ -// | "| 1 | 2 | 3 ,| 4 '| 5 "| 6 || 7 | 8 | 9 | 0 | | + | <-- | -// | "| & '| ~| " #| ' {| ( [| - || `| _ \| ^| @| ) ]| = }| | +// | œ "| 1 ·| 2 É| 3 ,| 4 '| 5 "| 6 || 7 È| 8 ¯| 9 Ç| 0 À| ° ÿ| + °| <-- | +// | Œ "| & '| é ~| " #| ' {| ( [| - || è `| _ \| ç ^| à @| ) ]| = }| | // ======================================================================== -// | |<- | A | Z | E | R | T | Y | U | I | O | P '| " `| $ | , | -// | ->| | 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 | | * | | +// | |<- | A ä| Z Å| E ¢| R Ç| T Þ| Y Ý| U ü| I ï| O ö| P '| " `| $ ë| , | +// | ->| | 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 | ? | . | / | | ^ | -// | | | < || w | x | c | v | b | n | , | ; | : | ! | | | +// | ^ | > | W | X | C | V | B | N | ? | . | / | § | ^ | +// | | | < || w «| x »| c ©| v ®| b ß| n ¬| , ¿| ; ×| : ÷| ! ¡| | | // ======================================================================== // | | | | | | | | | // | Ctrl | Meta | Alt | Space Nobreakspace | AltGr | Multi|Menu | Ctrl | -// +// ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯ ¯¯¯¯¯¯ // // // Si les touches mortes fonctionnent, utiliser les accents dits -// morts , i.e. fonctionnant comme l'accent circonflexe & le -// trma des machines crire ; sont disponibles : +// « morts », i.e. fonctionnant comme l'accent circonflexe & le +// tréma des machines à écrire ; sont disponibles : // // (^) : accent circonflexe, -// Shift+(^) : trma, +// Shift+(^) : tréma, // Shift+AltGr (^) : tilde, // AltGr (1) : accent aigu, // AltGr (7) : accent grave // -// Pour s'en servir, procder comme avec l'accent circonflexe & le trma -// sur les vielles machines crire : +// Pour s'en servir, procéder comme avec l'accent circonflexe & le tréma +// sur les vielles machines à écrire : // -// AltGr (1) puis e : -// Shift+AltGr (1) puis e : ... +// AltGr (1) puis e : é +// Shift+AltGr (1) puis e : É ... partial alphanumeric_keys @@ -217,6 +217,64 @@ }; partial alphanumeric_keys +xkb_symbols "unicode" { + + include "fr(latin9)" + + // Replace doublequotemarks with ubreve + key { [ oe, OE, ubreve, Ubreve ] }; // œ Œ ŭ Ŭ + + // Move acute and remove periodcentered + key { [ ampersand, 1, dead_acute, acute ] }; // & 1 ´ ´ + + // Add correct unicode typographical apostrophe + key { [ apostrophe, 4, braceleft, rightsinglequotemark ] }; // ' 4 { ’ + + // Group accented letters with the corresponding accented caps + key { [ a, A, acircumflex, Acircumflex ] }; // a A â  + key { [ u, U, ucircumflex, Ucircumflex ] }; // u U û Û + key { [ i, I, icircumflex, Icircumflex ] }; // i I î Î + key { [ o, O, ocircumflex, Ocircumflex ] }; // o O ô Ô + key { [ dollar, sterling, ecircumflex, Ecircumflex ] }; // $ £ ê Ê + + key { [ q, Q, adiaeresis, Adiaeresis ] }; // q Q ä Ä + key { [ j, J, udiaeresis, Udiaeresis ] }; // j J ü Ü + key { [ k, K, idiaeresis, Idiaeresis ] }; // k K ï Ï + key { [ l, L, odiaeresis, Odiaeresis ] }; // l L ö Ö + key { [ d, D, ediaeresis, Ediaeresis ] }; // d D ë Ë + + // Move doublequotemarks + key { [ w, W, guillemotleft, leftdoublequotemark ] }; // w W « “ + key { [ x, X, guillemotright, rightdoublequotemark ] }; // x X » ” + + // add trademark access + key { [ c, C, copyright, trademark ] }; // c C © ™ + + // add typographical dashes and ellipsis + key { [ b, B, ssharp, 0x1002013 ] }; // b B ß – + key { [ n, N, notsign, 0x1002014 ] }; // n N ¬ — + key { [ comma, question, questiondown, 0x1002026 ] }; // , ? ¿ … + + // Add more math operators + key { [ semicolon, period, multiply, 0x10022C5 ] }; // ; . × ⋅ + key { [ colon, slash, division, 0x1002215 ] }; // : / ÷ ¿ + key { [ exclam, section, exclamdown, 0x1002212 ] }; // ! § ¡ ¿ + + + // Add brokenbar access + key { [ less, greater, lessthanequal, greaterthanequal ] }; // < > ¿ ¿ + + // Make nobreakspace harder to hit + key { [ space, space, space, nobreakspace ] }; + + // Add math operators and arrows to the keypad + include "keypad(unimath)" + include "keypad(uniarrows)" +}; + + + +partial alphanumeric_keys xkb_symbols "latin9_Sundeadkeys" { // Modifies the basic fr-latin9 layout to use the Sun dead keys @@ -252,7 +310,7 @@ key { [ asciicircum, diaeresis, asciitilde, quoteright ] }; }; -// Keymap Dvorak pour le Franais +// Keymap Dvorak pour le Français // par Josselin Mouette . partial alphanumeric_keys diff -uNr xkeyboard-config-0.8.orig/symbols/keypad xkeyboard-config-0.8/symbols/keypad --- xkeyboard-config-0.8.orig/symbols/keypad 2005-09-21 23:29:26.000000000 +0200 +++ xkeyboard-config-0.8/symbols/keypad 2006-09-14 21:08:07.000000000 +0200 @@ -87,3 +87,43 @@ xkb_symbols "comma" { key { [ KP_Delete, KP_Separator ] }; }; + +// Math keypad with unicode operators +// Added by nicolas.mailhot at laposte.net +partial hidden keypad_keys +xkb_symbols "unimath" { + + key.type[Group1] = "FOUR_LEVEL_X" ; + + key { [ KP_Divide, 0x1002215, 0x10000F7, XF86_Ungrab ] }; // / ∕ ÷ + key { [ KP_Multiply, 0x10022C5, 0x10000D7, XF86_ClearGrab ] }; // * ⋅ × + key { [ KP_Subtract, 0x1002212, 0x1002212, XF86_Prev_VMode ] }; // - − − + + key { [ KP_Add, 0x100002B, 0x100002B, XF86_Next_VMode ] }; // + + + + +}; + +// Adds arrow symbols to the keypad digit keys +// Added by nicolas.mailhot at laposte.net +partial hidden keypad_keys +xkb_symbols "uniarrows" { + + key.type[Group1] = "FOUR_LEVEL_MIXED_KEYPAD" ; + + key { [ KP_Home, KP_7, 0x1002196, 0x10021D6 ] }; // 7 ↖ ⇖ + key { [ KP_Up, KP_8, 0x1002191, 0x10021D1 ] }; // 8 ↑ ⇑ + key { [ KP_Prior, KP_9, 0x1002197, 0x10021D7 ] }; // 9 ↗ ⇗ + + key { [ KP_Left, KP_4, 0x1002190, 0x10021D0 ] }; // 4 ← ⇐ + key { [ KP_Begin, KP_5, 0x1002194, 0x10021D4 ] }; // 5 ↔ ⇔ + key { [ KP_Right, KP_6, 0x1002192, 0x10021D2 ] }; // 6 → ⇒ + + key { [ KP_End, KP_1, 0x1002199, 0x10021D9 ] }; // 1 ↙ ⇙ + key { [ KP_Down, KP_2, 0x1002193, 0x10021D3 ] }; // 2 ↓ ⇓ + key { [ KP_Next, KP_3, 0x1002198, 0x10021D8 ] }; // 3 ↘ ⇘ + + key { [ KP_Insert, KP_0, 0x1002195, 0x10021D5 ] }; // 0 ↕ ⇕ + // We could use KP_Decimal and KP_Separator but we do not want the locale + // decimal and separator symbol but locale-insensitive dot and comma + key { [ KP_Delete, period, comma, 0x100202F ] }; // . , "narrow no-break space" +}; diff -uNr xkeyboard-config-0.8.orig/types/extra xkeyboard-config-0.8/types/extra --- xkeyboard-config-0.8.orig/types/extra 2005-10-16 03:24:47.000000000 +0200 +++ xkeyboard-config-0.8/types/extra 2006-09-14 20:17:01.000000000 +0200 @@ -68,6 +68,36 @@ level_name[Level4] = "Alt Number"; }; + // Another four level keypad variant + // First two levels controled by NumLock + // LevelThree overrides this mode, with two Shift-ed levels + type "FOUR_LEVEL_MIXED_KEYPAD" { + modifiers = Shift+NumLock+LevelThree; + map[None] = Level1; + map[NumLock] = Level2; + map[LevelThree] = Level3; + map[NumLock+LevelThree] = Level3; + map[Shift+LevelThree] = Level4; + map[Shift+NumLock+LevelThree] = Level4; + level_name[Level1] = "Base"; + level_name[Level2] = "Number"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + }; + + // Base level, two Shift-ed LevelThree levels, one Ctrl+Alt command level + type "FOUR_LEVEL_X" { + modifiers = Shift+LevelThree+Control+Alt; + map[None] = Level1; + map[LevelThree] = Level2; + map[Shift+LevelThree] = Level3; + map[Control+Alt] = Level4; + level_name[Level1] = "Base"; + level_name[Level2] = "Alt Base"; + level_name[Level3] = "Shift Alt"; + level_name[Level4] = "Ctrl+Alt"; + }; + // Special type for keys used in Serbian Latin Unicode map // It makes it possible to use all three forms of latin letters // present in Unicode that are made up of two separate letters