Attachment 20223 Details for Bug 17821 – update of my previous patch

[patch] update of my previous patch

xkeyboard-config.bepo_1.0rc2.v2.patch (text/plain), 18.33 KB, created by Frédéric Boiteux on 2008-11-11 12:34:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Boiteux

Created: 2008-11-11 12:34:54 UTC

Size: 18.33 KB

patch

obsolete

>diff -Naur xkeyboard-config/symbols/fr xkeyboard-config-bepo/symbols/fr
>--- xkeyboard-config/symbols/fr	2008-10-20 20:52:04.000000000 +0200
>+++ xkeyboard-config-bepo/symbols/fr	2008-11-05 22:04:16.000000000 +0100
>@@ -430,98 +430,98 @@
> };
> 
> // 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 <fboiteux @ free.fr>
>+// Built by community on 'Dvorak Fr / BÃ©po'Â :
>+// see http://www.clavier-dvorak.org/wiki/ to join and help.
>+// XOrg integration (1.0rc2 version) in 2008
>+// by FrÃ©dÃ©ric Boiteux <fboiteux @ free.fr>
> //
>-// BÃ©po layout (6.2.1.1 version) for a pc105 keyboard (french)Â :
>+// BÃ©po layout (1.0rc2 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â
>+// â # Â¶ â 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   â   â   â
>+// â       â B Â¦ â Ã Ë â P Â§ â O Å â Ã ` â !   â V   â D Ã â L   â J Ä² â Z Æ â W   âEntrÃ©e â
>+// âTab â¹  â b | â Ã© Ë â p & â o Å â Ã¨ ` â Ë Â¡ â v Ë â d Ã° â l / â j Ä³ â z É â w Ì â   â   â
> // â£ââââââââ»â±âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââ´â¬âââââºâ      â
>-// â        â A Ã â U Ã â I Ë â E   â ?   â C Â¢ â T Ã â S   â N   â R   â M   â !   â      â
>-// âMaj â¬   â a Ã¦ â u Ã¹ â i Ì â e â¬ â , Â¿ â c Â© â t Ã¾ â s Ã â n   â r Â® â m Âº â Ë Â¡ â      â
>+// â        â A Ã â U Ã â I Ë â E Â¤ â ; Ì â C Å¿ â T Ã â S áº â R â¢ â N   â M Âº â Ã , â      â
>+// âMaj â¬   â a Ã¦ â u Ã¹ â i Ì â e â¬ â , â â c Â© â t Ã¾ â s Ã â r Â® â n Ë â m Â¯ â Ã§ Â¸ â      â
> // â£ââââââââ³â¹âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ¬â´âââââ²â·ââââââ»âââââââ«
>-// â       â Ã¹   â Ã Ë â H   â Y   â : Â· â K   â ;   â Q   â G   â X   â W   â             â
>-// âShift â§â Ãª / â Ã  ~ â h ! â y Â¥ â . \ â k   â '   â q   â g   â x   â w   âShift â§      â
>+// â       â Ã   â Ã   â Y â â X â â : Â· â K   â ? Ì â Q Ì£ â G   â H â¡ â F Âª â             â
>+// âShift â§â Ãª / â Ã  \ â y { â x } â . â¦ â k ~ â ' Â¿ â q Ë â g Âµ â h â  â f Ë âShift â§      â
> // â£ââââââââââââââ·ââ³ââââ·ââââ±ââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââ²ââ·ââââââââââââ»ââ³ââââââââ³ââââ
>-// â       â       â       â â½ Espace insÃ©cable              â£ â       â       â       â
>-// âCtrl   âMeta   âAlt    â â£ Espace                        â£ âAltGr â®âMenu   âCtrl   â
>+// â       â       â       â Espace insÃ©c.   Espace insÃ©c. fin â       â       â       â
>+// âCtrl   âMeta   âAlt    â â£ (Espace)      _               â£ âAltGr â®âMenu   âCtrl   â
> // âââââââââ»ââââââââ»ââââââââ¹ââââââââââââââââââââââââââââââââââââºââââââââ»ââââââââ»ââââââââ
> partial alphanumeric_keys
> xkb_symbols "bepo" {
> 
>+    include "level3(ralt_switch)"
>     include "keypad(oss)"
> 
>     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                                 ] }; // % Âµ
>+    key <TLDE> { [          dollar,   numbersign,        endash,       paragraph ] }; // $ # â Â¶
>+    key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        quotedbl,            1,         emdash, doublelowquotemark ] }; // " 1 â â
>+    key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [   guillemotleft,            2,           less,  leftdoublequotemark ] }; // Â« 2 < â
>+    key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  guillemotright,            3,        greater, rightdoublequotemark ] }; // Â» 3 > â
>+    key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenleft,            4,    bracketleft,      lessthanequal ] }; // ( 4 [ â¤
>+    key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      parenright,            5,   bracketright,   greaterthanequal ] }; // ) 5 ] â¥
>+    key <AE06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [              at,            6,    asciicircum                 ] }; // @ 6 ^
>+    key <AE07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            plus,            7,      plusminus,        notsign ] }; // + 7 Â± Â¬
>+    key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           minus,            8,          U2212,     onequarter ] }; // - 8 â Â¼
>+    key <AE09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           slash,            9,       division,        onehalf ] }; // / 9 Ã· Â½
>+    key <AE10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        asterisk,            0,       multiply,  threequarters ] }; // * 0 Ã Â¾
>+    key <AE11> { [           equal,       degree,       notequal,        minutes ] }; // = Â° â  â²
>+    key <AE12> { [         percent,        grave,          U2030,        seconds ] }; // % ` â° â³
> 
>     // 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 <AD01> { [               b,            B,            bar,      brokenbar ] }; // b B | Â¦
>+    key <AD02> { [          eacute,       Eacute,     dead_acute, dead_doubleacute ] }; // Ã© Ã Ë Ë
>+    key <AD03> { [               p,            P,      ampersand,        section ] }; // 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 <AD05> { [          egrave,       Egrave,     dead_grave,          grave ] }; // Ã¨ Ã ` `
>+    key <AD06> { [ dead_circumflex,       exclam,     exclamdown                 ] }; // ^ ! Â¡
>+    key <AD07> { [               v,            V,     dead_caron                 ] }; // 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
>+    key <AD09> { [               l,            L,    dead_stroke                 ] }; // l L /
>+    key <AD10> { [               j,            J,          U0133,          U0132 ] }; // j J Ä³ Ä²
>+    key <AD11> { [               z,            Z,          schwa,          SCHWA ] }; // z Z É Æ
>+    key <AD12> { [               w,            W,     dead_breve                 ] }; // w W Ì
> 
>     // 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                 ] }; // ^ ! Â¡
>+    key <AC03> { [               i,            I, dead_diaeresis,  dead_abovedot ] }; // i I Ì Ë
>+    key <AC04> { [               e,            E,       EuroSign,          UFDD1 ] }; // e E â¬ Â¤
>+    key <AC05> { [           comma,    semicolon, rightsinglequotemark, dead_horn ] }; // , ; â Ì
>+    key <AC06> { [               c,            C,      copyright,          U017f ] }; // c C Â© Å¿
>+    key <AC07> { [               t,            T,          thorn,          THORN ] }; // t T Ã¾ Ã
>+    key <AC08> { [               s,            S,         ssharp,          U1E9E ] }; // s S Ã áº
>+    key <AC09> { [               r,            R,     registered,      trademark ] }; // r R Â® â¢
>+    key <AC10> { [               n,            N,     dead_tilde                 ] }; // n N ~
>+    key <AC11> { [               m,            M,    dead_macron,      masculine ] }; // m M Ì Âº
>+    key <BKSL> { [        ccedilla,     Ccedilla,   dead_cedilla, dead_belowcomma ] }; // Ã§ Ã Â¸ ,
> 
>     // 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 <LSGT> { [     ecircumflex,  Ecircumflex,          slash                 ] }; // Ãª Ã /
>+    key <AB01> { [          agrave,       Agrave,      backslash                 ] }; // Ã  Ã \
>+    key <AB02> { [               y,            Y,      braceleft, leftsinglequotemark  ] }; // y Y { â
>+    key <AB03> { [               x,            X,     braceright, rightsinglequotemark ] }; // x X } â
>+    key <AB04> { [          period,        colon,       ellipsis, periodcentered ] }; // . : â¦ Â·
>+    key <AB05> { [               k,            K,     asciitilde                 ] }; // k, K, ~
>+    key <AB06> { [      apostrophe,     question,   questiondown,      dead_hook ] }; // ' ? Â¿ Ì
>+    key <AB07> { [               q,            Q, dead_abovering,  dead_belowdot ] }; // q Q Ë Ì£
>+    key <AB08> { [               g,            G,          UFDD2                 ] }; // g G Âµ
>+    key <AB09> { [               h,            H,         dagger,   doubledagger ] }; // h H â  â¡
>+    key <AB10> { [               f,            F,    dead_ogonek,    ordfeminine ] }; // f F Ì¨ Âª
> 
>-    key <SPCE> { [           space, nobreakspace,          space,          space ] }; // â£ â½â¯(espace insÃ©cable) â£ â£
>-
>-    include "level3(ralt_switch)"
>+    key <SPCE> { [           space, nobreakspace,     underscore,          U202F ] }; // â£ (espace insÃ©cable) _ (espace insÃ©cable fin)
> };
> 
> partial alphanumeric_keys
>@@ -529,12 +529,45 @@
> 
>     // Restricts the fr(bepo) layout to latin9 symbols
> 
>-    include "keypad(oss_latin9)"
>     include "fr(bepo)"
>+    include "keypad(oss_latin9)"
> 
>     name[Group1]="France - Bepo, ergonomic, Dvorak way, latin-9 only";
> 
>-    // at now, no difference (oss keypad excepted), but will change !
>+    key <TLDE> { [          dollar,   numbersign,        dollar,       paragraph ] }; // $ # $ Â¶
>+
>+    key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        quotedbl,            1                                 ] }; // " 1
>+    key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [   guillemotleft,            2,           less                 ] }; // Â« 2 <
>+    key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  guillemotright,            3,        greater                 ] }; // Â» 3 >
>+    key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenleft,            4,    bracketleft                 ] }; // ( 4 [
>+    key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      parenright,            5,   bracketright                 ] }; // ) 5 ]
>+    key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           minus,            8,          minus,     onequarter ] }; // - 8 - Â¼
>+    key <AE11> { [           equal,       degree                                 ] }; // = Â°
>+    key <AE12> { [         percent,        grave                                 ] }; // % `
>+
>+    key <AD01> { [               b,            B,            bar                 ] }; // b B |
>+    key <AD02> { [          eacute,       Eacute,     dead_acute                 ] }; // Ã© Ã Ë
>+    key <AD07> { [               v,            V                                 ] }; // v V
>+    key <AD10> { [               j,            J                                 ] }; // j J
>+    key <AD11> { [               z,            Z                                 ] }; // z Z
>+    key <AD12> { [               w,            W                                 ] }; // w W
>+
>+    key <AC03> { [               i,            I, dead_diaeresis                 ] }; // i I Ì
>+    key <AC05> { [           comma,    semicolon,          comma,      dead_horn ] }; // , ; , Ì
>+    key <AC06> { [               c,            C,      copyright                 ] }; // c C Â©
>+    key <AC08> { [               s,            S,         ssharp                 ] }; // s S Ã
>+    key <AC09> { [               r,            R,     registered                 ] }; // r R Â®
>+    key <AC11> { [               m,            M,         macron,      masculine ] }; // m M Ì Âº
>+
>+    key <AB02> { [               y,            Y,      braceleft                 ] }; // y Y {
>+    key <AB03> { [               x,            X,     braceright                 ] }; // x X }
>+    key <AB04> { [          period,        colon                                 ] }; // . :
>+    key <AB09> { [               h,            H                                 ] }; // h H
>+    key <AB10> { [               f,            F,              f,    ordfeminine ] }; // f F   Âª
>+
>+    // NoteÂ : on a besoin de redÃ©finir les niveaux 3 et 4,
>+    // donc nbsp(level2) ne suffit pasÂ !
>+    key <SPCE> { [           space,  nobreakspace,    underscore,   nobreakspace ] }; // â£ (espace insÃ©cable) _ (espace insÃ©cable)
> };
> 
> // Author   : Francis Leboutte, http://www.algo.be/ergo/dvorak-fr.html

Actions: View | Splinter Review

Attachments on bug 17821: 19303 | 20223 | 21068

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.