fixing typos b.fd.o#8495

4 files changed, 14 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index ba676a92..cadedf62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* symbols/macintosh_vndr/gb, symbols/gb: adding missing Euro
 	character, closing https://bugs.freedesktop.org/show_bug.cgi?id=5227
+	* symbols/bt, symbols/fr, symbols/np: fixing typos, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8495
 
 2006-10-01  Sergey Udaltsov
 
diff --git a/symbols/bt b/symbols/bt
index b399b27a..d8755837 100644
--- a/symbols/bt
+++ b/symbols/bt
@@ -35,15 +35,15 @@ xkb_symbols "basic" {
       key <AE12> { [      0x1000F0D, 0x1000F11, equal, plus ]	};
 
 // consonants ( ka kha ga nga )
-      key <AD01> { [      0x1000F40, 0x1000F90, 0x1000F88, reserved  ]	};
-      key <AD02> { [      0x1000F41, 0x1000F91, 0x1000F89, reserved  ]	};
+      key <AD01> { [      0x1000F40, 0x1000F90, 0x1000F88, VoidSymbol  ]	};
+      key <AD02> { [      0x1000F41, 0x1000F91, 0x1000F89, VoidSymbol  ]	};
       key <AD03> { [      0x1000F42, 0x1000F92, 0x1000F6E, 0x1000F6F] 	};
       key <AD04> { [      0x1000F44, 0x1000F94, 0x1000F83, 0x1000F82  ]	};
 
 // vowels ( i u e o )
-      key <AD05> { [      0x1000F72, 0x1000F80, 0x1000F1A, reserved  ]	};
-      key <AD06> { [      0x1000F74, 0x1000F84, 0x1000F1B, reserved  ]	};
-      key <AD07> { [      0x1000F7A, 0x1000F7B, 0x1000F1C, reserved ]	};
+      key <AD05> { [      0x1000F72, 0x1000F80, 0x1000F1A, VoidSymbol  ]	};
+      key <AD06> { [      0x1000F74, 0x1000F84, 0x1000F1B, VoidSymbol  ]	};
+      key <AD07> { [      0x1000F7A, 0x1000F7B, 0x1000F1C, VoidSymbol ]	};
       key <AD08> { [      0x1000F7C, 0x1000F7D, 0x1000F1D, 0x1000F17  ]	};
 
 // consonants ( ca cha ja nya )
@@ -60,8 +60,8 @@ xkb_symbols "basic" {
       key <AC05> { [      0x1000F54, 0x1000FA4, 0x1002039, guillemotleft ]	};
       key <AC06> { [      0x1000F55, 0x1000FA5, 0x100203A, guillemotright ]	};
       key <AC07> { [      0x1000F56, 0x1000FA6, 0x1000F37, 0x1000F35 ]	};
-      key <AC08> { [      0x1000F58, 0x1000FA8, 0x1000F7E, reserved ]	};
-      key <AC09> { [      0x1000F59, 0x1000FA9, 0x1000F39, reserved ]	};
+      key <AC08> { [      0x1000F58, 0x1000FA8, 0x1000F7E, VoidSymbol ]	};
+      key <AC09> { [      0x1000F59, 0x1000FA9, 0x1000F39, VoidSymbol ]	};
       key <AC10> { [      0x1000F5A, 0x1000FAA, colon, semicolon ]	};
       key <AC11> { [      0x1000F5B, 0x1000FAB, apostrophe, quotedbl ]	};
       
diff --git a/symbols/fr b/symbols/fr
index d0c7a2d8..0dc1dd24 100644
--- a/symbols/fr
+++ b/symbols/fr
@@ -123,7 +123,7 @@ xkb_symbols "oss" {
     key <AE02>	{ [           eacute,                2,           asciitilde,                Eacute ] }; // é 2 ~ É
     key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_breve ] }; // " 3 # ˘
     key <AE04>	{ [       apostrophe,                4,            braceleft,             0x1002014 ] }; // ' 4 { — (tiret cadratin)
-    key <AE05>	{ [        parenleft,                5,          bracketleft,             0x1002013 ] }; // ( 5 } – (tiret demi-cadratin)
+    key <AE05>	{ [        parenleft,                5,          bracketleft,             0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin)
     key <AE06>	{ [            minus,                6,                  bar,             0x1002011 ] }; // - 6 | ‑ (tiret insécable)
     key <AE07>	{ [           egrave,                7,                grave,                Egrave ] }; // è 7 ` È
     key <AE08>	{ [       underscore,                8,            backslash,             trademark ] }; // _ 8 \ ™
@@ -190,13 +190,13 @@ xkb_symbols "oss_latin9" {
     // First row
     key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_tilde ] }; // " 3 # ~
     key <AE04>	{ [       apostrophe,                4,            braceleft,            underscore ] }; // ' 4 { _
-    key <AE05>	{ [        parenleft,                5,          bracketleft,                 minus ] }; // ( 5 } -
+    key <AE05>	{ [        parenleft,                5,          bracketleft,                 minus ] }; // ( 5 [ -
     key <AE06>  { [            minus,                6,                  bar,                 minus ] }; // - 6 | -
     key <AE08>  { [       underscore,                8,            backslash,             backslash ] }; // _ 8 \ \
 
     // Third row
     key <AC02>	{ [                s,                S,               ssharp,         guillemotleft ] }; // s S ß « 
-    key <AC04>	{ [                f,                F,            apostophe,             quoteleft ] }; // f F ' `
+    key <AC04>	{ [                f,                F,           apostrophe,             quoteleft ] }; // f F ' `
     key <AC05>	{ [                g,                G,           apostrophe,            quoteright ] }; // g G ' '
     key <AC09>  { [                l,                L,       periodcentered,        periodcentered ] }; // l L · ·
     key <BKSL>	{ [         asterisk,               mu,          twosuperior,       dead_circumflex ] }; // * µ ² ^ 
@@ -305,7 +305,7 @@ xkb_symbols "oss_nodeadkeys" {
 // | |   | < || w «| x »| c ©| v ®| b ß| n ¬| , ¿| ; ×| : ÷| ! ¡|     |     |
 //  ========================================================================
 // |      |      |      |                       |       |      |     |      |
-// | Ctrl | Meta | Alt  | Space    Nobreakspace | AltGr | Multi|Menu | Ctrl |
+// | Ctrl | Super| Alt  | Space    Nobreakspace | AltGr | Super|Menu | Ctrl |
 //  ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯ ¯¯¯¯¯¯
 //
 //
diff --git a/symbols/np b/symbols/np
index 193a8134..a004bf48 100644
--- a/symbols/np
+++ b/symbols/np
@@ -23,7 +23,7 @@ xkb_symbols "basic" {
       key <AE09> { [      0x100096F	 		]	};
       key <AE10> { [      0x1000966,0x1000970		]	};
       key <AE11> { [      minus, 0x1000952 		]	};
-      key <AE12> { [      equals, 0x100200C 		]	};
+      key <AE12> { [      equal, 0x100200C 		]	};
 
 // q,w,e,r,t,y,u,i,o,p,[,]