xkeyboard-config/symbols fr,1.20,1.21 nbsp,1.3,1.4

--===============1355670334==

Committed by: svu

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

Modified Files:
	fr nbsp 
Log Message:
options for nonbreakspace handling, b.fd.o#9529

Index: fr
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/fr,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- fr	22 Mar 2008 18:50:08 -0000	1.20
+++ fr	22 Apr 2008 19:54:11 -0000	1.21
@@ -85,11 +85,11 @@
 // Unicode French derivative
 // Loose refactoring of the historic Linux French keyboard layout
 //
-// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+// Copyright © 2006-2008 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
 //
 // Credits (fr-latin1, fr-latin0, fr-latin9)
 //   © 199x-1996 René Cougnenc ✝
-//   © 1997-2002 Guylhem Aznar <clavier @ externe.net> 
+//   © 1997-2002 Guylhem Aznar <clavier @ externe.net>
 //   © 2003-2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
 //
 // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
@@ -113,8 +113,7 @@
 
     include "latin"
     include "level3(ralt_switch)"
-    include "level5(rctrl_switch)"
-    include "nbsp(level4n)"
+    include "nbsp(level4nl)"
     include "keypad(oss)"
 
     name[Group1]="France - Alternative";

Index: nbsp
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/nbsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- nbsp	4 Jan 2007 23:31:30 -0000	1.3
+++ nbsp	22 Apr 2008 19:54:11 -0000	1.4
@@ -62,7 +62,6 @@
 };
 
 // level4n provides narrow no-breaking space in addition to the normal one
-// Used by fr(oss), be(oss)…
 partial
 xkb_symbols "level4n" {
  key <SPCE> {
@@ -71,3 +70,14 @@
  };
 };
 
+// level4nl provides narrow no-breaking space in addition to the normal one
+// without forcing the use of level5 for mostly four-level layouts
+// Used by fr(oss), be(oss)…
+partial
+xkb_symbols "level4nl" {
+ key <SPCE> {
+   type[Group1]="LOCAL_EIGHT_LEVEL",
+   symbols[Group1]= [ space, space, space, nobreakspace, space, 0x100202F, NoSymbol, NoSymbol ]
+ };
+};
+


--===============1355670334==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
xlibs-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xlibs-commit

--===============1355670334==--