--- ibus-unikey-0.6.1/ukengine/data.cpp.old	2016-09-21 19:56:02.388382226 -0400
+++ ibus-unikey-0.6.1/ukengine/data.cpp	2016-09-21 20:18:07.943009680 -0400
@@ -96,149 +96,149 @@
 unsigned char SingleByteTables[][TOTAL_VNCHARS] = 
 
 // TCVN3
-{{'A','a','�','�','�','�','�','�','�','�','�','�',      // 0: a
-  '�','�','�','�','�','�','�','�','�','�','�','�',		// 1: a^
-  '�','�','�','�','�','�','�','�','�','�','�','�',		// 2: a(
-  'B','b','C','c','D','d',
-  '�','�',
-  'E','e','�','�','�','�','�','�','�','�','�','�',		// 3: e
-  '�','�','�','�','�','�','�','�','�','�','�','�',      // 4: e^
-  'F','f','G','g','H','h',
-  'I','i','�','�','�','�','�','�','�','�','�','�',		// 5: i
-  'J','j','K','k','L','l','M','m','N','n',
-  'O','o','�','�','�','�','�','�','�','�','�','�',		// 6: o
-  '�','�','�','�','�','�','�','�','�','�','�','�',		// 7: o^
-  '�','�','�','�','�','�','�','�','�','�','�','�',		// 8: o+
-  'P','p','Q','q','R','r','S','s','T','t',
-  'U','u','�','�','�','�','�','�','�','�','�','�',		// 9: u
-  '�','�','�','�','�','�','�','�','�','�','�','�',		//10: u+ 
-  'V','v','W','w','X','x',
-  'Y','y','�','�','�','�','�','�','�','�','�','�',		//11: y
-  'Z','z',
-  0x80, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,
-  0x89, 0x8A, 0x8B, 0x8C, 0x8E, 0x91, 0x92, 0x93,
-  0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B,
-  0x9C, 0x9E, 0x9F},
+{{'A',(unsigned char)'a',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)      // 0: a
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)		// 1: a^
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)		// 2: a(
+  'B',(unsigned char)'b',(unsigned char)'C',(unsigned char)'c',(unsigned char)'D',(unsigned char)'d',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)
+  'E',(unsigned char)'e',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)		// 3: e
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)      // 4: e^
+  'F',(unsigned char)'f',(unsigned char)'G',(unsigned char)'g',(unsigned char)'H',(unsigned char)'h',(unsigned char)
+  'I',(unsigned char)'i',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)		// 5: i
+  'J',(unsigned char)'j',(unsigned char)'K',(unsigned char)'k',(unsigned char)'L',(unsigned char)'l',(unsigned char)'M',(unsigned char)'m',(unsigned char)'N',(unsigned char)'n',(unsigned char)
+  'O',(unsigned char)'o',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)		// 6: o
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)		// 7: o^
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)		// 8: o+
+  'P',(unsigned char)'p',(unsigned char)'Q',(unsigned char)'q',(unsigned char)'R',(unsigned char)'r',(unsigned char)'S',(unsigned char)'s',(unsigned char)'T',(unsigned char)'t',(unsigned char)
+  'U',(unsigned char)'u',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)		// 9: u
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)		//10: u+ 
+  'V',(unsigned char)'v',(unsigned char)'W',(unsigned char)'w',(unsigned char)'X',(unsigned char)'x',(unsigned char)
+  'Y',(unsigned char)'y',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)		//11: y
+  'Z',(unsigned char)'z',(unsigned char)
+  0x80,(unsigned char) 0x82,(unsigned char) 0x83,(unsigned char) 0x84,(unsigned char) 0x85,(unsigned char) 0x86,(unsigned char) 0x87,(unsigned char) 0x88,(unsigned char)
+  0x89,(unsigned char) 0x8A,(unsigned char) 0x8B,(unsigned char) 0x8C,(unsigned char) 0x8E,(unsigned char) 0x91,(unsigned char) 0x92,(unsigned char) 0x93,(unsigned char)
+  0x94,(unsigned char) 0x95,(unsigned char) 0x96,(unsigned char) 0x97,(unsigned char) 0x98,(unsigned char) 0x99,(unsigned char) 0x9A,(unsigned char) 0x9B,(unsigned char)
+  0x9C,(unsigned char) 0x9E,(unsigned char) 0x9F},
 //VPS
