Attachment 8296 Details for Bug 9529 – Proposed patch

[patch] Proposed patch

xkeyboard-config-20070104-space.patch (text/plain), 6.44 KB, created by Nicolas Mailhot on 2007-01-04 14:33:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Mailhot

Created: 2007-01-04 14:33:08 UTC

Size: 6.44 KB

patch

obsolete

>diff -uNr xkeyboard-config-20070104.orig/rules/base.xml.in xkeyboard-config-20070104.space/rules/base.xml.in
>--- xkeyboard-config-20070104.orig/rules/base.xml.in	2007-01-02 21:56:55.000000000 +0100
>+++ xkeyboard-config-20070104.space/rules/base.xml.in	2007-01-04 23:24:58.000000000 +0100
>@@ -3499,10 +3499,28 @@
>       </option>
>       <option>
>         <configItem>
>+          <name>nbsp:level3s</name>
>+          <_description>Space key output nobreakspace at third level, nothing at fourth level.</_description>
>+        </configItem>
>+      </option>
>+      <option>
>+        <configItem>
>+          <name>nbsp:level3n</name>
>+          <_description>Space key output nobreakspace at third level, thin nobreakspace at fourth level</_description>
>+        </configItem>
>+      </option>
>+      <option>
>+        <configItem>
>           <name>nbsp:level4</name>
>           <_description>Space key output nobreakspace at fourth level.</_description>
>         </configItem>
>       </option>
>+      <option>
>+        <configItem>
>+          <name>nbsp:level4n</name>
>+          <_description>Space key output nobreakspace at fourth level, thin nobreakspace at sixth level</_description>
>+        </configItem>
>+      </option>
>     </group>
>     <group allowMultipleSelection="true">
>       <configItem>
>diff -uNr xkeyboard-config-20070104.orig/symbols/ca xkeyboard-config-20070104.space/symbols/ca
>--- xkeyboard-config-20070104.orig/symbols/ca	2006-09-04 22:25:10.000000000 +0200
>+++ xkeyboard-config-20070104.space/symbols/ca	2007-01-04 23:24:12.000000000 +0100
>@@ -445,7 +445,7 @@
>     key <AB10>	{ [    eacute,     Eacute,     dead_acute, NoSymbol,
>     		   NoSymbol, dead_abovedot ]	};
> 
>-    key <SPCE>	{ type[Group1]= "FOUR_LEVEL", [     space,      space,   nobreakspace, NoSymbol ]	};
>+    include "nbsp(level3s)"
> 
>     modifier_map Control{ Control_L };
> 
>diff -uNr xkeyboard-config-20070104.orig/symbols/fr xkeyboard-config-20070104.space/symbols/fr
>--- xkeyboard-config-20070104.orig/symbols/fr	2006-11-02 21:49:10.000000000 +0100
>+++ xkeyboard-config-20070104.space/symbols/fr	2007-01-04 23:24:42.000000000 +0100
>@@ -105,14 +105,16 @@
> // â       â > â¥ â W â â X â â C Â® â V â â B â â N â â ? â¦ â . . â / â â Â§ â â             â
> // âShift â§â < â¤ â w Â« â x Â» â c Â© â v â½ â b â â n Â¬ â , Â¿ â ; Ã â : Ã· â ! Â¡ âShift â§      â
> // â£ââââââââââââââ·ââ³ââââ·ââââ±ââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââââ´ââââ²ââ·ââââââââââââ»ââ³ââââââââ³ââââ
>-// â       â       â       â â£              Espace insÃ©cable â½ â       â       â       â
>-// âCtrl   âMeta   âAlt    â â£ Espace                        â£ âAltGr â®âMenu   âCtrl   â
>+// â       â       â       â â£         Espace fine insÃ©cable â½ â       â       â       â
>+// âCtrl   âMeta   âAlt    â â£ Espace       Espace insÃ©cable â½ âAltGr â®âMenu   âCtrl   â
> // âââââââââ»ââââââââ»ââââââââ¹ââââââââââââââââââââââââââââââââââââºââââââââ»ââââââââ»ââââââââ
> partial alphanumeric_keys
> xkb_symbols "oss" {
> 
>     include "latin"
>     include "level3(ralt_switch)"
>+    include "level5(rctrl_switch)"
>+    include "nbsp(level4n)"
>     include "keypad(oss)"
> 
>     name[Group1]="France - Alternative";
>@@ -172,9 +174,6 @@
>     key <AB08>  { [        semicolon,           period,             multiply,             0x10022C5 ] }; // ; . Ã â
>     key <AB09>  { [            colon,            slash,             division,             0x1002215 ] }; // : / Ã· â
>     key <AB10>  { [           exclam,          section,           exclamdown,             0x1002212 ] }; // ! Â§ Â¡ â
>-
>-    // Make nobreakspace harder to hit
>-    key <SPCE>  { [            space,            space,                space,          nobreakspace ] }; // â£ â£ â£ â½â¯(espace insÃ©cable)
> };
> 
> partial alphanumeric_keys
>@@ -332,6 +331,7 @@
> xkb_symbols "latin9" {
> 
>     include "latin"
>+    include "nbsp(level3)"
> 
>     name[Group1]="France - (Legacy) Alternative";
> 
>@@ -387,8 +387,6 @@
>     key <AB09>	{ [           colon,           slash,            division                       ] };
>     key <AB10>	{ [          exclam,         section,          exclamdown                       ] };
> 
>-    key <SPCE>  { [           space,           space,        nobreakspace                       ] };
>-
>     // French uses a comma as decimal separator, but keyboards are labeled with a period
>     // Will take effect when KP_Decimal is mapped to the locale decimal separator
>     key <KPDL>  { [       KP_Delete,          period,           KP_Delete,           KP_Decimal ] };
>diff -uNr xkeyboard-config-20070104.orig/symbols/nbsp xkeyboard-config-20070104.space/symbols/nbsp
>--- xkeyboard-config-20070104.orig/symbols/nbsp	2006-10-11 21:32:35.000000000 +0200
>+++ xkeyboard-config-20070104.space/symbols/nbsp	2007-01-04 23:25:31.000000000 +0100
>@@ -19,6 +19,11 @@
>   };
> };
> 
>+
>+// level3 & level3ns provide no-breaking spaces starting from level3
>+// This is good for typographers but experience shows many users accidently
>+// type no-breaking spaces on the CLI (resulting in errors)
>+// Used by fr(latin9)
> partial
> xkb_symbols "level3" {
>   key <SPCE> {
>@@ -27,6 +32,27 @@
>   };
> };
> 
>+// level3s kills fourth level
>+// Used by ca(multix)
>+partial
>+xkb_symbols "level3s" {
>+  key <SPCE> {
>+    type[Group1]="FOUR_LEVEL",
>+    symbols[Group1]= [ space, space, nobreakspace, NoSymbol ]
>+  };
>+};
>+
>+// level3n provides narrow no-breaking space in addition to the normal one
>+partial
>+xkb_symbols "level3n" {
>+  key <SPCE> {
>+    type[Group1]="FOUR_LEVEL",
>+    symbols[Group1]= [ space, space, nobreakspace, 0x100202F ]
>+  };
>+};
>+
>+
>+// for this reason pushing no-breaking spaces to level4 is the safe default nowadays
> partial
> xkb_symbols "level4" {
>   key <SPCE> {
>@@ -34,3 +60,14 @@
>     symbols[Group1]= [ space, space, space, nobreakspace ]
>   };
> };
>+
>+// level4n provides narrow no-breaking space in addition to the normal one
>+// Used by fr(oss), be(oss)â¦
>+partial
>+xkb_symbols "level4n" {
>+ key <SPCE> {
>+   type[Group1]="EIGHT_LEVEL",
>+   symbols[Group1]= [ space, space, space, nobreakspace, space, 0x100202F, NoSymbol, NoSymbol ]
>+ };
>+};
>+

Actions: View | Splinter Review

Attachments on bug 9529: 8296 | 16056 | 16057 | 16060 | 16061

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.