Attachment 7489 Details for Bug 8728 – preliminary patch

[patch] preliminary patch

xkeyboard-config.fr-dvorak.patch (text/plain), 10.93 KB, created by Frédéric Boiteux on 2006-10-23 04:46:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Boiteux

Created: 2006-10-23 04:46:58 UTC

Size: 10.93 KB

patch

obsolete

>diff -Naur xkeyboard-config-0.9.REF/rules/base.lst xkeyboard-config-0.9/rules/base.lst
>--- xkeyboard-config-0.9.REF/rules/base.lst	2006-10-16 12:06:32.000000000 +0200
>+++ xkeyboard-config-0.9/rules/base.lst	2006-10-17 13:39:55.000000000 +0200
>@@ -301,6 +301,8 @@
>   latin9          fr: (Legacy) Alternative
>   latin9_nodeadkeys fr: (Legacy) Alternative, eliminate dead keys
>   latin9_sundeadkeys fr: (Legacy) Alternative, Sun dead keys
>+  fr-dvorak       fr: Dvorak Alternative
>+  fr-dvorak_latin9 fr: Dvorak Alternative, latin-9 only
>   dvorak          fr: Dvorak
>   mac             fr: Macintosh
>   generic         gh: Multilingual
>diff -Naur xkeyboard-config-0.9.REF/rules/base.xml.in xkeyboard-config-0.9/rules/base.xml.in
>--- xkeyboard-config-0.9.REF/rules/base.xml.in	2006-10-16 12:06:32.000000000 +0200
>+++ xkeyboard-config-0.9/rules/base.xml.in	2006-10-17 13:42:02.000000000 +0200
>@@ -1576,6 +1576,18 @@
>         </variant>
>         <variant>
>           <configItem>
>+            <name>fr-dvorak</name>
>+            <_description>Dvorak Alternative</_description>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>+            <name>fr-dvorak_latin9</name>
>+            <_description>Dvorak Alternative, latin-9 only</_description>
>+          </configItem>
>+        </variant>
>+        <variant>
>+          <configItem>
>             <name>dvorak</name>
>             <_description>Dvorak</_description>
>           </configItem>
>diff -Naur xkeyboard-config-0.9.REF/symbols/fr xkeyboard-config-0.9/symbols/fr
>--- xkeyboard-config-0.9.REF/symbols/fr	2006-10-16 12:06:32.000000000 +0200
>+++ xkeyboard-config-0.9/symbols/fr	2006-10-17 13:47:46.000000000 +0200
>@@ -429,6 +429,114 @@
>     key <AD11>	{ [	asciicircum,  	   diaeresis,          asciitilde,           quoteright ] };
> };
> 
>+// Keymap Dvorak alternatif pour le FranÃ§ais
>+// DÃ©veloppÃ© collaborativement sur la liste de diffusion Dvorak FrÂ :
>+// dvorak-fr@gpl.insa-lyon.fr et sur le wikiÂ : http://gpl.insa-lyon.fr/Dvorak-Fr/ .
>+//
>+// Carte du clavier Dvorak-fr 6.2.1.1 pour un clavier 105 touches (franÃ§ais)Â :
>+// ââââââ
>+// â 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 "fr-dvorak" {
>+
>+    include "keypad(oss)"
>+
>+    name[Group1]= "Dvorak France - Alternative";
>+
>+    // 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) â£ â£
>+
>+    include "level3(ralt_switch)"
>+};
>+
>+partial alphanumeric_keys
>+xkb_symbols "fr-dvorak_latin9" {
>+
>+    // Restricts the fr(fr-dvorak) layout to latin9 symbols
>+
>+    include "keypad(oss_latin9)"
>+    include "fr(fr-dvorak)"
>+
>+    name[Group1]="Dvorak France - Alternative, latin-9 only";
>+
>+    // at now, no difference (oss keypad excepted), but may change !
>+};
>+
>+
> // Keymap Dvorak pour le FranÃ§ais
> // par Josselin Mouette <josselin.mouette@ens-lyon.org>.
> 
>diff -Naur xkeyboard-config-0.9.REF/symbols/symbols.dir xkeyboard-config-0.9/symbols/symbols.dir
>--- xkeyboard-config-0.9.REF/symbols/symbols.dir	2006-10-16 12:06:31.000000000 +0200
>+++ xkeyboard-config-0.9/symbols/symbols.dir	2006-10-17 13:34:47.000000000 +0200
>@@ -158,6 +158,8 @@
> --p----- a------- fr(Sundeadkeys)
> -dp----- a------- fr(basic)
> --p----- a------- fr(dvorak)
>+--p----- a------- fr(fr-dvorak)
>+--p----- a------- fr(fr-dvorak_latin9)
> --p----- a------- fr(latin9)
> --p----- a------- fr(latin9_Sundeadkeys)
> --p----- a------- fr(latin9_nodeadkeys)

Actions: View | Splinter Review

Attachments on bug 8728: 7489 | 7551

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.