On Sat, Mar 22, 2008, Roland Mas wrote: > There's an even newer upstream version now, 0.6.5.1, with even more > non-cosmetic changes (two more letter pairs, R/N and F/J, were > swapped). From a discussion I had with upstream on IRC, it seems the > layout is approaching stabilisation, so it would be a shame to ship an > old version in Lenny.
Is the attached patch OK for you? Cc-ing Joss as his name is quoted as related to the legacy dvorak layout. -- Mohammed Adnène Trojette
--- symbols/fr 2008-05-01 00:20:50.000000000 +0200 +++ /tmp/fr.new 2008-05-01 03:22:09.000000000 +0200 @@ -440,22 +440,22 @@ // │ 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 ┃ -// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛ +// ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────╔═════════╗ +// │ # ¶│ 1 │ 2 ≤│ 3 ≥│ 4 “│ 5 ”║ 6 │ 7 °│ 8 ′│ 9 ″│ 0 │ @ │ µ ║ ║ +// │ $ §│ " —│ « <│ » >│ ( [│ ) ]║ _ │ + ±│ - –│ / ÷│ * ×│ = ¬│ % ‰║ <-- ║ +// ╔════╧══╗─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─╚══╦══════╣ +// ║ |<- ║ B ¦│ É ˝│ P │ O Œ│ È `║ ! ¡│ V │ D Ð│ L │ J IJ│ Z Ə│ W ║ | ║ +// ║ ->| ║ b |│ é ´│ p &│ o œ│ è `║ ˆ ˇ│ v │ d ð│ l /│ j ij│ z ə│ w ˘║ <-' ║ +// ╠═══════╩╗───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───╚╗ ║ +// ║ ║ A Æ│ U Ù│ I ˙│ E ¤│ ? ¿║ C │ T Þ│ S │ R │ N Ñ│ M º│ Ç ║ ║ +// ║ CAPS ║ a æ│ u ù│ i ¨│ e €│ , ’║ c ©│ t þ│ s ß│ r ®│ n ñ│ m ¯│ ç ¸║ ║ +// ╠══════╦═╝──┬─┴──┬─┴──┬─┴─══─┴──┬─┴──┬─┴─══─┴──┬─┴──┬─┴──┬─┴──╔═╧════╩═════╣ +// ║ ^ ║ Ê │ À ˜│ Y │ H │ : ·│ K ║ ; │ Q │ G │ X ‡│ F ª║ ^ ║ +// ║ | ║ ê /│ à ~│ y \│ h {│ . }│ k …║ ' ‘│ q │ g °│ x †│ f ˛║ | ║ +// ╠══════╩╦═══╧══╦═╧═══╦╧════╧════╧════╧════╧════╧═╦══╧══╦═╧════╬═════╦══════╣ +// ║ ║ ║ ║ NBSPACE FINE-NBSPACE ║ ║ ║ ║ ║ +// ║ Ctrl ║ WinG ║ Alt ║ SPACE ║AltGr║ WinD ║WinM ║ Ctrl ║ +// ╚═══════╩══════╩═════╩═══════════════════════════╩═════╩══════╩═════╩══════╝ partial alphanumeric_keys xkb_symbols "bepo" { @@ -463,64 +463,60 @@ name[Group1]= "France - Bepo, ergonomic, Dvorak way"; - // First row - key <TLDE> { [ at, dollar, numbersign ] }; // @ $ # - key <AE01> { [ underscore, 1, braceleft, onesuperior ] }; // _ 1 { ¹ - key <AE02> { [ quotedbl, 2, braceright, twosuperior ] }; // " 2 } ² - key <AE03> { [ guillemotleft, 3, less, threesuperior ] }; // « 3 < ³ - key <AE04> { [ guillemotright, 4, greater, degree ] }; // » 4 > ° - key <AE05> { [ parenleft, 5, bracketleft, dead_abovering ] }; // ( 5 [ ˚ - key <AE06> { [ parenright, 6, bracketright ] }; // ) 6 ] - key <AE07> { [ plus, 7, plusminus ] }; // + 7 ± - key <AE08> { [ minus, 8, notsign ] }; // - 8 ¬ - key <AE09> { [ asterisk, 9, multiply ] }; // * 9 × - key <AE10> { [ slash, 0, division ] }; // / 0 ÷ - key <AE11> { [ equal, asciicircum, macron ] }; // = ^ ¯ - key <AE12> { [ percent, mu ] }; // % µ - - // Second row - key <AD01> { [ b, B, bar ] }; // b B | - key <AD02> { [ eacute, Eacute, ampersand, dead_acute ] }; // é É & ˊ - key <AD03> { [ p, P, section, paragraph ] }; // p P § ¶ - key <AD04> { [ o, O, oe, OE ] }; // o O œ Œ - key <AD05> { [ egrave, Egrave, grave, dead_grave ] }; // è È ` ` - key <AD06> { [ ccedilla, Ccedilla ] }; // ç Ç - key <AD07> { [ v, V ] }; // v V - key <AD08> { [ d, D, eth, ETH ] }; // d D ð Ð - key <AD09> { [ l, L, sterling ] }; // l L £ - key <AD10> { [ f, F, ordfeminine ] }; // f F ª - key <AD11> { [ j, J ] }; // j J - key <AD12> { [ z, Z ] }; // z Z - - // Third row - key <AC01> { [ a, A, ae, AE ] }; // a A æ Æ - key <AC02> { [ u, U, ugrave, Ugrave ] }; // u U ù Ù - key <AC03> { [ i, I, dead_diaeresis, dead_caron ] }; // i I ̈ ˇ - key <AC04> { [ e, E, EuroSign ] }; // e E € - key <AC05> { [ comma, question, questiondown ] }; // , ? ¿ - key <AC06> { [ c, C, copyright, cent ] }; // c C © ¢ - key <AC07> { [ t, T, thorn, Thorn ] }; // t T þ Þ - key <AC08> { [ s, S, ssharp ] }; // s S ß - key <AC09> { [ n, N ] }; // n N - key <AC10> { [ r, R, registered ] }; // r R ® - key <AC11> { [ m, M, masculine ] }; // m M º - key <BKSL> { [ dead_circumflex, exclam, exclamdown ] }; // ^ ! ¡ - - // Fourth row - key <LSGT> { [ ecircumflex, ugrave, slash ] }; // ê ù / - key <AB01> { [ agrave, Agrave, asciitilde, dead_tilde ] }; // à À ~ ~ - key <AB02> { [ h, H, exclam ] }; // h H ! - key <AB03> { [ y, Y, yen ] }; // y Y ¥ - key <AB04> { [ period, colon, backslash, periodcentered ] }; // . : \ · - key <AB05> { [ k, K ] }; // k K - key <AB06> { [ apostrophe, semicolon ] }; // ' ; - key <AB07> { [ q, Q, oslash, Ooblique ] }; // q Q ø Ø - key <AB08> { [ g, G ] }; // g G - key <AB09> { [ x, X ] }; // x X - key <AB10> { [ w, W ] }; // w W - - key <SPCE> { [ space, nobreakspace, space, space ] }; // ␣ ⍽ (espace insécable) ␣ ␣ - + key <TLDE> { type[group1] = "FOUR_LEVEL" , [ dollar , numbersign , section , paragraph ] }; // $ # § ¶ + key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ quotedbl , 1 , emdash ] }; // " 1 — + key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ guillemotleft , 2 , less , lessthanequal ] }; // « 2 < = + key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ guillemotright , 3 , greater , greaterthanequal ] }; // » 3 > = + key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ parenleft , 4 , bracketleft , leftdoublequotemark ] }; // ( 4 [ “ + key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ parenright , 5 , bracketright , rightdoublequotemark ] }; // ) 5 ] ” + key <AE06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ underscore , 6 ] }; // _ 6 + key <AE07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ plus , 7 , plusminus , degree ] }; // + 7 ± ° + key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ minus , 8 , endash , minutes ] }; // - 8 – ' + key <AE09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ slash , 9 , division , seconds ] }; // / 9 ÷ ? + key <AE10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ asterisk , 0 , multiply ] }; // * 0 × + key <AE11> { type[group1] = "THREE_LEVEL" , [ equal , at , notsign ] }; // = @ ¬ + key <AE12> { type[group1] = "THREE_LEVEL" , [ percent , mu , U2030 ] }; // % µ ‰ + + key <AD01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ b , B , bar , brokenbar ] }; // b B | ¦ + key <AD02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ eacute , Eacute , dead_acute , dead_doubleacute ] }; // é É ´ ? + key <AD03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ p , P , ampersand ] }; // p P & + key <AD04> { type[group1] = "FOUR_LEVEL_ALPHABETIC" , [ o , O , oe , OE ] }; // o O œ Œ + key <AD05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ egrave , Egrave , grave , dead_grave ] }; // è È ` ` + key <AD06> { type[group1] = "FOUR_LEVEL" , [ dead_circumflex, exclam , dead_caron , exclamdown ] }; // ^ ! ? ¡ + key <AD07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ v , V ] }; // v V + key <AD08> { type[group1] = "FOUR_LEVEL_ALPHABETIC" , [ d , D , eth , ETH ] }; // d D ð Ð + key <AD09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ l , L , UFE63 ] }; // l L / + key <AD10> { type[group1] = "FOUR_LEVEL_ALPHABETIC" , [ j , J , U0133 , U0132 ] }; // j J ? ? + key <AD11> { type[group1] = "FOUR_LEVEL_ALPHABETIC" , [ z , Z , schwa , SCHWA ] }; // z Z ? ? + key <AD12> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ w , W , dead_breve ] }; // w W ? + + key <AC01> { type[group1] = "FOUR_LEVEL_ALPHABETIC" , [ a , A , ae , AE ] }; // a A æ Æ + key <AC02> { type[group1] = "FOUR_LEVEL_ALPHABETIC" , [ u , U , ugrave , Ugrave ] }; // u U ù Ù + key <AC03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ i , I , dead_diaeresis , dead_abovedot ] }; // i I ¨ ? + key <AC04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ e , E , EuroSign , UFE67 ] }; // e E € ¤ + key <AC05> { type[group1] = "FOUR_LEVEL" , [ comma , question , rightsinglequotemark, questiondown ] }; // , ? ’ ¿ + key <AC06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ c , C , copyright ] }; // c C © + key <AC07> { type[group1] = "FOUR_LEVEL_ALPHABETIC" , [ t , T , thorn , THORN ] }; // t T þ Þ + key <AC08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ s , S , ssharp ] }; // s S ß + key <AC09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ r , R , registered ] }; // r R ® + key <AC10> { type[group1] = "FOUR_LEVEL_ALPHABETIC" , [ n , N , ntilde , Ntilde ] }; // n N ñ Ñ + key <AC11> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ m , M , dead_macron , masculine ] }; // m M ¯ º + key <BKSL> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ ccedilla , Ccedilla , dead_cedilla ] }; // ç Ç ¸ + + key <LSGT> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ ecircumflex , Ecircumflex , slash ] }; // ê Ê / + key <AB01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ agrave , Agrave , asciitilde , dead_tilde ] }; // à À ~ ~ + key <AB02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ y , Y , backslash ] }; // y Y \ + key <AB03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ h , H , braceleft ] }; // h H { + key <AB04> { type[group1] = "FOUR_LEVEL" , [ period , colon , braceright , periodcentered ] }; // . : } · + key <AB05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ k , K , ellipsis ] }; // k K … + key <AB06> { type[group1] = "THREE_LEVEL" , [ apostrophe , semicolon , leftsinglequotemark ] }; // ' ; ‘ + key <AB07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ q , Q ] }; // q Q + key <AB08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ g , G , dead_abovering ] }; // g G ° + key <AB09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ x , X , dagger , doubledagger ] }; // x X † ‡ + key <AB10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ f , F , dead_ogonek , ordfeminine ] }; // f F ? ª + + key <SPCE> { type[group1] = "FOUR_LEVEL" , [ space , nobreakspace, space , U202F ] }; // ? + include "level3(ralt_switch)" };