-{ 'A','a','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'B','b','C','c','D','d',
-  '�','�',
-  'E','e','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'F','f','G','g','H','h',
-  'I','i','�','�','�','�','�','�','�','�','�','�',
-  'J','j','K','k','L','l','M','m','N','n',
-  'O','o','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'P','p','Q','q','R','r','S','s','T','t',
-  'U','u','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'V','v','W','w','X','x',
-  'Y','y','�','�','�','�','�','�','�','�','�','�',
-  'Z','z',
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x8E, 0x91, 0x92, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x9E, 0x00},
+{ (unsigned char)'A',(unsigned char)'a',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'B',(unsigned char)'b',(unsigned char)'C',(unsigned char)'c',(unsigned char)'D',(unsigned char)'d',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)
+  'E',(unsigned char)'e',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'F',(unsigned char)'f',(unsigned char)'G',(unsigned char)'g',(unsigned char)'H',(unsigned char)'h',(unsigned char)
+  'I',(unsigned char)'i',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'J',(unsigned char)'j',(unsigned char)'K',(unsigned char)'k',(unsigned char)'L',(unsigned char)'l',(unsigned char)'M',(unsigned char)'m',(unsigned char)'N',(unsigned char)'n',(unsigned char)
+  'O',(unsigned char)'o',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'P',(unsigned char)'p',(unsigned char)'Q',(unsigned char)'q',(unsigned char)'R',(unsigned char)'r',(unsigned char)'S',(unsigned char)'s',(unsigned char)'T',(unsigned char)'t',(unsigned char)
+  'U',(unsigned char)'u',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'V',(unsigned char)'v',(unsigned char)'W',(unsigned char)'w',(unsigned char)'X',(unsigned char)'x',(unsigned char)
+  'Y',(unsigned char)'y',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'Z',(unsigned char)'z',(unsigned char)
+  0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x8E,(unsigned char) 0x91,(unsigned char) 0x92,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x9E,(unsigned char) 0x00},
 //VISCII
-{ 'A','a','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'B','b','C','c','D','d',
-  '�','�',
-  'E','e','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'F','f','G','g','H','h',
-  'I','i','�','�','�','�','�','�','�','�','�','�',
-  'J','j','K','k','L','l','M','m','N','n',
-  'O','o','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'P','p','Q','q','R','r','S','s','T','t',
-  'U','u','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'V','v','W','w','X','x',
-  'Y','y','�','�','�','�','�','�','�','�','�','�',
-  'Z','z',
-  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x9E, 0x00},
+{ (unsigned char)'A',(unsigned char)'a',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'B',(unsigned char)'b',(unsigned char)'C',(unsigned char)'c',(unsigned char)'D',(unsigned char)'d',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)
+  'E',(unsigned char)'e',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'F',(unsigned char)'f',(unsigned char)'G',(unsigned char)'g',(unsigned char)'H',(unsigned char)'h',(unsigned char)
+  'I',(unsigned char)'i',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'J',(unsigned char)'j',(unsigned char)'K',(unsigned char)'k',(unsigned char)'L',(unsigned char)'l',(unsigned char)'M',(unsigned char)'m',(unsigned char)'N',(unsigned char)'n',(unsigned char)
+  'O',(unsigned char)'o',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'P',(unsigned char)'p',(unsigned char)'Q',(unsigned char)'q',(unsigned char)'R',(unsigned char)'r',(unsigned char)'S',(unsigned char)'s',(unsigned char)'T',(unsigned char)'t',(unsigned char)
+  'U',(unsigned char)'u',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'V',(unsigned char)'v',(unsigned char)'W',(unsigned char)'w',(unsigned char)'X',(unsigned char)'x',(unsigned char)
+  'Y',(unsigned char)'y',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'Z',(unsigned char)'z',(unsigned char)
+  0x80,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x8E,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x9E,(unsigned char) 0x00},
 // BKHCM1
