xkeyboard-config/rules base.o_s.part, 1.29, 1.30 base.xml.in, 1.251, 1.252

Committed by: svu

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

Modified Files:
	base.o_s.part base.xml.in 
Log Message:
options for nonbreakspace handling, b.fd.o#9529

Index: base.o_s.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.o_s.part,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- base.o_s.part	7 Apr 2008 21:28:16 -0000	1.29
+++ base.o_s.part	22 Apr 2008 19:54:11 -0000	1.30
@@ -65,9 +65,9 @@
   eurosign:5		=	+eurosign(5)
   keypad:oss            =       +keypad(oss)
   keypad:legacy         =	+keypad(legacy)
-  keypad:legacy_wang         =	+keypad(legacy_wang)
-  keypad:oss_wang         =	+keypad(oss_wang)
-  keypad:future_wang         =	+keypad(future_wang)
+  keypad:legacy_wang    =	+keypad(legacy_wang)
+  keypad:oss_wang       =	+keypad(oss_wang)
+  keypad:future_wang    =	+keypad(future_wang)
   nbsp:none             =	+nbsp(none)
   nbsp:level2           =	+nbsp(level2)
   nbsp:level3           =	+nbsp(level3)
@@ -75,6 +75,7 @@
   nbsp:level3n          =	+nbsp(level3n)
   nbsp:level4           =	+nbsp(level4)
   nbsp:level4n          =	+nbsp(level4n)
+  nbsp:level4nl         =	+nbsp(level4nl)
   japan:nicola_f_bs     =	+jp(nicola_f_bs)
   kpdl:dot              =	+kpdl(dot)
   kpdl:comma            =	+kpdl(comma)

Index: base.xml.in
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.xml.in,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- base.xml.in	21 Apr 2008 12:30:16 -0000	1.251
+++ base.xml.in	22 Apr 2008 19:54:11 -0000	1.252
@@ -1739,46 +1739,37 @@
         <name>ca</name>
         <_shortDescription>Can</_shortDescription>
         <_description>Canada</_description>
-        <languageList><iso639Id>eng</iso639Id>
-                      <iso639Id>fra</iso639Id></languageList>
+        <languageList><iso639Id>fra</iso639Id></languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>fr-dvorak</name>
             <_description>French Dvorak</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr-legacy</name>
             <_description>French (legacy)</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multix</name>
             <_description>Multilingual</_description>
-            <languageList><iso639Id>eng</iso639Id>
-                          <iso639Id>fra</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multi</name>
             <_description>Multilingual, first part</_description>
-            <languageList><iso639Id>eng</iso639Id>
-                          <iso639Id>fra</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multi-2gr</name>
             <_description>Multilingual, second part</_description>
-            <languageList><iso639Id>eng</iso639Id>
-                          <iso639Id>fra</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
@@ -4589,6 +4580,12 @@
           <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4nl</name>
+          <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level; uses hardcoded control instead of iso-level-5 to access high levels.</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <configItem>