Attachment 7620 Details for Bug 8853 – Proposed patch

[patch] Proposed patch

xkeyboard-config-0.9-frossfixes.patch (text/plain), 11.01 KB, created by Nicolas Mailhot on 2006-11-01 08:05:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Mailhot

Created: 2006-11-01 08:05:46 UTC

Size: 11.01 KB

patch

obsolete

>diff -uNr xkeyboard-config-0.9.orig/symbols/fr xkeyboard-config-0.9/symbols/fr
>--- xkeyboard-config-0.9.orig/symbols/fr	2006-11-01 14:01:30.000000000 +0100
>+++ xkeyboard-config-0.9/symbols/fr	2006-11-01 16:54:36.000000000 +0100
>@@ -93,14 +93,14 @@
> //   Â© 2003-2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
> //
> // âââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ¬ââââââ²ââââââââââ
>-// â Ã Â¸ â 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â
> // â¢ââââââ·ââ±ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââ´ââ¬ââââºââ³ââââââââ«
>-// â       â A Ã â Z Ã â E Â¢ â R Ã â T Ã â Y Å¸ â U Ã â I Ã â O Å â P Ã â Â¨ Ë â Â£ Â¥ âEntrÃ©e â
>-// âTab â¹  â a Ã¦ â z Ã¢ â e â¬ â r Ãª â t Ã¾ â y Ã¿ â u Ã» â i Ã® â o Å â p Ã´ â ^ ~ â $ Â³ â   â   â
>+// â       â A Ã â Z Ã â E Â¢ â R Ã â T Ã â Y Å¸ â U Ã â I Ã â O Å â P Ã â Â¨ Ë â Â£ Ã âEntrÃ©e â
>+// âTab â¹  â 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 Ã¶ â Ã¹ Â¹ â * Â² â      â
>+// â        â 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 â â ? â¦ â . . â / â â Â§ â â             â
> // âShift â§â < â¤ â w Â« â x Â» â c Â© â v â½ â b â â n Â¬ â , Â¿ â ; Ã â : Ã· â ! Â¡ âShift â§      â
>@@ -118,8 +118,8 @@
>     name[Group1]="France - Alternative";
> 
>     // First row
>-    key <TLDE>	{ [           oslash,         Ooblique,           dead_grave,          dead_cedilla ] }; // Ã¸ Ã  ` Â¸ 
>-    key <AE01>	{ [        ampersand,                1,           dead_acute,            dead_caron ] }; // & 1 Â´ Ë
>+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // Â² Â³ Â¹ Â¸ 
>+    key <AE01>	{ [        ampersand,                1,           dead_caron,           dead_ogonek ] }; // & 1 Ë Ì¨
>     key <AE02>	{ [           eacute,                2,           asciitilde,                Eacute ] }; // Ã© 2 ~ Ã
>     key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_breve ] }; // " 3 # Ë
>     key <AE04>	{ [       apostrophe,                4,            braceleft,             0x1002014 ] }; // ' 4 { â (tiret cadratin)
>@@ -144,21 +144,21 @@
>     key <AD09>	{ [                o,                O,                   oe,                    OE ] }; // o O Å Å
>     key <AD10>	{ [                p,                P,          ocircumflex,           Ocircumflex ] }; // p P Ã´ Ã
>     key <AD11>	{ [  dead_circumflex,   dead_diaeresis,           dead_tilde,        dead_abovering ] }; // ^ Ì Ì Ë
>-    key <AD12>	{ [           dollar,         sterling,        threesuperior,                   yen ] }; // $ Â£ Â³ Â¥
>+    key <AD12>	{ [           dollar,         sterling,               oslash,              Ooblique ] }; // $ Â£ Ã¸ Ã
> 
>     // Third row
>     key <AC01>	{ [                q,                Q,           adiaeresis,            Adiaeresis ] }; // q Q Ã¤ Ã
>     key <AC02>	{ [                s,                S,               ssharp,    doublelowquotemark ] }; // s S Ã â 
>     key <AC03>	{ [                d,                D,           ediaeresis,            Ediaeresis ] }; // d D Ã« Ã
>-    key <AC04>	{ [                f,                F,  leftsinglequotemark,             quoteleft ] }; // f F â `
>-    key <AC05>	{ [                g,                G, rightsinglequotemark,            quoteright ] }; // g G â '
>+    key <AC04>	{ [                f,                F,  leftsinglequotemark,    singlelowquotemark ] }; // f F â â
>+    key <AC05>	{ [                g,                G, rightsinglequotemark,                   yen ] }; // g G â Â¥
>     key <AC06>	{ [                h,                H,                  eth,                   ETH ] }; // h H Ã° Ã
>     key <AC07>	{ [                j,                J,           udiaeresis,            Udiaeresis ] }; // j J Ã¼ Ã
>     key <AC08>	{ [                k,                K,           idiaeresis,            Idiaeresis ] }; // k K Ã¯ Ã
>     key <AC09>	{ [                l,                L,            0x1000140,             0x100013F ] }; // l L Å Ä¿
>     key <AC10>	{ [                m,                M,           odiaeresis,            Odiaeresis ] }; // m M Ã¶ Ã
>-    key <AC11>	{ [           ugrave,          percent,          onesuperior,                Ugrave ] }; // Ã¹ % Â¹ Ã
>-    key <BKSL>	{ [         asterisk,               mu,          twosuperior,           dead_macron ] }; // * Âµ Â² Ì
>+    key <AC11>	{ [           ugrave,          percent,           dead_acute,                Ugrave ] }; // Ã¹ % ' Ã
>+    key <BKSL>	{ [         asterisk,               mu,           dead_grave,           dead_macron ] }; // * Âµ ` Ì
> 
>     // Fourth row
>     key <LSGT>  { [             less,          greater,        lessthanequal,      greaterthanequal ] }; // < > â¤ â¥
>@@ -188,18 +188,20 @@
>     name[Group1]="France - Alternative, latin-9 only";
> 
>     // First row
>+    key <AE01>	{ [        ampersand,                1,           dead_caron,          dead_cedilla ] }; // & 1 Ë Â¸
>     key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_tilde ] }; // " 3 # ~
>     key <AE04>	{ [       apostrophe,                4,            braceleft,            underscore ] }; // ' 4 { _
>     key <AE05>	{ [        parenleft,                5,          bracketleft,                 minus ] }; // ( 5 [ -
>     key <AE06>  { [            minus,                6,                  bar,                 minus ] }; // - 6 | -
>     key <AE08>  { [       underscore,                8,            backslash,             backslash ] }; // _ 8 \ \
>+    key <AE11>	{ [       parenright,           degree,         bracketright,                 equal ] }; // ) Â° ] =
> 
>     // Third row
>     key <AC02>	{ [                s,                S,               ssharp,         guillemotleft ] }; // s S Ã Â« 
>-    key <AC04>	{ [                f,                F,           apostrophe,             quoteleft ] }; // f F ' `
>-    key <AC05>	{ [                g,                G,           apostrophe,            quoteright ] }; // g G ' '
>+    key <AC04>	{ [                f,                F,           apostrophe,            apostrophe ] }; // f F ' '
>+    key <AC05>	{ [                g,                G,           apostrophe,                   yen ] }; // g G ' Â¥
>     key <AC09>  { [                l,                L,       periodcentered,        periodcentered ] }; // l L Â· Â·
>-    key <BKSL>	{ [         asterisk,               mu,          twosuperior,       dead_circumflex ] }; // * Âµ Â² ^ 
>+    key <BKSL>	{ [         asterisk,               mu,           dead_grave,       dead_circumflex ] }; // * Âµ ` ^ 
> 
>     // Fourth row
>     key <LSGT>  { [             less,          greater,                 less,               greater ] }; // < > < >
>@@ -222,11 +224,14 @@
>     include "fr(oss)"
> 
>     // First row
>-    key <TLDE>	{ [           oslash,         Ooblique,          SunFA_Grave,         SunFA_Cedilla ] }; // Ã¸ Ã ` Â¸ 
>-    key <AE01>	{ [        ampersand,                1,          SunFA_Acute,            dead_caron ] }; // & 1 Â´ Ë
>+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,         SunFA_Cedilla ] }; // Â¹ Â² Â³ Â¸ 
> 
>     // Second row
>     key <AD11>	{ [     SunFA_Circum,  SunFA_Diaeresis,          SunFA_Tilde,        dead_abovering ] }; // ^ Ì Ì Ë
>+
>+    //Third row
>+    key <AC11>	{ [           ugrave,          percent,          SunFA_Acute,                Ugrave ] }; // Ã¹ % ' Ã
>+    key <BKSL>	{ [         asterisk,               mu,          SunFA_Grave,           dead_macron ] }; // * Âµ ` Ì
> };
> 
> partial alphanumeric_keys
>@@ -246,16 +251,14 @@
> 
>     name[Group1]="France - Alternative, eliminate dead keys";
> 
>-    // First row
>-    key <TLDE>	{ [           oslash,         Ooblique,                grave,          dead_cedilla ] }; // Ã¸ Ã ` Â¸ 
>-    key <AE01>	{ [        ampersand,                1,                acute,                 caron ] }; // & 1 Â´ Ë
>-    key <AE03>  { [         quotedbl,                3,           numbersign,                 breve ] }; // " 3 # Ë
>+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,               cedilla ] }; // Â² Â³ Â¹ Â¸ 
>+    key <AE01>	{ [        ampersand,                1,                caron,                ogonek ] }; // & 1 Ë Ì¨
>+    key <AE03>	{ [         quotedbl,                3,           numbersign,                 breve ] }; // " 3 # Ë
> 
>     // Second row
>-    key <AD11>	{ [      asciicircum,  	     diaeresis,           asciitilde,                 Aring ] }; // ^ Ì ~ Ã
>-
>-    // Third row
>-    key <BKSL>  { [         asterisk,               mu,          twosuperior,                macron ] }; // * Âµ Â² Ì
>+    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,           asciitilde,                 Aring ] }; // ^ Ì Ì Ã
>+    key <AC11>	{ [           ugrave,          percent,                acute,                Ugrave ] }; // Ã¹ % ' Ã
>+    key <BKSL>	{ [         asterisk,               mu,                grave,                macron ] }; // * Âµ ` Ì
> };
> 
>

Actions: View | Splinter Review

Attachments on bug 8853: 7620 | 7621

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.