Index: b/ukengine/data.cpp =================================================================== --- a/ukengine/data.cpp +++ b/ukengine/data.cpp @@ -96,144 +96,144 @@ See TCVN3 & VPS below for examples unsigned char SingleByteTables[][TOTAL_VNCHARS] = // TCVN3 -{{'A','a','','','','','','','','','','', // 0: a - '','','','','','','','','','','','', // 1: a^ - '','','','','','','','','','','','', // 2: a( +{{'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 0: a + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 1: a^ + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 2: a( 'B','b','C','c','D','d', - '','', - 'E','e','','','','','','','','','','', // 3: e - '','','','','','','','','','','','', // 4: e^ + static_cast(''),static_cast(''), + 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 3: e + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 4: e^ 'F','f','G','g','H','h', - 'I','i','','','','','','','','','','', // 5: i + 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 5: i 'J','j','K','k','L','l','M','m','N','n', - 'O','o','','','','','','','','','','', // 6: o - '','','','','','','','','','','','', // 7: o^ - '','','','','','','','','','','','', // 8: o+ + 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 6: o + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 7: o^ + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 8: o+ 'P','p','Q','q','R','r','S','s','T','t', - 'U','u','','','','','','','','','','', // 9: u - '','','','','','','','','','','','', //10: u+ + 'U','u',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), // 9: u + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), //10: u+ 'V','v','W','w','X','x', - 'Y','y','','','','','','','','','','', //11: y + 'Y','y',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), //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}, //VPS -{ 'A','a','','','','','','','','','','', - '','','','','','','','','','','','', - '','','','','','','','','','','','', +{ 'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'B','b','C','c','D','d', - '','', - 'E','e','','','','','','','','','','', - '','','','','','','','','','','','', + static_cast(''),static_cast(''), + 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'F','f','G','g','H','h', - 'I','i','','','','','','','','','','', + 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'J','j','K','k','L','l','M','m','N','n', - 'O','o','','','','','','','','','','', - '','','','','','','','','','','','', - '','','','','','','','','','','','', + 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'P','p','Q','q','R','r','S','s','T','t', - 'U','u','','','','','','','','','','', - '','','','','','','','','','','','', + 'U','u',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'V','v','W','w','X','x', - 'Y','y','','','','','','','','','','', + 'Y','y',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), '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}, //VISCII -{ 'A','a','','','','','','','','','','', - '','','','','','','','','','','','', - '','','','','','','','','','','','', +{ 'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'B','b','C','c','D','d', - '','', - 'E','e','','','','','','','','','','', - '','','','','','','','','','','','', + static_cast(''),static_cast(''), + 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'F','f','G','g','H','h', - 'I','i','','','','','','','','','','', + 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'J','j','K','k','L','l','M','m','N','n', - 'O','o','','','','','','','','','','', - '','','','','','','','','','','','', - '','','','','','','','','','','','', + 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'P','p','Q','q','R','r','S','s','T','t', - 'U','u','','','','','','','','','','', - '','','','','','','','','','','','', + 'U','u',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'V','v','W','w','X','x', - 'Y','y','','','','','','','','','','', + 'Y','y',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), '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}, // BKHCM1 -{'A','a','','','','','','','','','','', - '','','~','','','','','','','','','', - '','','','','','','','','','','','', +{'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),'~',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'B','b','C','c','D','d', - '}','', - 'E','e','','','','','','','','','','', - '','','','','','','','','','','','', + '}',static_cast(''), + 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'F','f','G','g','H','h', - 'I','i','','','','','','','','','','', + 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'J','j','K','k','L','l','M','m','N','n', - 'O','o','','','','','','','','','','', - '','','','','','','','','','','','', - '','','','','','','','','','','','', + 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'P','p','Q','q','R','r','S','s','T','t', - 'U','u','','','','','','','','','','', - '','','','','','','','','','','','', + 'U','u',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'V','v','W','w','X','x', - 'Y','y','{','','^','','`','','|','','','', + 'Y','y','{',static_cast(''),'^',static_cast(''),'`',static_cast(''),'|',static_cast(''),static_cast(''),static_cast(''), '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}, //Vietware-F -{ 'A','a','','','','','','','','','','', - '','','','','','','','','','','','', - '','','','','','','','','','','','', +{ 'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'B','b','C','c','D','d', - '','', - 'E','e','','','','','','','','','','', - '','','','','','','','','','','','', + static_cast(''),static_cast(''), + 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'F','f','G','g','H','h', - 'I','i','','','','','','','','','','', + 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'J','j','K','k','L','l','M','m','N','n', - 'O','o','','','','','','','','','','', - '','','','','','','','','','','','', - '','','','','','','','','','','','', + 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'P','p','Q','q','R','r','S','s','T','t', - 'U','u','','','','','','','','','','', - '','','','','','','','','','','','', + 'U','u',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'V','v','W','w','X','x', - 'Y','y','','','','','','','','','','', + 'Y','y',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), '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}, // ISC - {'A','a','','','','','','','','','','', - '','','','','','','','','','','','', - '','','','','','','','','','','','', + {'A','a',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'B','b','C','c','D','d', - '','', - 'E','e','','','','','','','','','','', - '','','','','','','','','','','','', + static_cast(''),static_cast(''), + 'E','e',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'F','f','G','g','H','h', - 'I','i','','','','','','','','','','', + 'I','i',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'J','j','K','k','L','l','M','m','N','n', - 'O','o','','','','','','','','','','', - '','','','','','','','','','','','', - '','','','','','','','','','','','', + 'O','o',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), + static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'P','p','Q','q','R','r','S','s','T','t', - 'U','u','@','','','','','','','','|','', - '','','`','',0x5C,'','^','','~','','#','', + 'U','u','@',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),'|',static_cast(''), + static_cast(''),static_cast(''),'`',static_cast(''),0x5C,static_cast(''),'^',static_cast(''),'~',static_cast(''),'#',static_cast(''), 'V','v','W','w','X','x', - 'Y','y','','','','','','','','','','', + 'Y','y',static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''),static_cast(''), 'Z','z', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x12, 0x13,