Tsukada
ttsuk****@users*****
2002年 8月 10日 (土) 11:39:37 JST
ttsukada 02/08/10 11:39:37
Modified: ext/mbstring/mbfl mbfl_filter.h filter.c filter_8859.c
filter_mime.c filter_ucs.c
Log:
improved convert table structure
Revision Changes Path
1.6 +15 -24 php4/ext/mbstring/mbfl/mbfl_filter.h
Index: mbfl_filter.h
===================================================================
RCS file: /cvsroot/php-i18n/php4/ext/mbstring/mbfl/mbfl_filter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mbfl_filter.h 2 Jun 2002 17:47:15 -0000 1.5
+++ mbfl_filter.h 10 Aug 2002 02:39:37 -0000 1.6
@@ -36,6 +36,10 @@
#define MBFL_MEMORY_TYPE_SALLOC 2
#define MBFL_MEMORY_TYPE_DALLOC 3
+#define MBFL_TABLE_TYPE_LOOKUP 1
+#define MBFL_TABLE_TYPE_PAIR 2
+#define MBFL_TABLE_TYPE_SORT 3
+
#define MBFL_CONVFILTER_ILLEGAL_SUBSTCHAR 0x3f /* '?' */
#define MBFL_CONVFILTER_ILLEGAL_MODE_NONE 0x0001
@@ -57,28 +61,15 @@
typedef struct _mbfl_convert_filter mbfl_convert_filter;
-typedef struct _mbfl_lookup_table {
+typedef struct _mbfl_convert_table {
+ char type;
const char *name;
const int *table;
int size;
int min;
int max;
- char memory_type_table;
char memory_type_self;
-} mbfl_lookup_table;
-
-typedef struct _mbfl_code_pair {
- int mb;
- int uc;
-} mbfl_code_pair;
-
-typedef struct _mbfl_pair_table {
- const char *name;
- const mbfl_code_pair *table;
- int size;
- char memory_type_table;
- char memory_type_self;
-} mbfl_pair_table;
+} mbfl_convert_table;
typedef struct _mbfl_convert_function {
const char *name;
@@ -93,9 +84,8 @@
const char *name;
php_mb_encid from;
php_mb_encid to;
- const mbfl_convert_function *function;
- const mbfl_pair_table **pair_table_list;
- const mbfl_lookup_table **lookup_table_list;
+ mbfl_convert_function *function;
+ mbfl_convert_table **table_list;
char memory_type_self;
} mbfl_convert_collection;
@@ -110,8 +100,7 @@
void *global_resource;
php_mb_enc *from;
php_mb_enc *to;
- const mbfl_pair_table **pair_table_list;
- const mbfl_lookup_table **lookup_table_list;
+ mbfl_convert_table **table_list;
unsigned int mode;
int substchar;
int status;
@@ -128,6 +117,7 @@
int mbfl_filter_output_pipe(int c, void *stream_resource);
int mbfl_filter_output_null(int c, void *stream_resource);
+extern mbfl_convert_table * mbfl_convert_table_list_empty[];
/*
@@ -137,6 +127,7 @@
typedef struct _mbfl_identify_filter mbfl_identify_filter;
typedef struct _mbfl_identify_function {
+ const char *name;
php_mb_encid encoding_id;
void (*filter_ctor)(mbfl_identify_filter *filter);
void (*filter_dtor)(mbfl_identify_filter *filter);
@@ -178,7 +169,7 @@
mbfl_codeset * mbfl_codeset_get(int id);
mbfl_codeset * mbfl_codeset_get_by_plane(int wcsplane);
-/* wchar plane, spesial charactor */
+/* wchar plane, local codeset */
#define MBFL_WCSPLANE_MASK 0xffff
#define MBFL_WCSPLANE_SIZE 0x10000
#define MBFL_WCSPLANE_UCS2MAX 0x00010000
@@ -200,9 +191,9 @@
#define MBFL_WCSPLANE_8859_15 0x70ef0000 /* 00h - FFh */
#define MBFL_WCSPLANE_JIS0201 0x71e10000 /* 00h - FFh */
-#define MBFL_WCSPLANE_JIS0208 0x71e20000 /* JIS HEX: 2121 - 987E, DEC: 0 - 11280 */
+#define MBFL_WCSPLANE_JIS0208 0x71e20000 /* JIS HEX: 2121 - 7E7E, DEC: 0 - 8836 */
#define MBFL_WCSPLANE_JIS0212 0x71e30000 /* JIS HEX: 2121 - 7E7E, DEC: 0 - 8836 */
-#define MBFL_WCSPLANE_WINCP932 0x71e40000 /* JIS HEX : 2121h - 9898h */
+#define MBFL_WCSPLANE_WINCP932 0x71e40000 /* JIS HEX: 2121 - 987E, DEC: 0 - 11280 */
#define MBFL_WCSPLANE_KSC5601 0x71e80000 /* 2121h - 7E7Eh */
1.4 +49 -35 php4/ext/mbstring/mbfl/filter.c
Index: filter.c
===================================================================
RCS file: /cvsroot/php-i18n/php4/ext/mbstring/mbfl/filter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- filter.c 30 May 2002 17:42:44 -0000 1.3
+++ filter.c 10 Aug 2002 02:39:37 -0000 1.4
@@ -366,6 +366,27 @@
/*
+ * convert table
+ */
+
+static const int table_empty[] = { -1, -1 };
+
+mbfl_convert_table mbfl_convert_table_empty = {
+ MBFL_TABLE_TYPE_LOOKUP,
+ "empty",
+ table_empty,
+ sizeof(table_empty)/sizeof(int),
+ 0,
+ sizeof(table_empty)/sizeof(int),
+ MBFL_MEMORY_TYPE_CONST
+};
+
+mbfl_convert_table * mbfl_convert_table_list_empty[] = {
+ NULL
+};
+
+
+/*
* convert filter function
*/
static mbfl_convert_function cvfn_pass = {
@@ -417,83 +438,75 @@
/*
* convert filter collection
*/
-static const mbfl_convert_collection conv_pass = {
+static mbfl_convert_collection conv_pass = {
"pass",
php_mb_encid_pass,
php_mb_encid_pass,
&cvfn_pass,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_wchar = {
+static mbfl_convert_collection conv_wchar_wchar = {
"wchar_wchar",
php_mb_encid_wchar,
php_mb_encid_wchar,
&cvfn_pass,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_ascii_wchar = {
+static mbfl_convert_collection conv_ascii_wchar = {
"ascii_wchar",
php_mb_encid_ascii,
php_mb_encid_wchar,
&cvfn_pass,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_ascii = {
+static mbfl_convert_collection conv_wchar_ascii = {
"wchar_ascii",
php_mb_encid_wchar,
php_mb_encid_ascii,
&cvfn_wchar_ascii,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_utf8_wchar = {
+static mbfl_convert_collection conv_utf8_wchar = {
"utf8_wchar",
php_mb_encid_utf8,
php_mb_encid_wchar,
&cvfn_utf8_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_utf8 = {
+static mbfl_convert_collection conv_wchar_utf8 = {
"wchar_utf8",
php_mb_encid_wchar,
php_mb_encid_utf8,
&cvfn_wchar_utf8,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_utf8inner_wchar = {
+static mbfl_convert_collection conv_utf8inner_wchar = {
"utf8inner_wchar",
php_mb_encid_utf8inner,
php_mb_encid_wchar,
&cvfn_utf8_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_utf8inner = {
+static mbfl_convert_collection conv_wchar_utf8inner = {
"wchar_utf8inner",
php_mb_encid_wchar,
php_mb_encid_utf8inner,
&cvfn_wchar_utf8inner,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
@@ -502,7 +515,8 @@
/*
* identify filter function table
*/
-static const mbfl_identify_function identify_function_ascii = {
+static mbfl_identify_function identify_function_ascii = {
+ "ascii",
php_mb_encid_ascii,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -510,7 +524,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function identify_function_utf8 = {
+static mbfl_identify_function identify_function_utf8 = {
+ "utf8",
php_mb_encid_utf8,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -518,7 +533,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function identify_function_true = {
+static mbfl_identify_function identify_function_true = {
+ "true",
php_mb_encid_pass,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -526,7 +542,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function identify_function_false = {
+static mbfl_identify_function identify_function_false = {
+ "false",
php_mb_encid_invalid,
mbfl_filt_ident_false_ctor,
mbfl_filt_ident_common_dtor,
@@ -539,8 +556,7 @@
/*
* filter list
*/
-#if 0
-const mbfl_convert_function *mbfl_convert_function_list_standard[] = {
+mbfl_convert_function *mbfl_convert_function_list_standard[] = {
&cvfn_pass,
&cvfn_wchar_ascii,
&cvfn_utf8_wchar,
@@ -548,9 +564,8 @@
&cvfn_wchar_utf8inner,
NULL
};
-#endif
-const mbfl_convert_collection *mbfl_convert_collection_list_standard[] = {
+mbfl_convert_collection *mbfl_convert_collection_list_standard[] = {
&conv_pass,
&conv_wchar_wchar,
&conv_ascii_wchar,
@@ -562,7 +577,7 @@
NULL
};
-const mbfl_identify_function *mbfl_identify_function_list_standard[] = {
+mbfl_identify_function *mbfl_identify_function_list_standard[] = {
&identify_function_ascii,
&identify_function_utf8,
&identify_function_true,
@@ -637,8 +652,7 @@
}
c &= MBFL_WCSPLANE_MASK;
} else {
- ret = filt_conv_strcat(filter, filter->from->name);
- ret = filt_conv_strcat(filter, "+");
+ ret = filt_conv_strcat(filter, "BAD+");
c &= MBFL_WCSGROUP_MASK;
}
}
1.3 +1391 -1382php4/ext/mbstring/mbfl/filter_8859.c
Index: filter_8859.c
===================================================================
RCS file: /cvsroot/php-i18n/php4/ext/mbstring/mbfl/filter_8859.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- filter_8859.c 25 May 2002 16:31:21 -0000 1.2
+++ filter_8859.c 10 Aug 2002 02:39:37 -0000 1.3
@@ -80,37 +80,37 @@
static int
filt_conv_8859x_wc(int c, mbfl_convert_filter *filter)
{
- int i, j, wchar;
- const mbfl_pair_table *pair_table;
- const mbfl_lookup_table *lookup_table;
+ int wchar, i, n;
+ const mbfl_convert_table *convert_table;
wchar = -1;
if (c >= 0 && c < 0xa0) {
wchar = c;
goto output;
}
- if (filter->pair_table_list != NULL && c >= 0) {
- i = 0;
- while ((pair_table = filter->pair_table_list[i++]) != NULL) {
- j = pair_table->size - 1;
- while (j >= 0) {
- if (c == pair_table->table[j].mb) {
- wchar = pair_table->table[j].uc;
+
+ i = 0;
+ while ((convert_table = filter->table_list[i++]) != NULL) {
+ switch (convert_table->type) {
+ case MBFL_TABLE_TYPE_PAIR:
+ n = convert_table->size - 2;
+ while (n >= 0) {
+ if (c == convert_table->table[n]) {
+ wchar = convert_table->table[n + 1];
goto output;
}
- j--;
+ n -= 2;
}
- }
- }
- if (filter->lookup_table_list != NULL && c >= 0) {
- i = 0;
- while ((lookup_table = filter->lookup_table_list[i++]) != NULL) {
- if (c >= lookup_table->min && c < lookup_table->max) {
- wchar = lookup_table->table[c - lookup_table->min];
+ break;
+
+ case MBFL_TABLE_TYPE_LOOKUP:
+ if (c >= convert_table->min && c < convert_table->max) {
+ wchar = convert_table->table[c - convert_table->min];
if (wchar >= 0) {
goto output;
}
}
+ break;
}
}
wchar = c & MBFL_WCSGROUP_MASK;
@@ -128,37 +128,37 @@
static int
filt_conv_wc_8859x(int c, mbfl_convert_filter *filter)
{
- int i, j, code;
- const mbfl_pair_table *pair_table;
- const mbfl_lookup_table *lookup_table;
+ int code, i, n;
+ const mbfl_convert_table *convert_table;
code = -1;
if (c >= 0 && c < 0xa0) {
code = c;
goto output;
}
- if (filter->pair_table_list != NULL && c >= 0) {
- i = 0;
- while ((pair_table = filter->pair_table_list[i++]) != NULL) {
- j = pair_table->size - 1;
- while (j >= 0) {
- if (c == pair_table->table[j].uc) {
- code = pair_table->table[j].mb;
+
+ i = 0;
+ while ((convert_table = filter->table_list[i++]) != NULL) {
+ switch (convert_table->type) {
+ case MBFL_TABLE_TYPE_PAIR:
+ n = convert_table->size - 1;
+ while (n >= 0) {
+ if (c == convert_table->table[n]) {
+ code = convert_table->table[n - 1];
goto output;
}
- j--;
+ n -= 2;
}
- }
- }
- if (filter->lookup_table_list != NULL && c >= 0) {
- i = 0;
- while ((lookup_table = filter->lookup_table_list[i++]) != NULL) {
- if (c >= lookup_table->min && c < lookup_table->max) {
- code = lookup_table->table[c - lookup_table->min];
+ break;
+
+ case MBFL_TABLE_TYPE_LOOKUP:
+ if (c >= convert_table->min && c < convert_table->max) {
+ code = convert_table->table[c - convert_table->min];
if (code >= 0) {
goto output;
}
}
+ break;
}
}
@@ -206,1203 +206,1203 @@
#define I14(c) (MBFL_WCSPLANE_8859_14 | c)
#define I15(c) (MBFL_WCSPLANE_8859_15 | c)
-static const mbfl_code_pair table_iso8859_2[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, 0x0104 },
-{ 0xA2, 0x02D8 },
-{ 0xA3, 0x0141 },
-{ 0xA4, 0x00A4 },
-{ 0xA5, 0x013D },
-{ 0xA6, 0x015A },
-{ 0xA7, 0x00A7 },
-{ 0xA8, 0x00A8 },
-{ 0xA9, 0x0160 },
-{ 0xAA, 0x015E },
-{ 0xAB, 0x0164 },
-{ 0xAC, 0x0179 },
-{ 0xAD, 0x00AD },
-{ 0xAE, 0x017D },
-{ 0xAF, 0x017B },
-{ 0xB0, 0x00B0 },
-{ 0xB1, 0x0105 },
-{ 0xB2, 0x02DB },
-{ 0xB3, 0x0142 },
-{ 0xB4, 0x00B4 },
-{ 0xB5, 0x013E },
-{ 0xB6, 0x015B },
-{ 0xB7, 0x02C7 },
-{ 0xB8, 0x00B8 },
-{ 0xB9, 0x0161 },
-{ 0xBA, 0x015F },
-{ 0xBB, 0x0165 },
-{ 0xBC, 0x017A },
-{ 0xBD, 0x02DD },
-{ 0xBE, 0x017E },
-{ 0xBF, 0x017C },
-{ 0xC0, 0x0154 },
-{ 0xC1, 0x00C1 },
-{ 0xC2, 0x00C2 },
-{ 0xC3, 0x0102 },
-{ 0xC4, 0x00C4 },
-{ 0xC5, 0x0139 },
-{ 0xC6, 0x0106 },
-{ 0xC7, 0x00C7 },
-{ 0xC8, 0x010C },
-{ 0xC9, 0x00C9 },
-{ 0xCA, 0x0118 },
-{ 0xCB, 0x00CB },
-{ 0xCC, 0x011A },
-{ 0xCD, 0x00CD },
-{ 0xCE, 0x00CE },
-{ 0xCF, 0x010E },
-{ 0xD0, 0x0110 },
-{ 0xD1, 0x0143 },
-{ 0xD2, 0x0147 },
-{ 0xD3, 0x00D3 },
-{ 0xD4, 0x00D4 },
-{ 0xD5, 0x0150 },
-{ 0xD6, 0x00D6 },
-{ 0xD7, 0x00D7 },
-{ 0xD8, 0x0158 },
-{ 0xD9, 0x016E },
-{ 0xDA, 0x00DA },
-{ 0xDB, 0x0170 },
-{ 0xDC, 0x00DC },
-{ 0xDD, 0x00DD },
-{ 0xDE, 0x0162 },
-{ 0xDF, 0x00DF },
-{ 0xE0, 0x0155 },
-{ 0xE1, 0x00E1 },
-{ 0xE2, 0x00E2 },
-{ 0xE3, 0x0103 },
-{ 0xE4, 0x00E4 },
-{ 0xE5, 0x013A },
-{ 0xE6, 0x0107 },
-{ 0xE7, 0x00E7 },
-{ 0xE8, 0x010D },
-{ 0xE9, 0x00E9 },
-{ 0xEA, 0x0119 },
-{ 0xEB, 0x00EB },
-{ 0xEC, 0x011B },
-{ 0xED, 0x00ED },
-{ 0xEE, 0x00EE },
-{ 0xEF, 0x010F },
-{ 0xF0, 0x0111 },
-{ 0xF1, 0x0144 },
-{ 0xF2, 0x0148 },
-{ 0xF3, 0x00F3 },
-{ 0xF4, 0x00F4 },
-{ 0xF5, 0x0151 },
-{ 0xF6, 0x00F6 },
-{ 0xF7, 0x00F7 },
-{ 0xF8, 0x0159 },
-{ 0xF9, 0x016F },
-{ 0xFA, 0x00FA },
-{ 0xFB, 0x0171 },
-{ 0xFC, 0x00FC },
-{ 0xFD, 0x00FD },
-{ 0xFE, 0x0163 },
-{ 0xFF, 0x02D9 }
-};
-
-
-static const mbfl_code_pair table_iso8859_3[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, 0x0126 },
-{ 0xA2, 0x02D8 },
-{ 0xA3, 0x00A3 },
-{ 0xA4, 0x00A4 },
-{ 0xA5, I3(0x00A5)},
-{ 0xA6, 0x0124 },
-{ 0xA7, 0x00A7 },
-{ 0xA8, 0x00A8 },
-{ 0xA9, 0x0130 },
-{ 0xAA, 0x015E },
-{ 0xAB, 0x011E },
-{ 0xAC, 0x0134 },
-{ 0xAD, 0x00AD },
-{ 0xAE, I3(0x00AE)},
-{ 0xAF, 0x017B },
-{ 0xB0, 0x00B0 },
-{ 0xB1, 0x0127 },
-{ 0xB2, 0x00B2 },
-{ 0xB3, 0x00B3 },
-{ 0xB4, 0x00B4 },
-{ 0xB5, 0x00B5 },
-{ 0xB6, 0x0125 },
-{ 0xB7, 0x00B7 },
-{ 0xB8, 0x00B8 },
-{ 0xB9, 0x0131 },
-{ 0xBA, 0x015F },
-{ 0xBB, 0x011F },
-{ 0xBC, 0x0135 },
-{ 0xBD, 0x00BD },
-{ 0xBE, I3(0x00BE)},
-{ 0xBF, 0x017C },
-{ 0xC0, 0x00C0 },
-{ 0xC1, 0x00C1 },
-{ 0xC2, 0x00C2 },
-{ 0xC3, I3(0x00C3)},
-{ 0xC4, 0x00C4 },
-{ 0xC5, 0x010A },
-{ 0xC6, 0x0108 },
-{ 0xC7, 0x00C7 },
-{ 0xC8, 0x00C8 },
-{ 0xC9, 0x00C9 },
-{ 0xCA, 0x00CA },
-{ 0xCB, 0x00CB },
-{ 0xCC, 0x00CC },
-{ 0xCD, 0x00CD },
-{ 0xCE, 0x00CE },
-{ 0xCF, 0x00CF },
-{ 0xD0, I3(0x00D0)},
-{ 0xD1, 0x00D1 },
-{ 0xD2, 0x00D2 },
-{ 0xD3, 0x00D3 },
-{ 0xD4, 0x00D4 },
-{ 0xD5, 0x0120 },
-{ 0xD6, 0x00D6 },
-{ 0xD7, 0x00D7 },
-{ 0xD8, 0x011C },
-{ 0xD9, 0x00D9 },
-{ 0xDA, 0x00DA },
-{ 0xDB, 0x00DB },
-{ 0xDC, 0x00DC },
-{ 0xDD, 0x016C },
-{ 0xDE, 0x015C },
-{ 0xDF, 0x00DF },
-{ 0xE0, 0x00E0 },
-{ 0xE1, 0x00E1 },
-{ 0xE2, 0x00E2 },
-{ 0xE3, I3(0x00E3)},
-{ 0xE4, 0x00E4 },
-{ 0xE5, 0x010B },
-{ 0xE6, 0x0109 },
-{ 0xE7, 0x00E7 },
-{ 0xE8, 0x00E8 },
-{ 0xE9, 0x00E9 },
-{ 0xEA, 0x00EA },
-{ 0xEB, 0x00EB },
-{ 0xEC, 0x00EC },
-{ 0xED, 0x00ED },
-{ 0xEE, 0x00EE },
-{ 0xEF, 0x00EF },
-{ 0xF0, I3(0x00F0)},
-{ 0xF1, 0x00F1 },
-{ 0xF2, 0x00F2 },
-{ 0xF3, 0x00F3 },
-{ 0xF4, 0x00F4 },
-{ 0xF5, 0x0121 },
-{ 0xF6, 0x00F6 },
-{ 0xF7, 0x00F7 },
-{ 0xF8, 0x011D },
-{ 0xF9, 0x00F9 },
-{ 0xFA, 0x00FA },
-{ 0xFB, 0x00FB },
-{ 0xFC, 0x00FC },
-{ 0xFD, 0x016D },
-{ 0xFE, 0x015D },
-{ 0xFF, 0x02D9 }
-};
-
-
-static const mbfl_code_pair table_iso8859_4[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, 0x0104 },
-{ 0xA2, 0x0138 },
-{ 0xA3, 0x0156 },
-{ 0xA4, 0x00A4 },
-{ 0xA5, 0x0128 },
-{ 0xA6, 0x013B },
-{ 0xA7, 0x00A7 },
-{ 0xA8, 0x00A8 },
-{ 0xA9, 0x0160 },
-{ 0xAA, 0x0112 },
-{ 0xAB, 0x0122 },
-{ 0xAC, 0x0166 },
-{ 0xAD, 0x00AD },
-{ 0xAE, 0x017D },
-{ 0xAF, 0x00AF },
-{ 0xB0, 0x00B0 },
-{ 0xB1, 0x0105 },
-{ 0xB2, 0x02DB },
-{ 0xB3, 0x0157 },
-{ 0xB4, 0x00B4 },
-{ 0xB5, 0x0129 },
-{ 0xB6, 0x013C },
-{ 0xB7, 0x02C7 },
-{ 0xB8, 0x00B8 },
-{ 0xB9, 0x0161 },
-{ 0xBA, 0x0113 },
-{ 0xBB, 0x0123 },
-{ 0xBC, 0x0167 },
-{ 0xBD, 0x014A },
-{ 0xBE, 0x017E },
-{ 0xBF, 0x014B },
-{ 0xC0, 0x0100 },
-{ 0xC1, 0x00C1 },
-{ 0xC2, 0x00C2 },
-{ 0xC3, 0x00C3 },
-{ 0xC4, 0x00C4 },
-{ 0xC5, 0x00C5 },
-{ 0xC6, 0x00C6 },
-{ 0xC7, 0x012E },
-{ 0xC8, 0x010C },
-{ 0xC9, 0x00C9 },
-{ 0xCA, 0x0118 },
-{ 0xCB, 0x00CB },
-{ 0xCC, 0x0116 },
-{ 0xCD, 0x00CD },
-{ 0xCE, 0x00CE },
-{ 0xCF, 0x012A },
-{ 0xD0, 0x0110 },
-{ 0xD1, 0x0145 },
-{ 0xD2, 0x014C },
-{ 0xD3, 0x0136 },
-{ 0xD4, 0x00D4 },
-{ 0xD5, 0x00D5 },
-{ 0xD6, 0x00D6 },
-{ 0xD7, 0x00D7 },
-{ 0xD8, 0x00D8 },
-{ 0xD9, 0x0172 },
-{ 0xDA, 0x00DA },
-{ 0xDB, 0x00DB },
-{ 0xDC, 0x00DC },
-{ 0xDD, 0x0168 },
-{ 0xDE, 0x016A },
-{ 0xDF, 0x00DF },
-{ 0xE0, 0x0101 },
-{ 0xE1, 0x00E1 },
-{ 0xE2, 0x00E2 },
-{ 0xE3, 0x00E3 },
-{ 0xE4, 0x00E4 },
-{ 0xE5, 0x00E5 },
-{ 0xE6, 0x00E6 },
-{ 0xE7, 0x012F },
-{ 0xE8, 0x010D },
-{ 0xE9, 0x00E9 },
-{ 0xEA, 0x0119 },
-{ 0xEB, 0x00EB },
-{ 0xEC, 0x0117 },
-{ 0xED, 0x00ED },
-{ 0xEE, 0x00EE },
-{ 0xEF, 0x012B },
-{ 0xF0, 0x0111 },
-{ 0xF1, 0x0146 },
-{ 0xF2, 0x014D },
-{ 0xF3, 0x0137 },
-{ 0xF4, 0x00F4 },
-{ 0xF5, 0x00F5 },
-{ 0xF6, 0x00F6 },
-{ 0xF7, 0x00F7 },
-{ 0xF8, 0x00F8 },
-{ 0xF9, 0x0173 },
-{ 0xFA, 0x00FA },
-{ 0xFB, 0x00FB },
-{ 0xFC, 0x00FC },
-{ 0xFD, 0x0169 },
-{ 0xFE, 0x016B },
-{ 0xFF, 0x02D9 }
-};
-
-
-static const mbfl_code_pair table_iso8859_5[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, 0x0401 },
-{ 0xA2, 0x0402 },
-{ 0xA3, 0x0403 },
-{ 0xA4, 0x0404 },
-{ 0xA5, 0x0405 },
-{ 0xA6, 0x0406 },
-{ 0xA7, 0x0407 },
-{ 0xA8, 0x0408 },
-{ 0xA9, 0x0409 },
-{ 0xAA, 0x040A },
-{ 0xAB, 0x040B },
-{ 0xAC, 0x040C },
-{ 0xAD, 0x00AD },
-{ 0xAE, 0x040E },
-{ 0xAF, 0x040F },
-{ 0xB0, 0x0410 },
-{ 0xB1, 0x0411 },
-{ 0xB2, 0x0412 },
-{ 0xB3, 0x0413 },
-{ 0xB4, 0x0414 },
-{ 0xB5, 0x0415 },
-{ 0xB6, 0x0416 },
-{ 0xB7, 0x0417 },
-{ 0xB8, 0x0418 },
-{ 0xB9, 0x0419 },
-{ 0xBA, 0x041A },
-{ 0xBB, 0x041B },
-{ 0xBC, 0x041C },
-{ 0xBD, 0x041D },
-{ 0xBE, 0x041E },
-{ 0xBF, 0x041F },
-{ 0xC0, 0x0420 },
-{ 0xC1, 0x0421 },
-{ 0xC2, 0x0422 },
-{ 0xC3, 0x0423 },
-{ 0xC4, 0x0424 },
-{ 0xC5, 0x0425 },
-{ 0xC6, 0x0426 },
-{ 0xC7, 0x0427 },
-{ 0xC8, 0x0428 },
-{ 0xC9, 0x0429 },
-{ 0xCA, 0x042A },
-{ 0xCB, 0x042B },
-{ 0xCC, 0x042C },
-{ 0xCD, 0x042D },
-{ 0xCE, 0x042E },
-{ 0xCF, 0x042F },
-{ 0xD0, 0x0430 },
-{ 0xD1, 0x0431 },
-{ 0xD2, 0x0432 },
-{ 0xD3, 0x0433 },
-{ 0xD4, 0x0434 },
-{ 0xD5, 0x0435 },
-{ 0xD6, 0x0436 },
-{ 0xD7, 0x0437 },
-{ 0xD8, 0x0438 },
-{ 0xD9, 0x0439 },
-{ 0xDA, 0x043A },
-{ 0xDB, 0x043B },
-{ 0xDC, 0x043C },
-{ 0xDD, 0x043D },
-{ 0xDE, 0x043E },
-{ 0xDF, 0x043F },
-{ 0xE0, 0x0440 },
-{ 0xE1, 0x0441 },
-{ 0xE2, 0x0442 },
-{ 0xE3, 0x0443 },
-{ 0xE4, 0x0444 },
-{ 0xE5, 0x0445 },
-{ 0xE6, 0x0446 },
-{ 0xE7, 0x0447 },
-{ 0xE8, 0x0448 },
-{ 0xE9, 0x0449 },
-{ 0xEA, 0x044A },
-{ 0xEB, 0x044B },
-{ 0xEC, 0x044C },
-{ 0xED, 0x044D },
-{ 0xEE, 0x044E },
-{ 0xEF, 0x044F },
-{ 0xF0, 0x2116 },
-{ 0xF1, 0x0451 },
-{ 0xF2, 0x0452 },
-{ 0xF3, 0x0453 },
-{ 0xF4, 0x0454 },
-{ 0xF5, 0x0455 },
-{ 0xF6, 0x0456 },
-{ 0xF7, 0x0457 },
-{ 0xF8, 0x0458 },
-{ 0xF9, 0x0459 },
-{ 0xFA, 0x045A },
-{ 0xFB, 0x045B },
-{ 0xFC, 0x045C },
-{ 0xFD, 0x00A7 },
-{ 0xFE, 0x045E },
-{ 0xFF, 0x045F }
-};
-
-
-static const mbfl_code_pair table_iso8859_6[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, I6(0x00A1)},
-{ 0xA2, I6(0x00A2)},
-{ 0xA3, I6(0x00A3)},
-{ 0xA4, 0x00A4 },
-{ 0xA5, I6(0x00A5)},
-{ 0xA6, I6(0x00A6)},
-{ 0xA7, I6(0x00A7)},
-{ 0xA8, I6(0x00A8)},
-{ 0xA9, I6(0x00A9)},
-{ 0xAA, I6(0x00AA)},
-{ 0xAB, I6(0x00AB)},
-{ 0xAC, 0x060C },
-{ 0xAD, 0x00AD },
-{ 0xAE, I6(0x00AE)},
-{ 0xAF, I6(0x00AF)},
-{ 0xB0, I6(0x00B0)},
-{ 0xB1, I6(0x00B1)},
-{ 0xB2, I6(0x00B2)},
-{ 0xB3, I6(0x00B3)},
-{ 0xB4, I6(0x00B4)},
-{ 0xB5, I6(0x00B5)},
-{ 0xB6, I6(0x00B6)},
-{ 0xB7, I6(0x00B7)},
-{ 0xB8, I6(0x00B8)},
-{ 0xB9, I6(0x00B9)},
-{ 0xBA, I6(0x00BA)},
-{ 0xBB, 0x061B },
-{ 0xBC, I6(0x00BC)},
-{ 0xBD, I6(0x00BD)},
-{ 0xBE, I6(0x00BE)},
-{ 0xBF, 0x061F },
-{ 0xC0, I6(0x00C0)},
-{ 0xC1, 0x0621 },
-{ 0xC2, 0x0622 },
-{ 0xC3, 0x0623 },
-{ 0xC4, 0x0624 },
-{ 0xC5, 0x0625 },
-{ 0xC6, 0x0626 },
-{ 0xC7, 0x0627 },
-{ 0xC8, 0x0628 },
-{ 0xC9, 0x0629 },
-{ 0xCA, 0x062A },
-{ 0xCB, 0x062B },
-{ 0xCC, 0x062C },
-{ 0xCD, 0x062D },
-{ 0xCE, 0x062E },
-{ 0xCF, 0x062F },
-{ 0xD0, 0x0630 },
-{ 0xD1, 0x0631 },
-{ 0xD2, 0x0632 },
-{ 0xD3, 0x0633 },
-{ 0xD4, 0x0634 },
-{ 0xD5, 0x0635 },
-{ 0xD6, 0x0636 },
-{ 0xD7, 0x0637 },
-{ 0xD8, 0x0638 },
-{ 0xD9, 0x0639 },
-{ 0xDA, 0x063A },
-{ 0xDB, I6(0x00DB)},
-{ 0xDC, I6(0x00DC)},
-{ 0xDD, I6(0x00DD)},
-{ 0xDE, I6(0x00DE)},
-{ 0xDF, I6(0x00DF)},
-{ 0xE0, 0x0640 },
-{ 0xE1, 0x0641 },
-{ 0xE2, 0x0642 },
-{ 0xE3, 0x0643 },
-{ 0xE4, 0x0644 },
-{ 0xE5, 0x0645 },
-{ 0xE6, 0x0646 },
-{ 0xE7, 0x0647 },
-{ 0xE8, 0x0648 },
-{ 0xE9, 0x0649 },
-{ 0xEA, 0x064A },
-{ 0xEB, 0x064B },
-{ 0xEC, 0x064C },
-{ 0xED, 0x064D },
-{ 0xEE, 0x064E },
-{ 0xEF, 0x064F },
-{ 0xF0, 0x0650 },
-{ 0xF1, 0x0651 },
-{ 0xF2, 0x0652 },
-{ 0xF3, I6(0x00F3)},
-{ 0xF4, I6(0x00F4)},
-{ 0xF5, I6(0x00F5)},
-{ 0xF6, I6(0x00F6)},
-{ 0xF7, I6(0x00F7)},
-{ 0xF8, I6(0x00F8)},
-{ 0xF9, I6(0x00F9)},
-{ 0xFA, I6(0x00FA)},
-{ 0xFB, I6(0x00FB)},
-{ 0xFC, I6(0x00FC)},
-{ 0xFD, I6(0x00FD)},
-{ 0xFE, I6(0x00FE)},
-{ 0xFF, I6(0x00FF)}
-};
-
-
-static const mbfl_code_pair table_iso8859_7[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, 0x2018 },
-{ 0xA2, 0x2019 },
-{ 0xA3, 0x00A3 },
-{ 0xA4, I7(0x00A4)},
-{ 0xA5, I7(0x00A5)},
-{ 0xA6, 0x00A6 },
-{ 0xA7, 0x00A7 },
-{ 0xA8, 0x00A8 },
-{ 0xA9, 0x00A9 },
-{ 0xAA, I7(0x00AA)},
-{ 0xAB, 0x00AB },
-{ 0xAC, 0x00AC },
-{ 0xAD, 0x00AD },
-{ 0xAE, I7(0x00AE)},
-{ 0xAF, 0x2015 },
-{ 0xB0, 0x00B0 },
-{ 0xB1, 0x00B1 },
-{ 0xB2, 0x00B2 },
-{ 0xB3, 0x00B3 },
-{ 0xB4, 0x0384 },
-{ 0xB5, 0x0385 },
-{ 0xB6, 0x0386 },
-{ 0xB7, 0x00B7 },
-{ 0xB8, 0x0388 },
-{ 0xB9, 0x0389 },
-{ 0xBA, 0x038A },
-{ 0xBB, 0x00BB },
-{ 0xBC, 0x038C },
-{ 0xBD, 0x00BD },
-{ 0xBE, 0x038E },
-{ 0xBF, 0x038F },
-{ 0xC0, 0x0390 },
-{ 0xC1, 0x0391 },
-{ 0xC2, 0x0392 },
-{ 0xC3, 0x0393 },
-{ 0xC4, 0x0394 },
-{ 0xC5, 0x0395 },
-{ 0xC6, 0x0396 },
-{ 0xC7, 0x0397 },
-{ 0xC8, 0x0398 },
-{ 0xC9, 0x0399 },
-{ 0xCA, 0x039A },
-{ 0xCB, 0x039B },
-{ 0xCC, 0x039C },
-{ 0xCD, 0x039D },
-{ 0xCE, 0x039E },
-{ 0xCF, 0x039F },
-{ 0xD0, 0x03A0 },
-{ 0xD1, 0x03A1 },
-{ 0xD2, I7(0x00D2)},
-{ 0xD3, 0x03A3 },
-{ 0xD4, 0x03A4 },
-{ 0xD5, 0x03A5 },
-{ 0xD6, 0x03A6 },
-{ 0xD7, 0x03A7 },
-{ 0xD8, 0x03A8 },
-{ 0xD9, 0x03A9 },
-{ 0xDA, 0x03AA },
-{ 0xDB, 0x03AB },
-{ 0xDC, 0x03AC },
-{ 0xDD, 0x03AD },
-{ 0xDE, 0x03AE },
-{ 0xDF, 0x03AF },
-{ 0xE0, 0x03B0 },
-{ 0xE1, 0x03B1 },
-{ 0xE2, 0x03B2 },
-{ 0xE3, 0x03B3 },
-{ 0xE4, 0x03B4 },
-{ 0xE5, 0x03B5 },
-{ 0xE6, 0x03B6 },
-{ 0xE7, 0x03B7 },
-{ 0xE8, 0x03B8 },
-{ 0xE9, 0x03B9 },
-{ 0xEA, 0x03BA },
-{ 0xEB, 0x03BB },
-{ 0xEC, 0x03BC },
-{ 0xED, 0x03BD },
-{ 0xEE, 0x03BE },
-{ 0xEF, 0x03BF },
-{ 0xF0, 0x03C0 },
-{ 0xF1, 0x03C1 },
-{ 0xF2, 0x03C2 },
-{ 0xF3, 0x03C3 },
-{ 0xF4, 0x03C4 },
-{ 0xF5, 0x03C5 },
-{ 0xF6, 0x03C6 },
-{ 0xF7, 0x03C7 },
-{ 0xF8, 0x03C8 },
-{ 0xF9, 0x03C9 },
-{ 0xFA, 0x03CA },
-{ 0xFB, 0x03CB },
-{ 0xFC, 0x03CC },
-{ 0xFD, 0x03CD },
-{ 0xFE, 0x03CE },
-{ 0xFF, I7(0x00FF)}
-};
-
-
-static const mbfl_code_pair table_iso8859_8[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, I8(0x00A1)},
-{ 0xA2, 0x00A2 },
-{ 0xA3, 0x00A3 },
-{ 0xA4, 0x00A4 },
-{ 0xA5, 0x00A5 },
-{ 0xA6, 0x00A6 },
-{ 0xA7, 0x00A7 },
-{ 0xA8, 0x00A8 },
-{ 0xA9, 0x00A9 },
-{ 0xAA, 0x00D7 },
-{ 0xAB, 0x00AB },
-{ 0xAC, 0x00AC },
-{ 0xAD, 0x00AD },
-{ 0xAE, 0x00AE },
-{ 0xAF, 0x203E },
-{ 0xB0, 0x00B0 },
-{ 0xB1, 0x00B1 },
-{ 0xB2, 0x00B2 },
-{ 0xB3, 0x00B3 },
-{ 0xB4, 0x00B4 },
-{ 0xB5, 0x00B5 },
-{ 0xB6, 0x00B6 },
-{ 0xB7, 0x00B7 },
-{ 0xB8, 0x00B8 },
-{ 0xB9, 0x00B9 },
-{ 0xBA, 0x00F7 },
-{ 0xBB, 0x00BB },
-{ 0xBC, 0x00BC },
-{ 0xBD, 0x00BD },
-{ 0xBE, 0x00BE },
-{ 0xBF, I8(0x00BF)},
-{ 0xC0, I8(0x00C0)},
-{ 0xC1, I8(0x00C1)},
-{ 0xC2, I8(0x00C2)},
-{ 0xC3, I8(0x00C3)},
-{ 0xC4, I8(0x00C4)},
-{ 0xC5, I8(0x00C5)},
-{ 0xC6, I8(0x00C6)},
-{ 0xC7, I8(0x00C7)},
-{ 0xC8, I8(0x00C8)},
-{ 0xC9, I8(0x00C9)},
-{ 0xCA, I8(0x00CA)},
-{ 0xCB, I8(0x00CB)},
-{ 0xCC, I8(0x00CC)},
-{ 0xCD, I8(0x00CD)},
-{ 0xCE, I8(0x00CE)},
-{ 0xCF, I8(0x00CF)},
-{ 0xD0, I8(0x00D0)},
-{ 0xD1, I8(0x00D1)},
-{ 0xD2, I8(0x00D2)},
-{ 0xD3, I8(0x00D3)},
-{ 0xD4, I8(0x00D4)},
-{ 0xD5, I8(0x00D5)},
-{ 0xD6, I8(0x00D6)},
-{ 0xD7, I8(0x00D7)},
-{ 0xD8, I8(0x00D8)},
-{ 0xD9, I8(0x00D9)},
-{ 0xDA, I8(0x00DA)},
-{ 0xDB, I8(0x00DB)},
-{ 0xDC, I8(0x00DC)},
-{ 0xDD, I8(0x00DD)},
-{ 0xDE, I8(0x00DE)},
-{ 0xDF, 0x2017 },
-{ 0xE0, 0x05D0 },
-{ 0xE1, 0x05D1 },
-{ 0xE2, 0x05D2 },
-{ 0xE3, 0x05D3 },
-{ 0xE4, 0x05D4 },
-{ 0xE5, 0x05D5 },
-{ 0xE6, 0x05D6 },
-{ 0xE7, 0x05D7 },
-{ 0xE8, 0x05D8 },
-{ 0xE9, 0x05D9 },
-{ 0xEA, 0x05DA },
-{ 0xEB, 0x05DB },
-{ 0xEC, 0x05DC },
-{ 0xED, 0x05DD },
-{ 0xEE, 0x05DE },
-{ 0xEF, 0x05DF },
-{ 0xF0, 0x05E0 },
-{ 0xF1, 0x05E1 },
-{ 0xF2, 0x05E2 },
-{ 0xF3, 0x05E3 },
-{ 0xF4, 0x05E4 },
-{ 0xF5, 0x05E5 },
-{ 0xF6, 0x05E6 },
-{ 0xF7, 0x05E7 },
-{ 0xF8, 0x05E8 },
-{ 0xF9, 0x05E9 },
-{ 0xFA, 0x05EA },
-{ 0xFB, I8(0x00FB)},
-{ 0xFC, I8(0x00FC)},
-{ 0xFD, I8(0x00FD)},
-{ 0xFE, I8(0x00FE)},
-{ 0xFF, I8(0x00FF)}
-};
-
-
-static const mbfl_code_pair table_iso8859_9[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, 0x00A1 },
-{ 0xA2, 0x00A2 },
-{ 0xA3, 0x00A3 },
-{ 0xA4, 0x00A4 },
-{ 0xA5, 0x00A5 },
-{ 0xA6, 0x00A6 },
-{ 0xA7, 0x00A7 },
-{ 0xA8, 0x00A8 },
-{ 0xA9, 0x00A9 },
-{ 0xAA, 0x00AA },
-{ 0xAB, 0x00AB },
-{ 0xAC, 0x00AC },
-{ 0xAD, 0x00AD },
-{ 0xAE, 0x00AE },
-{ 0xAF, 0x00AF },
-{ 0xB0, 0x00B0 },
-{ 0xB1, 0x00B1 },
-{ 0xB2, 0x00B2 },
-{ 0xB3, 0x00B3 },
-{ 0xB4, 0x00B4 },
-{ 0xB5, 0x00B5 },
-{ 0xB6, 0x00B6 },
-{ 0xB7, 0x00B7 },
-{ 0xB8, 0x00B8 },
-{ 0xB9, 0x00B9 },
-{ 0xBA, 0x00BA },
-{ 0xBB, 0x00BB },
-{ 0xBC, 0x00BC },
-{ 0xBD, 0x00BD },
-{ 0xBE, 0x00BE },
-{ 0xBF, 0x00BF },
-{ 0xC0, 0x00C0 },
-{ 0xC1, 0x00C1 },
-{ 0xC2, 0x00C2 },
-{ 0xC3, 0x00C3 },
-{ 0xC4, 0x00C4 },
-{ 0xC5, 0x00C5 },
-{ 0xC6, 0x00C6 },
-{ 0xC7, 0x00C7 },
-{ 0xC8, 0x00C8 },
-{ 0xC9, 0x00C9 },
-{ 0xCA, 0x00CA },
-{ 0xCB, 0x00CB },
-{ 0xCC, 0x00CC },
-{ 0xCD, 0x00CD },
-{ 0xCE, 0x00CE },
-{ 0xCF, 0x00CF },
-{ 0xD0, 0x011E },
-{ 0xD1, 0x00D1 },
-{ 0xD2, 0x00D2 },
-{ 0xD3, 0x00D3 },
-{ 0xD4, 0x00D4 },
-{ 0xD5, 0x00D5 },
-{ 0xD6, 0x00D6 },
-{ 0xD7, 0x00D7 },
-{ 0xD8, 0x00D8 },
-{ 0xD9, 0x00D9 },
-{ 0xDA, 0x00DA },
-{ 0xDB, 0x00DB },
-{ 0xDC, 0x00DC },
-{ 0xDD, 0x0130 },
-{ 0xDE, 0x015E },
-{ 0xDF, 0x00DF },
-{ 0xE0, 0x00E0 },
-{ 0xE1, 0x00E1 },
-{ 0xE2, 0x00E2 },
-{ 0xE3, 0x00E3 },
-{ 0xE4, 0x00E4 },
-{ 0xE5, 0x00E5 },
-{ 0xE6, 0x00E6 },
-{ 0xE7, 0x00E7 },
-{ 0xE8, 0x00E8 },
-{ 0xE9, 0x00E9 },
-{ 0xEA, 0x00EA },
-{ 0xEB, 0x00EB },
-{ 0xEC, 0x00EC },
-{ 0xED, 0x00ED },
-{ 0xEE, 0x00EE },
-{ 0xEF, 0x00EF },
-{ 0xF0, 0x011F },
-{ 0xF1, 0x00F1 },
-{ 0xF2, 0x00F2 },
-{ 0xF3, 0x00F3 },
-{ 0xF4, 0x00F4 },
-{ 0xF5, 0x00F5 },
-{ 0xF6, 0x00F6 },
-{ 0xF7, 0x00F7 },
-{ 0xF8, 0x00F8 },
-{ 0xF9, 0x00F9 },
-{ 0xFA, 0x00FA },
-{ 0xFB, 0x00FB },
-{ 0xFC, 0x00FC },
-{ 0xFD, 0x0131 },
-{ 0xFE, 0x015F },
-{ 0xFF, 0x00FF }
-};
-
-
-static const mbfl_code_pair table_iso8859_10[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, 0x0104 },
-{ 0xA2, 0x0112 },
-{ 0xA3, 0x0122 },
-{ 0xA4, 0x0124 },
-{ 0xA5, 0x0128 },
-{ 0xA6, 0x0136 },
-{ 0xA7, 0x00A7 },
-{ 0xA8, 0x013B },
-{ 0xA9, 0x0110 },
-{ 0xAA, 0x0160 },
-{ 0xAB, 0x0166 },
-{ 0xAC, 0x017D },
-{ 0xAD, 0x00AD },
-{ 0xAE, 0x016A },
-{ 0xAF, 0x014A },
-{ 0xB0, 0x00B0 },
-{ 0xB1, 0x0105 },
-{ 0xB2, 0x0113 },
-{ 0xB3, 0x0123 },
-{ 0xB4, 0x012B },
-{ 0xB5, 0x0129 },
-{ 0xB6, 0x0137 },
-{ 0xB7, 0x00B7 },
-{ 0xB8, 0x013C },
-{ 0xB9, 0x0111 },
-{ 0xBA, 0x0161 },
-{ 0xBB, 0x0167 },
-{ 0xBC, 0x017E },
-{ 0xBD, 0x2015 },
-{ 0xBE, 0x016B },
-{ 0xBF, 0x014B },
-{ 0xC0, 0x0100 },
-{ 0xC1, 0x00C1 },
-{ 0xC2, 0x00C2 },
-{ 0xC3, 0x00C3 },
-{ 0xC4, 0x00C4 },
-{ 0xC5, 0x00C5 },
-{ 0xC6, 0x00C6 },
-{ 0xC7, 0x012E },
-{ 0xC8, 0x010C },
-{ 0xC9, 0x00C9 },
-{ 0xCA, 0x0118 },
-{ 0xCB, 0x00CB },
-{ 0xCC, 0x0116 },
-{ 0xCD, 0x00CD },
-{ 0xCE, 0x00CE },
-{ 0xCF, 0x00CF },
-{ 0xD0, 0x00D0 },
-{ 0xD1, 0x0145 },
-{ 0xD2, 0x014C },
-{ 0xD3, 0x00D3 },
-{ 0xD4, 0x00D4 },
-{ 0xD5, 0x00D5 },
-{ 0xD6, 0x00D6 },
-{ 0xD7, 0x0168 },
-{ 0xD8, 0x00D8 },
-{ 0xD9, 0x0172 },
-{ 0xDA, 0x00DA },
-{ 0xDB, 0x00DB },
-{ 0xDC, 0x00DC },
-{ 0xDD, 0x00DD },
-{ 0xDE, 0x00DE },
-{ 0xDF, 0x00DF },
-{ 0xE0, 0x0101 },
-{ 0xE1, 0x00E1 },
-{ 0xE2, 0x00E2 },
-{ 0xE3, 0x00E3 },
-{ 0xE4, 0x00E4 },
-{ 0xE5, 0x00E5 },
-{ 0xE6, 0x00E6 },
-{ 0xE7, 0x012F },
-{ 0xE8, 0x010D },
-{ 0xE9, 0x00E9 },
-{ 0xEA, 0x0119 },
-{ 0xEB, 0x00EB },
-{ 0xEC, 0x0117 },
-{ 0xED, 0x00ED },
-{ 0xEE, 0x00EE },
-{ 0xEF, 0x00EF },
-{ 0xF0, 0x00F0 },
-{ 0xF1, 0x0146 },
-{ 0xF2, 0x014D },
-{ 0xF3, 0x00F3 },
-{ 0xF4, 0x00F4 },
-{ 0xF5, 0x00F5 },
-{ 0xF6, 0x00F6 },
-{ 0xF7, 0x0169 },
-{ 0xF8, 0x00F8 },
-{ 0xF9, 0x0173 },
-{ 0xFA, 0x00FA },
-{ 0xFB, 0x00FB },
-{ 0xFC, 0x00FC },
-{ 0xFD, 0x00FD },
-{ 0xFE, 0x00FE },
-{ 0xFF, 0x0138 }
-};
-
-
-static const mbfl_code_pair table_iso8859_13[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, 0x201D },
-{ 0xA2, 0x00A2 },
-{ 0xA3, 0x00A3 },
-{ 0xA4, 0x00A4 },
-{ 0xA5, 0x201E },
-{ 0xA6, 0x00A6 },
-{ 0xA7, 0x00A7 },
-{ 0xA8, 0x00D8 },
-{ 0xA9, 0x00A9 },
-{ 0xAA, 0x0156 },
-{ 0xAB, 0x00AB },
-{ 0xAC, 0x00AC },
-{ 0xAD, 0x00AD },
-{ 0xAE, 0x00AE },
-{ 0xAF, 0x00C6 },
-{ 0xB0, 0x00B0 },
-{ 0xB1, 0x00B1 },
-{ 0xB2, 0x00B2 },
-{ 0xB3, 0x00B3 },
-{ 0xB4, 0x201C },
-{ 0xB5, 0x00B5 },
-{ 0xB6, 0x00B6 },
-{ 0xB7, 0x00B7 },
-{ 0xB8, 0x00F8 },
-{ 0xB9, 0x00B9 },
-{ 0xBA, 0x0157 },
-{ 0xBB, 0x00BB },
-{ 0xBC, 0x00BC },
-{ 0xBD, 0x00BD },
-{ 0xBE, 0x00BE },
-{ 0xBF, 0x00E6 },
-{ 0xC0, 0x0104 },
-{ 0xC1, 0x012E },
-{ 0xC2, 0x0100 },
-{ 0xC3, 0x0106 },
-{ 0xC4, 0x00C4 },
-{ 0xC5, 0x00C5 },
-{ 0xC6, 0x0118 },
-{ 0xC7, 0x0112 },
-{ 0xC8, 0x010C },
-{ 0xC9, 0x00C9 },
-{ 0xCA, 0x0179 },
-{ 0xCB, 0x0116 },
-{ 0xCC, 0x0122 },
-{ 0xCD, 0x0136 },
-{ 0xCE, 0x012A },
-{ 0xCF, 0x013B },
-{ 0xD0, 0x0160 },
-{ 0xD1, 0x0143 },
-{ 0xD2, 0x0145 },
-{ 0xD3, 0x00D3 },
-{ 0xD4, 0x014C },
-{ 0xD5, 0x00D5 },
-{ 0xD6, 0x00D6 },
-{ 0xD7, 0x00D7 },
-{ 0xD8, 0x0172 },
-{ 0xD9, 0x0141 },
-{ 0xDA, 0x015A },
-{ 0xDB, 0x016A },
-{ 0xDC, 0x00DC },
-{ 0xDD, 0x017B },
-{ 0xDE, 0x017D },
-{ 0xDF, 0x00DF },
-{ 0xE0, 0x0105 },
-{ 0xE1, 0x012F },
-{ 0xE2, 0x0101 },
-{ 0xE3, 0x0107 },
-{ 0xE4, 0x00E4 },
-{ 0xE5, 0x00E5 },
-{ 0xE6, 0x0119 },
-{ 0xE7, 0x0113 },
-{ 0xE8, 0x010D },
-{ 0xE9, 0x00E9 },
-{ 0xEA, 0x017A },
-{ 0xEB, 0x0117 },
-{ 0xEC, 0x0123 },
-{ 0xED, 0x0137 },
-{ 0xEE, 0x012B },
-{ 0xEF, 0x013C },
-{ 0xF0, 0x0161 },
-{ 0xF1, 0x0144 },
-{ 0xF2, 0x0146 },
-{ 0xF3, 0x00F3 },
-{ 0xF4, 0x014D },
-{ 0xF5, 0x00F5 },
-{ 0xF6, 0x00F6 },
-{ 0xF7, 0x00F7 },
-{ 0xF8, 0x0173 },
-{ 0xF9, 0x0142 },
-{ 0xFA, 0x015B },
-{ 0xFB, 0x016B },
-{ 0xFC, 0x00FC },
-{ 0xFD, 0x017C },
-{ 0xFE, 0x017E },
-{ 0xFF, 0x2019 }
-};
-
-
-static const mbfl_code_pair table_iso8859_14[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, 0x1E02 },
-{ 0xA2, 0x1E03 },
-{ 0xA3, 0x00A3 },
-{ 0xA4, 0x010A },
-{ 0xA5, 0x010B },
-{ 0xA6, 0x1E0A },
-{ 0xA7, 0x00A7 },
-{ 0xA8, 0x1E80 },
-{ 0xA9, 0x00A9 },
-{ 0xAA, 0x1E82 },
-{ 0xAB, 0x1E0B },
-{ 0xAC, 0x1EF2 },
-{ 0xAD, 0x00AD },
-{ 0xAE, 0x00AE },
-{ 0xAF, 0x0178 },
-{ 0xB0, 0x1E1E },
-{ 0xB1, 0x1E1F },
-{ 0xB2, 0x0120 },
-{ 0xB3, 0x0121 },
-{ 0xB4, 0x1E40 },
-{ 0xB5, 0x1E41 },
-{ 0xB6, 0x00B6 },
-{ 0xB7, 0x1E56 },
-{ 0xB8, 0x1E81 },
-{ 0xB9, 0x1E57 },
-{ 0xBA, 0x1E83 },
-{ 0xBB, 0x1E60 },
-{ 0xBC, 0x1EF3 },
-{ 0xBD, 0x1E84 },
-{ 0xBE, 0x1E85 },
-{ 0xBF, 0x1E61 },
-{ 0xC0, 0x00C0 },
-{ 0xC1, 0x00C1 },
-{ 0xC2, 0x00C2 },
-{ 0xC3, 0x00C3 },
-{ 0xC4, 0x00C4 },
-{ 0xC5, 0x00C5 },
-{ 0xC6, 0x00C6 },
-{ 0xC7, 0x00C7 },
-{ 0xC8, 0x00C8 },
-{ 0xC9, 0x00C9 },
-{ 0xCA, 0x00CA },
-{ 0xCB, 0x00CB },
-{ 0xCC, 0x00CC },
-{ 0xCD, 0x00CD },
-{ 0xCE, 0x00CE },
-{ 0xCF, 0x00CF },
-{ 0xD0, 0x0174 },
-{ 0xD1, 0x00D1 },
-{ 0xD2, 0x00D2 },
-{ 0xD3, 0x00D3 },
-{ 0xD4, 0x00D4 },
-{ 0xD5, 0x00D5 },
-{ 0xD6, 0x00D6 },
-{ 0xD7, 0x1E6A },
-{ 0xD8, 0x00D8 },
-{ 0xD9, 0x00D9 },
-{ 0xDA, 0x00DA },
-{ 0xDB, 0x00DB },
-{ 0xDC, 0x00DC },
-{ 0xDD, 0x00DD },
-{ 0xDE, 0x0176 },
-{ 0xDF, 0x00DF },
-{ 0xE0, 0x00E0 },
-{ 0xE1, 0x00E1 },
-{ 0xE2, 0x00E2 },
-{ 0xE3, 0x00E3 },
-{ 0xE4, 0x00E4 },
-{ 0xE5, 0x00E5 },
-{ 0xE6, 0x00E6 },
-{ 0xE7, 0x00E7 },
-{ 0xE8, 0x00E8 },
-{ 0xE9, 0x00E9 },
-{ 0xEA, 0x00EA },
-{ 0xEB, 0x00EB },
-{ 0xEC, 0x00EC },
-{ 0xED, 0x00ED },
-{ 0xEE, 0x00EE },
-{ 0xEF, 0x00EF },
-{ 0xF0, 0x0175 },
-{ 0xF1, 0x00F1 },
-{ 0xF2, 0x00F2 },
-{ 0xF3, 0x00F3 },
-{ 0xF4, 0x00F4 },
-{ 0xF5, 0x00F5 },
-{ 0xF6, 0x00F6 },
-{ 0xF7, 0x1E6B },
-{ 0xF8, 0x00F8 },
-{ 0xF9, 0x00F9 },
-{ 0xFA, 0x00FA },
-{ 0xFB, 0x00FB },
-{ 0xFC, 0x00FC },
-{ 0xFD, 0x00FD },
-{ 0xFE, 0x0177 },
-{ 0xFF, 0x00FF }
-};
-
-
-static const mbfl_code_pair table_iso8859_15[] = {
-{ 0xA0, 0x00A0 },
-{ 0xA1, 0x00A1 },
-{ 0xA2, 0x00A2 },
-{ 0xA3, 0x00A3 },
-{ 0xA4, 0x20AC },
-{ 0xA5, 0x00A5 },
-{ 0xA6, 0x0160 },
-{ 0xA7, 0x00A7 },
-{ 0xA8, 0x0161 },
-{ 0xA9, 0x00A9 },
-{ 0xAA, 0x00AA },
-{ 0xAB, 0x00AB },
-{ 0xAC, 0x00AC },
-{ 0xAD, 0x00AD },
-{ 0xAE, 0x00AE },
-{ 0xAF, 0x00AF },
-{ 0xB0, 0x00B0 },
-{ 0xB1, 0x00B1 },
-{ 0xB2, 0x00B2 },
-{ 0xB3, 0x00B3 },
-{ 0xB4, 0x017D },
-{ 0xB5, 0x00B5 },
-{ 0xB6, 0x00B6 },
-{ 0xB7, 0x00B7 },
-{ 0xB8, 0x017E },
-{ 0xB9, 0x00B9 },
-{ 0xBA, 0x00BA },
-{ 0xBB, 0x00BB },
-{ 0xBC, 0x0152 },
-{ 0xBD, 0x0153 },
-{ 0xBE, 0x0178 },
-{ 0xBF, 0x00BF },
-{ 0xC0, 0x00C0 },
-{ 0xC1, 0x00C1 },
-{ 0xC2, 0x00C2 },
-{ 0xC3, 0x00C3 },
-{ 0xC4, 0x00C4 },
-{ 0xC5, 0x00C5 },
-{ 0xC6, 0x00C6 },
-{ 0xC7, 0x00C7 },
-{ 0xC8, 0x00C8 },
-{ 0xC9, 0x00C9 },
-{ 0xCA, 0x00CA },
-{ 0xCB, 0x00CB },
-{ 0xCC, 0x00CC },
-{ 0xCD, 0x00CD },
-{ 0xCE, 0x00CE },
-{ 0xCF, 0x00CF },
-{ 0xD0, 0x00D0 },
-{ 0xD1, 0x00D1 },
-{ 0xD2, 0x00D2 },
-{ 0xD3, 0x00D3 },
-{ 0xD4, 0x00D4 },
-{ 0xD5, 0x00D5 },
-{ 0xD6, 0x00D6 },
-{ 0xD7, 0x00D7 },
-{ 0xD8, 0x00D8 },
-{ 0xD9, 0x00D9 },
-{ 0xDA, 0x00DA },
-{ 0xDB, 0x00DB },
-{ 0xDC, 0x00DC },
-{ 0xDD, 0x00DD },
-{ 0xDE, 0x00DE },
-{ 0xDF, 0x00DF },
-{ 0xE0, 0x00E0 },
-{ 0xE1, 0x00E1 },
-{ 0xE2, 0x00E2 },
-{ 0xE3, 0x00E3 },
-{ 0xE4, 0x00E4 },
-{ 0xE5, 0x00E5 },
-{ 0xE6, 0x00E6 },
-{ 0xE7, 0x00E7 },
-{ 0xE8, 0x00E8 },
-{ 0xE9, 0x00E9 },
-{ 0xEA, 0x00EA },
-{ 0xEB, 0x00EB },
-{ 0xEC, 0x00EC },
-{ 0xED, 0x00ED },
-{ 0xEE, 0x00EE },
-{ 0xEF, 0x00EF },
-{ 0xF0, 0x00F0 },
-{ 0xF1, 0x00F1 },
-{ 0xF2, 0x00F2 },
-{ 0xF3, 0x00F3 },
-{ 0xF4, 0x00F4 },
-{ 0xF5, 0x00F5 },
-{ 0xF6, 0x00F6 },
-{ 0xF7, 0x00F7 },
-{ 0xF8, 0x00F8 },
-{ 0xF9, 0x00F9 },
-{ 0xFA, 0x00FA },
-{ 0xFB, 0x00FB },
-{ 0xFC, 0x00FC },
-{ 0xFD, 0x00FD },
-{ 0xFE, 0x00FE },
-{ 0xFF, 0x00FF }
+static const int table_iso8859_2[] = {
+ 0xA0, 0x00A0,
+ 0xA1, 0x0104,
+ 0xA2, 0x02D8,
+ 0xA3, 0x0141,
+ 0xA4, 0x00A4,
+ 0xA5, 0x013D,
+ 0xA6, 0x015A,
+ 0xA7, 0x00A7,
+ 0xA8, 0x00A8,
+ 0xA9, 0x0160,
+ 0xAA, 0x015E,
+ 0xAB, 0x0164,
+ 0xAC, 0x0179,
+ 0xAD, 0x00AD,
+ 0xAE, 0x017D,
+ 0xAF, 0x017B,
+ 0xB0, 0x00B0,
+ 0xB1, 0x0105,
+ 0xB2, 0x02DB,
+ 0xB3, 0x0142,
+ 0xB4, 0x00B4,
+ 0xB5, 0x013E,
+ 0xB6, 0x015B,
+ 0xB7, 0x02C7,
+ 0xB8, 0x00B8,
+ 0xB9, 0x0161,
+ 0xBA, 0x015F,
+ 0xBB, 0x0165,
+ 0xBC, 0x017A,
+ 0xBD, 0x02DD,
+ 0xBE, 0x017E,
+ 0xBF, 0x017C,
+ 0xC0, 0x0154,
+ 0xC1, 0x00C1,
+ 0xC2, 0x00C2,
+ 0xC3, 0x0102,
+ 0xC4, 0x00C4,
+ 0xC5, 0x0139,
+ 0xC6, 0x0106,
+ 0xC7, 0x00C7,
+ 0xC8, 0x010C,
+ 0xC9, 0x00C9,
+ 0xCA, 0x0118,
+ 0xCB, 0x00CB,
+ 0xCC, 0x011A,
+ 0xCD, 0x00CD,
+ 0xCE, 0x00CE,
+ 0xCF, 0x010E,
+ 0xD0, 0x0110,
+ 0xD1, 0x0143,
+ 0xD2, 0x0147,
+ 0xD3, 0x00D3,
+ 0xD4, 0x00D4,
+ 0xD5, 0x0150,
+ 0xD6, 0x00D6,
+ 0xD7, 0x00D7,
+ 0xD8, 0x0158,
+ 0xD9, 0x016E,
+ 0xDA, 0x00DA,
+ 0xDB, 0x0170,
+ 0xDC, 0x00DC,
+ 0xDD, 0x00DD,
+ 0xDE, 0x0162,
+ 0xDF, 0x00DF,
+ 0xE0, 0x0155,
+ 0xE1, 0x00E1,
+ 0xE2, 0x00E2,
+ 0xE3, 0x0103,
+ 0xE4, 0x00E4,
+ 0xE5, 0x013A,
+ 0xE6, 0x0107,
+ 0xE7, 0x00E7,
+ 0xE8, 0x010D,
+ 0xE9, 0x00E9,
+ 0xEA, 0x0119,
+ 0xEB, 0x00EB,
+ 0xEC, 0x011B,
+ 0xED, 0x00ED,
+ 0xEE, 0x00EE,
+ 0xEF, 0x010F,
+ 0xF0, 0x0111,
+ 0xF1, 0x0144,
+ 0xF2, 0x0148,
+ 0xF3, 0x00F3,
+ 0xF4, 0x00F4,
+ 0xF5, 0x0151,
+ 0xF6, 0x00F6,
+ 0xF7, 0x00F7,
+ 0xF8, 0x0159,
+ 0xF9, 0x016F,
+ 0xFA, 0x00FA,
+ 0xFB, 0x0171,
+ 0xFC, 0x00FC,
+ 0xFD, 0x00FD,
+ 0xFE, 0x0163,
+ 0xFF, 0x02D9
+};
+
+
+static const int table_iso8859_3[] = {
+ 0xA0, 0x00A0,
+ 0xA1, 0x0126,
+ 0xA2, 0x02D8,
+ 0xA3, 0x00A3,
+ 0xA4, 0x00A4,
+ 0xA5, I3(0x00A5),
+ 0xA6, 0x0124,
+ 0xA7, 0x00A7,
+ 0xA8, 0x00A8,
+ 0xA9, 0x0130,
+ 0xAA, 0x015E,
+ 0xAB, 0x011E,
+ 0xAC, 0x0134,
+ 0xAD, 0x00AD,
+ 0xAE, I3(0x00AE),
+ 0xAF, 0x017B,
+ 0xB0, 0x00B0,
+ 0xB1, 0x0127,
+ 0xB2, 0x00B2,
+ 0xB3, 0x00B3,
+ 0xB4, 0x00B4,
+ 0xB5, 0x00B5,
+ 0xB6, 0x0125,
+ 0xB7, 0x00B7,
+ 0xB8, 0x00B8,
+ 0xB9, 0x0131,
+ 0xBA, 0x015F,
+ 0xBB, 0x011F,
+ 0xBC, 0x0135,
+ 0xBD, 0x00BD,
+ 0xBE, I3(0x00BE),
+ 0xBF, 0x017C,
+ 0xC0, 0x00C0,
+ 0xC1, 0x00C1,
+ 0xC2, 0x00C2,
+ 0xC3, I3(0x00C3),
+ 0xC4, 0x00C4,
+ 0xC5, 0x010A,
+ 0xC6, 0x0108,
+ 0xC7, 0x00C7,
+ 0xC8, 0x00C8,
+ 0xC9, 0x00C9,
+ 0xCA, 0x00CA,
+ 0xCB, 0x00CB,
+ 0xCC, 0x00CC,
+ 0xCD, 0x00CD,
+ 0xCE, 0x00CE,
+ 0xCF, 0x00CF,
+ 0xD0, I3(0x00D0),
+ 0xD1, 0x00D1,
+ 0xD2, 0x00D2,
+ 0xD3, 0x00D3,
+ 0xD4, 0x00D4,
+ 0xD5, 0x0120,
+ 0xD6, 0x00D6,
+ 0xD7, 0x00D7,
+ 0xD8, 0x011C,
+ 0xD9, 0x00D9,
+ 0xDA, 0x00DA,
+ 0xDB, 0x00DB,
+ 0xDC, 0x00DC,
+ 0xDD, 0x016C,
+ 0xDE, 0x015C,
+ 0xDF, 0x00DF,
+ 0xE0, 0x00E0,
+ 0xE1, 0x00E1,
+ 0xE2, 0x00E2,
+ 0xE3, I3(0x00E3),
+ 0xE4, 0x00E4,
+ 0xE5, 0x010B,
+ 0xE6, 0x0109,
+ 0xE7, 0x00E7,
+ 0xE8, 0x00E8,
+ 0xE9, 0x00E9,
+ 0xEA, 0x00EA,
+ 0xEB, 0x00EB,
+ 0xEC, 0x00EC,
+ 0xED, 0x00ED,
+ 0xEE, 0x00EE,
+ 0xEF, 0x00EF,
+ 0xF0, I3(0x00F0),
+ 0xF1, 0x00F1,
+ 0xF2, 0x00F2,
+ 0xF3, 0x00F3,
+ 0xF4, 0x00F4,
+ 0xF5, 0x0121,
+ 0xF6, 0x00F6,
+ 0xF7, 0x00F7,
+ 0xF8, 0x011D,
+ 0xF9, 0x00F9,
+ 0xFA, 0x00FA,
+ 0xFB, 0x00FB,
+ 0xFC, 0x00FC,
+ 0xFD, 0x016D,
+ 0xFE, 0x015D,
+ 0xFF, 0x02D9
+};
+
+
+static const int table_iso8859_4[] = {
+ 0xA0, 0x00A0,
+ 0xA1, 0x0104,
+ 0xA2, 0x0138,
+ 0xA3, 0x0156,
+ 0xA4, 0x00A4,
+ 0xA5, 0x0128,
+ 0xA6, 0x013B,
+ 0xA7, 0x00A7,
+ 0xA8, 0x00A8,
+ 0xA9, 0x0160,
+ 0xAA, 0x0112,
+ 0xAB, 0x0122,
+ 0xAC, 0x0166,
+ 0xAD, 0x00AD,
+ 0xAE, 0x017D,
+ 0xAF, 0x00AF,
+ 0xB0, 0x00B0,
+ 0xB1, 0x0105,
+ 0xB2, 0x02DB,
+ 0xB3, 0x0157,
+ 0xB4, 0x00B4,
+ 0xB5, 0x0129,
+ 0xB6, 0x013C,
+ 0xB7, 0x02C7,
+ 0xB8, 0x00B8,
+ 0xB9, 0x0161,
+ 0xBA, 0x0113,
+ 0xBB, 0x0123,
+ 0xBC, 0x0167,
+ 0xBD, 0x014A,
+ 0xBE, 0x017E,
+ 0xBF, 0x014B,
+ 0xC0, 0x0100,
+ 0xC1, 0x00C1,
+ 0xC2, 0x00C2,
+ 0xC3, 0x00C3,
+ 0xC4, 0x00C4,
+ 0xC5, 0x00C5,
+ 0xC6, 0x00C6,
+ 0xC7, 0x012E,
+ 0xC8, 0x010C,
+ 0xC9, 0x00C9,
+ 0xCA, 0x0118,
+ 0xCB, 0x00CB,
+ 0xCC, 0x0116,
+ 0xCD, 0x00CD,
+ 0xCE, 0x00CE,
+ 0xCF, 0x012A,
+ 0xD0, 0x0110,
+ 0xD1, 0x0145,
+ 0xD2, 0x014C,
+ 0xD3, 0x0136,
+ 0xD4, 0x00D4,
+ 0xD5, 0x00D5,
+ 0xD6, 0x00D6,
+ 0xD7, 0x00D7,
+ 0xD8, 0x00D8,
+ 0xD9, 0x0172,
+ 0xDA, 0x00DA,
+ 0xDB, 0x00DB,
+ 0xDC, 0x00DC,
+ 0xDD, 0x0168,
+ 0xDE, 0x016A,
+ 0xDF, 0x00DF,
+ 0xE0, 0x0101,
+ 0xE1, 0x00E1,
+ 0xE2, 0x00E2,
+ 0xE3, 0x00E3,
+ 0xE4, 0x00E4,
+ 0xE5, 0x00E5,
+ 0xE6, 0x00E6,
+ 0xE7, 0x012F,
+ 0xE8, 0x010D,
+ 0xE9, 0x00E9,
+ 0xEA, 0x0119,
+ 0xEB, 0x00EB,
+ 0xEC, 0x0117,
+ 0xED, 0x00ED,
+ 0xEE, 0x00EE,
+ 0xEF, 0x012B,
+ 0xF0, 0x0111,
+ 0xF1, 0x0146,
+ 0xF2, 0x014D,
+ 0xF3, 0x0137,
+ 0xF4, 0x00F4,
+ 0xF5, 0x00F5,
+ 0xF6, 0x00F6,
+ 0xF7, 0x00F7,
+ 0xF8, 0x00F8,
+ 0xF9, 0x0173,
+ 0xFA, 0x00FA,
+ 0xFB, 0x00FB,
+ 0xFC, 0x00FC,
+ 0xFD, 0x0169,
+ 0xFE, 0x016B,
+ 0xFF, 0x02D9
+};
+
+
+static const int table_iso8859_5[] = {
+ 0xA0, 0x00A0,
+ 0xA1, 0x0401,
+ 0xA2, 0x0402,
+ 0xA3, 0x0403,
+ 0xA4, 0x0404,
+ 0xA5, 0x0405,
+ 0xA6, 0x0406,
+ 0xA7, 0x0407,
+ 0xA8, 0x0408,
+ 0xA9, 0x0409,
+ 0xAA, 0x040A,
+ 0xAB, 0x040B,
+ 0xAC, 0x040C,
+ 0xAD, 0x00AD,
+ 0xAE, 0x040E,
+ 0xAF, 0x040F,
+ 0xB0, 0x0410,
+ 0xB1, 0x0411,
+ 0xB2, 0x0412,
+ 0xB3, 0x0413,
+ 0xB4, 0x0414,
+ 0xB5, 0x0415,
+ 0xB6, 0x0416,
+ 0xB7, 0x0417,
+ 0xB8, 0x0418,
+ 0xB9, 0x0419,
+ 0xBA, 0x041A,
+ 0xBB, 0x041B,
+ 0xBC, 0x041C,
+ 0xBD, 0x041D,
+ 0xBE, 0x041E,
+ 0xBF, 0x041F,
+ 0xC0, 0x0420,
+ 0xC1, 0x0421,
+ 0xC2, 0x0422,
+ 0xC3, 0x0423,
+ 0xC4, 0x0424,
+ 0xC5, 0x0425,
+ 0xC6, 0x0426,
+ 0xC7, 0x0427,
+ 0xC8, 0x0428,
+ 0xC9, 0x0429,
+ 0xCA, 0x042A,
+ 0xCB, 0x042B,
+ 0xCC, 0x042C,
+ 0xCD, 0x042D,
+ 0xCE, 0x042E,
+ 0xCF, 0x042F,
+ 0xD0, 0x0430,
+ 0xD1, 0x0431,
+ 0xD2, 0x0432,
+ 0xD3, 0x0433,
+ 0xD4, 0x0434,
+ 0xD5, 0x0435,
+ 0xD6, 0x0436,
+ 0xD7, 0x0437,
+ 0xD8, 0x0438,
+ 0xD9, 0x0439,
+ 0xDA, 0x043A,
+ 0xDB, 0x043B,
+ 0xDC, 0x043C,
+ 0xDD, 0x043D,
+ 0xDE, 0x043E,
+ 0xDF, 0x043F,
+ 0xE0, 0x0440,
+ 0xE1, 0x0441,
+ 0xE2, 0x0442,
+ 0xE3, 0x0443,
+ 0xE4, 0x0444,
+ 0xE5, 0x0445,
+ 0xE6, 0x0446,
+ 0xE7, 0x0447,
+ 0xE8, 0x0448,
+ 0xE9, 0x0449,
+ 0xEA, 0x044A,
+ 0xEB, 0x044B,
+ 0xEC, 0x044C,
+ 0xED, 0x044D,
+ 0xEE, 0x044E,
+ 0xEF, 0x044F,
+ 0xF0, 0x2116,
+ 0xF1, 0x0451,
+ 0xF2, 0x0452,
+ 0xF3, 0x0453,
+ 0xF4, 0x0454,
+ 0xF5, 0x0455,
+ 0xF6, 0x0456,
+ 0xF7, 0x0457,
+ 0xF8, 0x0458,
+ 0xF9, 0x0459,
+ 0xFA, 0x045A,
+ 0xFB, 0x045B,
+ 0xFC, 0x045C,
+ 0xFD, 0x00A7,
+ 0xFE, 0x045E,
+ 0xFF, 0x045F
+};
+
+
+static const int table_iso8859_6[] = {
+ 0xA0, 0x00A0,
+ 0xA1, I6(0x00A1),
+ 0xA2, I6(0x00A2),
+ 0xA3, I6(0x00A3),
+ 0xA4, 0x00A4,
+ 0xA5, I6(0x00A5),
+ 0xA6, I6(0x00A6),
+ 0xA7, I6(0x00A7),
+ 0xA8, I6(0x00A8),
+ 0xA9, I6(0x00A9),
+ 0xAA, I6(0x00AA),
+ 0xAB, I6(0x00AB),
+ 0xAC, 0x060C,
+ 0xAD, 0x00AD,
+ 0xAE, I6(0x00AE),
+ 0xAF, I6(0x00AF),
+ 0xB0, I6(0x00B0),
+ 0xB1, I6(0x00B1),
+ 0xB2, I6(0x00B2),
+ 0xB3, I6(0x00B3),
+ 0xB4, I6(0x00B4),
+ 0xB5, I6(0x00B5),
+ 0xB6, I6(0x00B6),
+ 0xB7, I6(0x00B7),
+ 0xB8, I6(0x00B8),
+ 0xB9, I6(0x00B9),
+ 0xBA, I6(0x00BA),
+ 0xBB, 0x061B,
+ 0xBC, I6(0x00BC),
+ 0xBD, I6(0x00BD),
+ 0xBE, I6(0x00BE),
+ 0xBF, 0x061F,
+ 0xC0, I6(0x00C0),
+ 0xC1, 0x0621,
+ 0xC2, 0x0622,
+ 0xC3, 0x0623,
+ 0xC4, 0x0624,
+ 0xC5, 0x0625,
+ 0xC6, 0x0626,
+ 0xC7, 0x0627,
+ 0xC8, 0x0628,
+ 0xC9, 0x0629,
+ 0xCA, 0x062A,
+ 0xCB, 0x062B,
+ 0xCC, 0x062C,
+ 0xCD, 0x062D,
+ 0xCE, 0x062E,
+ 0xCF, 0x062F,
+ 0xD0, 0x0630,
+ 0xD1, 0x0631,
+ 0xD2, 0x0632,
+ 0xD3, 0x0633,
+ 0xD4, 0x0634,
+ 0xD5, 0x0635,
+ 0xD6, 0x0636,
+ 0xD7, 0x0637,
+ 0xD8, 0x0638,
+ 0xD9, 0x0639,
+ 0xDA, 0x063A,
+ 0xDB, I6(0x00DB),
+ 0xDC, I6(0x00DC),
+ 0xDD, I6(0x00DD),
+ 0xDE, I6(0x00DE),
+ 0xDF, I6(0x00DF),
+ 0xE0, 0x0640,
+ 0xE1, 0x0641,
+ 0xE2, 0x0642,
+ 0xE3, 0x0643,
+ 0xE4, 0x0644,
+ 0xE5, 0x0645,
+ 0xE6, 0x0646,
+ 0xE7, 0x0647,
+ 0xE8, 0x0648,
+ 0xE9, 0x0649,
+ 0xEA, 0x064A,
+ 0xEB, 0x064B,
+ 0xEC, 0x064C,
+ 0xED, 0x064D,
+ 0xEE, 0x064E,
+ 0xEF, 0x064F,
+ 0xF0, 0x0650,
+ 0xF1, 0x0651,
+ 0xF2, 0x0652,
+ 0xF3, I6(0x00F3),
+ 0xF4, I6(0x00F4),
+ 0xF5, I6(0x00F5),
+ 0xF6, I6(0x00F6),
+ 0xF7, I6(0x00F7),
+ 0xF8, I6(0x00F8),
+ 0xF9, I6(0x00F9),
+ 0xFA, I6(0x00FA),
+ 0xFB, I6(0x00FB),
+ 0xFC, I6(0x00FC),
+ 0xFD, I6(0x00FD),
+ 0xFE, I6(0x00FE),
+ 0xFF, I6(0x00FF)
+};
+
+
+static const int table_iso8859_7[] = {
+ 0xA0, 0x00A0,
+ 0xA1, 0x2018,
+ 0xA2, 0x2019,
+ 0xA3, 0x00A3,
+ 0xA4, I7(0x00A4),
+ 0xA5, I7(0x00A5),
+ 0xA6, 0x00A6,
+ 0xA7, 0x00A7,
+ 0xA8, 0x00A8,
+ 0xA9, 0x00A9,
+ 0xAA, I7(0x00AA),
+ 0xAB, 0x00AB,
+ 0xAC, 0x00AC,
+ 0xAD, 0x00AD,
+ 0xAE, I7(0x00AE),
+ 0xAF, 0x2015,
+ 0xB0, 0x00B0,
+ 0xB1, 0x00B1,
+ 0xB2, 0x00B2,
+ 0xB3, 0x00B3,
+ 0xB4, 0x0384,
+ 0xB5, 0x0385,
+ 0xB6, 0x0386,
+ 0xB7, 0x00B7,
+ 0xB8, 0x0388,
+ 0xB9, 0x0389,
+ 0xBA, 0x038A,
+ 0xBB, 0x00BB,
+ 0xBC, 0x038C,
+ 0xBD, 0x00BD,
+ 0xBE, 0x038E,
+ 0xBF, 0x038F,
+ 0xC0, 0x0390,
+ 0xC1, 0x0391,
+ 0xC2, 0x0392,
+ 0xC3, 0x0393,
+ 0xC4, 0x0394,
+ 0xC5, 0x0395,
+ 0xC6, 0x0396,
+ 0xC7, 0x0397,
+ 0xC8, 0x0398,
+ 0xC9, 0x0399,
+ 0xCA, 0x039A,
+ 0xCB, 0x039B,
+ 0xCC, 0x039C,
+ 0xCD, 0x039D,
+ 0xCE, 0x039E,
+ 0xCF, 0x039F,
+ 0xD0, 0x03A0,
+ 0xD1, 0x03A1,
+ 0xD2, I7(0x00D2),
+ 0xD3, 0x03A3,
+ 0xD4, 0x03A4,
+ 0xD5, 0x03A5,
+ 0xD6, 0x03A6,
+ 0xD7, 0x03A7,
+ 0xD8, 0x03A8,
+ 0xD9, 0x03A9,
+ 0xDA, 0x03AA,
+ 0xDB, 0x03AB,
+ 0xDC, 0x03AC,
+ 0xDD, 0x03AD,
+ 0xDE, 0x03AE,
+ 0xDF, 0x03AF,
+ 0xE0, 0x03B0,
+ 0xE1, 0x03B1,
+ 0xE2, 0x03B2,
+ 0xE3, 0x03B3,
+ 0xE4, 0x03B4,
+ 0xE5, 0x03B5,
+ 0xE6, 0x03B6,
+ 0xE7, 0x03B7,
+ 0xE8, 0x03B8,
+ 0xE9, 0x03B9,
+ 0xEA, 0x03BA,
+ 0xEB, 0x03BB,
+ 0xEC, 0x03BC,
+ 0xED, 0x03BD,
+ 0xEE, 0x03BE,
+ 0xEF, 0x03BF,
+ 0xF0, 0x03C0,
+ 0xF1, 0x03C1,
+ 0xF2, 0x03C2,
+ 0xF3, 0x03C3,
+ 0xF4, 0x03C4,
+ 0xF5, 0x03C5,
+ 0xF6, 0x03C6,
+ 0xF7, 0x03C7,
+ 0xF8, 0x03C8,
+ 0xF9, 0x03C9,
+ 0xFA, 0x03CA,
+ 0xFB, 0x03CB,
+ 0xFC, 0x03CC,
+ 0xFD, 0x03CD,
+ 0xFE, 0x03CE,
+ 0xFF, I7(0x00FF)
+};
+
+
+static const int table_iso8859_8[] = {
+ 0xA0, 0x00A0,
+ 0xA1, I8(0x00A1),
+ 0xA2, 0x00A2,
+ 0xA3, 0x00A3,
+ 0xA4, 0x00A4,
+ 0xA5, 0x00A5,
+ 0xA6, 0x00A6,
+ 0xA7, 0x00A7,
+ 0xA8, 0x00A8,
+ 0xA9, 0x00A9,
+ 0xAA, 0x00D7,
+ 0xAB, 0x00AB,
+ 0xAC, 0x00AC,
+ 0xAD, 0x00AD,
+ 0xAE, 0x00AE,
+ 0xAF, 0x203E,
+ 0xB0, 0x00B0,
+ 0xB1, 0x00B1,
+ 0xB2, 0x00B2,
+ 0xB3, 0x00B3,
+ 0xB4, 0x00B4,
+ 0xB5, 0x00B5,
+ 0xB6, 0x00B6,
+ 0xB7, 0x00B7,
+ 0xB8, 0x00B8,
+ 0xB9, 0x00B9,
+ 0xBA, 0x00F7,
+ 0xBB, 0x00BB,
+ 0xBC, 0x00BC,
+ 0xBD, 0x00BD,
+ 0xBE, 0x00BE,
+ 0xBF, I8(0x00BF),
+ 0xC0, I8(0x00C0),
+ 0xC1, I8(0x00C1),
+ 0xC2, I8(0x00C2),
+ 0xC3, I8(0x00C3),
+ 0xC4, I8(0x00C4),
+ 0xC5, I8(0x00C5),
+ 0xC6, I8(0x00C6),
+ 0xC7, I8(0x00C7),
+ 0xC8, I8(0x00C8),
+ 0xC9, I8(0x00C9),
+ 0xCA, I8(0x00CA),
+ 0xCB, I8(0x00CB),
+ 0xCC, I8(0x00CC),
+ 0xCD, I8(0x00CD),
+ 0xCE, I8(0x00CE),
+ 0xCF, I8(0x00CF),
+ 0xD0, I8(0x00D0),
+ 0xD1, I8(0x00D1),
+ 0xD2, I8(0x00D2),
+ 0xD3, I8(0x00D3),
+ 0xD4, I8(0x00D4),
+ 0xD5, I8(0x00D5),
+ 0xD6, I8(0x00D6),
+ 0xD7, I8(0x00D7),
+ 0xD8, I8(0x00D8),
+ 0xD9, I8(0x00D9),
+ 0xDA, I8(0x00DA),
+ 0xDB, I8(0x00DB),
+ 0xDC, I8(0x00DC),
+ 0xDD, I8(0x00DD),
+ 0xDE, I8(0x00DE),
+ 0xDF, 0x2017,
+ 0xE0, 0x05D0,
+ 0xE1, 0x05D1,
+ 0xE2, 0x05D2,
+ 0xE3, 0x05D3,
+ 0xE4, 0x05D4,
+ 0xE5, 0x05D5,
+ 0xE6, 0x05D6,
+ 0xE7, 0x05D7,
+ 0xE8, 0x05D8,
+ 0xE9, 0x05D9,
+ 0xEA, 0x05DA,
+ 0xEB, 0x05DB,
+ 0xEC, 0x05DC,
+ 0xED, 0x05DD,
+ 0xEE, 0x05DE,
+ 0xEF, 0x05DF,
+ 0xF0, 0x05E0,
+ 0xF1, 0x05E1,
+ 0xF2, 0x05E2,
+ 0xF3, 0x05E3,
+ 0xF4, 0x05E4,
+ 0xF5, 0x05E5,
+ 0xF6, 0x05E6,
+ 0xF7, 0x05E7,
+ 0xF8, 0x05E8,
+ 0xF9, 0x05E9,
+ 0xFA, 0x05EA,
+ 0xFB, I8(0x00FB),
+ 0xFC, I8(0x00FC),
+ 0xFD, I8(0x00FD),
+ 0xFE, I8(0x00FE),
+ 0xFF, I8(0x00FF)
+};
+
+
+static const int table_iso8859_9[] = {
+ 0xA0, 0x00A0,
+ 0xA1, 0x00A1,
+ 0xA2, 0x00A2,
+ 0xA3, 0x00A3,
+ 0xA4, 0x00A4,
+ 0xA5, 0x00A5,
+ 0xA6, 0x00A6,
+ 0xA7, 0x00A7,
+ 0xA8, 0x00A8,
+ 0xA9, 0x00A9,
+ 0xAA, 0x00AA,
+ 0xAB, 0x00AB,
+ 0xAC, 0x00AC,
+ 0xAD, 0x00AD,
+ 0xAE, 0x00AE,
+ 0xAF, 0x00AF,
+ 0xB0, 0x00B0,
+ 0xB1, 0x00B1,
+ 0xB2, 0x00B2,
+ 0xB3, 0x00B3,
+ 0xB4, 0x00B4,
+ 0xB5, 0x00B5,
+ 0xB6, 0x00B6,
+ 0xB7, 0x00B7,
+ 0xB8, 0x00B8,
+ 0xB9, 0x00B9,
+ 0xBA, 0x00BA,
+ 0xBB, 0x00BB,
+ 0xBC, 0x00BC,
+ 0xBD, 0x00BD,
+ 0xBE, 0x00BE,
+ 0xBF, 0x00BF,
+ 0xC0, 0x00C0,
+ 0xC1, 0x00C1,
+ 0xC2, 0x00C2,
+ 0xC3, 0x00C3,
+ 0xC4, 0x00C4,
+ 0xC5, 0x00C5,
+ 0xC6, 0x00C6,
+ 0xC7, 0x00C7,
+ 0xC8, 0x00C8,
+ 0xC9, 0x00C9,
+ 0xCA, 0x00CA,
+ 0xCB, 0x00CB,
+ 0xCC, 0x00CC,
+ 0xCD, 0x00CD,
+ 0xCE, 0x00CE,
+ 0xCF, 0x00CF,
+ 0xD0, 0x011E,
+ 0xD1, 0x00D1,
+ 0xD2, 0x00D2,
+ 0xD3, 0x00D3,
+ 0xD4, 0x00D4,
+ 0xD5, 0x00D5,
+ 0xD6, 0x00D6,
+ 0xD7, 0x00D7,
+ 0xD8, 0x00D8,
+ 0xD9, 0x00D9,
+ 0xDA, 0x00DA,
+ 0xDB, 0x00DB,
+ 0xDC, 0x00DC,
+ 0xDD, 0x0130,
+ 0xDE, 0x015E,
+ 0xDF, 0x00DF,
+ 0xE0, 0x00E0,
+ 0xE1, 0x00E1,
+ 0xE2, 0x00E2,
+ 0xE3, 0x00E3,
+ 0xE4, 0x00E4,
+ 0xE5, 0x00E5,
+ 0xE6, 0x00E6,
+ 0xE7, 0x00E7,
+ 0xE8, 0x00E8,
+ 0xE9, 0x00E9,
+ 0xEA, 0x00EA,
+ 0xEB, 0x00EB,
+ 0xEC, 0x00EC,
+ 0xED, 0x00ED,
+ 0xEE, 0x00EE,
+ 0xEF, 0x00EF,
+ 0xF0, 0x011F,
+ 0xF1, 0x00F1,
+ 0xF2, 0x00F2,
+ 0xF3, 0x00F3,
+ 0xF4, 0x00F4,
+ 0xF5, 0x00F5,
+ 0xF6, 0x00F6,
+ 0xF7, 0x00F7,
+ 0xF8, 0x00F8,
+ 0xF9, 0x00F9,
+ 0xFA, 0x00FA,
+ 0xFB, 0x00FB,
+ 0xFC, 0x00FC,
+ 0xFD, 0x0131,
+ 0xFE, 0x015F,
+ 0xFF, 0x00FF
+};
+
+
+static const int table_iso8859_10[] = {
+ 0xA0, 0x00A0,
+ 0xA1, 0x0104,
+ 0xA2, 0x0112,
+ 0xA3, 0x0122,
+ 0xA4, 0x0124,
+ 0xA5, 0x0128,
+ 0xA6, 0x0136,
+ 0xA7, 0x00A7,
+ 0xA8, 0x013B,
+ 0xA9, 0x0110,
+ 0xAA, 0x0160,
+ 0xAB, 0x0166,
+ 0xAC, 0x017D,
+ 0xAD, 0x00AD,
+ 0xAE, 0x016A,
+ 0xAF, 0x014A,
+ 0xB0, 0x00B0,
+ 0xB1, 0x0105,
+ 0xB2, 0x0113,
+ 0xB3, 0x0123,
+ 0xB4, 0x012B,
+ 0xB5, 0x0129,
+ 0xB6, 0x0137,
+ 0xB7, 0x00B7,
+ 0xB8, 0x013C,
+ 0xB9, 0x0111,
+ 0xBA, 0x0161,
+ 0xBB, 0x0167,
+ 0xBC, 0x017E,
+ 0xBD, 0x2015,
+ 0xBE, 0x016B,
+ 0xBF, 0x014B,
+ 0xC0, 0x0100,
+ 0xC1, 0x00C1,
+ 0xC2, 0x00C2,
+ 0xC3, 0x00C3,
+ 0xC4, 0x00C4,
+ 0xC5, 0x00C5,
+ 0xC6, 0x00C6,
+ 0xC7, 0x012E,
+ 0xC8, 0x010C,
+ 0xC9, 0x00C9,
+ 0xCA, 0x0118,
+ 0xCB, 0x00CB,
+ 0xCC, 0x0116,
+ 0xCD, 0x00CD,
+ 0xCE, 0x00CE,
+ 0xCF, 0x00CF,
+ 0xD0, 0x00D0,
+ 0xD1, 0x0145,
+ 0xD2, 0x014C,
+ 0xD3, 0x00D3,
+ 0xD4, 0x00D4,
+ 0xD5, 0x00D5,
+ 0xD6, 0x00D6,
+ 0xD7, 0x0168,
+ 0xD8, 0x00D8,
+ 0xD9, 0x0172,
+ 0xDA, 0x00DA,
+ 0xDB, 0x00DB,
+ 0xDC, 0x00DC,
+ 0xDD, 0x00DD,
+ 0xDE, 0x00DE,
+ 0xDF, 0x00DF,
+ 0xE0, 0x0101,
+ 0xE1, 0x00E1,
+ 0xE2, 0x00E2,
+ 0xE3, 0x00E3,
+ 0xE4, 0x00E4,
+ 0xE5, 0x00E5,
+ 0xE6, 0x00E6,
+ 0xE7, 0x012F,
+ 0xE8, 0x010D,
+ 0xE9, 0x00E9,
+ 0xEA, 0x0119,
+ 0xEB, 0x00EB,
+ 0xEC, 0x0117,
+ 0xED, 0x00ED,
+ 0xEE, 0x00EE,
+ 0xEF, 0x00EF,
+ 0xF0, 0x00F0,
+ 0xF1, 0x0146,
+ 0xF2, 0x014D,
+ 0xF3, 0x00F3,
+ 0xF4, 0x00F4,
+ 0xF5, 0x00F5,
+ 0xF6, 0x00F6,
+ 0xF7, 0x0169,
+ 0xF8, 0x00F8,
+ 0xF9, 0x0173,
+ 0xFA, 0x00FA,
+ 0xFB, 0x00FB,
+ 0xFC, 0x00FC,
+ 0xFD, 0x00FD,
+ 0xFE, 0x00FE,
+ 0xFF, 0x0138
+};
+
+
+static const int table_iso8859_13[] = {
+ 0xA0, 0x00A0,
+ 0xA1, 0x201D,
+ 0xA2, 0x00A2,
+ 0xA3, 0x00A3,
+ 0xA4, 0x00A4,
+ 0xA5, 0x201E,
+ 0xA6, 0x00A6,
+ 0xA7, 0x00A7,
+ 0xA8, 0x00D8,
+ 0xA9, 0x00A9,
+ 0xAA, 0x0156,
+ 0xAB, 0x00AB,
+ 0xAC, 0x00AC,
+ 0xAD, 0x00AD,
+ 0xAE, 0x00AE,
+ 0xAF, 0x00C6,
+ 0xB0, 0x00B0,
+ 0xB1, 0x00B1,
+ 0xB2, 0x00B2,
+ 0xB3, 0x00B3,
+ 0xB4, 0x201C,
+ 0xB5, 0x00B5,
+ 0xB6, 0x00B6,
+ 0xB7, 0x00B7,
+ 0xB8, 0x00F8,
+ 0xB9, 0x00B9,
+ 0xBA, 0x0157,
+ 0xBB, 0x00BB,
+ 0xBC, 0x00BC,
+ 0xBD, 0x00BD,
+ 0xBE, 0x00BE,
+ 0xBF, 0x00E6,
+ 0xC0, 0x0104,
+ 0xC1, 0x012E,
+ 0xC2, 0x0100,
+ 0xC3, 0x0106,
+ 0xC4, 0x00C4,
+ 0xC5, 0x00C5,
+ 0xC6, 0x0118,
+ 0xC7, 0x0112,
+ 0xC8, 0x010C,
+ 0xC9, 0x00C9,
+ 0xCA, 0x0179,
+ 0xCB, 0x0116,
+ 0xCC, 0x0122,
+ 0xCD, 0x0136,
+ 0xCE, 0x012A,
+ 0xCF, 0x013B,
+ 0xD0, 0x0160,
+ 0xD1, 0x0143,
+ 0xD2, 0x0145,
+ 0xD3, 0x00D3,
+ 0xD4, 0x014C,
+ 0xD5, 0x00D5,
+ 0xD6, 0x00D6,
+ 0xD7, 0x00D7,
+ 0xD8, 0x0172,
+ 0xD9, 0x0141,
+ 0xDA, 0x015A,
+ 0xDB, 0x016A,
+ 0xDC, 0x00DC,
+ 0xDD, 0x017B,
+ 0xDE, 0x017D,
+ 0xDF, 0x00DF,
+ 0xE0, 0x0105,
+ 0xE1, 0x012F,
+ 0xE2, 0x0101,
+ 0xE3, 0x0107,
+ 0xE4, 0x00E4,
+ 0xE5, 0x00E5,
+ 0xE6, 0x0119,
+ 0xE7, 0x0113,
+ 0xE8, 0x010D,
+ 0xE9, 0x00E9,
+ 0xEA, 0x017A,
+ 0xEB, 0x0117,
+ 0xEC, 0x0123,
+ 0xED, 0x0137,
+ 0xEE, 0x012B,
+ 0xEF, 0x013C,
+ 0xF0, 0x0161,
+ 0xF1, 0x0144,
+ 0xF2, 0x0146,
+ 0xF3, 0x00F3,
+ 0xF4, 0x014D,
+ 0xF5, 0x00F5,
+ 0xF6, 0x00F6,
+ 0xF7, 0x00F7,
+ 0xF8, 0x0173,
+ 0xF9, 0x0142,
+ 0xFA, 0x015B,
+ 0xFB, 0x016B,
+ 0xFC, 0x00FC,
+ 0xFD, 0x017C,
+ 0xFE, 0x017E,
+ 0xFF, 0x2019
+};
+
+
+static const int table_iso8859_14[] = {
+ 0xA0, 0x00A0,
+ 0xA1, 0x1E02,
+ 0xA2, 0x1E03,
+ 0xA3, 0x00A3,
+ 0xA4, 0x010A,
+ 0xA5, 0x010B,
+ 0xA6, 0x1E0A,
+ 0xA7, 0x00A7,
+ 0xA8, 0x1E80,
+ 0xA9, 0x00A9,
+ 0xAA, 0x1E82,
+ 0xAB, 0x1E0B,
+ 0xAC, 0x1EF2,
+ 0xAD, 0x00AD,
+ 0xAE, 0x00AE,
+ 0xAF, 0x0178,
+ 0xB0, 0x1E1E,
+ 0xB1, 0x1E1F,
+ 0xB2, 0x0120,
+ 0xB3, 0x0121,
+ 0xB4, 0x1E40,
+ 0xB5, 0x1E41,
+ 0xB6, 0x00B6,
+ 0xB7, 0x1E56,
+ 0xB8, 0x1E81,
+ 0xB9, 0x1E57,
+ 0xBA, 0x1E83,
+ 0xBB, 0x1E60,
+ 0xBC, 0x1EF3,
+ 0xBD, 0x1E84,
+ 0xBE, 0x1E85,
+ 0xBF, 0x1E61,
+ 0xC0, 0x00C0,
+ 0xC1, 0x00C1,
+ 0xC2, 0x00C2,
+ 0xC3, 0x00C3,
+ 0xC4, 0x00C4,
+ 0xC5, 0x00C5,
+ 0xC6, 0x00C6,
+ 0xC7, 0x00C7,
+ 0xC8, 0x00C8,
+ 0xC9, 0x00C9,
+ 0xCA, 0x00CA,
+ 0xCB, 0x00CB,
+ 0xCC, 0x00CC,
+ 0xCD, 0x00CD,
+ 0xCE, 0x00CE,
+ 0xCF, 0x00CF,
+ 0xD0, 0x0174,
+ 0xD1, 0x00D1,
+ 0xD2, 0x00D2,
+ 0xD3, 0x00D3,
+ 0xD4, 0x00D4,
+ 0xD5, 0x00D5,
+ 0xD6, 0x00D6,
+ 0xD7, 0x1E6A,
+ 0xD8, 0x00D8,
+ 0xD9, 0x00D9,
+ 0xDA, 0x00DA,
+ 0xDB, 0x00DB,
+ 0xDC, 0x00DC,
+ 0xDD, 0x00DD,
+ 0xDE, 0x0176,
+ 0xDF, 0x00DF,
+ 0xE0, 0x00E0,
+ 0xE1, 0x00E1,
+ 0xE2, 0x00E2,
+ 0xE3, 0x00E3,
+ 0xE4, 0x00E4,
+ 0xE5, 0x00E5,
+ 0xE6, 0x00E6,
+ 0xE7, 0x00E7,
+ 0xE8, 0x00E8,
+ 0xE9, 0x00E9,
+ 0xEA, 0x00EA,
+ 0xEB, 0x00EB,
+ 0xEC, 0x00EC,
+ 0xED, 0x00ED,
+ 0xEE, 0x00EE,
+ 0xEF, 0x00EF,
+ 0xF0, 0x0175,
+ 0xF1, 0x00F1,
+ 0xF2, 0x00F2,
+ 0xF3, 0x00F3,
+ 0xF4, 0x00F4,
+ 0xF5, 0x00F5,
+ 0xF6, 0x00F6,
+ 0xF7, 0x1E6B,
+ 0xF8, 0x00F8,
+ 0xF9, 0x00F9,
+ 0xFA, 0x00FA,
+ 0xFB, 0x00FB,
+ 0xFC, 0x00FC,
+ 0xFD, 0x00FD,
+ 0xFE, 0x0177,
+ 0xFF, 0x00FF
+};
+
+
+static const int table_iso8859_15[] = {
+ 0xA0, 0x00A0,
+ 0xA1, 0x00A1,
+ 0xA2, 0x00A2,
+ 0xA3, 0x00A3,
+ 0xA4, 0x20AC,
+ 0xA5, 0x00A5,
+ 0xA6, 0x0160,
+ 0xA7, 0x00A7,
+ 0xA8, 0x0161,
+ 0xA9, 0x00A9,
+ 0xAA, 0x00AA,
+ 0xAB, 0x00AB,
+ 0xAC, 0x00AC,
+ 0xAD, 0x00AD,
+ 0xAE, 0x00AE,
+ 0xAF, 0x00AF,
+ 0xB0, 0x00B0,
+ 0xB1, 0x00B1,
+ 0xB2, 0x00B2,
+ 0xB3, 0x00B3,
+ 0xB4, 0x017D,
+ 0xB5, 0x00B5,
+ 0xB6, 0x00B6,
+ 0xB7, 0x00B7,
+ 0xB8, 0x017E,
+ 0xB9, 0x00B9,
+ 0xBA, 0x00BA,
+ 0xBB, 0x00BB,
+ 0xBC, 0x0152,
+ 0xBD, 0x0153,
+ 0xBE, 0x0178,
+ 0xBF, 0x00BF,
+ 0xC0, 0x00C0,
+ 0xC1, 0x00C1,
+ 0xC2, 0x00C2,
+ 0xC3, 0x00C3,
+ 0xC4, 0x00C4,
+ 0xC5, 0x00C5,
+ 0xC6, 0x00C6,
+ 0xC7, 0x00C7,
+ 0xC8, 0x00C8,
+ 0xC9, 0x00C9,
+ 0xCA, 0x00CA,
+ 0xCB, 0x00CB,
+ 0xCC, 0x00CC,
+ 0xCD, 0x00CD,
+ 0xCE, 0x00CE,
+ 0xCF, 0x00CF,
+ 0xD0, 0x00D0,
+ 0xD1, 0x00D1,
+ 0xD2, 0x00D2,
+ 0xD3, 0x00D3,
+ 0xD4, 0x00D4,
+ 0xD5, 0x00D5,
+ 0xD6, 0x00D6,
+ 0xD7, 0x00D7,
+ 0xD8, 0x00D8,
+ 0xD9, 0x00D9,
+ 0xDA, 0x00DA,
+ 0xDB, 0x00DB,
+ 0xDC, 0x00DC,
+ 0xDD, 0x00DD,
+ 0xDE, 0x00DE,
+ 0xDF, 0x00DF,
+ 0xE0, 0x00E0,
+ 0xE1, 0x00E1,
+ 0xE2, 0x00E2,
+ 0xE3, 0x00E3,
+ 0xE4, 0x00E4,
+ 0xE5, 0x00E5,
+ 0xE6, 0x00E6,
+ 0xE7, 0x00E7,
+ 0xE8, 0x00E8,
+ 0xE9, 0x00E9,
+ 0xEA, 0x00EA,
+ 0xEB, 0x00EB,
+ 0xEC, 0x00EC,
+ 0xED, 0x00ED,
+ 0xEE, 0x00EE,
+ 0xEF, 0x00EF,
+ 0xF0, 0x00F0,
+ 0xF1, 0x00F1,
+ 0xF2, 0x00F2,
+ 0xF3, 0x00F3,
+ 0xF4, 0x00F4,
+ 0xF5, 0x00F5,
+ 0xF6, 0x00F6,
+ 0xF7, 0x00F7,
+ 0xF8, 0x00F8,
+ 0xF9, 0x00F9,
+ 0xFA, 0x00FA,
+ 0xFB, 0x00FB,
+ 0xFC, 0x00FC,
+ 0xFD, 0x00FD,
+ 0xFE, 0x00FE,
+ 0xFF, 0x00FF
};
#undef I2
@@ -1418,165 +1418,189 @@
#undef I14
#undef I15
-static const mbfl_pair_table pair_iso8859_2 = {
+static mbfl_convert_table pair_iso8859_2 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_2",
table_iso8859_2,
- sizeof(table_iso8859_2)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_2)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table pair_iso8859_3 = {
+static mbfl_convert_table pair_iso8859_3 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_3",
table_iso8859_3,
- sizeof(table_iso8859_3)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_3)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table pair_iso8859_4 = {
+static mbfl_convert_table pair_iso8859_4 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_4",
table_iso8859_4,
- sizeof(table_iso8859_4)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_4)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table pair_iso8859_5 = {
+static mbfl_convert_table pair_iso8859_5 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_5",
table_iso8859_5,
- sizeof(table_iso8859_5)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_5)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table pair_iso8859_6 = {
+static mbfl_convert_table pair_iso8859_6 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_6",
table_iso8859_6,
- sizeof(table_iso8859_6)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_6)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table pair_iso8859_7 = {
+static mbfl_convert_table pair_iso8859_7 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_7",
table_iso8859_7,
- sizeof(table_iso8859_7)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_7)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table pair_iso8859_8 = {
+static mbfl_convert_table pair_iso8859_8 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_8",
table_iso8859_8,
- sizeof(table_iso8859_8)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_8)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table pair_iso8859_9 = {
+static mbfl_convert_table pair_iso8859_9 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_9",
table_iso8859_9,
- sizeof(table_iso8859_9)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_9)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table pair_iso8859_10 = {
+static mbfl_convert_table pair_iso8859_10 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_10",
table_iso8859_10,
- sizeof(table_iso8859_10)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_10)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table pair_iso8859_13 = {
+static mbfl_convert_table pair_iso8859_13 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_13",
table_iso8859_13,
- sizeof(table_iso8859_13)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_13)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table pair_iso8859_14 = {
+static mbfl_convert_table pair_iso8859_14 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_14",
table_iso8859_14,
- sizeof(table_iso8859_14)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_14)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table pair_iso8859_15 = {
+static mbfl_convert_table pair_iso8859_15 = {
+ MBFL_TABLE_TYPE_PAIR,
"iso8859_15",
table_iso8859_15,
- sizeof(table_iso8859_15)/sizeof(mbfl_code_pair),
- MBFL_MEMORY_TYPE_CONST,
+ sizeof(table_iso8859_15)/sizeof(int),
+ 0,
+ 0,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_pair_table *pair_list_iso8859_2[] = {
+static mbfl_convert_table *table_list_iso8859_2[] = {
&pair_iso8859_2,
NULL
};
-static const mbfl_pair_table *pair_list_iso8859_3[] = {
+static mbfl_convert_table *table_list_iso8859_3[] = {
&pair_iso8859_3,
NULL
};
-static const mbfl_pair_table *pair_list_iso8859_4[] = {
+static mbfl_convert_table *table_list_iso8859_4[] = {
&pair_iso8859_4,
NULL
};
-static const mbfl_pair_table *pair_list_iso8859_5[] = {
+static mbfl_convert_table *table_list_iso8859_5[] = {
&pair_iso8859_5,
NULL
};
-static const mbfl_pair_table *pair_list_iso8859_6[] = {
+static mbfl_convert_table *table_list_iso8859_6[] = {
&pair_iso8859_6,
NULL
};
-static const mbfl_pair_table *pair_list_iso8859_7[] = {
+static mbfl_convert_table *table_list_iso8859_7[] = {
&pair_iso8859_7,
NULL
};
-static const mbfl_pair_table *pair_list_iso8859_8[] = {
+static mbfl_convert_table *table_list_iso8859_8[] = {
&pair_iso8859_8,
NULL
};
-static const mbfl_pair_table *pair_list_iso8859_9[] = {
+static mbfl_convert_table *table_list_iso8859_9[] = {
&pair_iso8859_9,
NULL
};
-static const mbfl_pair_table *pair_list_iso8859_10[] = {
+static mbfl_convert_table *table_list_iso8859_10[] = {
&pair_iso8859_10,
NULL
};
-static const mbfl_pair_table *pair_list_iso8859_13[] = {
+static mbfl_convert_table *table_list_iso8859_13[] = {
&pair_iso8859_13,
NULL
};
-static const mbfl_pair_table *pair_list_iso8859_14[] = {
+static mbfl_convert_table *table_list_iso8859_14[] = {
&pair_iso8859_14,
NULL
};
-static const mbfl_pair_table *pair_list_iso8859_15[] = {
+static mbfl_convert_table *table_list_iso8859_15[] = {
&pair_iso8859_15,
NULL
};
-const mbfl_pair_table *mbfl_pair_table_list_8859[] = {
+mbfl_convert_table *mbfl_convert_table_list_8859[] = {
&pair_iso8859_2,
&pair_iso8859_3,
&pair_iso8859_4,
@@ -1596,7 +1620,7 @@
/*
* convert filter function
*/
-static const mbfl_convert_function cvfn_8859_1_wchar = {
+static mbfl_convert_function cvfn_8859_1_wchar = {
"8859_1_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1605,7 +1629,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_8859_1 = {
+static mbfl_convert_function cvfn_wchar_8859_1 = {
"wchar_8859_1",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1614,7 +1638,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_8859x_wchar = {
+static mbfl_convert_function cvfn_8859x_wchar = {
"8859x_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1623,7 +1647,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_8859x = {
+static mbfl_convert_function cvfn_wchar_8859x = {
"wchar_8859x",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1636,263 +1660,237 @@
/*
* convert filter collection
*/
-static const mbfl_convert_collection conv_8859_1_wchar = {
+static mbfl_convert_collection conv_8859_1_wchar = {
"8859_1_wchar",
php_mb_encid_8859_1,
php_mb_encid_wchar,
&cvfn_8859_1_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_1 = {
+static mbfl_convert_collection conv_wchar_8859_1 = {
"wchar_8859_1",
php_mb_encid_wchar,
php_mb_encid_8859_1,
&cvfn_wchar_8859_1,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_2_wchar = {
+static mbfl_convert_collection conv_8859_2_wchar = {
"8859_2_wchar",
php_mb_encid_8859_2,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_2,
- NULL,
+ table_list_iso8859_2,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_2 = {
+static mbfl_convert_collection conv_wchar_8859_2 = {
"wchar_8859_2",
php_mb_encid_wchar,
php_mb_encid_8859_2,
&cvfn_wchar_8859x,
- pair_list_iso8859_2,
- NULL,
+ table_list_iso8859_2,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_3_wchar = {
+static mbfl_convert_collection conv_8859_3_wchar = {
"8859_3_wchar",
php_mb_encid_8859_3,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_3,
- NULL,
+ table_list_iso8859_3,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_3 = {
+static mbfl_convert_collection conv_wchar_8859_3 = {
"wchar_8859_3",
php_mb_encid_wchar,
php_mb_encid_8859_3,
&cvfn_wchar_8859x,
- pair_list_iso8859_3,
- NULL,
+ table_list_iso8859_3,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_4_wchar = {
+static mbfl_convert_collection conv_8859_4_wchar = {
"8859_4_wchar",
php_mb_encid_8859_4,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_4,
- NULL,
+ table_list_iso8859_4,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_4 = {
+static mbfl_convert_collection conv_wchar_8859_4 = {
"wchar_8859_4",
php_mb_encid_wchar,
php_mb_encid_8859_4,
&cvfn_wchar_8859x,
- pair_list_iso8859_4,
- NULL,
+ table_list_iso8859_4,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_5_wchar = {
+static mbfl_convert_collection conv_8859_5_wchar = {
"8859_5_wchar",
php_mb_encid_8859_5,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_5,
- NULL,
+ table_list_iso8859_5,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_5 = {
+static mbfl_convert_collection conv_wchar_8859_5 = {
"wchar_8859_5",
php_mb_encid_wchar,
php_mb_encid_8859_5,
&cvfn_wchar_8859x,
- pair_list_iso8859_5,
- NULL,
+ table_list_iso8859_5,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_6_wchar = {
+static mbfl_convert_collection conv_8859_6_wchar = {
"8859_6_wchar",
php_mb_encid_8859_6,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_6,
- NULL,
+ table_list_iso8859_6,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_6 = {
+static mbfl_convert_collection conv_wchar_8859_6 = {
"wchar_8859_6",
php_mb_encid_wchar,
php_mb_encid_8859_6,
&cvfn_wchar_8859x,
- pair_list_iso8859_6,
- NULL,
+ table_list_iso8859_6,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_7_wchar = {
+static mbfl_convert_collection conv_8859_7_wchar = {
"8859_7_wchar",
php_mb_encid_8859_7,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_7,
- NULL,
+ table_list_iso8859_7,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_7 = {
+static mbfl_convert_collection conv_wchar_8859_7 = {
"wchar_8859_7",
php_mb_encid_wchar,
php_mb_encid_8859_7,
&cvfn_wchar_8859x,
- pair_list_iso8859_7,
- NULL,
+ table_list_iso8859_7,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_8_wchar = {
+static mbfl_convert_collection conv_8859_8_wchar = {
"8859_8_wchar",
php_mb_encid_8859_8,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_8,
- NULL,
+ table_list_iso8859_8,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_8 = {
+static mbfl_convert_collection conv_wchar_8859_8 = {
"wchar_8859_8",
php_mb_encid_wchar,
php_mb_encid_8859_8,
&cvfn_wchar_8859x,
- pair_list_iso8859_8,
- NULL,
+ table_list_iso8859_8,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_9_wchar = {
+static mbfl_convert_collection conv_8859_9_wchar = {
"8859_9_wchar",
php_mb_encid_8859_9,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_9,
- NULL,
+ table_list_iso8859_9,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_9 = {
+static mbfl_convert_collection conv_wchar_8859_9 = {
"wchar_8859_9",
php_mb_encid_wchar,
php_mb_encid_8859_9,
&cvfn_wchar_8859x,
- pair_list_iso8859_9,
- NULL,
+ table_list_iso8859_9,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_10_wchar = {
+static mbfl_convert_collection conv_8859_10_wchar = {
"8859_10_wchar",
php_mb_encid_8859_10,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_10,
- NULL,
+ table_list_iso8859_10,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_10 = {
+static mbfl_convert_collection conv_wchar_8859_10 = {
"wchar_8859_10",
php_mb_encid_wchar,
php_mb_encid_8859_10,
&cvfn_wchar_8859x,
- pair_list_iso8859_10,
- NULL,
+ table_list_iso8859_10,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_13_wchar = {
+static mbfl_convert_collection conv_8859_13_wchar = {
"8859_13_wchar",
php_mb_encid_8859_13,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_13,
- NULL,
+ table_list_iso8859_13,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_13 = {
+static mbfl_convert_collection conv_wchar_8859_13 = {
"wchar_8859_13",
php_mb_encid_wchar,
php_mb_encid_8859_13,
&cvfn_wchar_8859x,
- pair_list_iso8859_13,
- NULL,
+ table_list_iso8859_13,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_14_wchar = {
+static mbfl_convert_collection conv_8859_14_wchar = {
"8859_14_wchar",
php_mb_encid_8859_14,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_14,
- NULL,
+ table_list_iso8859_14,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_14 = {
+static mbfl_convert_collection conv_wchar_8859_14 = {
"wchar_8859_14",
php_mb_encid_wchar,
php_mb_encid_8859_14,
&cvfn_wchar_8859x,
- pair_list_iso8859_14,
- NULL,
+ table_list_iso8859_14,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8859_15_wchar = {
+static mbfl_convert_collection conv_8859_15_wchar = {
"8859_15_wchar",
php_mb_encid_8859_15,
php_mb_encid_wchar,
&cvfn_8859x_wchar,
- pair_list_iso8859_15,
- NULL,
+ table_list_iso8859_15,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_8859_15 = {
+static mbfl_convert_collection conv_wchar_8859_15 = {
"wchar_8859_15",
php_mb_encid_wchar,
php_mb_encid_8859_15,
&cvfn_wchar_8859x,
- pair_list_iso8859_15,
- NULL,
+ table_list_iso8859_15,
MBFL_MEMORY_TYPE_CONST
};
@@ -1901,7 +1899,8 @@
/*
* identify filter function table
*/
-static const mbfl_identify_function ident_func_8859_1 = {
+static mbfl_identify_function ident_func_8859_1 = {
+ "iso_8859_1",
php_mb_encid_8859_1,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1909,7 +1908,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_2 = {
+static mbfl_identify_function ident_func_8859_2 = {
+ "iso_8859_2",
php_mb_encid_8859_2,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1917,7 +1917,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_3 = {
+static mbfl_identify_function ident_func_8859_3 = {
+ "iso_8859_3",
php_mb_encid_8859_3,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1925,7 +1926,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_4 = {
+static mbfl_identify_function ident_func_8859_4 = {
+ "iso_8859_4",
php_mb_encid_8859_4,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1933,7 +1935,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_5 = {
+static mbfl_identify_function ident_func_8859_5 = {
+ "iso_8859_5",
php_mb_encid_8859_5,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1941,7 +1944,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_6 = {
+static mbfl_identify_function ident_func_8859_6 = {
+ "iso_8859_6",
php_mb_encid_8859_6,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1949,7 +1953,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_7 = {
+static mbfl_identify_function ident_func_8859_7 = {
+ "iso_8859_7",
php_mb_encid_8859_7,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1957,7 +1962,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_8 = {
+static mbfl_identify_function ident_func_8859_8 = {
+ "iso_8859_8",
php_mb_encid_8859_8,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1965,7 +1971,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_9 = {
+static mbfl_identify_function ident_func_8859_9 = {
+ "iso_8859_9",
php_mb_encid_8859_9,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1973,7 +1980,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_10 = {
+static mbfl_identify_function ident_func_8859_10 = {
+ "iso_8859_10",
php_mb_encid_8859_10,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1981,7 +1989,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_13 = {
+static mbfl_identify_function ident_func_8859_13 = {
+ "iso_8859_13",
php_mb_encid_8859_13,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1989,7 +1998,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_14 = {
+static mbfl_identify_function ident_func_8859_14 = {
+ "iso_8859_14",
php_mb_encid_8859_14,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1997,7 +2007,8 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_identify_function ident_func_8859_15 = {
+static mbfl_identify_function ident_func_8859_15 = {
+ "iso_8859_15",
php_mb_encid_8859_15,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -2010,17 +2021,15 @@
/*
* filter list
*/
-#if 0
-const mbfl_convert_function *mbfl_convert_function_list_8859[] = {
+mbfl_convert_function *mbfl_convert_function_list_8859[] = {
&cvfn_8859_1_wchar,
&cvfn_wchar_8859_1,
&cvfn_8859x_wchar,
&cvfn_wchar_8859x,
NULL
};
-#endif
-const mbfl_convert_collection *mbfl_convert_collection_list_8859[] = {
+mbfl_convert_collection *mbfl_convert_collection_list_8859[] = {
&conv_8859_1_wchar,
&conv_wchar_8859_1,
&conv_8859_2_wchar,
@@ -2050,7 +2059,7 @@
NULL
};
-const mbfl_identify_function *mbfl_identify_function_list_8859[] = {
+mbfl_identify_function *mbfl_identify_function_list_8859[] = {
&ident_func_8859_1,
&ident_func_8859_2,
&ident_func_8859_3,
1.3 +28 -39 php4/ext/mbstring/mbfl/filter_mime.c
Index: filter_mime.c
===================================================================
RCS file: /cvsroot/php-i18n/php4/ext/mbstring/mbfl/filter_mime.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- filter_mime.c 25 May 2002 16:33:46 -0000 1.2
+++ filter_mime.c 10 Aug 2002 02:39:37 -0000 1.3
@@ -521,7 +521,7 @@
/*
* convert filter function
*/
-static const mbfl_convert_function cvfn_base64enc = {
+static mbfl_convert_function cvfn_base64enc = {
"base64_encode",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -530,7 +530,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_base64dec = {
+static mbfl_convert_function cvfn_base64dec = {
"base64_decode",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -539,7 +539,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_qprintenc = {
+static mbfl_convert_function cvfn_qprintenc = {
"qprint_encode",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -548,7 +548,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_qprintdec = {
+static mbfl_convert_function cvfn_qprintdec = {
"qprint_decode",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -557,7 +557,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_uudec = {
+static mbfl_convert_function cvfn_uudec = {
"uudecode",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -566,7 +566,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_any_7bit = {
+static mbfl_convert_function cvfn_any_7bit = {
"any_7bit",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -575,7 +575,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_any_8bit = {
+static mbfl_convert_function cvfn_any_8bit = {
"any_8bit",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -588,93 +588,84 @@
/*
* convert filter collection
*/
-static const mbfl_convert_collection conv_8bit_b64 = {
+static mbfl_convert_collection conv_8bit_b64 = {
"8bit_base64",
php_mb_encid_8bit,
php_mb_encid_base64,
&cvfn_base64enc,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_b64_8bit = {
+static mbfl_convert_collection conv_b64_8bit = {
"base64_8bit",
php_mb_encid_base64,
php_mb_encid_8bit,
&cvfn_base64dec,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8bit_qprint = {
+static mbfl_convert_collection conv_8bit_qprint = {
"8bit_qprint",
php_mb_encid_8bit,
php_mb_encid_qprint,
&cvfn_qprintenc,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_qprint_8bit = {
+static mbfl_convert_collection conv_qprint_8bit = {
"qprint_8bit",
php_mb_encid_qprint,
php_mb_encid_8bit,
&cvfn_qprintdec,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8bit_uuencode = {
+static mbfl_convert_collection conv_8bit_uuencode = {
"8bit_uuencode",
php_mb_encid_8bit,
php_mb_encid_uuencode,
&cvfn_any_8bit,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_uuencode_8bit = {
+static mbfl_convert_collection conv_uuencode_8bit = {
"uuencode_8bit",
php_mb_encid_uuencode,
php_mb_encid_8bit,
&cvfn_uudec,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8bit_7bit = {
+static mbfl_convert_collection conv_8bit_7bit = {
"8bit_7bit",
php_mb_encid_8bit,
php_mb_encid_7bit,
&cvfn_any_7bit,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_7bit_8bit = {
+static mbfl_convert_collection conv_7bit_8bit = {
"7bit_8bit",
php_mb_encid_7bit,
php_mb_encid_8bit,
&cvfn_any_8bit,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_8bit_8bit = {
+static mbfl_convert_collection conv_8bit_8bit = {
"8bit_8bit",
php_mb_encid_8bit,
php_mb_encid_8bit,
&cvfn_any_8bit,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
@@ -689,8 +680,7 @@
/*
* filter list
*/
-#if 0
-const mbfl_convert_function * mbfl_convert_function_list_mime[] = {
+mbfl_convert_function * mbfl_convert_function_list_mime[] = {
&cvfn_base64enc,
&cvfn_base64dec,
&cvfn_qprintenc,
@@ -700,9 +690,8 @@
&cvfn_any_8bit,
NULL
};
-#endif
-const mbfl_convert_collection * mbfl_convert_collection_list_mime[] = {
+mbfl_convert_collection * mbfl_convert_collection_list_mime[] = {
&conv_8bit_b64,
&conv_b64_8bit,
&conv_8bit_qprint,
@@ -715,7 +704,7 @@
NULL
};
-const mbfl_identify_function * mbfl_identify_function_list_mime[] = {
+mbfl_identify_function * mbfl_identify_function_list_mime[] = {
NULL
};
1.3 +99 -134 php4/ext/mbstring/mbfl/filter_ucs.c
Index: filter_ucs.c
===================================================================
RCS file: /cvsroot/php-i18n/php4/ext/mbstring/mbfl/filter_ucs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- filter_ucs.c 25 May 2002 16:34:22 -0000 1.2
+++ filter_ucs.c 10 Aug 2002 02:39:37 -0000 1.3
@@ -1238,7 +1238,7 @@
/*
* convert filter function
*/
-static const mbfl_convert_function cvfn_byte2be_wchar = {
+static mbfl_convert_function cvfn_byte2be_wchar = {
"byte2be_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1247,7 +1247,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_byte2be = {
+static mbfl_convert_function cvfn_wchar_byte2be = {
"wchar_byte2be",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1256,7 +1256,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_byte2le_wchar = {
+static mbfl_convert_function cvfn_byte2le_wchar = {
"byte2le_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1265,7 +1265,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_byte2le = {
+static mbfl_convert_function cvfn_wchar_byte2le = {
"wchar_byte2le",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1275,7 +1275,7 @@
};
-static const mbfl_convert_function cvfn_byte4be_wchar = {
+static mbfl_convert_function cvfn_byte4be_wchar = {
"byte4be_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1284,7 +1284,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_byte4be = {
+static mbfl_convert_function cvfn_wchar_byte4be = {
"wchar_byte4be",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1293,7 +1293,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_byte4le_wchar = {
+static mbfl_convert_function cvfn_byte4le_wchar = {
"byte4le_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1302,7 +1302,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_byte4le = {
+static mbfl_convert_function cvfn_wchar_byte4le = {
"wchar_byte4le",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1311,7 +1311,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_ucs4_wchar = {
+static mbfl_convert_function cvfn_ucs4_wchar = {
"ucs4_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1320,7 +1320,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_ucs4be = {
+static mbfl_convert_function cvfn_wchar_ucs4be = {
"wchar_ucs4be",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1329,7 +1329,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_ucs4le = {
+static mbfl_convert_function cvfn_wchar_ucs4le = {
"wchar_ucs4le",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1338,7 +1338,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_ucs2_wchar = {
+static mbfl_convert_function cvfn_ucs2_wchar = {
"ucs2_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1347,7 +1347,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_ucs2be = {
+static mbfl_convert_function cvfn_wchar_ucs2be = {
"wchar_ucs2be",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1356,7 +1356,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_ucs2le = {
+static mbfl_convert_function cvfn_wchar_ucs2le = {
"wchar_ucs2le",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1365,7 +1365,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_utf16_wchar = {
+static mbfl_convert_function cvfn_utf16_wchar = {
"utf16_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1374,7 +1374,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_utf16be_wchar = {
+static mbfl_convert_function cvfn_utf16be_wchar = {
"utf16be_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1383,7 +1383,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_utf16be = {
+static mbfl_convert_function cvfn_wchar_utf16be = {
"wchar_utf16be",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1392,7 +1392,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_utf16le_wchar = {
+static mbfl_convert_function cvfn_utf16le_wchar = {
"utf16le_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1401,7 +1401,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_utf16le = {
+static mbfl_convert_function cvfn_wchar_utf16le = {
"wchar_utf16le",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1410,7 +1410,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_utf7_wchar = {
+static mbfl_convert_function cvfn_utf7_wchar = {
"utf7_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1419,7 +1419,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_utf7 = {
+static mbfl_convert_function cvfn_wchar_utf7 = {
"wchar_utf7",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1428,7 +1428,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_utf7imap_wchar = {
+static mbfl_convert_function cvfn_utf7imap_wchar = {
"utf7imap_wchar",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1437,7 +1437,7 @@
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_function cvfn_wchar_utf7imap = {
+static mbfl_convert_function cvfn_wchar_utf7imap = {
"wchar_utf7imap",
mbfl_filt_conv_common_ctor,
mbfl_filt_conv_common_dtor,
@@ -1450,363 +1450,327 @@
/*
* filter collection
*/
-static const mbfl_convert_collection conv_ucs4_wchar = {
+static mbfl_convert_collection conv_ucs4_wchar = {
"ucs4_wchar",
php_mb_encid_ucs4,
php_mb_encid_wchar,
&cvfn_ucs4_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_ucs4 = {
+static mbfl_convert_collection conv_wchar_ucs4 = {
"wchar_ucs4",
php_mb_encid_wchar,
php_mb_encid_ucs4,
&cvfn_wchar_ucs4be,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_ucs4be_wchar = {
+static mbfl_convert_collection conv_ucs4be_wchar = {
"ucs4be_wchar",
php_mb_encid_ucs4be,
php_mb_encid_wchar,
&cvfn_byte4be_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_ucs4be = {
+static mbfl_convert_collection conv_wchar_ucs4be = {
"wchar_ucs4be",
php_mb_encid_wchar,
php_mb_encid_ucs4be,
&cvfn_wchar_ucs4be,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_ucs4le_wchar = {
+static mbfl_convert_collection conv_ucs4le_wchar = {
"ucs4le_wchar",
php_mb_encid_ucs4le,
php_mb_encid_wchar,
&cvfn_byte4le_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_ucs4le = {
+static mbfl_convert_collection conv_wchar_ucs4le = {
"wchar_ucs4le",
php_mb_encid_wchar,
php_mb_encid_ucs4le,
&cvfn_wchar_ucs4le,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_ucs2_wchar = {
+static mbfl_convert_collection conv_ucs2_wchar = {
"ucs2_wchar",
php_mb_encid_ucs2,
php_mb_encid_wchar,
&cvfn_ucs2_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_ucs2 = {
+static mbfl_convert_collection conv_wchar_ucs2 = {
"wchar_ucs2",
php_mb_encid_wchar,
php_mb_encid_ucs2,
&cvfn_wchar_ucs2be,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_ucs2be_wchar = {
+static mbfl_convert_collection conv_ucs2be_wchar = {
"ucs2be_wchar",
php_mb_encid_ucs2be,
php_mb_encid_wchar,
&cvfn_byte2be_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_ucs2be = {
+static mbfl_convert_collection conv_wchar_ucs2be = {
"wchar_ucs2be",
php_mb_encid_wchar,
php_mb_encid_ucs2be,
&cvfn_wchar_ucs2be,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_ucs2le_wchar = {
+static mbfl_convert_collection conv_ucs2le_wchar = {
"ucs2le_wchar",
php_mb_encid_ucs2le,
php_mb_encid_wchar,
&cvfn_byte2le_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_ucs2le = {
+static mbfl_convert_collection conv_wchar_ucs2le = {
"wchar_ucs2le",
php_mb_encid_wchar,
php_mb_encid_ucs2le,
&cvfn_wchar_ucs2le,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_utf32_wchar = {
+static mbfl_convert_collection conv_utf32_wchar = {
"utf32_wchar",
php_mb_encid_utf32,
php_mb_encid_wchar,
&cvfn_ucs4_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_utf32 = {
+static mbfl_convert_collection conv_wchar_utf32 = {
"wchar_utf32",
php_mb_encid_wchar,
php_mb_encid_utf32,
&cvfn_wchar_ucs4be,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_utf32be_wchar = {
+static mbfl_convert_collection conv_utf32be_wchar = {
"utf32be_wchar",
php_mb_encid_utf32be,
php_mb_encid_wchar,
&cvfn_byte4be_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_utf32be = {
+static mbfl_convert_collection conv_wchar_utf32be = {
"wchar_utf32be",
php_mb_encid_wchar,
php_mb_encid_utf32be,
&cvfn_wchar_ucs4be,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_utf32le_wchar = {
+static mbfl_convert_collection conv_utf32le_wchar = {
"utf32le_wchar",
php_mb_encid_utf32le,
php_mb_encid_wchar,
&cvfn_byte4le_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_utf32le = {
+static mbfl_convert_collection conv_wchar_utf32le = {
"wchar_utf32le",
php_mb_encid_wchar,
php_mb_encid_utf32le,
&cvfn_wchar_ucs4le,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_utf16_wchar = {
+static mbfl_convert_collection conv_utf16_wchar = {
"utf16_wchar",
php_mb_encid_utf16,
php_mb_encid_wchar,
&cvfn_utf16_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_utf16 = {
+static mbfl_convert_collection conv_wchar_utf16 = {
"wchar_utf16",
php_mb_encid_wchar,
php_mb_encid_utf16,
&cvfn_wchar_utf16be,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_utf16be_wchar = {
+static mbfl_convert_collection conv_utf16be_wchar = {
"utf16be_wchar",
php_mb_encid_utf16be,
php_mb_encid_wchar,
&cvfn_utf16be_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_utf16be = {
+static mbfl_convert_collection conv_wchar_utf16be = {
"wchar_utf16be",
php_mb_encid_wchar,
php_mb_encid_utf16be,
&cvfn_wchar_utf16be,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_utf16le_wchar = {
+static mbfl_convert_collection conv_utf16le_wchar = {
"utf16le_wchar",
php_mb_encid_utf16le,
php_mb_encid_wchar,
&cvfn_utf16le_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_utf16le = {
+static mbfl_convert_collection conv_wchar_utf16le = {
"wchar_utf16le",
php_mb_encid_wchar,
php_mb_encid_utf16le,
&cvfn_wchar_utf16le,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_utf7_wchar = {
+static mbfl_convert_collection conv_utf7_wchar = {
"utf7_wchar",
php_mb_encid_utf7,
php_mb_encid_wchar,
&cvfn_utf7_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_utf7 = {
+static mbfl_convert_collection conv_wchar_utf7 = {
"wchar_utf7",
php_mb_encid_wchar,
php_mb_encid_utf7,
&cvfn_wchar_utf7,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_utf7imap_wchar = {
+static mbfl_convert_collection conv_utf7imap_wchar = {
"utf7imap_wchar",
php_mb_encid_utf7imap,
php_mb_encid_wchar,
&cvfn_utf7imap_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_utf7imap = {
+static mbfl_convert_collection conv_wchar_utf7imap = {
"wchar_utf7imap",
php_mb_encid_wchar,
php_mb_encid_utf7imap,
&cvfn_wchar_utf7imap,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_byte2be_wchar = {
+static mbfl_convert_collection conv_byte2be_wchar = {
"byte2be_wchar",
php_mb_encid_byte2be,
php_mb_encid_wchar,
&cvfn_byte2be_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_byte2be = {
+static mbfl_convert_collection conv_wchar_byte2be = {
"wchar_byte2be",
php_mb_encid_wchar,
php_mb_encid_byte2be,
&cvfn_wchar_byte2be,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_byte2le_wchar = {
+static mbfl_convert_collection conv_byte2le_wchar = {
"byte2le_wchar",
php_mb_encid_byte2le,
php_mb_encid_wchar,
&cvfn_byte2le_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_byte2le = {
+static mbfl_convert_collection conv_wchar_byte2le = {
"wchar_byte2le",
php_mb_encid_wchar,
php_mb_encid_byte2le,
&cvfn_wchar_byte2le,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_byte4be_wchar = {
+static mbfl_convert_collection conv_byte4be_wchar = {
"byte4be_wchar",
php_mb_encid_byte4be,
php_mb_encid_wchar,
&cvfn_byte4be_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_byte4be = {
+static mbfl_convert_collection conv_wchar_byte4be = {
"wchar_byte4be",
php_mb_encid_wchar,
php_mb_encid_byte4be,
&cvfn_wchar_byte4be,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_byte4le_wchar = {
+static mbfl_convert_collection conv_byte4le_wchar = {
"byte4le_wchar",
php_mb_encid_byte4le,
php_mb_encid_wchar,
&cvfn_byte4le_wchar,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
-static const mbfl_convert_collection conv_wchar_byte4le = {
+static mbfl_convert_collection conv_wchar_byte4le = {
"wchar_byte4le",
php_mb_encid_wchar,
php_mb_encid_byte4le,
&cvfn_wchar_byte4le,
- NULL,
- NULL,
+ mbfl_convert_table_list_empty,
MBFL_MEMORY_TYPE_CONST
};
@@ -1815,7 +1779,8 @@
/*
* identify filter function table
*/
-static const mbfl_identify_function ident_func_utf7 = {
+static mbfl_identify_function ident_func_utf7 = {
+ "utf7",
php_mb_encid_utf7,
mbfl_filt_ident_common_ctor,
mbfl_filt_ident_common_dtor,
@@ -1828,7 +1793,7 @@
/*
* filter list
*/
-const mbfl_convert_collection *mbfl_convert_collection_list_ucs[] = {
+mbfl_convert_collection *mbfl_convert_collection_list_ucs[] = {
&conv_utf7_wchar,
&conv_wchar_utf7,
&conv_utf7imap_wchar,
@@ -1868,7 +1833,7 @@
NULL
};
-const mbfl_identify_function *mbfl_identify_function_list_ucs[] = {
+mbfl_identify_function *mbfl_identify_function_list_ucs[] = {
&ident_func_utf7,
NULL
};