filter short name brakets in getContent ('N')
[enigma2.git] / lib / base / estring.cpp
index 72ca365..487dcee 100644 (file)
@@ -1,11 +1,27 @@
 #include <string>
 #include <ctype.h>
 #include <limits.h>
-#include <lib/base/elock.h>
 #include <lib/base/eerror.h>
+#include <lib/base/encoding.h>
 #include <lib/base/estring.h>
 
-static pthread_mutex_t lock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
+std::string buildShortName( const std::string &str )
+{
+       std::string tmp;
+       static char stropen[3] = { 0xc2, 0x86, 0x00 };
+       static char strclose[3] = { 0xc2, 0x87, 0x00 };
+       unsigned int open=std::string::npos-1;
+       while ( (open = str.find(stropen, open+2)) != std::string::npos )
+       {
+               unsigned int close = str.find(strclose, open);
+               if ( close != std::string::npos )
+               {
+                       tmp+=str.substr( open+2, close-(open+2) );
+                       eDebug("now %s", tmp.c_str());
+               }
+       }
+       return tmp.length() ? tmp : str;
+}
 
 std::string getNum(int val, int sys)
 {
@@ -23,215 +39,378 @@ std::string getNum(int val, int sys)
        return res;
 }
 
-               // 8859-x to ucs coding tables. taken from www.unicode.org/Public/MAPPINGS/ISO8859/
-static unsigned long c88595[128]={
-0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 
-0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 
-0x00a0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408, 0x0409, 0x040a, 0x040b, 0x040c, 0x00ad, 0x040e, 0x040f, 
-0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f, 
-0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, 
-0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f, 
-0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f, 
-0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x00a7, 0x045e, 0x045f};
-
-static unsigned long c88596[128]={
-0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 
-0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 
-0x00a0, 0x0000, 0x0000, 0x0000, 0x00a4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x060c, 0x00ad, 0x0000, 0x0000, 
-0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x061b, 0x0000, 0x0000, 0x0000, 0x061f, 
-0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, 0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f, 
-0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, 0x0638, 0x0639, 0x063a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, 
+               // 8859-x to ucs-16 coding tables. taken from www.unicode.org/Public/MAPPINGS/ISO8859/
+
+static unsigned long c88592[96]={
+0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, 0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B,
+0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7, 0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C,
+0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
+0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
+0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
+0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9};
+
+static unsigned long c88593[96]={
+0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0x0000, 0x0124, 0x00A7, 0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, 0x0000, 0x017B,
+0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7, 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, 0x0000, 0x017C,
+0x00C0, 0x00C1, 0x00C2, 0x0000, 0x00C4, 0x010A, 0x0108, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+0x0000, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, 0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF,
+0x00E0, 0x00E1, 0x00E2, 0x0000, 0x00E4, 0x010B, 0x0109, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+0x0000, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7, 0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9};
+
+static unsigned long c88594[96]={
+0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7, 0x00A8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF,
+0x00B0, 0x0105, 0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7, 0x00B8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014A, 0x017E, 0x014B,
+0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x012A,
+0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A, 0x00DF,
+0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B,
+0x0111, 0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9};
+
+static unsigned long c88595[96]={
+0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F,
+0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
+0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F};
+
+static unsigned long c88596[96]={
+0x00A0, 0x0000, 0x0000, 0x0000, 0x00A4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x060C, 0x00AD, 0x0000, 0x0000,
+0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x061B, 0x0000, 0x0000, 0x0000, 0x061F,
+0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, 0x0638, 0x0639, 0x063A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F,
 0x0650, 0x0651, 0x0652, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000};
 
-static unsigned long c88597[128]={
-0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 
-0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 
-0x00a0, 0x2018, 0x2019, 0x00a3, 0x0000, 0x0000, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x0000, 0x00ab, 0x00ac, 0x00ad, 0x0000, 0x2015, 
-0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x0384, 0x0385, 0x0386, 0x00b7, 0x0388, 0x0389, 0x038a, 0x00bb, 0x038c, 0x00bd, 0x038e, 0x038f, 
-0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, 
-0x03a0, 0x03a1, 0x0000, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, 0x03a8, 0x03a9, 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03ae, 0x03af, 
-0x03b0, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, 
-0x03c0, 0x03c1, 0x03c2, 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7, 0x03c8, 0x03c9, 0x03ca, 0x03cb, 0x03cc, 0x03cd, 0x03ce, 0x0000};
-
-static unsigned long c88598[128]={
-0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 
-0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 
-0x00a0, 0x0000, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00d7, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
-0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00f7, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x0000, 
-0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2017, 
-0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7, 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, 
-0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, 0x05e8, 0x05e9, 0x05ea, 0x0000, 0x0000, 0x200e, 0x200f, 0x0000};
-
-static unsigned long c88599[128]={
-0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 
-0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 
-0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
-0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 
-0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, 
-0x011e, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x0130, 0x015e, 0x00df, 
-0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 
-0x011f, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x0131, 0x015f, 0x00ff};
-
-               // UPC Direct / HBO strange two-character encoding. 0xC2 means acute, 0xC8 doule 'dot', 0xCA small 'circle', 0xCD double 'acute', 0xCF acute.
-               // many thanks to the czechs who helped me while solving this.
-static inline unsigned int doCzech(int c1, int c2)
+static unsigned long c88597[96]={
+0x00A0, 0x2018, 0x2019, 0x00A3, 0x20AC, 0x20AF, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x037A, 0x00AB, 0x00AC, 0x00AD, 0x0000, 0x2015,
+0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7, 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
+0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
+0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000};
+
+static unsigned long c88598[96]={
+0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x0000,
+0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2017,
+0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x200E, 0x200F, 0x0000};
+
+static unsigned long c88599[96]={
+0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF,
+0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF};
+
+static unsigned long c885910[96]={
+0x00A0, 0x0104, 0x0112, 0x0122, 0x012A, 0x0128, 0x0136, 0x00A7, 0x013B, 0x0110, 0x0160, 0x0166, 0x017D, 0x00AD, 0x016A, 0x014A,
+0x00B0, 0x0105, 0x0113, 0x0123, 0x012B, 0x0129, 0x0137, 0x00B7, 0x013C, 0x0111, 0x0161, 0x0167, 0x017E, 0x2015, 0x016B, 0x014B,
+0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x00CF,
+0x00D0, 0x0145, 0x014C, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x0168, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x00EF,
+0x00F0, 0x0146, 0x014D, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x0169, 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x0138};
+
+static unsigned long c885911[96]={
+0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F,
+0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F,
+0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
+0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, 0x0E38, 0x0E39, 0x0E3A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0E3F,
+0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
+0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, 0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0x0000, 0x0000, 0x0000, 0x0000};
+
+static unsigned long c885913[96]={
+0x00A0, 0x201D, 0x00A2, 0x00A3, 0x00A4, 0x201E, 0x00A6, 0x00A7, 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6,
+0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x201C, 0x00B5, 0x00B6, 0x00B7, 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
+0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, 0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
+0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, 0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
+0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
+0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x2019};
+
+static unsigned long c885914[96]={
+0x00A0, 0x1E02, 0x1E03, 0x00A3, 0x010A, 0x010B, 0x1E0A, 0x00A7, 0x1E80, 0x00A9, 0x1E82, 0x1E0B, 0x1EF2, 0x00AD, 0x00AE, 0x0178,
+0x1E1E, 0x1E1F, 0x0120, 0x0121, 0x1E40, 0x1E41, 0x00B6, 0x1E56, 0x1E81, 0x1E57, 0x1E83, 0x1E60, 0x1EF3, 0x1E84, 0x1E85, 0x1E61,
+0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+0x0174, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x1E6A, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x0176, 0x00DF,
+0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+0x0175, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x1E6B, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x0177, 0x00FF};
+
+static unsigned long c885915[96]={
+0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7, 0x0161, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7, 0x017E, 0x00B9, 0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF,
+0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF};
+
+static unsigned long c885916[96]={
+0x00A0, 0x0104, 0x0105, 0x0141, 0x20AC, 0x201E, 0x0160, 0x00A7, 0x0161, 0x00A9, 0x0218, 0x00AB, 0x0179, 0x00AD, 0x017A, 0x017B,
+0x00B0, 0x00B1, 0x010C, 0x0142, 0x017D, 0x201D, 0x00B6, 0x00B7, 0x017E, 0x010D, 0x0219, 0x00BB, 0x0152, 0x0153, 0x0178, 0x017C,
+0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0106, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+0x0110, 0x0143, 0x00D2, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x015A, 0x0170, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0118, 0x021A, 0x00DF,
+0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x0107, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+0x0111, 0x0144, 0x00F2, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x015B, 0x0171, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0119, 0x021B, 0x00FF};
+
+// Two Char Mapping ( many polish services and UPC Direct/HBO services)
+// get from http://mitglied.lycos.de/buran/charsets/videotex-suppl.html
+static inline unsigned int doVideoTexSuppl(int c1, int c2)
 {
        switch (c1)
        {
-       case 0xC2: // acute
-               switch (c2)
-               {
-               case 'A': return 0x00C1;
-               case 'a': return 0x00E1;
-               case 'E': return 0x00C9;
-               case 'e': return 0x00E9;
-               case 'I': return 0x00CD;
-               case 'i': return 0x00ED;
-               case 'O': return 0x00D3;
-               case 'o': return 0x00F3; // corrected, was 0x00E3
-               case 'U': return 0x00DA;
-               case 'u': return 0x00FA;
-               case 'Y': return 0x00DD;
-               case 'y': return 0x00FD;
-               default:
-                       return 0;
-               }
-       case 0xC8: // double 'dot'
-               switch (c2)
-               {
-               case 'A': return 0x00C4;
-               case 'a': return 0x00E4;
-               case 'E': return 0x00CB;
-               case 'e': return 0x00EB;
-               case 'O': return 0x00D6;
-               case 'o': return 0x00F6;
-               case 'U': return 0x00DC;
-               case 'u': return 0x00FC;
-               default:
-                       return 0;
-               }
-       case 0xCA: // small 'circle'
-               switch (c2)               
-               {                         
-               case 'U': return 0x016E;  
-               case 'u': return 0x016F;  
-               default:                  
-                       return 0;             
-               }                         
-       case 0xCD: // double 'acute'
-               switch (c2)               
-               {                         
-               case 'O': return 0x0150;  
-               case 'o': return 0x0151;  
-               case 'U': return 0x0170;  
-               case 'u': return 0x0171;  
-               default:                  
-                       return 0;             
-               }                         
-       case 0xCF: // caron
-               switch (c2)
-               {
-               case 'C': return 0x010C;
-               case 'c': return 0x010D;
-               case 'D': return 0x010E;
-               case 'd': return 0x010F;
-               case 'E': return 0x011A;
-               case 'e': return 0x011B;
-               case 'L': return 0x013D;        // not sure if they really exist.
-               case 'l': return 0x013E;
-               case 'N': return 0x0147;
-               case 'n': return 0x0148;
-               case 'R': return 0x0158;
-               case 'r': return 0x0159;
-               case 'S': return 0x0160;
-               case 's': return 0x0161;
-               case 'T': return 0x0164;
-               case 't': return 0x0165;
-               case 'Z': return 0x017D;
-               case 'z': return 0x017E;
-               default:
-                       return 0;
-               }
-       default:
-               return 0;
+               case 0xC1: // grave
+                       switch (c2)
+                       {
+                               case 0x61: return 224;                          case 0x41: return 192;
+                               case 0x65: return 232;                          case 0x45: return 200;
+                               case 0x69: return 236;                          case 0x49: return 204;
+                               case 0x6f: return 242;                          case 0x4f: return 210;
+                               case 0x75: return 249;                          case 0x55: return 217;
+                               default: return 0;
+                       }
+               case 0xC2: // acute
+                       switch (c2)
+                       {
+                               case 0x61: return 225;                          case 0x41: return 193;
+                               case 0x65: return 233;                          case 0x45: return 201;
+                               case 0x69: return 237;                          case 0x49: return 205;
+                               case 0x6f: return 243;                          case 0x4f: return 211;
+                               case 0x75: return 250;                          case 0x55: return 218;
+                               case 0x79: return 253;                          case 0x59: return 221;
+                               case 0x63: return 263;                          case 0x43: return 262;
+                               case 0x6c: return 314;                          case 0x4c: return 313;
+                               case 0x6e: return 324;                          case 0x4e: return 323;
+                               case 0x72: return 341;                          case 0x52: return 340;
+                               case 0x73: return 347;                          case 0x53: return 346;
+                               case 0x7a: return 378;                          case 0x5a: return 377;
+                               default: return 0;
+                       }
+               case 0xC3: // cedilla
+                       switch (c2)
+                       {
+                               case 0x61: return 226;                          case 0x41: return 194;
+                               case 0x65: return 234;                          case 0x45: return 202;
+                               case 0x69: return 238;                          case 0x49: return 206;
+                               case 0x6f: return 244;                          case 0x4f: return 212;
+                               case 0x75: return 251;                          case 0x55: return 219;
+                               case 0x79: return 375;                          case 0x59: return 374;
+                               case 0x63: return 265;                          case 0x43: return 264;
+                               case 0x67: return 285;                          case 0x47: return 284;
+                               case 0x68: return 293;                          case 0x48: return 292;
+                               case 0x6a: return 309;                          case 0x4a: return 308;
+                               case 0x73: return 349;                          case 0x53: return 348;
+                               case 0x77: return 373;                          case 0x57: return 372;
+                               default: return 0;
+                       }
+               case 0xC4: // tilde
+                       switch (c2)
+                       {
+                               case 0x61: return 227;                          case 0x41: return 195;
+                               case 0x6e: return 241;                          case 0x4e: return 209;
+                               case 0x69: return 297;                          case 0x49: return 296;
+                               case 0x6f: return 245;                          case 0x4f: return 213;
+                               case 0x75: return 361;                          case 0x55: return 360;
+                               default: return 0;
+                       }
+               case 0xC6: // breve
+                       switch (c2)
+                       {
+                               case 0x61: return 259;                          case 0x41: return 258;
+                               case 0x67: return 287;                          case 0x47: return 286;
+                               case 0x75: return 365;                          case 0x55: return 364;
+                               default: return 0;
+                       }
+               case 0xC7: // dot above
+                       switch (c2)
+                       {
+                               case 0x63: return 267;                          case 0x43: return 266;
+                               case 0x65: return 279;                          case 0x45: return 278;
+                               case 0x67: return 289;                          case 0x47: return 288;
+                               case 0x49: return 304;                          case 0x7a: return 380;
+                               case 0x5a: return 379;
+                               default: return 0;
+                       }
+               case 0xC8: // diaeresis
+                       switch (c2)
+                       {
+                               case 0x61: return 228;                          case 0x41: return 196;
+                               case 0x65: return 235;                          case 0x45: return 203;
+                               case 0x69: return 239;                          case 0x49: return 207;
+                               case 0x6f: return 246;                          case 0x4f: return 214;
+                               case 0x75: return 252;                          case 0x55: return 220;
+                               case 0x79: return 255;                          case 0x59: return 376;
+                               default: return 0;
+                               }
+               case 0xCA: // ring above
+                       switch (c2)
+                       {
+                               case 0x61: return 229;                          case 0x41: return 197;
+                               case 0x75: return 367;                          case 0x55: return 366;
+                               default: return 0;
+                       }
+               case 0xCB: // cedilla
+                       switch (c2)
+                       {
+                               case 0x63: return 231;                          case 0x43: return 199;
+                               case 0x67: return 291;                          case 0x47: return 290;
+                               case 0x6b: return 311;                          case 0x4b: return 310;
+                               case 0x6c: return 316;                          case 0x4c: return 315;
+                               case 0x6e: return 326;                          case 0x4e: return 325;
+                               case 0x72: return 343;                          case 0x52: return 342;
+                               case 0x73: return 351;                          case 0x53: return 350;
+                               case 0x74: return 355;                          case 0x54: return 354;
+                               default: return 0;
+                       }
+               case 0xCD: // double acute accent
+                       switch (c2)
+                       {
+                               case 0x6f: return 337;                          case 0x4f: return 336;
+                               case 0x75: return 369;                          case 0x55: return 368;
+                               default: return 0;
+                       }
+               case 0xCE: // ogonek
+                       switch (c2)
+                       {
+                               case 0x61: return 261;                          case 0x41: return 260;
+                               case 0x65: return 281;                          case 0x45: return 280;
+                               case 0x69: return 303;                          case 0x49: return 302;
+                               case 0x75: return 371;                          case 0x55: return 370;
+                               default: return 0;
+                       }
+               case 0xCF: // caron
+                       switch (c2)
+                       {
+                               case 0x63: return 269;                          case 0x43: return 268;
+                               case 0x64: return 271;                          case 0x44: return 270;
+                               case 0x65: return 283;                          case 0x45: return 282;
+                               case 0x6c: return 318;                          case 0x4c: return 317;
+                               case 0x6e: return 328;                          case 0x4e: return 327;
+                               case 0x72: return 345;                          case 0x52: return 344;
+                               case 0x73: return 353;                          case 0x53: return 352;
+                               case 0x74: return 357;                          case 0x54: return 356;
+                               case 0x7a: return 382;                          case 0x5a: return 381;
+                               default: return 0;
+                       }
        }
+       return 0;
 }
 
 static inline unsigned int recode(unsigned char d, int cp)
 {
-       if (d < 0x80)
+       if (d < 0xA0)
                return d;
        switch (cp)
        {
-       case 0:         // 8859-1 Latin1 <-> unicode mapping
+       case 0:         // Latin1 <-> unicode mapping
+       case 1:         // 8859-1 <-> unicode mapping
                return d;
-       case 1:         // 8859-5 -> unicode mapping
-               return c88595[d-0x80];
-       case 2:         // 8859-6 -> unicode mapping
-               return c88596[d-0x80];
-       case 3:         // 8859-7 -> unicode mapping
-               return c88597[d-0x80];
-       case 4:         // 8859-8 -> unicode mapping
-               return c88598[d-0x80];
-       case 5:         // 8859-9 -> unicode mapping
-               return c88599[d-0x80];
+       case 2:         // 8859-2 -> unicode mapping
+               return c88592[d-0xA0];
+       case 3:         // 8859-3 -> unicode mapping
+               return c88593[d-0xA0];
+       case 4:         // 8859-2 -> unicode mapping
+               return c88594[d-0xA0];
+       case 5:         // 8859-5 -> unicode mapping
+               return c88595[d-0xA0];
+       case 6:         // 8859-6 -> unicode mapping
+               return c88596[d-0xA0];
+       case 7:         // 8859-7 -> unicode mapping
+               return c88597[d-0xA0];
+       case 8:         // 8859-8 -> unicode mapping
+               return c88598[d-0xA0];
+       case 9:         // 8859-9 -> unicode mapping
+               return c88599[d-0xA0];
+       case 10:// 8859-10 -> unicode mapping
+               return c885910[d-0xA0];
+       case 11:// 8859-11 -> unicode mapping
+               return c885911[d-0xA0];
+/*     case 12:// 8859-12 -> unicode mapping  // reserved for indian use..
+               return c885912[d-0xA0];*/
+       case 13:// 8859-13 -> unicode mapping
+               return c885913[d-0xA0];
+       case 14:// 8859-14 -> unicode mapping
+               return c885914[d-0xA0];
+       case 15:// 8859-15 -> unicode mapping
+               return c885915[d-0xA0];
+       case 16:// 8859-16 -> unicode mapping
+               return c885916[d-0xA0];
        default:
                return d;
        }
 }
 
-std::string convertDVBUTF8(const std::string &s, int table)
-{
-       return convertDVBUTF8((const unsigned char*)s.c_str(), s.size(), table);
-}
-
-std::string convertDVBUTF8(const unsigned char *data, int len, int table)
+std::string convertDVBUTF8(const unsigned char *data, int len, int table, int tsidonid)
 {
-       int i;
        if (!len)
                return "";
-               
-       i=0;
-       if (data[0] <= 5)
-               table=data[i++];
-       if ((data[0] >= 0x10) && (data[0] <= 0x12))
-               return "<unsupported encoding>";
 
-       int bytesneeded=0, t=0, s=i;
-       
-       for (; i<len; ++i)
+       int i=0, t=0;
+
+       if ( tsidonid )
+               encodingHandler.getTransponderDefaultMapping(tsidonid, table);
+
+       switch(data[0])
        {
-               unsigned long code=0;
-               if ((table == 5) && ((data[i] == 0xC2) || (data[i] == 0xC8) || (data[i] == 0xCA) || (data[i] == 0xCD) || (data[i] == 0xCF)) && (i+1 < len))
-                               // braindead czech encoding...
-                       if ((code=doCzech(data[i], data[i+1])))
-                               ++i;
-               if (!code)
-                       code=recode(data[i], table);
-               if (!code)
-                       continue;
-               if (code >= 0x10000)
-                       bytesneeded++;
-               if (code >= 0x800)
-                       bytesneeded++;
-               if (code >= 0x80)
-                       bytesneeded++;
-               bytesneeded++;
+               case 1 ... 11:
+                       table=data[i++]+4;
+//                     eDebug("(1..11)text encoded in ISO-8859-%d",table);
+                       break;
+               case 0x10:
+               {
+//                     eDebug("(0x10)text encoded in ISO-8859-%d",n);
+                       int n=(data[++i]<<8);
+                       n |= (data[++i]);
+                       ++i;
+                       switch(n)
+                       {
+                               case 12:
+                                       eDebug("unsup. ISO8859-12 enc.", n);
+                                       break;
+                               default:
+                                       table=n;
+                                       break;
+                       }
+                       break;
+               }
+               case 0x11:
+                       eDebug("unsup. Basic Multilingual Plane of ISO/IEC 10646-1 enc.");
+                       ++i;
+                       break;
+               case 0x12:
+                       ++i;
+                       eDebug("unsup. KSC 5601 enc.");
+                       break;
+               case 0x13:
+                       ++i;
+                       eDebug("unsup. GB-2312-1980 enc.");
+                       break;
+               case 0x14:
+                       ++i;
+                       eDebug("unsup. Big5 subset of ISO/IEC 10646-1 enc.");
+                       break;
+               case 0x15: // UTF-8 encoding of ISO/IEC 10646-1
+                       return std::string((char*)data+1, len-1);
+               case 0x0:
+               case 0xC ... 0xF:
+               case 0x16 ... 0x1F:
+                       eDebug("reserved %d", data[0]);
+                       ++i;
+                       break;
        }
-       
-       i=s;
-       
-       unsigned char res[bytesneeded];
-       
+
+       bool useTwoCharMapping =
+               tsidonid && encodingHandler.getTransponderUseTwoCharMapping(tsidonid);
+
+       unsigned char res[2048];
        while (i < len)
        {
                unsigned long code=0;
-               if ((table == 5) && ((data[i] == 0xC2) || (data[i] == 0xC8) || (data[i] == 0xCA) || (data[i] == 0xCD) || (data[i] == 0xCF)) && (i+1 < len))
-                               // braindead czech encoding...
-                       if ((code=doCzech(data[i], data[i+1])))
-                               i+=2;
+
+               if ( useTwoCharMapping && i+1 < len &&
+                       (code=doVideoTexSuppl(data[i], data[i+1])) )
+                       i+=2;
+
                if (!code)
                        code=recode(data[i++], table);
                if (!code)
@@ -255,70 +434,116 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table)
                        res[t++]=((code>>6)&0x3F)|0x80;
                        res[t++]=(code&0x3F)|0x80;
                }
+               if (t+4 > 2047)
+               {
+                       eDebug("convertDVBUTF8 buffer to small.. break now");
+                       break;
+               }
        }