-{'A','a','�','�','�','�','�','�','�','�','�','�',
-  '�','�','~','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'B','b','C','c','D','d',
-  '}','�',
-  'E','e','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'F','f','G','g','H','h',
-  'I','i','�','�','�','�','�','�','�','�','�','�',
-  'J','j','K','k','L','l','M','m','N','n',
-  'O','o','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'P','p','Q','q','R','r','S','s','T','t',
-  'U','u','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'V','v','W','w','X','x',
-  'Y','y','{','�','^','�','`','�','|','�','�','�',
-  'Z','z',
-  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x9E, 0x00},
+{(unsigned char)'A',(unsigned char)'a',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'~',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'B',(unsigned char)'b',(unsigned char)'C',(unsigned char)'c',(unsigned char)'D',(unsigned char)'d',(unsigned char)
+  '}',(unsigned char)'�',(unsigned char)
+  'E',(unsigned char)'e',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'F',(unsigned char)'f',(unsigned char)'G',(unsigned char)'g',(unsigned char)'H',(unsigned char)'h',(unsigned char)
+  'I',(unsigned char)'i',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'J',(unsigned char)'j',(unsigned char)'K',(unsigned char)'k',(unsigned char)'L',(unsigned char)'l',(unsigned char)'M',(unsigned char)'m',(unsigned char)'N',(unsigned char)'n',(unsigned char)
+  'O',(unsigned char)'o',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'P',(unsigned char)'p',(unsigned char)'Q',(unsigned char)'q',(unsigned char)'R',(unsigned char)'r',(unsigned char)'S',(unsigned char)'s',(unsigned char)'T',(unsigned char)'t',(unsigned char)
+  'U',(unsigned char)'u',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'V',(unsigned char)'v',(unsigned char)'W',(unsigned char)'w',(unsigned char)'X',(unsigned char)'x',(unsigned char)
+  'Y',(unsigned char)'y',(unsigned char)'{',(unsigned char)'�',(unsigned char)'^',(unsigned char)'�',(unsigned char)'`',(unsigned char)'�',(unsigned char)'|',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'Z',(unsigned char)'z',(unsigned char)
+  0x80,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x8E,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x9E,(unsigned char) 0x00},
 //Vietware-F
-{ 'A','a','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'B','b','C','c','D','d',
-  '�','�',
-  'E','e','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'F','f','G','g','H','h',
-  'I','i','�','�','�','�','�','�','�','�','�','�',
-  'J','j','K','k','L','l','M','m','N','n',
-  'O','o','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'P','p','Q','q','R','r','S','s','T','t',
-  'U','u','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'V','v','W','w','X','x',
-  'Y','y','�','�','�','�','�','�','�','�','�','�',
-  'Z','z',
-  0x80, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,
-  0x89, 0x8A, 0x8B, 0x8C, 0x8E, 0x91, 0x92, 0x93,
-  0x94, 0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x9E, 0x00},
+{ (unsigned char)'A',(unsigned char)'a',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'B',(unsigned char)'b',(unsigned char)'C',(unsigned char)'c',(unsigned char)'D',(unsigned char)'d',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)
+  'E',(unsigned char)'e',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'F',(unsigned char)'f',(unsigned char)'G',(unsigned char)'g',(unsigned char)'H',(unsigned char)'h',(unsigned char)
+  'I',(unsigned char)'i',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'J',(unsigned char)'j',(unsigned char)'K',(unsigned char)'k',(unsigned char)'L',(unsigned char)'l',(unsigned char)'M',(unsigned char)'m',(unsigned char)'N',(unsigned char)'n',(unsigned char)
+  'O',(unsigned char)'o',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'P',(unsigned char)'p',(unsigned char)'Q',(unsigned char)'q',(unsigned char)'R',(unsigned char)'r',(unsigned char)'S',(unsigned char)'s',(unsigned char)'T',(unsigned char)'t',(unsigned char)
+  'U',(unsigned char)'u',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'V',(unsigned char)'v',(unsigned char)'W',(unsigned char)'w',(unsigned char)'X',(unsigned char)'x',(unsigned char)
+  'Y',(unsigned char)'y',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'Z',(unsigned char)'z',(unsigned char)
+  0x80,(unsigned char) 0x82,(unsigned char) 0x83,(unsigned char) 0x84,(unsigned char) 0x85,(unsigned char) 0x86,(unsigned char) 0x87,(unsigned char) 0x88,(unsigned char)
+  0x89,(unsigned char) 0x8A,(unsigned char) 0x8B,(unsigned char) 0x8C,(unsigned char) 0x8E,(unsigned char) 0x91,(unsigned char) 0x92,(unsigned char) 0x93,(unsigned char)
+  0x94,(unsigned char) 0x95,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x9E,(unsigned char) 0x00},
 // ISC
