diff -rcN -xCVS clean/doc/src/sgml/charset.sgml pgsql/doc/src/sgml/charset.sgml *** clean/doc/src/sgml/charset.sgml 2005-11-04 15:13:59.000000000 -0800 --- pgsql/doc/src/sgml/charset.sgml 2006-02-03 00:51:09.000000000 -0800 *************** *** 571,576 **** --- 571,597 ---- 1 + + WIN1253 + Windows CP1253 + Greek + 1 + + + + WIN1254 + Windows CP1254 + Turkish + 1 + + + + WIN1255 + Windows CP1255 + Hebrew + 1 + + WIN1256 Windows CP1256 *************** *** 578,583 **** --- 599,611 ---- 1 + + WIN1257 + Windows CP1257 + Baltic + 1 + + WIN1258 Windows CP1258 *************** *** 953,964 **** --- 981,1016 ---- + WIN1253 + WIN1253, + UTF8 + + + + WIN1254 + WIN1254, + UTF8 + + + + WIN1255 + WIN1255, + UTF8 + + + WIN1256 WIN1256, UTF8 + WIN1257 + WIN1257, + UTF8 + + + WIN1258 WIN1258, UTF8 diff -rcN -xCVS clean/doc/src/sgml/func.sgml pgsql/doc/src/sgml/func.sgml *** clean/doc/src/sgml/func.sgml 2006-01-25 18:35:48.000000000 -0800 --- pgsql/doc/src/sgml/func.sgml 2006-02-02 23:49:04.000000000 -0800 *************** *** 2173,2184 **** --- 2173,2208 ---- + utf8_to_windows_1253 + UTF8 + WIN1253 + + + + utf8_to_windows_1254 + UTF8 + WIN1254 + + + + utf8_to_windows_1255 + UTF8 + WIN1255 + + + utf8_to_windows_1256 UTF8 WIN1256 + utf8_to_windows_1257 + UTF8 + WIN1257 + + + utf8_to_windows_866 UTF8 WIN866 diff -rcN -xCVS clean/src/include/mb/pg_wchar.h pgsql/src/include/mb/pg_wchar.h *** clean/src/include/mb/pg_wchar.h 2005-12-24 10:23:02.000000000 -0800 --- pgsql/src/include/mb/pg_wchar.h 2006-02-02 23:06:19.000000000 -0800 *************** *** 177,182 **** --- 177,186 ---- PG_ISO_8859_7, /* ISO-8859-7 */ PG_ISO_8859_8, /* ISO-8859-8 */ PG_WIN1250, /* windows-1250 */ + PG_WIN1253, /* windows-1253 */ + PG_WIN1254, /* windows-1254 */ + PG_WIN1255, /* windows-1255 */ + PG_WIN1257, /* windows-1257 */ /* PG_ENCODING_BE_LAST points to the above entry */ /* followings are for client encoding only */ *************** *** 189,195 **** } pg_enc; ! #define PG_ENCODING_BE_LAST PG_WIN1250 /* * Please use these tests before access to pg_encconv_tbl[] --- 193,199 ---- } pg_enc; ! #define PG_ENCODING_BE_LAST PG_WIN1257 /* * Please use these tests before access to pg_encconv_tbl[] diff -rcN -xCVS clean/src/bin/initdb/initdb.c pgsql/src/bin/initdb/initdb.c *** clean/src/bin/initdb/initdb.c 2006-01-27 11:01:15.000000000 -0800 --- pgsql/src/bin/initdb/initdb.c 2006-02-02 23:40:00.000000000 -0800 *************** *** 771,777 **** --- 771,781 ---- {PG_LATIN10, "iso885916"}, {PG_WIN1252, "CP1252"}, + {PG_WIN1253, "CP1253"}, + {PG_WIN1254, "CP1254"}, + {PG_WIN1255, "CP1255"}, {PG_WIN1256, "CP1256"}, + {PG_WIN1257, "CP1257"}, {PG_WIN1258, "CP1258"}, #ifdef NOT_VERIFIED {PG_WIN874, "???"}, diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/Makefile pgsql/src/backend/utils/mb/conversion_procs/Makefile *** clean/src/backend/utils/mb/conversion_procs/Makefile 2005-12-09 13:19:35.000000000 -0800 --- pgsql/src/backend/utils/mb/conversion_procs/Makefile 2006-02-03 02:35:54.000000000 -0800 *************** *** 23,30 **** utf8_and_ascii utf8_and_big5 utf8_and_cyrillic utf8_and_euc_cn \ utf8_and_euc_jp utf8_and_euc_kr utf8_and_euc_tw utf8_and_gb18030 \ utf8_and_gbk utf8_and_iso8859 utf8_and_iso8859_1 utf8_and_johab \ ! utf8_and_sjis utf8_and_win1258 utf8_and_uhc utf8_and_win1250 \ ! utf8_and_win1252 utf8_and_win1256 utf8_and_win874 # conversion_name source_encoding destination_encoding function object CONVERSIONS = \ --- 23,29 ---- utf8_and_ascii utf8_and_big5 utf8_and_cyrillic utf8_and_euc_cn \ utf8_and_euc_jp utf8_and_euc_kr utf8_and_euc_tw utf8_and_gb18030 \ utf8_and_gbk utf8_and_iso8859 utf8_and_iso8859_1 utf8_and_johab \ ! utf8_and_sjis utf8_and_win utf8_and_uhc \ # conversion_name source_encoding destination_encoding function object CONVERSIONS = \ *************** *** 84,95 **** utf8_to_big5 UTF8 BIG5 utf8_to_big5 utf8_and_big5 \ utf8_to_koi8_r UTF8 KOI8R utf8_to_koi8r utf8_and_cyrillic \ koi8_r_to_utf8 KOI8R UTF8 koi8r_to_utf8 utf8_and_cyrillic \ ! utf8_to_windows_1251 UTF8 WIN1251 utf8_to_win1251 utf8_and_cyrillic \ ! windows_1251_to_utf8 WIN1251 UTF8 win1251_to_utf8 utf8_and_cyrillic \ ! utf8_to_windows_1252 UTF8 WIN1252 utf8_to_win1252 utf8_and_win1252 \ ! windows_1252_to_utf8 WIN1252 UTF8 win1252_to_utf8 utf8_and_win1252 \ ! utf8_to_windows_866 UTF8 WIN866 utf8_to_win866 utf8_and_cyrillic \ ! windows_866_to_utf8 WIN866 UTF8 win866_to_utf8 utf8_and_cyrillic \ euc_cn_to_utf8 EUC_CN UTF8 euc_cn_to_utf8 utf8_and_euc_cn \ utf8_to_euc_cn UTF8 EUC_CN utf8_to_euc_cn utf8_and_euc_cn \ euc_jp_to_utf8 EUC_JP UTF8 euc_jp_to_utf8 utf8_and_euc_jp \ --- 83,110 ---- utf8_to_big5 UTF8 BIG5 utf8_to_big5 utf8_and_big5 \ utf8_to_koi8_r UTF8 KOI8R utf8_to_koi8r utf8_and_cyrillic \ koi8_r_to_utf8 KOI8R UTF8 koi8r_to_utf8 utf8_and_cyrillic \ ! utf8_to_windows_866 UTF8 WIN866 utf8_to_win utf8_and_win \ ! windows_866_to_utf8 WIN866 UTF8 win_to_utf8 utf8_and_win \ ! utf8_to_windows_874 UTF8 WIN874 utf8_to_win utf8_and_win \ ! windows_874_to_utf8 WIN874 UTF8 win_to_utf8 utf8_and_win \ ! utf8_to_windows_1250 UTF8 WIN1250 utf8_to_win utf8_and_win \ ! windows_1250_to_utf8 WIN1250 UTF8 win_to_utf8 utf8_and_win \ ! utf8_to_windows_1251 UTF8 WIN1251 utf8_to_win utf8_and_win \ ! windows_1251_to_utf8 WIN1251 UTF8 win_to_utf8 utf8_and_win \ ! utf8_to_windows_1252 UTF8 WIN1252 utf8_to_win utf8_and_win \ ! windows_1252_to_utf8 WIN1252 UTF8 win_to_utf8 utf8_and_win \ ! utf8_to_windows_1253 UTF8 WIN1253 utf8_to_win utf8_and_win \ ! windows_1253_to_utf8 WIN1253 UTF8 win_to_utf8 utf8_and_win \ ! utf8_to_windows_1254 UTF8 WIN1254 utf8_to_win utf8_and_win \ ! windows_1254_to_utf8 WIN1254 UTF8 win_to_utf8 utf8_and_win \ ! utf8_to_windows_1255 UTF8 WIN1255 utf8_to_win utf8_and_win \ ! windows_1255_to_utf8 WIN1255 UTF8 win_to_utf8 utf8_and_win \ ! utf8_to_windows_1256 UTF8 WIN1256 utf8_to_win utf8_and_win \ ! windows_1256_to_utf8 WIN1256 UTF8 win_to_utf8 utf8_and_win \ ! utf8_to_windows_1257 UTF8 WIN1257 utf8_to_win utf8_and_win \ ! windows_1257_to_utf8 WIN1257 UTF8 win_to_utf8 utf8_and_win \ ! utf8_to_windows_1258 UTF8 WIN1258 utf8_to_win utf8_and_win \ ! windows_1258_to_utf8 WIN1258 UTF8 win_to_utf8 utf8_and_win \ euc_cn_to_utf8 EUC_CN UTF8 euc_cn_to_utf8 utf8_and_euc_cn \ utf8_to_euc_cn UTF8 EUC_CN utf8_to_euc_cn utf8_and_euc_cn \ euc_jp_to_utf8 EUC_JP UTF8 euc_jp_to_utf8 utf8_and_euc_jp \ *************** *** 134,149 **** utf8_to_johab UTF8 JOHAB utf8_to_johab utf8_and_johab \ sjis_to_utf8 SJIS UTF8 sjis_to_utf8 utf8_and_sjis \ utf8_to_sjis UTF8 SJIS utf8_to_sjis utf8_and_sjis \ - win1258_to_utf8 WIN1258 UTF8 win1258_to_utf8 utf8_and_win1258 \ - utf8_to_win1258 UTF8 WIN1258 utf8_to_win1258 utf8_and_win1258 \ uhc_to_utf8 UHC UTF8 uhc_to_utf8 utf8_and_uhc \ ! utf8_to_uhc UTF8 UHC utf8_to_uhc utf8_and_uhc \ ! utf8_to_windows_1250 UTF8 WIN1250 utf8_to_win1250 utf8_and_win1250 \ ! windows_1250_to_utf8 WIN1250 UTF8 win1250_to_utf8 utf8_and_win1250 \ ! utf8_to_windows_1256 UTF8 WIN1256 utf8_to_win1256 utf8_and_win1256 \ ! windows_1256_to_utf8 WIN1256 UTF8 win1256_to_utf8 utf8_and_win1256 \ ! utf8_to_windows_874 UTF8 WIN874 utf8_to_win874 utf8_and_win874 \ ! windows_874_to_utf8 WIN874 UTF8 win874_to_utf8 utf8_and_win874 all: $(SQLSCRIPT) @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done --- 149,157 ---- utf8_to_johab UTF8 JOHAB utf8_to_johab utf8_and_johab \ sjis_to_utf8 SJIS UTF8 sjis_to_utf8 utf8_and_sjis \ utf8_to_sjis UTF8 SJIS utf8_to_sjis utf8_and_sjis \ uhc_to_utf8 UHC UTF8 uhc_to_utf8 utf8_and_uhc \ ! utf8_to_uhc UTF8 UHC utf8_to_uhc utf8_and_uhc ! all: $(SQLSCRIPT) @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c *** clean/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c 2005-10-14 19:49:34.000000000 -0700 --- pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c 2006-02-03 02:18:30.000000000 -0800 *************** *** 16,39 **** #include "mb/pg_wchar.h" #include "../../Unicode/utf8_to_koi8r.map" #include "../../Unicode/koi8r_to_utf8.map" - #include "../../Unicode/utf8_to_win1251.map" - #include "../../Unicode/win1251_to_utf8.map" - #include "../../Unicode/utf8_to_win866.map" - #include "../../Unicode/win866_to_utf8.map" PG_FUNCTION_INFO_V1(utf8_to_koi8r); PG_FUNCTION_INFO_V1(koi8r_to_utf8); - PG_FUNCTION_INFO_V1(utf8_to_win1251); - PG_FUNCTION_INFO_V1(win1251_to_utf8); - PG_FUNCTION_INFO_V1(utf8_to_win866); - PG_FUNCTION_INFO_V1(win866_to_utf8); extern Datum utf8_to_koi8r(PG_FUNCTION_ARGS); extern Datum koi8r_to_utf8(PG_FUNCTION_ARGS); - extern Datum utf8_to_win1251(PG_FUNCTION_ARGS); - extern Datum win1251_to_utf8(PG_FUNCTION_ARGS); - extern Datum utf8_to_win866(PG_FUNCTION_ARGS); - extern Datum win866_to_utf8(PG_FUNCTION_ARGS); /* ---------- * conv_proc( --- 16,27 ---- *************** *** 57,64 **** Assert(PG_GETARG_INT32(1) == PG_KOI8R); Assert(len >= 0); ! UtfToLocal(src, dest, ULmap_KOI8R, ! sizeof(ULmap_KOI8R) / sizeof(pg_utf_to_local), len); PG_RETURN_VOID(); } --- 45,52 ---- Assert(PG_GETARG_INT32(1) == PG_KOI8R); Assert(len >= 0); ! UtfToLocal(src, dest, ULmapKOI8R, ! sizeof(ULmapKOI8R) / sizeof(pg_utf_to_local), len); PG_RETURN_VOID(); } *************** *** 80,149 **** PG_RETURN_VOID(); } - Datum - utf8_to_win1251(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_UTF8); - Assert(PG_GETARG_INT32(1) == PG_WIN1251); - Assert(len >= 0); - - UtfToLocal(src, dest, ULmap_WIN1251, - sizeof(ULmap_WIN1251) / sizeof(pg_utf_to_local), len); - - PG_RETURN_VOID(); - } - - Datum - win1251_to_utf8(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_WIN1251); - Assert(PG_GETARG_INT32(1) == PG_UTF8); - Assert(len >= 0); - - LocalToUtf(src, dest, LUmapWIN1251, - sizeof(LUmapWIN1251) / sizeof(pg_local_to_utf), PG_WIN1251, len); - - PG_RETURN_VOID(); - } - - Datum - utf8_to_win866(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_UTF8); - Assert(PG_GETARG_INT32(1) == PG_WIN866); - Assert(len >= 0); - - UtfToLocal(src, dest, ULmap_WIN866, - sizeof(ULmap_WIN866) / sizeof(pg_utf_to_local), len); - - PG_RETURN_VOID(); - } - - Datum - win866_to_utf8(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_WIN866); - Assert(PG_GETARG_INT32(1) == PG_UTF8); - Assert(len >= 0); - - LocalToUtf(src, dest, LUmapWIN866, - sizeof(LUmapWIN866) / sizeof(pg_local_to_utf), PG_WIN866, len); - - PG_RETURN_VOID(); - } --- 68,70 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile *** clean/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile 1969-12-31 16:00:00.000000000 -0800 --- pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile 2006-02-03 02:10:53.000000000 -0800 *************** *** 0 **** --- 1,12 ---- + #------------------------------------------------------------------------- + # + # $PostgreSQL$ + # + #------------------------------------------------------------------------- + subdir = src/backend/utils/mb/conversion_procs/utf8_and_win + top_builddir = ../../../../../.. + include $(top_builddir)/src/Makefile.global + + NAME := utf8_and_win + + include $(srcdir)/../proc.mk diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c *** clean/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c 1969-12-31 16:00:00.000000000 -0800 --- pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c 2006-02-03 02:25:59.000000000 -0800 *************** *** 0 **** --- 1,156 ---- + /*------------------------------------------------------------------------- + * + * WIN <--> UTF8 + * + * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * IDENTIFICATION + * $PostgreSQL$ + * + *------------------------------------------------------------------------- + */ + + #include "postgres.h" + #include "fmgr.h" + #include "mb/pg_wchar.h" + #include "../../Unicode/utf8_to_win866.map" + #include "../../Unicode/utf8_to_win874.map" + #include "../../Unicode/utf8_to_win1250.map" + #include "../../Unicode/utf8_to_win1251.map" + #include "../../Unicode/utf8_to_win1252.map" + #include "../../Unicode/utf8_to_win1253.map" + #include "../../Unicode/utf8_to_win1254.map" + #include "../../Unicode/utf8_to_win1255.map" + #include "../../Unicode/utf8_to_win1256.map" + #include "../../Unicode/utf8_to_win1257.map" + #include "../../Unicode/utf8_to_win1258.map" + #include "../../Unicode/win866_to_utf8.map" + #include "../../Unicode/win874_to_utf8.map" + #include "../../Unicode/win1250_to_utf8.map" + #include "../../Unicode/win1251_to_utf8.map" + #include "../../Unicode/win1252_to_utf8.map" + #include "../../Unicode/win1253_to_utf8.map" + #include "../../Unicode/win1254_to_utf8.map" + #include "../../Unicode/win1255_to_utf8.map" + #include "../../Unicode/win1256_to_utf8.map" + #include "../../Unicode/win1257_to_utf8.map" + #include "../../Unicode/win1258_to_utf8.map" + + PG_FUNCTION_INFO_V1(win_to_utf8); + PG_FUNCTION_INFO_V1(utf8_to_win); + + extern Datum win_to_utf8(PG_FUNCTION_ARGS); + extern Datum utf8_to_win(PG_FUNCTION_ARGS); + + /* ---------- + * conv_proc( + * INTEGER, -- source encoding id + * INTEGER, -- destination encoding id + * CSTRING, -- source string (null terminated C string) + * CSTRING, -- destination string (null terminated C string) + * INTEGER -- source string length + * ) returns VOID; + * ---------- + */ + + typedef struct + { + pg_enc encoding; + pg_local_to_utf *map1; /* to UTF8 map name */ + pg_utf_to_local *map2; /* from UTF8 map name */ + int size1; /* size of map1 */ + int size2; /* size of map2 */ + } pg_conv_map; + + static pg_conv_map maps[] = { + {PG_WIN866, LUmapWIN866, ULmapWIN866, + sizeof(LUmapWIN866) / sizeof(pg_local_to_utf), + sizeof(ULmapWIN866) / sizeof(pg_utf_to_local)}, + {PG_WIN874, LUmapWIN874, ULmapWIN874, + sizeof(LUmapWIN874) / sizeof(pg_local_to_utf), + sizeof(ULmapWIN874) / sizeof(pg_utf_to_local)}, + {PG_WIN1250, LUmapWIN1250, ULmapWIN1250, + sizeof(LUmapWIN1250) / sizeof(pg_local_to_utf), + sizeof(ULmapWIN1250) / sizeof(pg_utf_to_local)}, + {PG_WIN1251, LUmapWIN1251, ULmapWIN1251, + sizeof(LUmapWIN1251) / sizeof(pg_local_to_utf), + sizeof(ULmapWIN1251) / sizeof(pg_utf_to_local)}, + {PG_WIN1252, LUmapWIN1252, ULmapWIN1252, + sizeof(LUmapWIN1252) / sizeof(pg_local_to_utf), + sizeof(ULmapWIN1252) / sizeof(pg_utf_to_local)}, + {PG_WIN1253, LUmapWIN1253, ULmapWIN1253, + sizeof(LUmapWIN1253) / sizeof(pg_local_to_utf), + sizeof(ULmapWIN1253) / sizeof(pg_utf_to_local)}, + {PG_WIN1254, LUmapWIN1254, ULmapWIN1254, + sizeof(LUmapWIN1254) / sizeof(pg_local_to_utf), + sizeof(ULmapWIN1254) / sizeof(pg_utf_to_local)}, + {PG_WIN1255, LUmapWIN1255, ULmapWIN1255, + sizeof(LUmapWIN1255) / sizeof(pg_local_to_utf), + sizeof(ULmapWIN1255) / sizeof(pg_utf_to_local)}, + {PG_WIN1256, LUmapWIN1256, ULmapWIN1256, + sizeof(LUmapWIN1256) / sizeof(pg_local_to_utf), + sizeof(ULmapWIN1256) / sizeof(pg_utf_to_local)}, + {PG_WIN1257, LUmapWIN1257, ULmapWIN1257, + sizeof(LUmapWIN1257) / sizeof(pg_local_to_utf), + sizeof(ULmapWIN1257) / sizeof(pg_utf_to_local)}, + {PG_WIN1258, LUmapWIN1258, ULmapWIN1258, + sizeof(LUmapWIN1258) / sizeof(pg_local_to_utf), + sizeof(ULmapWIN1258) / sizeof(pg_utf_to_local)}, + }; + + Datum + win_to_utf8(PG_FUNCTION_ARGS) + { + int encoding = PG_GETARG_INT32(0); + unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); + unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); + int len = PG_GETARG_INT32(4); + int i; + + Assert(PG_GETARG_INT32(1) == PG_UTF8); + Assert(len >= 0); + + for (i=0;i= 0); + + for (i=0;i= 0); - - UtfToLocal(src, dest, ULmapWIN1250, - sizeof(ULmapWIN1250) / sizeof(pg_utf_to_local), len); - - PG_RETURN_VOID(); - } - - Datum - win1250_to_utf8(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_WIN1250); - Assert(PG_GETARG_INT32(1) == PG_UTF8); - Assert(len >= 0); - - LocalToUtf(src, dest, LUmapWIN1250, - sizeof(LUmapWIN1250) / sizeof(pg_local_to_utf), PG_WIN1250, len); - - PG_RETURN_VOID(); - } --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/utf8_and_win1252/Makefile pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1252/Makefile *** clean/src/backend/utils/mb/conversion_procs/utf8_and_win1252/Makefile 2005-03-14 10:31:22.000000000 -0800 --- pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1252/Makefile 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,12 **** - #------------------------------------------------------------------------- - # - # $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1252/Makefile,v 1.3 2005/03/14 18:31:22 momjian Exp $ - # - #------------------------------------------------------------------------- - subdir = src/backend/utils/mb/conversion_procs/utf8_and_win1252 - top_builddir = ../../../../../.. - include $(top_builddir)/src/Makefile.global - - NAME := utf8_and_win1252 - - include $(srcdir)/../proc.mk --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/utf8_and_win1252/utf8_and_win1252.c pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1252/utf8_and_win1252.c *** clean/src/backend/utils/mb/conversion_procs/utf8_and_win1252/utf8_and_win1252.c 2005-10-14 19:49:35.000000000 -0700 --- pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1252/utf8_and_win1252.c 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,69 **** - /*------------------------------------------------------------------------- - * - * WIN1252 and UTF8 - * - * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group - * Portions Copyright (c) 1994, Regents of the University of California - * - * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1252/utf8_and_win1252.c,v 1.5 2005/10/15 02:49:35 momjian Exp $ - * - *------------------------------------------------------------------------- - */ - - #include "postgres.h" - #include "fmgr.h" - #include "mb/pg_wchar.h" - #include "../../Unicode/utf8_to_win1252.map" - #include "../../Unicode/win1252_to_utf8.map" - - PG_FUNCTION_INFO_V1(utf8_to_win1252); - PG_FUNCTION_INFO_V1(win1252_to_utf8); - - extern Datum utf8_to_win1252(PG_FUNCTION_ARGS); - extern Datum win1252_to_utf8(PG_FUNCTION_ARGS); - - /* ---------- - * conv_proc( - * INTEGER, -- source encoding id - * INTEGER, -- destination encoding id - * CSTRING, -- source string (null terminated C string) - * CSTRING, -- destination string (null terminated C string) - * INTEGER -- source string length - * ) returns VOID; - * ---------- - */ - - Datum - utf8_to_win1252(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_UTF8); - Assert(PG_GETARG_INT32(1) == PG_WIN1252); - Assert(len >= 0); - - UtfToLocal(src, dest, ULmapWIN1252, - sizeof(ULmapWIN1252) / sizeof(pg_utf_to_local), len); - - PG_RETURN_VOID(); - } - - Datum - win1252_to_utf8(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_WIN1252); - Assert(PG_GETARG_INT32(1) == PG_UTF8); - Assert(len >= 0); - - LocalToUtf(src, dest, LUmapWIN1252, - sizeof(LUmapWIN1252) / sizeof(pg_local_to_utf), PG_WIN1252, len); - - PG_RETURN_VOID(); - } --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/utf8_and_win1256/Makefile pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1256/Makefile *** clean/src/backend/utils/mb/conversion_procs/utf8_and_win1256/Makefile 2003-11-29 14:40:42.000000000 -0800 --- pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1256/Makefile 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,12 **** - #------------------------------------------------------------------------- - # - # $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1256/Makefile,v 1.3 2003/11/29 22:40:42 pgsql Exp $ - # - #------------------------------------------------------------------------- - subdir = src/backend/utils/mb/conversion_procs/utf8_and_win1256 - top_builddir = ../../../../../.. - include $(top_builddir)/src/Makefile.global - - NAME := utf8_and_win1256 - - include $(srcdir)/../proc.mk --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/utf8_and_win1256/utf8_and_win1256.c pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1256/utf8_and_win1256.c *** clean/src/backend/utils/mb/conversion_procs/utf8_and_win1256/utf8_and_win1256.c 2005-10-14 19:49:35.000000000 -0700 --- pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1256/utf8_and_win1256.c 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,69 **** - /*------------------------------------------------------------------------- - * - * WIN1256 and UTF8 - * - * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group - * Portions Copyright (c) 1994, Regents of the University of California - * - * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1256/utf8_and_win1256.c,v 1.13 2005/10/15 02:49:35 momjian Exp $ - * - *------------------------------------------------------------------------- - */ - - #include "postgres.h" - #include "fmgr.h" - #include "mb/pg_wchar.h" - #include "../../Unicode/utf8_to_win1256.map" - #include "../../Unicode/win1256_to_utf8.map" - - PG_FUNCTION_INFO_V1(utf8_to_win1256); - PG_FUNCTION_INFO_V1(win1256_to_utf8); - - extern Datum utf8_to_win1256(PG_FUNCTION_ARGS); - extern Datum win1256_to_utf8(PG_FUNCTION_ARGS); - - /* ---------- - * conv_proc( - * INTEGER, -- source encoding id - * INTEGER, -- destination encoding id - * CSTRING, -- source string (null terminated C string) - * CSTRING, -- destination string (null terminated C string) - * INTEGER -- source string length - * ) returns VOID; - * ---------- - */ - - Datum - utf8_to_win1256(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_UTF8); - Assert(PG_GETARG_INT32(1) == PG_WIN1256); - Assert(len >= 0); - - UtfToLocal(src, dest, ULmapWIN1256, - sizeof(ULmapWIN1256) / sizeof(pg_utf_to_local), len); - - PG_RETURN_VOID(); - } - - Datum - win1256_to_utf8(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_WIN1256); - Assert(PG_GETARG_INT32(1) == PG_UTF8); - Assert(len >= 0); - - LocalToUtf(src, dest, LUmapWIN1256, - sizeof(LUmapWIN1256) / sizeof(pg_local_to_utf), PG_WIN1256, len); - - PG_RETURN_VOID(); - } --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/utf8_and_win1258/Makefile pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1258/Makefile *** clean/src/backend/utils/mb/conversion_procs/utf8_and_win1258/Makefile 2005-03-07 15:18:06.000000000 -0800 --- pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1258/Makefile 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,12 **** - #------------------------------------------------------------------------- - # - # $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1258/Makefile,v 1.2 2005/03/07 23:18:06 neilc Exp $ - # - #------------------------------------------------------------------------- - subdir = src/backend/utils/mb/conversion_procs/utf8_and_win1258 - top_builddir = ../../../../../.. - include $(top_builddir)/src/Makefile.global - - NAME := utf8_and_win1258 - - include $(srcdir)/../proc.mk --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/utf8_and_win1258/utf8_and_win1258.c pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1258/utf8_and_win1258.c *** clean/src/backend/utils/mb/conversion_procs/utf8_and_win1258/utf8_and_win1258.c 2005-10-14 19:49:35.000000000 -0700 --- pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1258/utf8_and_win1258.c 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,68 **** - /*------------------------------------------------------------------------- - * - * WIN1258 <--> UTF8 - * - * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group - * Portions Copyright (c) 1994, Regents of the University of California - * - * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win1258/utf8_and_win1258.c,v 1.3 2005/10/15 02:49:35 momjian Exp $ - * - *------------------------------------------------------------------------- - */ - - #include "postgres.h" - #include "fmgr.h" - #include "mb/pg_wchar.h" - #include "../../Unicode/win1258_to_utf8.map" - #include "../../Unicode/utf8_to_win1258.map" - - PG_FUNCTION_INFO_V1(win1258_to_utf8); - PG_FUNCTION_INFO_V1(utf8_to_win1258); - - extern Datum win1258_to_utf8(PG_FUNCTION_ARGS); - extern Datum utf8_to_win1258(PG_FUNCTION_ARGS); - - /* ---------- - * conv_proc( - * INTEGER, -- source encoding id - * INTEGER, -- destination encoding id - * CSTRING, -- source string (null terminated C string) - * CSTRING, -- destination string (null terminated C string) - * INTEGER -- source string length - * ) returns VOID; - * ---------- - */ - Datum - win1258_to_utf8(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_WIN1258); - Assert(PG_GETARG_INT32(1) == PG_UTF8); - Assert(len >= 0); - - LocalToUtf(src, dest, LUmapWIN1258, - sizeof(LUmapWIN1258) / sizeof(pg_local_to_utf), PG_WIN1258, len); - - PG_RETURN_VOID(); - } - - Datum - utf8_to_win1258(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_UTF8); - Assert(PG_GETARG_INT32(1) == PG_WIN1258); - Assert(len >= 0); - - UtfToLocal(src, dest, ULmapWIN1258, - sizeof(ULmapWIN1258) / sizeof(pg_utf_to_local), len); - - PG_RETURN_VOID(); - } --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/utf8_and_win874/Makefile pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win874/Makefile *** clean/src/backend/utils/mb/conversion_procs/utf8_and_win874/Makefile 2003-11-29 14:40:43.000000000 -0800 --- pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win874/Makefile 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,12 **** - #------------------------------------------------------------------------- - # - # $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win874/Makefile,v 1.3 2003/11/29 22:40:43 pgsql Exp $ - # - #------------------------------------------------------------------------- - subdir = src/backend/utils/mb/conversion_procs/utf8_and_win874 - top_builddir = ../../../../../.. - include $(top_builddir)/src/Makefile.global - - NAME := utf8_and_win874 - - include $(srcdir)/../proc.mk --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/conversion_procs/utf8_and_win874/utf8_and_win874.c pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win874/utf8_and_win874.c *** clean/src/backend/utils/mb/conversion_procs/utf8_and_win874/utf8_and_win874.c 2005-10-14 19:49:35.000000000 -0700 --- pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win874/utf8_and_win874.c 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,69 **** - /*------------------------------------------------------------------------- - * - * WIN874 and UTF8 - * - * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group - * Portions Copyright (c) 1994, Regents of the University of California - * - * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win874/utf8_and_win874.c,v 1.13 2005/10/15 02:49:35 momjian Exp $ - * - *------------------------------------------------------------------------- - */ - - #include "postgres.h" - #include "fmgr.h" - #include "mb/pg_wchar.h" - #include "../../Unicode/utf8_to_win874.map" - #include "../../Unicode/win874_to_utf8.map" - - PG_FUNCTION_INFO_V1(utf8_to_win874); - PG_FUNCTION_INFO_V1(win874_to_utf8); - - extern Datum utf8_to_win874(PG_FUNCTION_ARGS); - extern Datum win874_to_utf8(PG_FUNCTION_ARGS); - - /* ---------- - * conv_proc( - * INTEGER, -- source encoding id - * INTEGER, -- destination encoding id - * CSTRING, -- source string (null terminated C string) - * CSTRING, -- destination string (null terminated C string) - * INTEGER -- source string length - * ) returns VOID; - * ---------- - */ - - Datum - utf8_to_win874(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_UTF8); - Assert(PG_GETARG_INT32(1) == PG_WIN874); - Assert(len >= 0); - - UtfToLocal(src, dest, ULmapWIN874, - sizeof(ULmapWIN874) / sizeof(pg_utf_to_local), len); - - PG_RETURN_VOID(); - } - - Datum - win874_to_utf8(PG_FUNCTION_ARGS) - { - unsigned char *src = (unsigned char *) PG_GETARG_CSTRING(2); - unsigned char *dest = (unsigned char *) PG_GETARG_CSTRING(3); - int len = PG_GETARG_INT32(4); - - Assert(PG_GETARG_INT32(0) == PG_WIN874); - Assert(PG_GETARG_INT32(1) == PG_UTF8); - Assert(len >= 0); - - LocalToUtf(src, dest, LUmapWIN874, - sizeof(LUmapWIN874) / sizeof(pg_local_to_utf), PG_WIN874, len); - - PG_RETURN_VOID(); - } --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/encnames.c pgsql/src/backend/utils/mb/encnames.c *** clean/src/backend/utils/mb/encnames.c 2006-01-11 00:43:12.000000000 -0800 --- pgsql/src/backend/utils/mb/encnames.c 2006-02-02 23:18:50.000000000 -0800 *************** *** 197,205 **** --- 197,217 ---- "win1252", PG_WIN1252 }, /* alias for Windows-1252 */ { + "win1253", PG_WIN1253 + }, /* alias for Windows-1253 */ + { + "win1254", PG_WIN1254 + }, /* alias for Windows-1254 */ + { + "win1255", PG_WIN1255 + }, /* alias for Windows-1255 */ + { "win1256", PG_WIN1256 }, /* alias for Windows-1256 */ { + "win1257", PG_WIN1257 + }, /* alias for Windows-1257 */ + { "win1258", PG_WIN1258 }, /* alias for Windows-1258 */ { *************** *** 230,238 **** --- 242,262 ---- "windows1252", PG_WIN1252 }, /* Windows-1252; Microsoft */ { + "windows1253", PG_WIN1253 + }, /* Windows-1253; Microsoft */ + { + "windows1254", PG_WIN1254 + }, /* Windows-1254; Microsoft */ + { + "windows1255", PG_WIN1255 + }, /* Windows-1255; Microsoft */ + { "windows1256", PG_WIN1256 }, /* Windows-1256; Microsoft */ { + "windows1257", PG_WIN1257 + }, /* Windows-1257; Microsoft */ + { "windows1258", PG_WIN1258 }, /* Windows-1258; Microsoft */ { *************** *** 359,364 **** --- 383,400 ---- "WIN1250", PG_WIN1250 }, { + "WIN1253", PG_WIN1253 + }, + { + "WIN1254", PG_WIN1254 + }, + { + "WIN1255", PG_WIN1255 + }, + { + "WIN1257", PG_WIN1257 + }, + { "SJIS", PG_SJIS }, { diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/README pgsql/src/backend/utils/mb/README *** clean/src/backend/utils/mb/README 2002-09-03 14:45:43.000000000 -0700 --- pgsql/src/backend/utils/mb/README 2006-02-02 17:03:09.000000000 -0800 *************** *** 1,15 **** ! common.c: public functions for both the backend and the frontend. ! requires conv.c and wchar.c conv.c: static functions and a public table for code conversion wchar.c: mostly static functions and a public table for mb string and multibyte conversion ! mbutilc.c: public functions for the backend only. requires conv.c and wchar.c wstrcmp.c: strcmp for mb wstrncmp.c: strncmp for mb ! alt.c: a tool to generate KOI8 <--> CP866 conversion table iso.c: a tool to generate KOI8 <--> ISO8859-5 conversion table ! win.c: a tool to generate KOI8 <--> CP1251 conversion table ! big5.c: conversion between BIG5 and Mule Internal Code(CNS 116643-1992 ! plane 1 and plane 2). ! utftest.c: test driver for utf2wchar() --- 1,11 ---- ! encnames.c: public functions for both the backend and the frontend. conv.c: static functions and a public table for code conversion wchar.c: mostly static functions and a public table for mb string and multibyte conversion ! mbutils.c: public functions for the backend only. requires conv.c and wchar.c wstrcmp.c: strcmp for mb wstrncmp.c: strncmp for mb ! win866.c: a tool to generate KOI8 <--> CP866 conversion table iso.c: a tool to generate KOI8 <--> ISO8859-5 conversion table ! win1251.c: a tool to generate KOI8 <--> CP1251 conversion table diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/Makefile pgsql/src/backend/utils/mb/Unicode/Makefile *** clean/src/backend/utils/mb/Unicode/Makefile 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/Makefile 2006-02-03 02:04:36.000000000 -0800 *************** *** 12,47 **** top_builddir = ../../../../.. include $(top_builddir)/src/Makefile.global ! ISO8859MAPS=iso8859_2_to_utf8.map iso8859_3_to_utf8.map \ ! iso8859_4_to_utf8.map iso8859_5_to_utf8.map \ ! utf8_to_iso8859_2.map utf8_to_iso8859_3.map \ ! utf8_to_iso8859_4.map utf8_to_iso8859_5.map ! ! ! CYRILLICMAPS=koi8r_to_utf8.map win1251_to_utf8.map win866_to_utf8.map\ ! utf8_to_koi8r.map utf8_to_win1251.map utf8_to_win866.map ! ! MAPS= $(ISO8859MAPS) $(CYRILLICMAPS)\ ! big5_to_utf8.map euc_cn_to_utf8.map euc_jp_to_utf8.map \ ! euc_kr_to_utf8.map euc_tw_to_utf8.map sjis_to_utf8.map \ ! utf8_to_big5.map utf8_to_euc_cn.map utf8_to_euc_jp.map \ ! utf8_to_euc_kr.map utf8_to_euc_tw.map utf8_to_iso8859_2.map \ ! utf8_to_sjis.map gb18030_to_utf8.map utf8_to_gb18030.map ! ! ISO8859TEXTS= 8859-2.TXT 8859-3.TXT 8859-4.TXT 8859-5.TXT ! CYRILLICTEXTS=cp866.txt cp1251.txt koi8-r.txt ! ! TEXTS=$(ISO8859TEXTS) $(CYRILLICTEXTS) \ ! BIG5.TXT CNS11643.TXT GB2312.TXT \ ! JIS0201.TXT JIS0208.TXT JIS0212.TXT \ ! OLD5601.TXT SHIFTJIS.TXT ISO10646-GB18030.TXT all: $(MAPS) ! $(ISO8859MAPS) : $(ISO8859TEXTS) ! ./UCS_to_8859.pl ! $(CYRILLICMAPS) : $(CYRILLICTEXTS) ! ./UCS_to_cyrillic.pl euc_jp_to_utf8.map utf8_to_euc_jp.map : JIS0201.TXT JIS0208.TXT JIS0212.TXT ./UCS_to_EUC_JP.pl --- 12,75 ---- top_builddir = ../../../../.. include $(top_builddir)/src/Makefile.global ! ISO8859MAPS = iso8859_2_to_utf8.map utf8_to_iso8859_2.map \ ! iso8859_3_to_utf8.map utf8_to_iso8859_3.map \ ! iso8859_4_to_utf8.map utf8_to_iso8859_4.map \ ! iso8859_5_to_utf8.map utf8_to_iso8859_5.map \ ! iso8859_6_to_utf8.map utf8_to_iso8859_6.map \ ! iso8859_7_to_utf8.map utf8_to_iso8859_7.map \ ! iso8859_8_to_utf8.map utf8_to_iso8859_8.map \ ! iso8859_9_to_utf8.map utf8_to_iso8859_9.map \ ! iso8859_10_to_utf8.map utf8_to_iso8859_10.map \ ! iso8859_13_to_utf8.map utf8_to_iso8859_13.map \ ! iso8859_14_to_utf8.map utf8_to_iso8859_14.map \ ! iso8859_15_to_utf8.map utf8_to_iso8859_15.map \ ! iso8859_16_to_utf8.map utf8_to_iso8859_16.map ! ! WINMAPS = win866_to_utf8.map utf8_to_win866.map \ ! win874_to_utf8.map utf8_to_win874.map \ ! win1250_to_utf8.map utf8_to_win1250.map \ ! win1251_to_utf8.map utf8_to_win1251.map \ ! win1252_to_utf8.map utf8_to_win1252.map \ ! win1253_to_utf8.map utf8_to_win1253.map \ ! win1254_to_utf8.map utf8_to_win1254.map \ ! win1255_to_utf8.map utf8_to_win1255.map \ ! win1256_to_utf8.map utf8_to_win1256.map \ ! win1257_to_utf8.map utf8_to_win1257.map \ ! win1258_to_utf8.map utf8_to_win1258.map ! ! GENERICMAPS = $(ISO8859MAPS) $(WINMAPS) \ ! big5_to_utf8.map utf8_to_big5.map \ ! johab_to_utf8.map utf8_to_johab.map \ ! uhc_to_utf8.map utf8_to_uhc.map \ ! gbk_to_utf8.map utf8_to_gbk.map \ ! koi8r_to_utf8.map utf8_to_koi8r.map ! ! SPECIALMAPS = euc_cn_to_utf8.map utf8_to_euc_cn.map \ ! euc_jp_to_utf8.map utf8_to_euc_jp.map \ ! euc_kr_to_utf8.map utf8_to_euc_kr.map \ ! euc_tw_to_utf8.map utf8_to_euc_tw.map \ ! sjis_to_utf8.map utf8_to_sjis.map \ ! gb18030_to_utf8.map utf8_to_gb18030.map ! ! MAPS = $(GENERICMAPS) $(SPECIALMAPS) ! ! ISO8859TEXTS = 8859-2.TXT 8859-3.TXT 8859-4.TXT 8859-5.TXT \ ! 8859-6.TXT 8859-7.TXT 8859-8.TXT 8859-9.TXT \ ! 8859-10.TXT 8859-13.TXT 8859-14.TXT 8859-15.TXT \ ! 8859-16.TXT ! ! WINTEXTS = CP866.TXT CP874.TXT CP1250.TXT CP1251.TXT \ ! CP1252.TXT CP1253.TXT CP1254.TXT CP1255.TXT \ ! CP1256.TXT CP1257.TXT CP1258.TXT ! ! GENERICTEXTS = $(ISO8859TEXTS) $(WINTEXTS) \ ! KOI8-R.TXT CP936.TXT CP949.TXT JOHAB.TXT BIG5.TXT all: $(MAPS) ! $(GENERICMAPS) : $(GENERICTEXTS) ! ./UCS_to_most.pl euc_jp_to_utf8.map utf8_to_euc_jp.map : JIS0201.TXT JIS0208.TXT JIS0212.TXT ./UCS_to_EUC_JP.pl *************** *** 49,66 **** euc_cn_to_utf8.map utf8_to_euc_cn.map : GB2312.TXT ./UCS_to_EUC_CN.pl ! euc_kr_to_utf8.map utf8_to_euc_kr.map : OLD5601.TXT ./UCS_to_EUC_KR.pl euc_tw_to_utf8.map utf8_to_euc_tw.map : CNS11643.TXT ./UCS_to_EUC_TW.pl ! sjis_to_utf8.map utf8_to_sjis.map : SHIFTJIS.TXT ./UCS_to_SJIS.pl - big5_to_utf8.map utf8_to_big5.map : BIG5.TXT - ./UCS_to_BIG5.pl - gb18030_to_utf8.map utf8_to_gb18030.map : ISO10646-GB18030.TXT ./UCS_to_GB18030.pl clean: --- 77,91 ---- euc_cn_to_utf8.map utf8_to_euc_cn.map : GB2312.TXT ./UCS_to_EUC_CN.pl ! euc_kr_to_utf8.map utf8_to_euc_kr.map : KSX1001.TXT ./UCS_to_EUC_KR.pl euc_tw_to_utf8.map utf8_to_euc_tw.map : CNS11643.TXT ./UCS_to_EUC_TW.pl ! sjis_to_utf8.map utf8_to_sjis.map : CP932.TXT ./UCS_to_SJIS.pl gb18030_to_utf8.map utf8_to_gb18030.map : ISO10646-GB18030.TXT ./UCS_to_GB18030.pl clean: diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/UCS_to_8859.pl pgsql/src/backend/utils/mb/Unicode/UCS_to_8859.pl *** clean/src/backend/utils/mb/Unicode/UCS_to_8859.pl 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/UCS_to_8859.pl 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,110 **** - #! /usr/bin/perl - # - # Copyright (c) 2001-2005, PostgreSQL Global Development Group - # - # $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_8859.pl,v 1.8 2005/03/07 04:30:52 momjian Exp $ - # - # Generate UTF-8 <--> ISO8859 code conversion tables from - # map files provided by Unicode organization. - # Unfortunately it is prohibited by the organization - # to distribute the map files. So if you try to use this script, - # you have to obtain "8859-[2-16].TXT" from the organization's ftp site. - # We assume the file include three tab-separated columns: - # ISO/IEC 8859 code in hex - # UCS-2 code in hex - # # and Unicode name (not used in this script) - - require "ucs2utf.pl"; - - @charsets = (2,3,4,5,6,7,8,9,10,13,14,15,16); - foreach $charset (@charsets) { - - # - # first, generate UTF8->ISO8859 table - # - $in_file = "8859-${charset}.TXT"; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - reset 'array'; - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80){ - $utf = &ucs2utf($ucs); - if( $array{ $utf } ne "" ){ - printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; - next; - } - $count++; - $array{ $utf } = $code; - } - } - close( FILE ); - - $file = "utf8_to_iso8859_${charset}.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_utf_to_local ULmapISO8859_${charset}[ $count ] = {\n"; - - for $index ( sort {$a <=> $b} keys( %array ) ){ - $code = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $code; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $code; - } - } - - print FILE "};\n"; - close(FILE); - - # - # then generate ISO885->UTF8 table - # - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - reset 'array'; - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if($code >= 0x80){ - $utf = &ucs2utf($ucs); - if( $array{ $utf } ne "" ){ - printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; - next; - } - $count++; - $array{ $code } = $utf; - } - } - close( FILE ); - - $file = "iso8859_${charset}_to_utf8.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_local_to_utf LUmapISO8859_${charset}[ $count ] = {\n"; - for $index ( sort {$a <=> $b} keys( %array ) ){ - $utf = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $utf; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $utf; - } - } - - print FILE "};\n"; - close(FILE); - } --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl pgsql/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl *** clean/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,111 **** - #! /usr/bin/perl - # - # Copyright (c) 2001-2005, PostgreSQL Global Development Group - # - # $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl,v 1.7 2005/03/07 04:30:52 momjian Exp $ - # - # Generate UTF-8 <--> BIG5 code conversion tables from - # map files provided by Unicode organization. - # Unfortunately it is prohibited by the organization - # to distribute the map files. So if you try to use this script, - # you have to obtain OLD5601.TXT from - # the organization's ftp site. - # - # OLD5601.TXT format: - # KSC5601 code in hex - # UCS-2 code in hex - # # and Unicode name (not used in this script) - - require "ucs2utf.pl"; - - # first generate UTF-8 --> BIG5 table - - $in_file = "BIG5.TXT"; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80 && $ucs >= 0x0080 ){ - $utf = &ucs2utf($ucs); - if( $array{ $utf } ne "" ){ - printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; - next; - } - $count++; - - $array{ $utf } = $code; - } - } - close( FILE ); - - # - # first, generate UTF8 --> BIG5 table - # - - $file = "utf8_to_big5.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_utf_to_local ULmapBIG5[ $count ] = {\n"; - - for $index ( sort {$a <=> $b} keys( %array ) ){ - $code = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $code; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $code; - } - } - - print FILE "};\n"; - close(FILE); - - # - # then generate EUC_JP --> UTF8 table - # - reset 'array'; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80 && $ucs >= 0x0080 ){ - $utf = &ucs2utf($ucs); - if( $array{ $code } ne "" ){ - printf STDERR "Warning: duplicate code: %04x\n",$ucs; - next; - } - $count++; - - $array{ $code } = $utf; - } - } - close( FILE ); - - $file = "big5_to_utf8.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_local_to_utf LUmapBIG5[ $count ] = {\n"; - for $index ( sort {$a <=> $b} keys( %array ) ){ - $utf = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $utf; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $utf; - } - } - - print FILE "};\n"; - close(FILE); --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/UCS_to_cyrillic.pl pgsql/src/backend/utils/mb/Unicode/UCS_to_cyrillic.pl *** clean/src/backend/utils/mb/Unicode/UCS_to_cyrillic.pl 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/UCS_to_cyrillic.pl 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,112 **** - #! /usr/bin/perl - # - # Copyright (c) 2001-2005, PostgreSQL Global Development Group - # - # $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_cyrillic.pl,v 1.7 2005/03/07 04:30:52 momjian Exp $ - # - # Generate UTF-8 <--> ISO8859 code conversion tables from - # map files provided by Unicode organization. - # Unfortunately it is prohibited by the organization - # to distribute the map files. So if you try to use this script, - # you have to obtain "8859-[2-5].TXT" from the organization's ftp site. - # We assume the file include three tab-separated columns: - # ISO/IEC 8859 code in hex - # UCS-2 code in hex - # # and Unicode name (not used in this script) - - require "ucs2utf.pl"; - %filename = ('KOI8R'=>'koi8-r.txt', - 'WIN1251'=>'cp1251.txt', - 'WIN866'=>'cp866.txt'); - @charsets = ('KOI8R','WIN866','WIN1251'); - foreach $charset (@charsets) { - - # - # first, generate UTF8->ISO8859 table - # - $in_file = $filename{$charset}; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - reset 'array'; - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80){ - $utf = &ucs2utf($ucs); - if( $array{ $utf } ne "" ){ - printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; - next; - } - $count++; - $array{ $utf } = $code; - } - } - close( FILE ); - - $file = "utf8_to_${charset}.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_utf_to_local ULmap_${charset}[ $count ] = {\n"; - - for $index ( sort {$a <=> $b} keys( %array ) ){ - $code = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $code; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $code; - } - } - - print FILE "};\n"; - close(FILE); - - # - # then generate ISO885->UTF8 table - # - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - reset 'array'; - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if($code >= 0x80){ - $utf = &ucs2utf($ucs); - if( $array{ $utf } ne "" ){ - printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; - next; - } - $count++; - $array{ $code } = $utf; - } - } - close( FILE ); - - $file = "${charset}_to_utf8.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_local_to_utf LUmap${charset}[ $count ] = {\n"; - for $index ( sort {$a <=> $b} keys( %array ) ){ - $utf = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $utf; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $utf; - } - } - - print FILE "};\n"; - close(FILE); - } --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/UCS_to_GBK.pl pgsql/src/backend/utils/mb/Unicode/UCS_to_GBK.pl *** clean/src/backend/utils/mb/Unicode/UCS_to_GBK.pl 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/UCS_to_GBK.pl 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,112 **** - #! /usr/bin/perl - # - # Copyright (c) 2001-2005, PostgreSQL Global Development Group - # - # $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_GBK.pl,v 1.6 2005/03/07 04:30:52 momjian Exp $ - # - # - # Generate UTF-8 <--> GBK code conversion tables from - # map files provided by Unicode organization. - # Unfortunately it is prohibited by the organization - # to distribute the map files. So if you try to use this script, - # you have to obtain CP936.TXT from - # the organization's ftp site. - # - # CP936.TXT format: - # GBK code in hex - # UCS-2 code in hex - # # and Unicode name (not used in this script) - - require "ucs2utf.pl"; - - # first generate UTF-8 --> GBK table - - $in_file = "CP936.TXT"; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80 && $ucs >= 0x0080 ){ - $utf = &ucs2utf($ucs); - if( $array{ $utf } ne "" ){ - printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; - next; - } - $count++; - - $array{ $utf } = $code; - } - } - close( FILE ); - - # - # first, generate UTF8 --> WIN949 table - # - - $file = "utf8_to_gbk.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_utf_to_local ULmapGBK[ $count ] = {\n"; - - for $index ( sort {$a <=> $b} keys( %array ) ){ - $code = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $code; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $code; - } - } - - print FILE "};\n"; - close(FILE); - - # - # then generate WIN936 --> UTF8 table - # - reset 'array'; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80 && $ucs >= 0x0080 ){ - $utf = &ucs2utf($ucs); - if( $array{ $code } ne "" ){ - printf STDERR "Warning: duplicate code: %04x\n",$ucs; - next; - } - $count++; - - $array{ $code } = $utf; - } - } - close( FILE ); - - $file = "gbk_to_utf8.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_local_to_utf LUmapGBK[ $count ] = {\n"; - for $index ( sort {$a <=> $b} keys( %array ) ){ - $utf = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $utf; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $utf; - } - } - - print FILE "};\n"; - close(FILE); --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl pgsql/src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl *** clean/src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,111 **** - #! /usr/bin/perl - # - # Copyright (c) 2001-2005, PostgreSQL Global Development Group - # - # $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl,v 1.6 2005/03/07 04:30:52 momjian Exp $ - # - # Generate UTF-8 <--> JOHAB code conversion tables from - # map files provided by Unicode organization. - # Unfortunately it is prohibited by the organization - # to distribute the map files. So if you try to use this script, - # you have to obtain JOHAB.TXT from - # the organization's ftp site. - # - # JOHAB.TXT format: - # JOHAB code in hex - # UCS-2 code in hex - # # and Unicode name (not used in this script) - - require "ucs2utf.pl"; - - # first generate UTF-8 --> JOHAB table - - $in_file = "JOHAB.TXT"; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80 && $ucs >= 0x0080 ){ - $utf = &ucs2utf($ucs); - if( $array{ $utf } ne "" ){ - printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; - next; - } - $count++; - - $array{ $utf } = $code; - } - } - close( FILE ); - - # - # first, generate UTF8 --> JOHAB table - # - - $file = "utf8_to_johab.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_utf_to_local ULmapJOHAB[ $count ] = {\n"; - - for $index ( sort {$a <=> $b} keys( %array ) ){ - $code = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $code; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $code; - } - } - - print FILE "};\n"; - close(FILE); - - # - # then generate JOHAB --> UTF8 table - # - reset 'array'; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80 && $ucs >= 0x0080 ){ - $utf = &ucs2utf($ucs); - if( $array{ $code } ne "" ){ - printf STDERR "Warning: duplicate code: %04x\n",$ucs; - next; - } - $count++; - - $array{ $code } = $utf; - } - } - close( FILE ); - - $file = "johab_to_utf8.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_local_to_utf LUmapJOHAB[ $count ] = {\n"; - for $index ( sort {$a <=> $b} keys( %array ) ){ - $utf = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $utf; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $utf; - } - } - - print FILE "};\n"; - close(FILE); --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/UCS_to_most.pl pgsql/src/backend/utils/mb/Unicode/UCS_to_most.pl *** clean/src/backend/utils/mb/Unicode/UCS_to_most.pl 1969-12-31 16:00:00.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/UCS_to_most.pl 2006-02-03 01:20:48.000000000 -0800 *************** *** 0 **** --- 1,143 ---- + #! /usr/bin/perl + # + # Copyright (c) 2001-2005, PostgreSQL Global Development Group + # + # $PostgreSQL$ + # + # Generate UTF-8 <--> character code conversion tables from + # map files provided by Unicode organization. + # Unfortunately it is prohibited by the organization + # to distribute the map files. So if you try to use this script, + # you have to obtain the map files from the organization's ftp site. + # ftp://www.unicode.org/Public/MAPPINGS/ + # We assume the file include three tab-separated columns: + # source character set code in hex + # UCS-2 code in hex + # # and Unicode name (not used in this script) + + require "ucs2utf.pl"; + + %filename = ( + 'WIN866' => 'CP866.TXT', + 'WIN874' => 'CP874.TXT', + 'WIN1250' => 'CP1250.TXT', + 'WIN1251' => 'CP1251.TXT', + 'WIN1252' => 'CP1252.TXT', + 'WIN1253' => 'CP1253.TXT', + 'WIN1254' => 'CP1254.TXT', + 'WIN1255' => 'CP1255.TXT', + 'WIN1256' => 'CP1256.TXT', + 'WIN1257' => 'CP1257.TXT', + 'WIN1258' => 'CP1258.TXT', + 'ISO8859_2' => '8859-2.TXT', + 'ISO8859_3' => '8859-3.TXT', + 'ISO8859_4' => '8859-4.TXT', + 'ISO8859_5' => '8859-5.TXT', + 'ISO8859_6' => '8859-6.TXT', + 'ISO8859_7' => '8859-7.TXT', + 'ISO8859_8' => '8859-8.TXT', + 'ISO8859_9' => '8859-9.TXT', + 'ISO8859_10' => '8859-10.TXT', + 'ISO8859_13' => '8859-13.TXT', + 'ISO8859_14' => '8859-14.TXT', + 'ISO8859_15' => '8859-15.TXT', + 'ISO8859_16' => '8859-16.TXT', + 'KOI8R' => 'KOI8-R.TXT', + 'GBK' => 'CP936.TXT', + 'UHC' => 'CP949.TXT', + 'JOHAB' => 'JOHAB.TXT', + 'BIG5' => 'BIG5.TXT', + ); + + @charsets = keys(filename); + foreach $charset (@charsets) { + + # + # first, generate UTF8-> charset table + # + $in_file = $filename{$charset}; + + open( FILE, $in_file ) || die( "cannot open $in_file" ); + + reset 'array'; + + while( ){ + chop; + if( /^#/ ){ + next; + } + ( $c, $u, $rest ) = split; + $ucs = hex($u); + $code = hex($c); + if( $code >= 0x80 && $ucs >= 0x0080){ + $utf = &ucs2utf($ucs); + if( $array{ $utf } ne "" ){ + printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; + next; + } + $count++; + $array{ $utf } = $code; + } + } + close( FILE ); + + $file = lc("utf8_to_${charset}.map"); + open( FILE, "> $file" ) || die( "cannot open $file" ); + print FILE "static pg_utf_to_local ULmap${charset}[ $count ] = {\n"; + + for $index ( sort {$a <=> $b} keys( %array ) ){ + $code = $array{ $index }; + $count--; + if( $count == 0 ){ + printf FILE " {0x%04x, 0x%04x}\n", $index, $code; + } else { + printf FILE " {0x%04x, 0x%04x},\n", $index, $code; + } + } + + print FILE "};\n"; + close(FILE); + + # + # then generate character set code ->UTF8 table + # + open( FILE, $in_file ) || die( "cannot open $in_file" ); + + reset 'array'; + + while( ){ + chop; + if( /^#/ ){ + next; + } + ( $c, $u, $rest ) = split; + $ucs = hex($u); + $code = hex($c); + if($code >= 0x80 && $ucs >= 0x0080){ + $utf = &ucs2utf($ucs); + if( $array{ $code } ne "" ){ + printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; + next; + } + $count++; + $array{ $code } = $utf; + } + } + close( FILE ); + + $file = lc("${charset}_to_utf8.map"); + open( FILE, "> $file" ) || die( "cannot open $file" ); + print FILE "static pg_local_to_utf LUmap${charset}[ $count ] = {\n"; + for $index ( sort {$a <=> $b} keys( %array ) ){ + $utf = $array{ $index }; + $count--; + if( $count == 0 ){ + printf FILE " {0x%04x, 0x%04x}\n", $index, $utf; + } else { + printf FILE " {0x%04x, 0x%04x},\n", $index, $utf; + } + } + + print FILE "};\n"; + close(FILE); + } diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/UCS_to_UHC.pl pgsql/src/backend/utils/mb/Unicode/UCS_to_UHC.pl *** clean/src/backend/utils/mb/Unicode/UCS_to_UHC.pl 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/UCS_to_UHC.pl 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,111 **** - #! /usr/bin/perl - # - # Copyright (c) 2001-2005, PostgreSQL Global Development Group - # - # $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_UHC.pl,v 1.6 2005/03/07 04:30:52 momjian Exp $ - # - # Generate UTF-8 <--> BIG5 code conversion tables from - # map files provided by Unicode organization. - # Unfortunately it is prohibited by the organization - # to distribute the map files. So if you try to use this script, - # you have to obtain OLD5601.TXT from - # the organization's ftp site. - # - # CP949.TXT format: - # UHC code in hex - # UCS-2 code in hex - # # and Unicode name (not used in this script) - - require "ucs2utf.pl"; - - # first generate UTF-8 --> WIN949 table - - $in_file = "CP949.TXT"; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80 && $ucs >= 0x0080 ){ - $utf = &ucs2utf($ucs); - if( $array{ $utf } ne "" ){ - printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; - next; - } - $count++; - - $array{ $utf } = $code; - } - } - close( FILE ); - - # - # first, generate UTF8 --> UHC table - # - - $file = "utf8_to_uhc.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_utf_to_local ULmapUHC[ $count ] = {\n"; - - for $index ( sort {$a <=> $b} keys( %array ) ){ - $code = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $code; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $code; - } - } - - print FILE "};\n"; - close(FILE); - - # - # then generate UHC --> UTF8 table - # - reset 'array'; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80 && $ucs >= 0x0080 ){ - $utf = &ucs2utf($ucs); - if( $array{ $code } ne "" ){ - printf STDERR "Warning: duplicate code: %04x\n",$ucs; - next; - } - $count++; - - $array{ $code } = $utf; - } - } - close( FILE ); - - $file = "uhc_to_utf8.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_local_to_utf LUmapUHC[ $count ] = {\n"; - for $index ( sort {$a <=> $b} keys( %array ) ){ - $utf = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $utf; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $utf; - } - } - - print FILE "};\n"; - close(FILE); --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/UCS_to_WIN874.pl pgsql/src/backend/utils/mb/Unicode/UCS_to_WIN874.pl *** clean/src/backend/utils/mb/Unicode/UCS_to_WIN874.pl 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/UCS_to_WIN874.pl 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,111 **** - #! /usr/bin/perl - # - # Copyright (c) 2001-2005, PostgreSQL Global Development Group - # - # $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_WIN874.pl,v 1.6 2005/03/07 04:30:52 momjian Exp $ - # - # Generate UTF-8 <--> WIN874 code conversion tables from - # map files provided by Unicode organization. - # Unfortunately it is prohibited by the organization - # to distribute the map files. So if you try to use this script, - # you have to obtain OLD5601.TXT from - # the organization's ftp site. - # - # OLD5601.TXT format: - # KSC5601 code in hex - # UCS-2 code in hex - # # and Unicode name (not used in this script) - - require "ucs2utf.pl"; - - # first generate UTF-8 --> WIN949 table - - $in_file = "CP874.TXT"; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80 && $ucs >= 0x0080 ){ - $utf = &ucs2utf($ucs); - if( $array{ $utf } ne "" ){ - printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; - next; - } - $count++; - - $array{ $utf } = $code; - } - } - close( FILE ); - - # - # first, generate UTF8 --> WIN874 table - # - - $file = "utf8_to_win874.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_utf_to_local ULmapWIN874[ $count ] = {\n"; - - for $index ( sort {$a <=> $b} keys( %array ) ){ - $code = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $code; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $code; - } - } - - print FILE "};\n"; - close(FILE); - - # - # then generate WIN874 --> UTF8 table - # - reset 'array'; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80 && $ucs >= 0x0080 ){ - $utf = &ucs2utf($ucs); - if( $array{ $code } ne "" ){ - printf STDERR "Warning: duplicate code: %04x\n",$ucs; - next; - } - $count++; - - $array{ $code } = $utf; - } - } - close( FILE ); - - $file = "win874_to_utf8.map"; - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_local_to_utf LUmapWIN874[ $count ] = {\n"; - for $index ( sort {$a <=> $b} keys( %array ) ){ - $utf = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $utf; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $utf; - } - } - - print FILE "};\n"; - close(FILE); --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/UCS_to_WINX.pl pgsql/src/backend/utils/mb/Unicode/UCS_to_WINX.pl *** clean/src/backend/utils/mb/Unicode/UCS_to_WINX.pl 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/UCS_to_WINX.pl 1969-12-31 16:00:00.000000000 -0800 *************** *** 1,113 **** - #! /usr/bin/perl - # - # Copyright (c) 2001-2005, PostgreSQL Global Development Group - # - # $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_WINX.pl,v 1.6 2005/03/07 04:30:52 momjian Exp $ - # - # Generate UTF-8 <--> WINX code conversion tables from - # map files provided by Unicode organization. - # Unfortunately it is prohibited by the organization - # to distribute the map files. So if you try to use this script, - # you have to obtain "8859-[2-5].TXT" from the organization's ftp site. - # We assume the file include three tab-separated columns: - # ISO/IEC 8859 code in hex - # UCS-2 code in hex - # # and Unicode name (not used in this script) - - require "ucs2utf.pl"; - %filename = ('WIN1256'=>'CP1256.TXT', - 'WIN1258'=>'CP1258.TXT', - 'WIN874'=>'CP874.TXT', - 'WIN1250'=>'CP1250.TXT'); - @charsets = ('WIN1256','WIN1258','WIN874','WIN1250'); - foreach $charset (@charsets) { - - # - # first, generate UTF8->ISO8859 table - # - $in_file = $filename{$charset}; - - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - reset 'array'; - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if( $code >= 0x80){ - $utf = &ucs2utf($ucs); - if( $array{ $utf } ne "" ){ - printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; - next; - } - $count++; - $array{ $utf } = $code; - } - } - close( FILE ); - - $file = lower("utf8_to_${charset}.map"); - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_utf_to_local ULmap_${charset}[ $count ] = {\n"; - - for $index ( sort {$a <=> $b} keys( %array ) ){ - $code = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $code; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $code; - } - } - - print FILE "};\n"; - close(FILE); - - # - # then generate ISO885->UTF8 table - # - open( FILE, $in_file ) || die( "cannot open $in_file" ); - - reset 'array'; - - while( ){ - chop; - if( /^#/ ){ - next; - } - ( $c, $u, $rest ) = split; - $ucs = hex($u); - $code = hex($c); - if($code >= 0x80){ - $utf = &ucs2utf($ucs); - if( $array{ $utf } ne "" ){ - printf STDERR "Warning: duplicate UTF8: %04x\n",$ucs; - next; - } - $count++; - $array{ $code } = $utf; - } - } - close( FILE ); - - $file = lower("${charset}_to_utf8.map"); - open( FILE, "> $file" ) || die( "cannot open $file" ); - print FILE "static pg_local_to_utf LUmap${charset}[ $count ] = {\n"; - for $index ( sort {$a <=> $b} keys( %array ) ){ - $utf = $array{ $index }; - $count--; - if( $count == 0 ){ - printf FILE " {0x%04x, 0x%04x}\n", $index, $utf; - } else { - printf FILE " {0x%04x, 0x%04x},\n", $index, $utf; - } - } - - print FILE "};\n"; - close(FILE); - } --- 0 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/utf8_to_koi8r.map pgsql/src/backend/utils/mb/Unicode/utf8_to_koi8r.map *** clean/src/backend/utils/mb/Unicode/utf8_to_koi8r.map 2001-09-06 20:32:11.000000000 -0700 --- pgsql/src/backend/utils/mb/Unicode/utf8_to_koi8r.map 2006-02-03 02:43:14.000000000 -0800 *************** *** 1,4 **** ! static pg_utf_to_local ULmap_KOI8R[ 128 ] = { {0xc2a0, 0x009a}, {0xc2a9, 0x00bf}, {0xc2b0, 0x009c}, --- 1,4 ---- ! static pg_utf_to_local ULmapKOI8R[ 128 ] = { {0xc2a0, 0x009a}, {0xc2a9, 0x00bf}, {0xc2b0, 0x009c}, diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/utf8_to_win1250.map pgsql/src/backend/utils/mb/Unicode/utf8_to_win1250.map *** clean/src/backend/utils/mb/Unicode/utf8_to_win1250.map 2002-03-05 22:12:58.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/utf8_to_win1250.map 2006-02-03 02:04:00.000000000 -0800 *************** *** 1,5 **** ! static pg_utf_to_local ULmapWIN1250[ 124 ] = { ! {0x0000, 0x0081}, {0xc2a0, 0x00a0}, {0xc2a4, 0x00a4}, {0xc2a6, 0x00a6}, --- 1,4 ---- ! static pg_utf_to_local ULmapWIN1250[ 123 ] = { {0xc2a0, 0x00a0}, {0xc2a4, 0x00a4}, {0xc2a6, 0x00a6}, diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/utf8_to_win1251.map pgsql/src/backend/utils/mb/Unicode/utf8_to_win1251.map *** clean/src/backend/utils/mb/Unicode/utf8_to_win1251.map 2001-09-06 20:32:11.000000000 -0700 --- pgsql/src/backend/utils/mb/Unicode/utf8_to_win1251.map 2006-02-03 02:03:59.000000000 -0800 *************** *** 1,5 **** ! static pg_utf_to_local ULmap_WIN1251[ 127 ] = { ! {0x0000, 0x0088}, {0xc2a0, 0x00a0}, {0xc2a4, 0x00a4}, {0xc2a6, 0x00a6}, --- 1,4 ---- ! static pg_utf_to_local ULmapWIN1251[ 127 ] = { {0xc2a0, 0x00a0}, {0xc2a4, 0x00a4}, {0xc2a6, 0x00a6}, *************** *** 124,129 **** --- 123,129 ---- {0xe280b0, 0x0089}, {0xe280b9, 0x008b}, {0xe280ba, 0x009b}, + {0xe282ac, 0x0088}, {0xe28496, 0x00b9}, {0xe284a2, 0x0099} }; diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/utf8_to_win1252.map pgsql/src/backend/utils/mb/Unicode/utf8_to_win1252.map *** clean/src/backend/utils/mb/Unicode/utf8_to_win1252.map 2005-03-14 10:31:20.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/utf8_to_win1252.map 2006-02-03 02:03:59.000000000 -0800 *************** *** 1,5 **** ! static pg_utf_to_local ULmapWIN1252[ 124 ] = { ! {0x0000, 0x0081}, {0xc2a0, 0x00a0}, {0xc2a1, 0x00a1}, {0xc2a2, 0x00a2}, --- 1,4 ---- ! static pg_utf_to_local ULmapWIN1252[ 123 ] = { {0xc2a0, 0x00a0}, {0xc2a1, 0x00a1}, {0xc2a2, 0x00a2}, diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/utf8_to_win1253.map pgsql/src/backend/utils/mb/Unicode/utf8_to_win1253.map *** clean/src/backend/utils/mb/Unicode/utf8_to_win1253.map 1969-12-31 16:00:00.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/utf8_to_win1253.map 2006-02-03 02:03:59.000000000 -0800 *************** *** 0 **** --- 1,113 ---- + static pg_utf_to_local ULmapWIN1253[ 111 ] = { + {0xc2a0, 0x00a0}, + {0xc2a3, 0x00a3}, + {0xc2a4, 0x00a4}, + {0xc2a5, 0x00a5}, + {0xc2a6, 0x00a6}, + {0xc2a7, 0x00a7}, + {0xc2a8, 0x00a8}, + {0xc2a9, 0x00a9}, + {0xc2ab, 0x00ab}, + {0xc2ac, 0x00ac}, + {0xc2ad, 0x00ad}, + {0xc2ae, 0x00ae}, + {0xc2b0, 0x00b0}, + {0xc2b1, 0x00b1}, + {0xc2b2, 0x00b2}, + {0xc2b3, 0x00b3}, + {0xc2b5, 0x00b5}, + {0xc2b6, 0x00b6}, + {0xc2b7, 0x00b7}, + {0xc2bb, 0x00bb}, + {0xc2bd, 0x00bd}, + {0xc692, 0x0083}, + {0xce84, 0x00b4}, + {0xce85, 0x00a1}, + {0xce86, 0x00a2}, + {0xce88, 0x00b8}, + {0xce89, 0x00b9}, + {0xce8a, 0x00ba}, + {0xce8c, 0x00bc}, + {0xce8e, 0x00be}, + {0xce8f, 0x00bf}, + {0xce90, 0x00c0}, + {0xce91, 0x00c1}, + {0xce92, 0x00c2}, + {0xce93, 0x00c3}, + {0xce94, 0x00c4}, + {0xce95, 0x00c5}, + {0xce96, 0x00c6}, + {0xce97, 0x00c7}, + {0xce98, 0x00c8}, + {0xce99, 0x00c9}, + {0xce9a, 0x00ca}, + {0xce9b, 0x00cb}, + {0xce9c, 0x00cc}, + {0xce9d, 0x00cd}, + {0xce9e, 0x00ce}, + {0xce9f, 0x00cf}, + {0xcea0, 0x00d0}, + {0xcea1, 0x00d1}, + {0xcea3, 0x00d3}, + {0xcea4, 0x00d4}, + {0xcea5, 0x00d5}, + {0xcea6, 0x00d6}, + {0xcea7, 0x00d7}, + {0xcea8, 0x00d8}, + {0xcea9, 0x00d9}, + {0xceaa, 0x00da}, + {0xceab, 0x00db}, + {0xceac, 0x00dc}, + {0xcead, 0x00dd}, + {0xceae, 0x00de}, + {0xceaf, 0x00df}, + {0xceb0, 0x00e0}, + {0xceb1, 0x00e1}, + {0xceb2, 0x00e2}, + {0xceb3, 0x00e3}, + {0xceb4, 0x00e4}, + {0xceb5, 0x00e5}, + {0xceb6, 0x00e6}, + {0xceb7, 0x00e7}, + {0xceb8, 0x00e8}, + {0xceb9, 0x00e9}, + {0xceba, 0x00ea}, + {0xcebb, 0x00eb}, + {0xcebc, 0x00ec}, + {0xcebd, 0x00ed}, + {0xcebe, 0x00ee}, + {0xcebf, 0x00ef}, + {0xcf80, 0x00f0}, + {0xcf81, 0x00f1}, + {0xcf82, 0x00f2}, + {0xcf83, 0x00f3}, + {0xcf84, 0x00f4}, + {0xcf85, 0x00f5}, + {0xcf86, 0x00f6}, + {0xcf87, 0x00f7}, + {0xcf88, 0x00f8}, + {0xcf89, 0x00f9}, + {0xcf8a, 0x00fa}, + {0xcf8b, 0x00fb}, + {0xcf8c, 0x00fc}, + {0xcf8d, 0x00fd}, + {0xcf8e, 0x00fe}, + {0xe28093, 0x0096}, + {0xe28094, 0x0097}, + {0xe28095, 0x00af}, + {0xe28098, 0x0091}, + {0xe28099, 0x0092}, + {0xe2809a, 0x0082}, + {0xe2809c, 0x0093}, + {0xe2809d, 0x0094}, + {0xe2809e, 0x0084}, + {0xe280a0, 0x0086}, + {0xe280a1, 0x0087}, + {0xe280a2, 0x0095}, + {0xe280a6, 0x0085}, + {0xe280b0, 0x0089}, + {0xe280b9, 0x008b}, + {0xe280ba, 0x009b}, + {0xe282ac, 0x0080}, + {0xe284a2, 0x0099} + }; diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/utf8_to_win1254.map pgsql/src/backend/utils/mb/Unicode/utf8_to_win1254.map *** clean/src/backend/utils/mb/Unicode/utf8_to_win1254.map 1969-12-31 16:00:00.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/utf8_to_win1254.map 2006-02-03 02:03:58.000000000 -0800 *************** *** 0 **** --- 1,123 ---- + static pg_utf_to_local ULmapWIN1254[ 121 ] = { + {0xc2a0, 0x00a0}, + {0xc2a1, 0x00a1}, + {0xc2a2, 0x00a2}, + {0xc2a3, 0x00a3}, + {0xc2a4, 0x00a4}, + {0xc2a5, 0x00a5}, + {0xc2a6, 0x00a6}, + {0xc2a7, 0x00a7}, + {0xc2a8, 0x00a8}, + {0xc2a9, 0x00a9}, + {0xc2aa, 0x00aa}, + {0xc2ab, 0x00ab}, + {0xc2ac, 0x00ac}, + {0xc2ad, 0x00ad}, + {0xc2ae, 0x00ae}, + {0xc2af, 0x00af}, + {0xc2b0, 0x00b0}, + {0xc2b1, 0x00b1}, + {0xc2b2, 0x00b2}, + {0xc2b3, 0x00b3}, + {0xc2b4, 0x00b4}, + {0xc2b5, 0x00b5}, + {0xc2b6, 0x00b6}, + {0xc2b7, 0x00b7}, + {0xc2b8, 0x00b8}, + {0xc2b9, 0x00b9}, + {0xc2ba, 0x00ba}, + {0xc2bb, 0x00bb}, + {0xc2bc, 0x00bc}, + {0xc2bd, 0x00bd}, + {0xc2be, 0x00be}, + {0xc2bf, 0x00bf}, + {0xc380, 0x00c0}, + {0xc381, 0x00c1}, + {0xc382, 0x00c2}, + {0xc383, 0x00c3}, + {0xc384, 0x00c4}, + {0xc385, 0x00c5}, + {0xc386, 0x00c6}, + {0xc387, 0x00c7}, + {0xc388, 0x00c8}, + {0xc389, 0x00c9}, + {0xc38a, 0x00ca}, + {0xc38b, 0x00cb}, + {0xc38c, 0x00cc}, + {0xc38d, 0x00cd}, + {0xc38e, 0x00ce}, + {0xc38f, 0x00cf}, + {0xc391, 0x00d1}, + {0xc392, 0x00d2}, + {0xc393, 0x00d3}, + {0xc394, 0x00d4}, + {0xc395, 0x00d5}, + {0xc396, 0x00d6}, + {0xc397, 0x00d7}, + {0xc398, 0x00d8}, + {0xc399, 0x00d9}, + {0xc39a, 0x00da}, + {0xc39b, 0x00db}, + {0xc39c, 0x00dc}, + {0xc39f, 0x00df}, + {0xc3a0, 0x00e0}, + {0xc3a1, 0x00e1}, + {0xc3a2, 0x00e2}, + {0xc3a3, 0x00e3}, + {0xc3a4, 0x00e4}, + {0xc3a5, 0x00e5}, + {0xc3a6, 0x00e6}, + {0xc3a7, 0x00e7}, + {0xc3a8, 0x00e8}, + {0xc3a9, 0x00e9}, + {0xc3aa, 0x00ea}, + {0xc3ab, 0x00eb}, + {0xc3ac, 0x00ec}, + {0xc3ad, 0x00ed}, + {0xc3ae, 0x00ee}, + {0xc3af, 0x00ef}, + {0xc3b1, 0x00f1}, + {0xc3b2, 0x00f2}, + {0xc3b3, 0x00f3}, + {0xc3b4, 0x00f4}, + {0xc3b5, 0x00f5}, + {0xc3b6, 0x00f6}, + {0xc3b7, 0x00f7}, + {0xc3b8, 0x00f8}, + {0xc3b9, 0x00f9}, + {0xc3ba, 0x00fa}, + {0xc3bb, 0x00fb}, + {0xc3bc, 0x00fc}, + {0xc3bf, 0x00ff}, + {0xc49e, 0x00d0}, + {0xc49f, 0x00f0}, + {0xc4b0, 0x00dd}, + {0xc4b1, 0x00fd}, + {0xc592, 0x008c}, + {0xc593, 0x009c}, + {0xc59e, 0x00de}, + {0xc59f, 0x00fe}, + {0xc5a0, 0x008a}, + {0xc5a1, 0x009a}, + {0xc5b8, 0x009f}, + {0xc692, 0x0083}, + {0xcb86, 0x0088}, + {0xcb9c, 0x0098}, + {0xe28093, 0x0096}, + {0xe28094, 0x0097}, + {0xe28098, 0x0091}, + {0xe28099, 0x0092}, + {0xe2809a, 0x0082}, + {0xe2809c, 0x0093}, + {0xe2809d, 0x0094}, + {0xe2809e, 0x0084}, + {0xe280a0, 0x0086}, + {0xe280a1, 0x0087}, + {0xe280a2, 0x0095}, + {0xe280a6, 0x0085}, + {0xe280b0, 0x0089}, + {0xe280b9, 0x008b}, + {0xe280ba, 0x009b}, + {0xe282ac, 0x0080}, + {0xe284a2, 0x0099} + }; diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/utf8_to_win1255.map pgsql/src/backend/utils/mb/Unicode/utf8_to_win1255.map *** clean/src/backend/utils/mb/Unicode/utf8_to_win1255.map 1969-12-31 16:00:00.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/utf8_to_win1255.map 2006-02-03 02:04:01.000000000 -0800 *************** *** 0 **** --- 1,107 ---- + static pg_utf_to_local ULmapWIN1255[ 105 ] = { + {0xc2a0, 0x00a0}, + {0xc2a1, 0x00a1}, + {0xc2a2, 0x00a2}, + {0xc2a3, 0x00a3}, + {0xc2a5, 0x00a5}, + {0xc2a6, 0x00a6}, + {0xc2a7, 0x00a7}, + {0xc2a8, 0x00a8}, + {0xc2a9, 0x00a9}, + {0xc2ab, 0x00ab}, + {0xc2ac, 0x00ac}, + {0xc2ad, 0x00ad}, + {0xc2ae, 0x00ae}, + {0xc2af, 0x00af}, + {0xc2b0, 0x00b0}, + {0xc2b1, 0x00b1}, + {0xc2b2, 0x00b2}, + {0xc2b3, 0x00b3}, + {0xc2b4, 0x00b4}, + {0xc2b5, 0x00b5}, + {0xc2b6, 0x00b6}, + {0xc2b7, 0x00b7}, + {0xc2b8, 0x00b8}, + {0xc2b9, 0x00b9}, + {0xc2bb, 0x00bb}, + {0xc2bc, 0x00bc}, + {0xc2bd, 0x00bd}, + {0xc2be, 0x00be}, + {0xc2bf, 0x00bf}, + {0xc397, 0x00aa}, + {0xc3b7, 0x00ba}, + {0xc692, 0x0083}, + {0xcb86, 0x0088}, + {0xcb9c, 0x0098}, + {0xd6b0, 0x00c0}, + {0xd6b1, 0x00c1}, + {0xd6b2, 0x00c2}, + {0xd6b3, 0x00c3}, + {0xd6b4, 0x00c4}, + {0xd6b5, 0x00c5}, + {0xd6b6, 0x00c6}, + {0xd6b7, 0x00c7}, + {0xd6b8, 0x00c8}, + {0xd6b9, 0x00c9}, + {0xd6bb, 0x00cb}, + {0xd6bc, 0x00cc}, + {0xd6bd, 0x00cd}, + {0xd6be, 0x00ce}, + {0xd6bf, 0x00cf}, + {0xd780, 0x00d0}, + {0xd781, 0x00d1}, + {0xd782, 0x00d2}, + {0xd783, 0x00d3}, + {0xd790, 0x00e0}, + {0xd791, 0x00e1}, + {0xd792, 0x00e2}, + {0xd793, 0x00e3}, + {0xd794, 0x00e4}, + {0xd795, 0x00e5}, + {0xd796, 0x00e6}, + {0xd797, 0x00e7}, + {0xd798, 0x00e8}, + {0xd799, 0x00e9}, + {0xd79a, 0x00ea}, + {0xd79b, 0x00eb}, + {0xd79c, 0x00ec}, + {0xd79d, 0x00ed}, + {0xd79e, 0x00ee}, + {0xd79f, 0x00ef}, + {0xd7a0, 0x00f0}, + {0xd7a1, 0x00f1}, + {0xd7a2, 0x00f2}, + {0xd7a3, 0x00f3}, + {0xd7a4, 0x00f4}, + {0xd7a5, 0x00f5}, + {0xd7a6, 0x00f6}, + {0xd7a7, 0x00f7}, + {0xd7a8, 0x00f8}, + {0xd7a9, 0x00f9}, + {0xd7aa, 0x00fa}, + {0xd7b0, 0x00d4}, + {0xd7b1, 0x00d5}, + {0xd7b2, 0x00d6}, + {0xd7b3, 0x00d7}, + {0xd7b4, 0x00d8}, + {0xe2808e, 0x00fd}, + {0xe2808f, 0x00fe}, + {0xe28093, 0x0096}, + {0xe28094, 0x0097}, + {0xe28098, 0x0091}, + {0xe28099, 0x0092}, + {0xe2809a, 0x0082}, + {0xe2809c, 0x0093}, + {0xe2809d, 0x0094}, + {0xe2809e, 0x0084}, + {0xe280a0, 0x0086}, + {0xe280a1, 0x0087}, + {0xe280a2, 0x0095}, + {0xe280a6, 0x0085}, + {0xe280b0, 0x0089}, + {0xe280b9, 0x008b}, + {0xe280ba, 0x009b}, + {0xe282aa, 0x00a4}, + {0xe282ac, 0x0080}, + {0xe284a2, 0x0099} + }; diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/utf8_to_win1257.map pgsql/src/backend/utils/mb/Unicode/utf8_to_win1257.map *** clean/src/backend/utils/mb/Unicode/utf8_to_win1257.map 1969-12-31 16:00:00.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/utf8_to_win1257.map 2006-02-03 02:04:00.000000000 -0800 *************** *** 0 **** --- 1,118 ---- + static pg_utf_to_local ULmapWIN1257[ 116 ] = { + {0xc2a0, 0x00a0}, + {0xc2a2, 0x00a2}, + {0xc2a3, 0x00a3}, + {0xc2a4, 0x00a4}, + {0xc2a6, 0x00a6}, + {0xc2a7, 0x00a7}, + {0xc2a8, 0x008d}, + {0xc2a9, 0x00a9}, + {0xc2ab, 0x00ab}, + {0xc2ac, 0x00ac}, + {0xc2ad, 0x00ad}, + {0xc2ae, 0x00ae}, + {0xc2af, 0x009d}, + {0xc2b0, 0x00b0}, + {0xc2b1, 0x00b1}, + {0xc2b2, 0x00b2}, + {0xc2b3, 0x00b3}, + {0xc2b4, 0x00b4}, + {0xc2b5, 0x00b5}, + {0xc2b6, 0x00b6}, + {0xc2b7, 0x00b7}, + {0xc2b8, 0x008f}, + {0xc2b9, 0x00b9}, + {0xc2bb, 0x00bb}, + {0xc2bc, 0x00bc}, + {0xc2bd, 0x00bd}, + {0xc2be, 0x00be}, + {0xc384, 0x00c4}, + {0xc385, 0x00c5}, + {0xc386, 0x00af}, + {0xc389, 0x00c9}, + {0xc393, 0x00d3}, + {0xc395, 0x00d5}, + {0xc396, 0x00d6}, + {0xc397, 0x00d7}, + {0xc398, 0x00a8}, + {0xc39c, 0x00dc}, + {0xc39f, 0x00df}, + {0xc3a4, 0x00e4}, + {0xc3a5, 0x00e5}, + {0xc3a6, 0x00bf}, + {0xc3a9, 0x00e9}, + {0xc3b3, 0x00f3}, + {0xc3b5, 0x00f5}, + {0xc3b6, 0x00f6}, + {0xc3b7, 0x00f7}, + {0xc3b8, 0x00b8}, + {0xc3bc, 0x00fc}, + {0xc480, 0x00c2}, + {0xc481, 0x00e2}, + {0xc484, 0x00c0}, + {0xc485, 0x00e0}, + {0xc486, 0x00c3}, + {0xc487, 0x00e3}, + {0xc48c, 0x00c8}, + {0xc48d, 0x00e8}, + {0xc492, 0x00c7}, + {0xc493, 0x00e7}, + {0xc496, 0x00cb}, + {0xc497, 0x00eb}, + {0xc498, 0x00c6}, + {0xc499, 0x00e6}, + {0xc4a2, 0x00cc}, + {0xc4a3, 0x00ec}, + {0xc4aa, 0x00ce}, + {0xc4ab, 0x00ee}, + {0xc4ae, 0x00c1}, + {0xc4af, 0x00e1}, + {0xc4b6, 0x00cd}, + {0xc4b7, 0x00ed}, + {0xc4bb, 0x00cf}, + {0xc4bc, 0x00ef}, + {0xc581, 0x00d9}, + {0xc582, 0x00f9}, + {0xc583, 0x00d1}, + {0xc584, 0x00f1}, + {0xc585, 0x00d2}, + {0xc586, 0x00f2}, + {0xc58c, 0x00d4}, + {0xc58d, 0x00f4}, + {0xc596, 0x00aa}, + {0xc597, 0x00ba}, + {0xc59a, 0x00da}, + {0xc59b, 0x00fa}, + {0xc5a0, 0x00d0}, + {0xc5a1, 0x00f0}, + {0xc5aa, 0x00db}, + {0xc5ab, 0x00fb}, + {0xc5b2, 0x00d8}, + {0xc5b3, 0x00f8}, + {0xc5b9, 0x00ca}, + {0xc5ba, 0x00ea}, + {0xc5bb, 0x00dd}, + {0xc5bc, 0x00fd}, + {0xc5bd, 0x00de}, + {0xc5be, 0x00fe}, + {0xcb87, 0x008e}, + {0xcb99, 0x00ff}, + {0xcb9b, 0x009e}, + {0xe28093, 0x0096}, + {0xe28094, 0x0097}, + {0xe28098, 0x0091}, + {0xe28099, 0x0092}, + {0xe2809a, 0x0082}, + {0xe2809c, 0x0093}, + {0xe2809d, 0x0094}, + {0xe2809e, 0x0084}, + {0xe280a0, 0x0086}, + {0xe280a1, 0x0087}, + {0xe280a2, 0x0095}, + {0xe280a6, 0x0085}, + {0xe280b0, 0x0089}, + {0xe280b9, 0x008b}, + {0xe280ba, 0x009b}, + {0xe282ac, 0x0080}, + {0xe284a2, 0x0099} + }; diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/utf8_to_win1258.map pgsql/src/backend/utils/mb/Unicode/utf8_to_win1258.map *** clean/src/backend/utils/mb/Unicode/utf8_to_win1258.map 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/utf8_to_win1258.map 2006-02-03 02:03:59.000000000 -0800 *************** *** 1,5 **** ! static pg_utf_to_local ULmapWIN1258[ 120 ] = { ! {0x0000, 0x0081}, {0xc2a0, 0x00a0}, {0xc2a1, 0x00a1}, {0xc2a2, 0x00a2}, --- 1,4 ---- ! static pg_utf_to_local ULmapWIN1258[ 119 ] = { {0xc2a0, 0x00a0}, {0xc2a1, 0x00a1}, {0xc2a2, 0x00a2}, diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/utf8_to_win866.map pgsql/src/backend/utils/mb/Unicode/utf8_to_win866.map *** clean/src/backend/utils/mb/Unicode/utf8_to_win866.map 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/utf8_to_win866.map 2006-02-03 02:04:00.000000000 -0800 *************** *** 1,4 **** ! static pg_utf_to_local ULmap_WIN866[ 128 ] = { {0xc2a0, 0x00ff}, {0xc2a4, 0x00fd}, {0xc2b0, 0x00f8}, --- 1,4 ---- ! static pg_utf_to_local ULmapWIN866[ 128 ] = { {0xc2a0, 0x00ff}, {0xc2a4, 0x00fd}, {0xc2b0, 0x00f8}, diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/utf8_to_win874.map pgsql/src/backend/utils/mb/Unicode/utf8_to_win874.map *** clean/src/backend/utils/mb/Unicode/utf8_to_win874.map 2002-03-05 22:12:59.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/utf8_to_win874.map 2006-02-03 02:03:59.000000000 -0800 *************** *** 1,5 **** ! static pg_utf_to_local ULmapWIN874[ 98 ] = { ! {0x0000, 0x0081}, {0xc2a0, 0x00a0}, {0xe0b881, 0x00a1}, {0xe0b882, 0x00a2}, --- 1,4 ---- ! static pg_utf_to_local ULmapWIN874[ 97 ] = { {0xc2a0, 0x00a0}, {0xe0b881, 0x00a1}, {0xe0b882, 0x00a2}, diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/win1250_to_utf8.map pgsql/src/backend/utils/mb/Unicode/win1250_to_utf8.map *** clean/src/backend/utils/mb/Unicode/win1250_to_utf8.map 2002-03-05 22:12:59.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/win1250_to_utf8.map 2006-02-03 02:04:00.000000000 -0800 *************** *** 1,13 **** ! static pg_local_to_utf LUmapWIN1250[ 128 ] = { {0x0080, 0xe282ac}, - {0x0081, 0x0000}, {0x0082, 0xe2809a}, - {0x0083, 0x0000}, {0x0084, 0xe2809e}, {0x0085, 0xe280a6}, {0x0086, 0xe280a0}, {0x0087, 0xe280a1}, - {0x0088, 0x0000}, {0x0089, 0xe280b0}, {0x008a, 0xc5a0}, {0x008b, 0xe280b9}, --- 1,10 ---- ! static pg_local_to_utf LUmapWIN1250[ 123 ] = { {0x0080, 0xe282ac}, {0x0082, 0xe2809a}, {0x0084, 0xe2809e}, {0x0085, 0xe280a6}, {0x0086, 0xe280a0}, {0x0087, 0xe280a1}, {0x0089, 0xe280b0}, {0x008a, 0xc5a0}, {0x008b, 0xe280b9}, *************** *** 15,21 **** {0x008d, 0xc5a4}, {0x008e, 0xc5bd}, {0x008f, 0xc5b9}, - {0x0090, 0x0000}, {0x0091, 0xe28098}, {0x0092, 0xe28099}, {0x0093, 0xe2809c}, --- 12,17 ---- *************** *** 23,29 **** {0x0095, 0xe280a2}, {0x0096, 0xe28093}, {0x0097, 0xe28094}, - {0x0098, 0x0000}, {0x0099, 0xe284a2}, {0x009a, 0xc5a1}, {0x009b, 0xe280ba}, --- 19,24 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/win1251_to_utf8.map pgsql/src/backend/utils/mb/Unicode/win1251_to_utf8.map *** clean/src/backend/utils/mb/Unicode/win1251_to_utf8.map 2001-09-06 20:32:11.000000000 -0700 --- pgsql/src/backend/utils/mb/Unicode/win1251_to_utf8.map 2006-02-03 02:03:59.000000000 -0800 *************** *** 1,4 **** ! static pg_local_to_utf LUmapWIN1251[ 128 ] = { {0x0080, 0xd082}, {0x0081, 0xd083}, {0x0082, 0xe2809a}, --- 1,4 ---- ! static pg_local_to_utf LUmapWIN1251[ 127 ] = { {0x0080, 0xd082}, {0x0081, 0xd083}, {0x0082, 0xe2809a}, *************** *** 7,13 **** {0x0085, 0xe280a6}, {0x0086, 0xe280a0}, {0x0087, 0xe280a1}, ! {0x0088, 0x0000}, {0x0089, 0xe280b0}, {0x008a, 0xd089}, {0x008b, 0xe280b9}, --- 7,13 ---- {0x0085, 0xe280a6}, {0x0086, 0xe280a0}, {0x0087, 0xe280a1}, ! {0x0088, 0xe282ac}, {0x0089, 0xe280b0}, {0x008a, 0xd089}, {0x008b, 0xe280b9}, *************** *** 23,29 **** {0x0095, 0xe280a2}, {0x0096, 0xe28093}, {0x0097, 0xe28094}, - {0x0098, 0x0000}, {0x0099, 0xe284a2}, {0x009a, 0xd199}, {0x009b, 0xe280ba}, --- 23,28 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/win1252_to_utf8.map pgsql/src/backend/utils/mb/Unicode/win1252_to_utf8.map *** clean/src/backend/utils/mb/Unicode/win1252_to_utf8.map 2005-03-14 10:31:20.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/win1252_to_utf8.map 2006-02-03 02:03:59.000000000 -0800 *************** *** 1,6 **** ! static pg_local_to_utf LUmapWIN1252[ 128 ] = { {0x0080, 0xe282ac}, - {0x0081, 0x0000}, {0x0082, 0xe2809a}, {0x0083, 0xc692}, {0x0084, 0xe2809e}, --- 1,5 ---- ! static pg_local_to_utf LUmapWIN1252[ 123 ] = { {0x0080, 0xe282ac}, {0x0082, 0xe2809a}, {0x0083, 0xc692}, {0x0084, 0xe2809e}, *************** *** 12,21 **** {0x008a, 0xc5a0}, {0x008b, 0xe280b9}, {0x008c, 0xc592}, - {0x008d, 0x0000}, {0x008e, 0xc5bd}, - {0x008f, 0x0000}, - {0x0090, 0x0000}, {0x0091, 0xe28098}, {0x0092, 0xe28099}, {0x0093, 0xe2809c}, --- 11,17 ---- *************** *** 28,34 **** {0x009a, 0xc5a1}, {0x009b, 0xe280ba}, {0x009c, 0xc593}, - {0x009d, 0x0000}, {0x009e, 0xc5be}, {0x009f, 0xc5b8}, {0x00a0, 0xc2a0}, --- 24,29 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/win1253_to_utf8.map pgsql/src/backend/utils/mb/Unicode/win1253_to_utf8.map *** clean/src/backend/utils/mb/Unicode/win1253_to_utf8.map 1969-12-31 16:00:00.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/win1253_to_utf8.map 2006-02-03 02:03:59.000000000 -0800 *************** *** 0 **** --- 1,113 ---- + static pg_local_to_utf LUmapWIN1253[ 111 ] = { + {0x0080, 0xe282ac}, + {0x0082, 0xe2809a}, + {0x0083, 0xc692}, + {0x0084, 0xe2809e}, + {0x0085, 0xe280a6}, + {0x0086, 0xe280a0}, + {0x0087, 0xe280a1}, + {0x0089, 0xe280b0}, + {0x008b, 0xe280b9}, + {0x0091, 0xe28098}, + {0x0092, 0xe28099}, + {0x0093, 0xe2809c}, + {0x0094, 0xe2809d}, + {0x0095, 0xe280a2}, + {0x0096, 0xe28093}, + {0x0097, 0xe28094}, + {0x0099, 0xe284a2}, + {0x009b, 0xe280ba}, + {0x00a0, 0xc2a0}, + {0x00a1, 0xce85}, + {0x00a2, 0xce86}, + {0x00a3, 0xc2a3}, + {0x00a4, 0xc2a4}, + {0x00a5, 0xc2a5}, + {0x00a6, 0xc2a6}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xc2a8}, + {0x00a9, 0xc2a9}, + {0x00ab, 0xc2ab}, + {0x00ac, 0xc2ac}, + {0x00ad, 0xc2ad}, + {0x00ae, 0xc2ae}, + {0x00af, 0xe28095}, + {0x00b0, 0xc2b0}, + {0x00b1, 0xc2b1}, + {0x00b2, 0xc2b2}, + {0x00b3, 0xc2b3}, + {0x00b4, 0xce84}, + {0x00b5, 0xc2b5}, + {0x00b6, 0xc2b6}, + {0x00b7, 0xc2b7}, + {0x00b8, 0xce88}, + {0x00b9, 0xce89}, + {0x00ba, 0xce8a}, + {0x00bb, 0xc2bb}, + {0x00bc, 0xce8c}, + {0x00bd, 0xc2bd}, + {0x00be, 0xce8e}, + {0x00bf, 0xce8f}, + {0x00c0, 0xce90}, + {0x00c1, 0xce91}, + {0x00c2, 0xce92}, + {0x00c3, 0xce93}, + {0x00c4, 0xce94}, + {0x00c5, 0xce95}, + {0x00c6, 0xce96}, + {0x00c7, 0xce97}, + {0x00c8, 0xce98}, + {0x00c9, 0xce99}, + {0x00ca, 0xce9a}, + {0x00cb, 0xce9b}, + {0x00cc, 0xce9c}, + {0x00cd, 0xce9d}, + {0x00ce, 0xce9e}, + {0x00cf, 0xce9f}, + {0x00d0, 0xcea0}, + {0x00d1, 0xcea1}, + {0x00d3, 0xcea3}, + {0x00d4, 0xcea4}, + {0x00d5, 0xcea5}, + {0x00d6, 0xcea6}, + {0x00d7, 0xcea7}, + {0x00d8, 0xcea8}, + {0x00d9, 0xcea9}, + {0x00da, 0xceaa}, + {0x00db, 0xceab}, + {0x00dc, 0xceac}, + {0x00dd, 0xcead}, + {0x00de, 0xceae}, + {0x00df, 0xceaf}, + {0x00e0, 0xceb0}, + {0x00e1, 0xceb1}, + {0x00e2, 0xceb2}, + {0x00e3, 0xceb3}, + {0x00e4, 0xceb4}, + {0x00e5, 0xceb5}, + {0x00e6, 0xceb6}, + {0x00e7, 0xceb7}, + {0x00e8, 0xceb8}, + {0x00e9, 0xceb9}, + {0x00ea, 0xceba}, + {0x00eb, 0xcebb}, + {0x00ec, 0xcebc}, + {0x00ed, 0xcebd}, + {0x00ee, 0xcebe}, + {0x00ef, 0xcebf}, + {0x00f0, 0xcf80}, + {0x00f1, 0xcf81}, + {0x00f2, 0xcf82}, + {0x00f3, 0xcf83}, + {0x00f4, 0xcf84}, + {0x00f5, 0xcf85}, + {0x00f6, 0xcf86}, + {0x00f7, 0xcf87}, + {0x00f8, 0xcf88}, + {0x00f9, 0xcf89}, + {0x00fa, 0xcf8a}, + {0x00fb, 0xcf8b}, + {0x00fc, 0xcf8c}, + {0x00fd, 0xcf8d}, + {0x00fe, 0xcf8e} + }; diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/win1254_to_utf8.map pgsql/src/backend/utils/mb/Unicode/win1254_to_utf8.map *** clean/src/backend/utils/mb/Unicode/win1254_to_utf8.map 1969-12-31 16:00:00.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/win1254_to_utf8.map 2006-02-03 02:03:58.000000000 -0800 *************** *** 0 **** --- 1,123 ---- + static pg_local_to_utf LUmapWIN1254[ 121 ] = { + {0x0080, 0xe282ac}, + {0x0082, 0xe2809a}, + {0x0083, 0xc692}, + {0x0084, 0xe2809e}, + {0x0085, 0xe280a6}, + {0x0086, 0xe280a0}, + {0x0087, 0xe280a1}, + {0x0088, 0xcb86}, + {0x0089, 0xe280b0}, + {0x008a, 0xc5a0}, + {0x008b, 0xe280b9}, + {0x008c, 0xc592}, + {0x0091, 0xe28098}, + {0x0092, 0xe28099}, + {0x0093, 0xe2809c}, + {0x0094, 0xe2809d}, + {0x0095, 0xe280a2}, + {0x0096, 0xe28093}, + {0x0097, 0xe28094}, + {0x0098, 0xcb9c}, + {0x0099, 0xe284a2}, + {0x009a, 0xc5a1}, + {0x009b, 0xe280ba}, + {0x009c, 0xc593}, + {0x009f, 0xc5b8}, + {0x00a0, 0xc2a0}, + {0x00a1, 0xc2a1}, + {0x00a2, 0xc2a2}, + {0x00a3, 0xc2a3}, + {0x00a4, 0xc2a4}, + {0x00a5, 0xc2a5}, + {0x00a6, 0xc2a6}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xc2a8}, + {0x00a9, 0xc2a9}, + {0x00aa, 0xc2aa}, + {0x00ab, 0xc2ab}, + {0x00ac, 0xc2ac}, + {0x00ad, 0xc2ad}, + {0x00ae, 0xc2ae}, + {0x00af, 0xc2af}, + {0x00b0, 0xc2b0}, + {0x00b1, 0xc2b1}, + {0x00b2, 0xc2b2}, + {0x00b3, 0xc2b3}, + {0x00b4, 0xc2b4}, + {0x00b5, 0xc2b5}, + {0x00b6, 0xc2b6}, + {0x00b7, 0xc2b7}, + {0x00b8, 0xc2b8}, + {0x00b9, 0xc2b9}, + {0x00ba, 0xc2ba}, + {0x00bb, 0xc2bb}, + {0x00bc, 0xc2bc}, + {0x00bd, 0xc2bd}, + {0x00be, 0xc2be}, + {0x00bf, 0xc2bf}, + {0x00c0, 0xc380}, + {0x00c1, 0xc381}, + {0x00c2, 0xc382}, + {0x00c3, 0xc383}, + {0x00c4, 0xc384}, + {0x00c5, 0xc385}, + {0x00c6, 0xc386}, + {0x00c7, 0xc387}, + {0x00c8, 0xc388}, + {0x00c9, 0xc389}, + {0x00ca, 0xc38a}, + {0x00cb, 0xc38b}, + {0x00cc, 0xc38c}, + {0x00cd, 0xc38d}, + {0x00ce, 0xc38e}, + {0x00cf, 0xc38f}, + {0x00d0, 0xc49e}, + {0x00d1, 0xc391}, + {0x00d2, 0xc392}, + {0x00d3, 0xc393}, + {0x00d4, 0xc394}, + {0x00d5, 0xc395}, + {0x00d6, 0xc396}, + {0x00d7, 0xc397}, + {0x00d8, 0xc398}, + {0x00d9, 0xc399}, + {0x00da, 0xc39a}, + {0x00db, 0xc39b}, + {0x00dc, 0xc39c}, + {0x00dd, 0xc4b0}, + {0x00de, 0xc59e}, + {0x00df, 0xc39f}, + {0x00e0, 0xc3a0}, + {0x00e1, 0xc3a1}, + {0x00e2, 0xc3a2}, + {0x00e3, 0xc3a3}, + {0x00e4, 0xc3a4}, + {0x00e5, 0xc3a5}, + {0x00e6, 0xc3a6}, + {0x00e7, 0xc3a7}, + {0x00e8, 0xc3a8}, + {0x00e9, 0xc3a9}, + {0x00ea, 0xc3aa}, + {0x00eb, 0xc3ab}, + {0x00ec, 0xc3ac}, + {0x00ed, 0xc3ad}, + {0x00ee, 0xc3ae}, + {0x00ef, 0xc3af}, + {0x00f0, 0xc49f}, + {0x00f1, 0xc3b1}, + {0x00f2, 0xc3b2}, + {0x00f3, 0xc3b3}, + {0x00f4, 0xc3b4}, + {0x00f5, 0xc3b5}, + {0x00f6, 0xc3b6}, + {0x00f7, 0xc3b7}, + {0x00f8, 0xc3b8}, + {0x00f9, 0xc3b9}, + {0x00fa, 0xc3ba}, + {0x00fb, 0xc3bb}, + {0x00fc, 0xc3bc}, + {0x00fd, 0xc4b1}, + {0x00fe, 0xc59f}, + {0x00ff, 0xc3bf} + }; diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/win1255_to_utf8.map pgsql/src/backend/utils/mb/Unicode/win1255_to_utf8.map *** clean/src/backend/utils/mb/Unicode/win1255_to_utf8.map 1969-12-31 16:00:00.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/win1255_to_utf8.map 2006-02-03 02:04:01.000000000 -0800 *************** *** 0 **** --- 1,107 ---- + static pg_local_to_utf LUmapWIN1255[ 105 ] = { + {0x0080, 0xe282ac}, + {0x0082, 0xe2809a}, + {0x0083, 0xc692}, + {0x0084, 0xe2809e}, + {0x0085, 0xe280a6}, + {0x0086, 0xe280a0}, + {0x0087, 0xe280a1}, + {0x0088, 0xcb86}, + {0x0089, 0xe280b0}, + {0x008b, 0xe280b9}, + {0x0091, 0xe28098}, + {0x0092, 0xe28099}, + {0x0093, 0xe2809c}, + {0x0094, 0xe2809d}, + {0x0095, 0xe280a2}, + {0x0096, 0xe28093}, + {0x0097, 0xe28094}, + {0x0098, 0xcb9c}, + {0x0099, 0xe284a2}, + {0x009b, 0xe280ba}, + {0x00a0, 0xc2a0}, + {0x00a1, 0xc2a1}, + {0x00a2, 0xc2a2}, + {0x00a3, 0xc2a3}, + {0x00a4, 0xe282aa}, + {0x00a5, 0xc2a5}, + {0x00a6, 0xc2a6}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xc2a8}, + {0x00a9, 0xc2a9}, + {0x00aa, 0xc397}, + {0x00ab, 0xc2ab}, + {0x00ac, 0xc2ac}, + {0x00ad, 0xc2ad}, + {0x00ae, 0xc2ae}, + {0x00af, 0xc2af}, + {0x00b0, 0xc2b0}, + {0x00b1, 0xc2b1}, + {0x00b2, 0xc2b2}, + {0x00b3, 0xc2b3}, + {0x00b4, 0xc2b4}, + {0x00b5, 0xc2b5}, + {0x00b6, 0xc2b6}, + {0x00b7, 0xc2b7}, + {0x00b8, 0xc2b8}, + {0x00b9, 0xc2b9}, + {0x00ba, 0xc3b7}, + {0x00bb, 0xc2bb}, + {0x00bc, 0xc2bc}, + {0x00bd, 0xc2bd}, + {0x00be, 0xc2be}, + {0x00bf, 0xc2bf}, + {0x00c0, 0xd6b0}, + {0x00c1, 0xd6b1}, + {0x00c2, 0xd6b2}, + {0x00c3, 0xd6b3}, + {0x00c4, 0xd6b4}, + {0x00c5, 0xd6b5}, + {0x00c6, 0xd6b6}, + {0x00c7, 0xd6b7}, + {0x00c8, 0xd6b8}, + {0x00c9, 0xd6b9}, + {0x00cb, 0xd6bb}, + {0x00cc, 0xd6bc}, + {0x00cd, 0xd6bd}, + {0x00ce, 0xd6be}, + {0x00cf, 0xd6bf}, + {0x00d0, 0xd780}, + {0x00d1, 0xd781}, + {0x00d2, 0xd782}, + {0x00d3, 0xd783}, + {0x00d4, 0xd7b0}, + {0x00d5, 0xd7b1}, + {0x00d6, 0xd7b2}, + {0x00d7, 0xd7b3}, + {0x00d8, 0xd7b4}, + {0x00e0, 0xd790}, + {0x00e1, 0xd791}, + {0x00e2, 0xd792}, + {0x00e3, 0xd793}, + {0x00e4, 0xd794}, + {0x00e5, 0xd795}, + {0x00e6, 0xd796}, + {0x00e7, 0xd797}, + {0x00e8, 0xd798}, + {0x00e9, 0xd799}, + {0x00ea, 0xd79a}, + {0x00eb, 0xd79b}, + {0x00ec, 0xd79c}, + {0x00ed, 0xd79d}, + {0x00ee, 0xd79e}, + {0x00ef, 0xd79f}, + {0x00f0, 0xd7a0}, + {0x00f1, 0xd7a1}, + {0x00f2, 0xd7a2}, + {0x00f3, 0xd7a3}, + {0x00f4, 0xd7a4}, + {0x00f5, 0xd7a5}, + {0x00f6, 0xd7a6}, + {0x00f7, 0xd7a7}, + {0x00f8, 0xd7a8}, + {0x00f9, 0xd7a9}, + {0x00fa, 0xd7aa}, + {0x00fd, 0xe2808e}, + {0x00fe, 0xe2808f} + }; diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/win1257_to_utf8.map pgsql/src/backend/utils/mb/Unicode/win1257_to_utf8.map *** clean/src/backend/utils/mb/Unicode/win1257_to_utf8.map 1969-12-31 16:00:00.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/win1257_to_utf8.map 2006-02-03 02:04:00.000000000 -0800 *************** *** 0 **** --- 1,118 ---- + static pg_local_to_utf LUmapWIN1257[ 116 ] = { + {0x0080, 0xe282ac}, + {0x0082, 0xe2809a}, + {0x0084, 0xe2809e}, + {0x0085, 0xe280a6}, + {0x0086, 0xe280a0}, + {0x0087, 0xe280a1}, + {0x0089, 0xe280b0}, + {0x008b, 0xe280b9}, + {0x008d, 0xc2a8}, + {0x008e, 0xcb87}, + {0x008f, 0xc2b8}, + {0x0091, 0xe28098}, + {0x0092, 0xe28099}, + {0x0093, 0xe2809c}, + {0x0094, 0xe2809d}, + {0x0095, 0xe280a2}, + {0x0096, 0xe28093}, + {0x0097, 0xe28094}, + {0x0099, 0xe284a2}, + {0x009b, 0xe280ba}, + {0x009d, 0xc2af}, + {0x009e, 0xcb9b}, + {0x00a0, 0xc2a0}, + {0x00a2, 0xc2a2}, + {0x00a3, 0xc2a3}, + {0x00a4, 0xc2a4}, + {0x00a6, 0xc2a6}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xc398}, + {0x00a9, 0xc2a9}, + {0x00aa, 0xc596}, + {0x00ab, 0xc2ab}, + {0x00ac, 0xc2ac}, + {0x00ad, 0xc2ad}, + {0x00ae, 0xc2ae}, + {0x00af, 0xc386}, + {0x00b0, 0xc2b0}, + {0x00b1, 0xc2b1}, + {0x00b2, 0xc2b2}, + {0x00b3, 0xc2b3}, + {0x00b4, 0xc2b4}, + {0x00b5, 0xc2b5}, + {0x00b6, 0xc2b6}, + {0x00b7, 0xc2b7}, + {0x00b8, 0xc3b8}, + {0x00b9, 0xc2b9}, + {0x00ba, 0xc597}, + {0x00bb, 0xc2bb}, + {0x00bc, 0xc2bc}, + {0x00bd, 0xc2bd}, + {0x00be, 0xc2be}, + {0x00bf, 0xc3a6}, + {0x00c0, 0xc484}, + {0x00c1, 0xc4ae}, + {0x00c2, 0xc480}, + {0x00c3, 0xc486}, + {0x00c4, 0xc384}, + {0x00c5, 0xc385}, + {0x00c6, 0xc498}, + {0x00c7, 0xc492}, + {0x00c8, 0xc48c}, + {0x00c9, 0xc389}, + {0x00ca, 0xc5b9}, + {0x00cb, 0xc496}, + {0x00cc, 0xc4a2}, + {0x00cd, 0xc4b6}, + {0x00ce, 0xc4aa}, + {0x00cf, 0xc4bb}, + {0x00d0, 0xc5a0}, + {0x00d1, 0xc583}, + {0x00d2, 0xc585}, + {0x00d3, 0xc393}, + {0x00d4, 0xc58c}, + {0x00d5, 0xc395}, + {0x00d6, 0xc396}, + {0x00d7, 0xc397}, + {0x00d8, 0xc5b2}, + {0x00d9, 0xc581}, + {0x00da, 0xc59a}, + {0x00db, 0xc5aa}, + {0x00dc, 0xc39c}, + {0x00dd, 0xc5bb}, + {0x00de, 0xc5bd}, + {0x00df, 0xc39f}, + {0x00e0, 0xc485}, + {0x00e1, 0xc4af}, + {0x00e2, 0xc481}, + {0x00e3, 0xc487}, + {0x00e4, 0xc3a4}, + {0x00e5, 0xc3a5}, + {0x00e6, 0xc499}, + {0x00e7, 0xc493}, + {0x00e8, 0xc48d}, + {0x00e9, 0xc3a9}, + {0x00ea, 0xc5ba}, + {0x00eb, 0xc497}, + {0x00ec, 0xc4a3}, + {0x00ed, 0xc4b7}, + {0x00ee, 0xc4ab}, + {0x00ef, 0xc4bc}, + {0x00f0, 0xc5a1}, + {0x00f1, 0xc584}, + {0x00f2, 0xc586}, + {0x00f3, 0xc3b3}, + {0x00f4, 0xc58d}, + {0x00f5, 0xc3b5}, + {0x00f6, 0xc3b6}, + {0x00f7, 0xc3b7}, + {0x00f8, 0xc5b3}, + {0x00f9, 0xc582}, + {0x00fa, 0xc59b}, + {0x00fb, 0xc5ab}, + {0x00fc, 0xc3bc}, + {0x00fd, 0xc5bc}, + {0x00fe, 0xc5be}, + {0x00ff, 0xcb99} + }; diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/win1258_to_utf8.map pgsql/src/backend/utils/mb/Unicode/win1258_to_utf8.map *** clean/src/backend/utils/mb/Unicode/win1258_to_utf8.map 2005-03-06 20:30:52.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/win1258_to_utf8.map 2006-02-03 02:03:59.000000000 -0800 *************** *** 1,6 **** ! static pg_local_to_utf LUmapWIN1258[ 128 ] = { {0x0080, 0xe282ac}, - {0x0081, 0x0000}, {0x0082, 0xe2809a}, {0x0083, 0xc692}, {0x0084, 0xe2809e}, --- 1,5 ---- ! static pg_local_to_utf LUmapWIN1258[ 119 ] = { {0x0080, 0xe282ac}, {0x0082, 0xe2809a}, {0x0083, 0xc692}, {0x0084, 0xe2809e}, *************** *** 9,21 **** {0x0087, 0xe280a1}, {0x0088, 0xcb86}, {0x0089, 0xe280b0}, - {0x008a, 0x0000}, {0x008b, 0xe280b9}, {0x008c, 0xc592}, - {0x008d, 0x0000}, - {0x008e, 0x0000}, - {0x008f, 0x0000}, - {0x0090, 0x0000}, {0x0091, 0xe28098}, {0x0092, 0xe28099}, {0x0093, 0xe2809c}, --- 8,15 ---- *************** *** 25,35 **** {0x0097, 0xe28094}, {0x0098, 0xcb9c}, {0x0099, 0xe284a2}, - {0x009a, 0x0000}, {0x009b, 0xe280ba}, {0x009c, 0xc593}, - {0x009d, 0x0000}, - {0x009e, 0x0000}, {0x009f, 0xc5b8}, {0x00a0, 0xc2a0}, {0x00a1, 0xc2a1}, --- 19,26 ---- diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/Unicode/win874_to_utf8.map pgsql/src/backend/utils/mb/Unicode/win874_to_utf8.map *** clean/src/backend/utils/mb/Unicode/win874_to_utf8.map 2002-03-05 22:12:59.000000000 -0800 --- pgsql/src/backend/utils/mb/Unicode/win874_to_utf8.map 2006-02-03 02:03:59.000000000 -0800 *************** *** 1,21 **** ! static pg_local_to_utf LUmapWIN874[ 128 ] = { {0x0080, 0xe282ac}, - {0x0081, 0x0000}, - {0x0082, 0x0000}, - {0x0083, 0x0000}, - {0x0084, 0x0000}, {0x0085, 0xe280a6}, - {0x0086, 0x0000}, - {0x0087, 0x0000}, - {0x0088, 0x0000}, - {0x0089, 0x0000}, - {0x008a, 0x0000}, - {0x008b, 0x0000}, - {0x008c, 0x0000}, - {0x008d, 0x0000}, - {0x008e, 0x0000}, - {0x008f, 0x0000}, - {0x0090, 0x0000}, {0x0091, 0xe28098}, {0x0092, 0xe28099}, {0x0093, 0xe2809c}, --- 1,6 ---- ! static pg_local_to_utf LUmapWIN874[ 97 ] = { {0x0080, 0xe282ac}, {0x0085, 0xe280a6}, {0x0091, 0xe28098}, {0x0092, 0xe28099}, {0x0093, 0xe2809c}, *************** *** 23,36 **** {0x0095, 0xe280a2}, {0x0096, 0xe28093}, {0x0097, 0xe28094}, - {0x0098, 0x0000}, - {0x0099, 0x0000}, - {0x009a, 0x0000}, - {0x009b, 0x0000}, - {0x009c, 0x0000}, - {0x009d, 0x0000}, - {0x009e, 0x0000}, - {0x009f, 0x0000}, {0x00a0, 0xc2a0}, {0x00a1, 0xe0b881}, {0x00a2, 0xe0b882}, --- 8,13 ---- *************** *** 90,99 **** {0x00d8, 0xe0b8b8}, {0x00d9, 0xe0b8b9}, {0x00da, 0xe0b8ba}, - {0x00db, 0x0000}, - {0x00dc, 0x0000}, - {0x00dd, 0x0000}, - {0x00de, 0x0000}, {0x00df, 0xe0b8bf}, {0x00e0, 0xe0b980}, {0x00e1, 0xe0b981}, --- 67,72 ---- *************** *** 122,130 **** {0x00f8, 0xe0b998}, {0x00f9, 0xe0b999}, {0x00fa, 0xe0b99a}, ! {0x00fb, 0xe0b99b}, ! {0x00fc, 0x0000}, ! {0x00fd, 0x0000}, ! {0x00fe, 0x0000}, ! {0x00ff, 0x0000} }; --- 95,99 ---- {0x00f8, 0xe0b998}, {0x00f9, 0xe0b999}, {0x00fa, 0xe0b99a}, ! {0x00fb, 0xe0b99b} }; diff -rcN -xCVS -x'*.TXT' clean/src/backend/utils/mb/wchar.c pgsql/src/backend/utils/mb/wchar.c *** clean/src/backend/utils/mb/wchar.c 2005-12-26 11:30:44.000000000 -0800 --- pgsql/src/backend/utils/mb/wchar.c 2006-02-02 23:05:32.000000000 -0800 *************** *** 711,721 **** {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 26; ISO-8859-7 */ {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 27; ISO-8859-8 */ {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 28; PG_WIN1250 */ ! {0, pg_sjis_mblen, pg_sjis_dsplen, 2}, /* 29; PG_SJIS */ ! {0, pg_big5_mblen, pg_big5_dsplen, 2}, /* 30; PG_BIG5 */ ! {0, pg_gbk_mblen, pg_gbk_dsplen, 2}, /* 31; PG_GBK */ ! {0, pg_uhc_mblen, pg_uhc_dsplen, 2}, /* 32; PG_UHC */ ! {0, pg_gb18030_mblen, pg_gb18030_dsplen, 2} /* 33; PG_GB18030 */ }; /* returns the byte length of a word for mule internal code */ --- 711,725 ---- {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 26; ISO-8859-7 */ {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 27; ISO-8859-8 */ {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 28; PG_WIN1250 */ ! {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 29; PG_WIN1253 */ ! {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 30; PG_WIN1254 */ ! {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 31; PG_WIN1255 */ ! {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 32; PG_WIN1257 */ ! {0, pg_sjis_mblen, pg_sjis_dsplen, 2}, /* 33; PG_SJIS */ ! {0, pg_big5_mblen, pg_big5_dsplen, 2}, /* 34; PG_BIG5 */ ! {0, pg_gbk_mblen, pg_gbk_dsplen, 2}, /* 35; PG_GBK */ ! {0, pg_uhc_mblen, pg_uhc_dsplen, 2}, /* 36; PG_UHC */ ! {0, pg_gb18030_mblen, pg_gb18030_dsplen, 2} /* 37; PG_GB18030 */ }; /* returns the byte length of a word for mule internal code */ diff -rcN -xCVS clean/src/test/regress/expected/conversion.out pgsql/src/test/regress/expected/conversion.out *** clean/src/test/regress/expected/conversion.out 2005-03-14 10:31:24.000000000 -0800 --- pgsql/src/test/regress/expected/conversion.out 2006-02-03 02:54:08.000000000 -0800 *************** *** 1409,1415 **** (1 row) -- WIN1258 --> UTF8 ! SELECT CONVERT('foo' USING win1258_to_utf8); convert_using --------------- foo --- 1409,1415 ---- (1 row) -- WIN1258 --> UTF8 ! SELECT CONVERT('foo' USING windows_1258_to_utf8); convert_using --------------- foo *************** *** 1422,1428 **** (1 row) -- UTF8 --> WIN1258 ! SELECT CONVERT('foo' USING utf8_to_win1258); convert_using --------------- foo --- 1422,1428 ---- (1 row) -- UTF8 --> WIN1258 ! SELECT CONVERT('foo' USING utf8_to_windows_1258); convert_using --------------- foo *************** *** 1538,1543 **** --- 1538,1647 ---- foo (1 row) + -- UTF8 --> WIN1253 + SELECT CONVERT('foo' USING utf8_to_windows_1253); + convert_using + --------------- + foo + (1 row) + + SELECT CONVERT('foo', 'UTF8', 'WIN1253'); + convert + --------- + foo + (1 row) + + -- WIN1253 --> UTF8 + SELECT CONVERT('foo' USING windows_1253_to_utf8); + convert_using + --------------- + foo + (1 row) + + SELECT CONVERT('foo', 'WIN1253', 'UTF8'); + convert + --------- + foo + (1 row) + + -- UTF8 --> WIN1254 + SELECT CONVERT('foo' USING utf8_to_windows_1254); + convert_using + --------------- + foo + (1 row) + + SELECT CONVERT('foo', 'UTF8', 'WIN1254'); + convert + --------- + foo + (1 row) + + -- WIN1254 --> UTF8 + SELECT CONVERT('foo' USING windows_1254_to_utf8); + convert_using + --------------- + foo + (1 row) + + SELECT CONVERT('foo', 'WIN1254', 'UTF8'); + convert + --------- + foo + (1 row) + + -- UTF8 --> WIN1255 + SELECT CONVERT('foo' USING utf8_to_windows_1255); + convert_using + --------------- + foo + (1 row) + + SELECT CONVERT('foo', 'UTF8', 'WIN1255'); + convert + --------- + foo + (1 row) + + -- WIN1255 --> UTF8 + SELECT CONVERT('foo' USING windows_1255_to_utf8); + convert_using + --------------- + foo + (1 row) + + SELECT CONVERT('foo', 'WIN1255', 'UTF8'); + convert + --------- + foo + (1 row) + + -- UTF8 --> WIN1257 + SELECT CONVERT('foo' USING utf8_to_windows_1257); + convert_using + --------------- + foo + (1 row) + + SELECT CONVERT('foo', 'UTF8', 'WIN1257'); + convert + --------- + foo + (1 row) + + -- WIN1257 --> UTF8 + SELECT CONVERT('foo' USING windows_1257_to_utf8); + convert_using + --------------- + foo + (1 row) + + SELECT CONVERT('foo', 'WIN1257', 'UTF8'); + convert + --------- + foo + (1 row) + -- -- return to the super user -- diff -rcN -xCVS clean/src/test/regress/sql/conversion.sql pgsql/src/test/regress/sql/conversion.sql *** clean/src/test/regress/sql/conversion.sql 2005-03-14 10:31:25.000000000 -0800 --- pgsql/src/test/regress/sql/conversion.sql 2006-02-03 02:52:13.000000000 -0800 *************** *** 346,355 **** SELECT CONVERT('foo' USING utf8_to_sjis); SELECT CONVERT('foo', 'UTF8', 'SJIS'); -- WIN1258 --> UTF8 ! SELECT CONVERT('foo' USING win1258_to_utf8); SELECT CONVERT('foo', 'WIN1258', 'UTF8'); -- UTF8 --> WIN1258 ! SELECT CONVERT('foo' USING utf8_to_win1258); SELECT CONVERT('foo', 'UTF8', 'WIN1258'); -- UHC --> UTF8 SELECT CONVERT('foo' USING uhc_to_utf8); --- 346,355 ---- SELECT CONVERT('foo' USING utf8_to_sjis); SELECT CONVERT('foo', 'UTF8', 'SJIS'); -- WIN1258 --> UTF8 ! SELECT CONVERT('foo' USING windows_1258_to_utf8); SELECT CONVERT('foo', 'WIN1258', 'UTF8'); -- UTF8 --> WIN1258 ! SELECT CONVERT('foo' USING utf8_to_windows_1258); SELECT CONVERT('foo', 'UTF8', 'WIN1258'); -- UHC --> UTF8 SELECT CONVERT('foo' USING uhc_to_utf8); *************** *** 375,380 **** --- 375,404 ---- -- WIN874 --> UTF8 SELECT CONVERT('foo' USING windows_874_to_utf8); SELECT CONVERT('foo', 'WIN874', 'UTF8'); + -- UTF8 --> WIN1253 + SELECT CONVERT('foo' USING utf8_to_windows_1253); + SELECT CONVERT('foo', 'UTF8', 'WIN1253'); + -- WIN1253 --> UTF8 + SELECT CONVERT('foo' USING windows_1253_to_utf8); + SELECT CONVERT('foo', 'WIN1253', 'UTF8'); + -- UTF8 --> WIN1254 + SELECT CONVERT('foo' USING utf8_to_windows_1254); + SELECT CONVERT('foo', 'UTF8', 'WIN1254'); + -- WIN1254 --> UTF8 + SELECT CONVERT('foo' USING windows_1254_to_utf8); + SELECT CONVERT('foo', 'WIN1254', 'UTF8'); + -- UTF8 --> WIN1255 + SELECT CONVERT('foo' USING utf8_to_windows_1255); + SELECT CONVERT('foo', 'UTF8', 'WIN1255'); + -- WIN1255 --> UTF8 + SELECT CONVERT('foo' USING windows_1255_to_utf8); + SELECT CONVERT('foo', 'WIN1255', 'UTF8'); + -- UTF8 --> WIN1257 + SELECT CONVERT('foo' USING utf8_to_windows_1257); + SELECT CONVERT('foo', 'UTF8', 'WIN1257'); + -- WIN1257 --> UTF8 + SELECT CONVERT('foo' USING windows_1257_to_utf8); + SELECT CONVERT('foo', 'WIN1257', 'UTF8'); -- -- return to the super user --