fixed Bhutan, b.fd.o#7556

1 files changed, 51 insertions, 51 deletions

diff --git a/symbols/bt b/symbols/bt
index 086b1a45..b399b27a 100644
--- a/symbols/bt
+++ b/symbols/bt
@@ -9,80 +9,80 @@
 //   Dzongkha Development Authority of the Government of Bhutan
 //
 //   Copyright (C) 2004, Gregory Mokhin <mokhin@bog.msu.ru>
-//   Layout map provided by Chris Fynn
 ///////////////////////////////////////////////////////////////// 
-//   Version 0.97.     Last modified: 09 Jan 2004
+//   Version 0.97  2004-01-09  Layout map provided by Chris Fynn
+//   Version 1.0   2004-07-29  Some correction by Pema Geyleg <pema_geyleg@druknet.bt>
 /////////////////////////////////////////////////////////////////
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
       name[Group1]= "Bhutan";
 
-      key <TLDE> { [      U0F09, U0F0A, U0F6C, U0F6B ]	};
+      key <TLDE> { [      0x1000F09, 0x1000F0A, 0x1000F6C, 0x1000F6D ]	};
       
 // numbers e.a.
-      key <AE01> { [      U0F21, U0F04, 1, exclam ]	};
-      key <AE02> { [      U0F22, U0F05, 2, at     ]	};
-      key <AE03> { [      U0F23, U0F06, 3, numbersign ]	};
-      key <AE04> { [      U0F24, U0F24, 4, dollar  ]	};
-      key <AE05> { [      U0F25, U0F25, 5, percent ]	};
-      key <AE06> { [      U0F26, U0F08, 6, U0F01 ]	};
-      key <AE07> { [      U0F27, U0F38, 7, ampersand ]	};
-      key <AE08> { [      U0F28, U0F34, 8, asterisk ]	};
-      key <AE09> { [      U0F29, U0F3C, 9, parenleft ]	};
-      key <AE10> { [      U0F20, U0F3D, 0, parenright ]	};
-      key <AE11> { [      U0F14, U0F7F, minus, underscore ]	};
-      key <AE12> { [      U0F0D, U0F11, equal, plus ]	};
+      key <AE01> { [      0x1000F21, 0x1000F04, 1, exclam ]	};
+      key <AE02> { [      0x1000F22, 0x1000F05, 2, at     ]	};
+      key <AE03> { [      0x1000F23, 0x1000F06, 3, numbersign ]	};
+      key <AE04> { [      0x1000F24, 0x1000F48, 4, dollar  ]	};
+      key <AE05> { [      0x1000F25, 0x1000F70, 5, percent ]	};
+      key <AE06> { [      0x1000F26, 0x1000F08, 6, 0x1000F01 ]	};
+      key <AE07> { [      0x1000F27, 0x1000F38, 7, ampersand ]	};
+      key <AE08> { [      0x1000F28, 0x1000F34, 8, asterisk ]	};
+      key <AE09> { [      0x1000F29, 0x1000F3C, 9, parenleft ]	};
+      key <AE10> { [      0x1000F20, 0x1000F3D, 0, parenright ]	};
+      key <AE11> { [      0x1000F14, 0x1000F7F, minus, underscore ]	};
+      key <AE12> { [      0x1000F0D, 0x1000F11, equal, plus ]	};
 
 // consonants ( ka kha ga nga )
-      key <AD01> { [      U0F40, U0F90, U0F88  ]	};
-      key <AD02> { [      U0F41, U0F91, U0F89  ]	};
-      key <AD03> { [      U0F42, U0F92 ]	};
-      key <AD04> { [      U0F44, U0F94, U0F83, U0F82  ]	};
+      key <AD01> { [      0x1000F40, 0x1000F90, 0x1000F88, reserved  ]	};
+      key <AD02> { [      0x1000F41, 0x1000F91, 0x1000F89, reserved  ]	};
+      key <AD03> { [      0x1000F42, 0x1000F92, 0x1000F6E, 0x1000F6F] 	};
+      key <AD04> { [      0x1000F44, 0x1000F94, 0x1000F83, 0x1000F82  ]	};
 
 // vowels ( i u e o )
-      key <AD05> { [      U0F72, U0F80, U0F1A  ]	};
-      key <AD06> { [      U0F74, U0F84, U0F1B  ]	};
-      key <AD07> { [      U0F7A, U0F7B, U0F1C  ]	};
-      key <AD08> { [      U0F7C, U0F7D, U0F1D, U0F17  ]	};
+      key <AD05> { [      0x1000F72, 0x1000F80, 0x1000F1A, reserved  ]	};
+      key <AD06> { [      0x1000F74, 0x1000F84, 0x1000F1B, reserved  ]	};
+      key <AD07> { [      0x1000F7A, 0x1000F7B, 0x1000F1C, reserved ]	};
+      key <AD08> { [      0x1000F7C, 0x1000F7D, 0x1000F1D, 0x1000F17  ]	};
 
 // consonants ( ca cha ja nya )