-       if ( t != bytesneeded)
-               eFatal("t: %d, bytesneeded: %d", t, bytesneeded);
-       return std::string().assign((char*)res, t);
+       return std::string((char*)res, t);
 }
 
-std::string convertUTF8DVB(const std::string &string)
+std::string convertUTF8DVB(const std::string &string, int table)
 {
-       std::string ss=std::string();
-       
-       int len=string.length();
-       for(int i=0;i<len;i++){
+       unsigned long *coding_table=0;
+
+       int len=string.length(), t=0;
+
+       unsigned char buf[len];
+
+       for(int i=0;i<len;i++)
+       {
                unsigned char c1=string[i];
                unsigned int c;
                if(c1<0x80)
                        c=c1;
-               else{
+               else
+               {
                        i++;
                        unsigned char c2=string[i];
                        c=((c1&0x3F)<<6) + (c2&0x3F);
-               }
-               // c = UNICODE
-               // now search it in table
-               if(c>=0x80){
-                       for(unsigned int j=0;j<128;j++){
-                               if(c88599[j]==c){            // now only 8859-9 ....
-                                       c=0x80+j;
-                                       break;
+                       if (table==0||table==1||c1<0xA0)
+                               ;
+                       else
+                       {
+                               if (!coding_table)
+                               {
+                                       switch(table)
+                                       {
+                                               case 2:
+                                                       coding_table = c88592;
+                                                       break;
+                                               case 3:
+                                                       coding_table = c88593;
+                                                       break;
+                                               case 4:
+                                                       coding_table = c88594;
+                                                       break;
+                                               case 5:
+                                                       coding_table = c88595;
+                                                       break;
+                                               case 6:
+                                                       coding_table = c88596;
+                                                       break;
+                                               case 7:
+                                                       coding_table = c88597;
+                                                       break;
+                                               case 8:
+                                                       coding_table = c88598;
+                                                       break;
+                                               case 9:
+                                                       coding_table = c88599;
+                                                       break;
+                                               case 10:
+                                                       coding_table = c885910;
+                                                       break;
+                                               case 11:
+                                                       coding_table = c885911;
+                                                       break;
+/*                             case 12:   // reserved.. for indian use
+                                               coding_table = c885912;
+                                               break;*/
+                                               case 13:
+                                                       coding_table = c885913;
+                                                       break;
+                                               case 14:
+                                                       coding_table = c885914;
+                                                       break;
+                                               case 15:
+                                                       coding_table = c885915;
+                                                       break;
+                                               case 16:
+                                                       coding_table = c885916;
+                                                       break;
+                                               default:
+                                                       eFatal("unknown coding table %d", table);
+                                                       break;
+                                       }
+                               }
+                               for(unsigned int j=0;j<96;j++)
+                               {
+                                       if(coding_table[j]==c)
+                                       {
+                                               c=0xA0+j;
+                                               break;
+                                       }
                                }
                        }
                }
-               ss+=c;
+               buf[t++]=(unsigned char)c;
        }
-
-       return ss;
+       return std::string((char*)buf,t);
 }
 
 std::string convertLatin1UTF8(const std::string &string)
 {
-       unsigned int bytesneeded=0, t=0, i;
-       
-       unsigned int len=string.size();
-       
-       for (i=0; i<len; ++i)
-       {
-               unsigned long code=string[i];
-               if (!code)
-                       continue;
-               if (code >= 0x10000)
-                       bytesneeded++;
-               if (code >= 0x800)
-                       bytesneeded++;
-               if (code >= 0x80)
-                       bytesneeded++;
-               bytesneeded++;
-       }
-       
-       i=0;
-       
-       unsigned char res[bytesneeded];
-       
+       unsigned int t=0, i=0, len=string.size();
+
+       unsigned char res[2048];
+
        while (i < len)
        {
-               unsigned long code=string[i++];
+               unsigned long code=(unsigned char)string[i++];
                                // Unicode->UTF8 encoding
                if (code < 0x80) // identity latin <-> utf8 mapping
                        res[t++]=char(code);
@@ -338,16 +563,19 @@ std::string convertLatin1UTF8(const std::string &string)
                        res[t++]=((code>>6)&0x3F)|0x80;
                        res[t++]=(code&0x3F)|0x80;
                }
+               if (t+4 > 2047)
+               {
+                       eDebug("convertLatin1UTF8 buffer to small.. break now");
+                       break;
+               }
        }
-       if ( t != bytesneeded)
-               eFatal("t: %d, bytesneeded: %d", t, bytesneeded);
-       return std::string().assign((char*)res, t);
+       return std::string((char*)res, t);
 }
 
 int isUTF8(const std::string &string)
 {
        unsigned int len=string.size();
-       
+
        for (unsigned int i=0; i < len; ++i)
        {
                if (!(string[i]&0x80)) // normal ASCII
@@ -381,13 +609,13 @@ std::string removeDVBChars(const std::string &s)
        
        int len = s.length();
        
-       for(int i = 0; i < len-1; i++)
+       for(int i = 0; i < len; i++)
        {
                unsigned char c1 = s[i];
                unsigned int c;
                
                        /* UTF8? decode (but only simple) */
-               if(c1 > 0x80)
+               if((c1 > 0x80) && (i < len-1))
                {
                        unsigned char c2 = s[i + 1];
                        c = ((c1&0x3F)<<6) + (c2&0x3F);