- {'A','a','�','�','�','�','�','�','�','�','�','�', 
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'B','b','C','c','D','d',
-  '�','�',
-  'E','e','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'F','f','G','g','H','h',
-  'I','i','�','�','�','�','�','�','�','�','�','�',
-  'J','j','K','k','L','l','M','m','N','n',
-  'O','o','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  '�','�','�','�','�','�','�','�','�','�','�','�',
-  'P','p','Q','q','R','r','S','s','T','t',
-  'U','u','@','�','�','�','�','�','�','�','|','�',
-  '�','�','`','�',0x5C,'�','^','�','~','�','#','�',
-  'V','v','W','w','X','x',
-  'Y','y','�','�','�','�','�','�','�','�','�','�',
-  'Z','z',
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x12, 0x13,
-  0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00}
+ {(unsigned char)'A',(unsigned char)'a',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char) 
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'B',(unsigned char)'b',(unsigned char)'C',(unsigned char)'c',(unsigned char)'D',(unsigned char)'d',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)
+  'E',(unsigned char)'e',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'F',(unsigned char)'f',(unsigned char)'G',(unsigned char)'g',(unsigned char)'H',(unsigned char)'h',(unsigned char)
+  'I',(unsigned char)'i',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'J',(unsigned char)'j',(unsigned char)'K',(unsigned char)'k',(unsigned char)'L',(unsigned char)'l',(unsigned char)'M',(unsigned char)'m',(unsigned char)'N',(unsigned char)'n',(unsigned char)
+  'O',(unsigned char)'o',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'P',(unsigned char)'p',(unsigned char)'Q',(unsigned char)'q',(unsigned char)'R',(unsigned char)'r',(unsigned char)'S',(unsigned char)'s',(unsigned char)'T',(unsigned char)'t',(unsigned char)
+  'U',(unsigned char)'u',(unsigned char)'@',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'|',(unsigned char)'�',(unsigned char)
+  '�',(unsigned char)'�',(unsigned char)'`',(unsigned char)'�',(unsigned char)0x5C,(unsigned char)'�',(unsigned char)'^',(unsigned char)'�',(unsigned char)'~',(unsigned char)'�',(unsigned char)'#',(unsigned char)'�',(unsigned char)
+  'V',(unsigned char)'v',(unsigned char)'W',(unsigned char)'w',(unsigned char)'X',(unsigned char)'x',(unsigned char)
+  'Y',(unsigned char)'y',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)'�',(unsigned char)
+  'Z',(unsigned char)'z',(unsigned char)
+  0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x11,(unsigned char) 0x12,(unsigned char) 0x13,(unsigned char)
+  0x14,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char) 0x00,(unsigned char)
+  0x00,(unsigned char) 0x00, (unsigned char) 0x00}
 };
 
 UKWORD DoubleByteTables[][TOTAL_VNCHARS] = {