-      key <AD09> { [      U0F45, U0F95, U0F1E, U0F18   ]	};
-      key <AD10> { [      U0F46, U0F96, U0F1F, U0F19   ]	};
-      key <AD11> { [      U0F47, U0F97, bracketleft, U0F3E ]	};
-      key <AD12> { [      U0F49, U0F99, bracketright, U0F3F  ]	};
+      key <AD09> { [      0x1000F45, 0x1000F95, 0x1000F1E, 0x1000F18   ]	};
+      key <AD10> { [      0x1000F46, 0x1000F96, 0x1000F1F, 0x1000F19   ]	};
+      key <AD11> { [      0x1000F47, 0x1000F97, bracketleft, 0x1000F3E ]	};
+      key <AD12> { [      0x1000F49, 0x1000F99, bracketright, 0x1000F3F  ]	};
 
 // consonants ( ta tha da na pa pha ba ma tsa tsha dza wa )
-      key <AC01> { [      U0F4F, U0F9F, U0F4A, U0F9A ]	};
-      key <AC02> { [      U0F50, U0FA0, U0F4B, U0F9B ]	};
-      key <AC03> { [      U0F51, U0FA1, U0F4C, U0F9C ]	};
-      key <AC04> { [      U0F53, U0FA3, U0F4E, U0F9E ]	};
-      key <AC05> { [      U0F54, U0FA4, U2039, U00AB ]	};
-      key <AC06> { [      U0F55, U0FA5, U203A, U00BB ]	};
-      key <AC07> { [      U0F56, U0FA6, U0F37, U0F35 ]	};
-      key <AC08> { [      U0F58, U0FA8, U0F7E ]	};
-      key <AC09> { [      U0F59, U0FA9, U0F39 ]	};
-      key <AC10> { [      U0F5A, U0FAA, colon, semicolon ]	};
-      key <AC11> { [      U0F5B, U0FAB, apostrophe, quotedbl ]	};
+      key <AC01> { [      0x1000F4F, 0x1000F9F, 0x1000F4A, 0x1000F9A ]	};
+      key <AC02> { [      0x1000F50, 0x1000FA0, 0x1000F4B, 0x1000F9B ]	};
+      key <AC03> { [      0x1000F51, 0x1000FA1, 0x1000F4C, 0x1000F9C ]	};
+      key <AC04> { [      0x1000F53, 0x1000FA3, 0x1000F4E, 0x1000F9E ]	};
+      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 <AC10> { [      0x1000F5A, 0x1000FAA, colon, semicolon ]	};
+      key <AC11> { [      0x1000F5B, 0x1000FAB, apostrophe, quotedbl ]	};
       
 // TODO: BKSL and LSGT are from gb layout, are there any variants?
-      key <BKSL> { [      U0F5D, U0FAD, backslash, U0FBA ]	};
-      key <LSGT> { [      U0F0D, U0F11, U0F10, U0F0F ]	};
+      key <BKSL> { [      0x1000F5D, 0x1000FAD, backslash, 0x1000FBA ]	};
+      key <LSGT> { [      0x1000F0D, 0x1000F11, 0x1000F10, 0x1000F0F ]	};
 
 // consonants ( zha za 'a ya ra la sha sa ha a )
-      key <AB01> { [      U0F5E, U0FAE, U0F13, U0F36 ]	};
-      key <AB02> { [      U0F5F, U0FAF, U0FBE, U0FBF ]	};
-      key <AB03> { [      U0F60, U0F71, U0F03, U0FB0 ]	};
-      key <AB04> { [      U0F61, U0FB1, U0F12, U0FBB ]	};
-      key <AB05> { [      U0F62, U0FB2, U0F6A, U0FBC ]	};
-      key <AB06> { [      U0F63, U0FB3, U0F8A, U0F88 ]	};
-      key <AB07> { [      U0F64, U0FB4, U0F65, U0FB5 ]	};
-      key <AB08> { [      U0F66, U0FB6, comma, less ]	};
-      key <AB09> { [      U0F67, U0FB7, period, greater ]	};
-      key <AB10> { [      U0F68, U0FB8, slash, question ]	};
+      key <AB01> { [      0x1000F5E, 0x1000FAE, 0x1000F13, 0x1000F36 ]	};
+      key <AB02> { [      0x1000F5F, 0x1000FAF, 0x1000FBE, 0x1000FBF ]	};
+      key <AB03> { [      0x1000F60, 0x1000F71, 0x1000F03, 0x1000FB0 ]	};
+      key <AB04> { [      0x1000F61, 0x1000FB1, 0x1000F12, 0x1000FBB ]	};
+      key <AB05> { [      0x1000F62, 0x1000FB2, 0x1000F6A, 0x1000FBC ]	};
+      key <AB06> { [      0x1000F63, 0x1000FB3, 0x1000F8A, 0x1000F8B ]	};
+      key <AB07> { [      0x1000F64, 0x1000FB4, 0x1000F65, 0x1000FB5 ]	};
+      key <AB08> { [      0x1000F66, 0x1000FB6, comma, less ]	};
+      key <AB09> { [      0x1000F67, 0x1000FB7, period, greater ]	};
+      key <AB10> { [      0x1000F68, 0x1000FB8, slash, question ]	};
 
 // space
-      key <SPCE> { [ U0F0B, space, U0F0C, U00A0 ] };
+      key <SPCE> { [ 0x1000F0B, space, 0x1000F0C, nobreakspace ] };
 
     include "level3(ralt_switch)"
 };