xkeyboard-config/symbols ca,1.14,1.15 fr,1.15,1.16 nbsp,1.2,1.3

Committed by: svu

Update of /cvs/xkeyboard-config/xkeyboard-config/symbols
In directory kemper:/tmp/cvs-serv10954a/symbols

Modified Files:
	ca fr nbsp 
Log Message:
more nbsp options, closing b.fd.o#9529

Index: ca
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/ca,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ca	4 Sep 2006 20:25:10 -0000	1.14
+++ ca	4 Jan 2007 23:31:30 -0000	1.15
@@ -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 };
 

Index: fr
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/fr,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- fr	2 Nov 2006 20:49:10 -0000	1.15
+++ fr	4 Jan 2007 23:31:30 -0000	1.16
@@ -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 ] };

Index: nbsp
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/nbsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nbsp	11 Oct 2006 19:32:35 -0000	1.2
+++ nbsp	4 Jan 2007 23:31:30 -0000	1.3
@@ -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 ]
+ };
+};
+