firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

New character sets (update intl sources)

Browse Source
This commit is contained in:
brodsom 2003-01-25 03:05:24 +00:00
parent f94db5ff62
commit 77df4bd117
16 changed files with 610 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/intl/charsets.h
View File

@ -16,6 +16,9 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*/
/** Added Jan 23 2003 Blas Rodriguez Somoza
CS_737, CS_775, CS_858, CS_862, CS_864, CS_866, CS_869
*/
#ifndef INTL_CHARSETS_H
#define INTL_CHARSETS_H
@ -25,61 +28,69 @@
extern "C" {
#endif
#define CS_NONE 0 /* No Character Set */
#define CS_BINARY 1 /* BINARY BYTES */
#define CS_ASCII 2 /* ASCII */
#define CS_UNICODE_FSS 3 /* UNICODE in FSS format */
#define CS_reserved4 4 /* reserved for future internal use */
#define CS_NONE 0 /* No Character Set */
#define CS_BINARY 1 /* BINARY BYTES */
#define CS_ASCII 2 /* ASCII */
#define CS_UNICODE_FSS 3 /* UNICODE in FSS format */
#define CS_reserved4 4 /* reserved for future internal use */
#define CS_SJIS 5 /* SJIS */
#define CS_EUCJ 6 /* EUC-J */
#define CS_SJIS 5 /* SJIS */
#define CS_EUCJ 6 /* EUC-J */
#define CS_JIS_0208 7 /* JIS 0208; 1990 */
#define CS_UNICODE_110 8 /* UNICODE v 1.10 */
#define CS_JIS_0208 7 /* JIS 0208; 1990 */
#define CS_UNICODE_UCS2 8 /* UNICODE v 1.10 */
#define CS_DOS_737 9
#define CS_DOS_437 10 /* DOS CP 437 */
#define CS_DOS_850 11 /* DOS CP 850 */
#define CS_DOS_865 12 /* DOS CP 865 */
#define CS_DOS_860 13 /* DOS CP 860 */
#define CS_DOS_863 14 /* DOS CP 863 */
#define CS_NeXTSTEP 19 /* NeXTSTEP OS native charset */
#define CS_LATIN1 21 /* ISO-8859.1 */
#define CS_LATIN2 22 /* ISO-8859.2 */
#define CS_LATIN3 23 /* ISO-8859.3 */
#define CS_LATIN4 34 /* ISO-8859.4 */
#define CS_LATIN5 35 /* ISO-8859.5 */
#define CS_LATIN6 36 /* ISO-8859.6 */
#define CS_LATIN7 37 /* ISO-8859.7 */
#define CS_LATIN8 38 /* ISO-8859.8 */
#define CS_LATIN9 39 /* ISO-8859.9 */
#define CS_DOS_775 15
#define CS_DOS_858 16
#define CS_DOS_862 17
#define CS_DOS_864 18
#define CS_NEXT 19 /* NeXTSTEP OS native charset */
#define CS_ISO8859_1 21 /* ISO-8859.1 */
#define CS_ISO8859_2 22 /* ISO-8859.2 */
#define CS_ISO8859_3 23 /* ISO-8859.3 */
#define CS_ISO8859_4 34 /* ISO-8859.4 */
#define CS_ISO8859_5 35 /* ISO-8859.5 */
#define CS_ISO8859_6 36 /* ISO-8859.6 */
#define CS_ISO8859_7 37 /* ISO-8859.7 */
#define CS_ISO8859_8 38 /* ISO-8859.8 */
#define CS_ISO8859_9 39 /* ISO-8859.9 */
#define CS_ISO8859_13 40 /* ISO-8859.13 */
#define CS_KSC5601 44 /* KOREAN STANDARD 5601 */
#define CS_DOS_852 45 /* DOS CP 852 */
#define CS_DOS_857 46 /* DOS CP 857 */
#define CS_DOS_861 47 /* DOS CP 861 */
#define CS_DOS_852 45 /* DOS CP 852 */
#define CS_DOS_857 46 /* DOS CP 857 */
#define CS_DOS_861 47 /* DOS CP 861 */
#define CS_CYRL 50
#define CS_WIN1250 51 /* Windows cp 1250 */
#define CS_WIN1251 52 /* Windows cp 1251 */
#define CS_WIN1252 53 /* Windows cp 1252 */
#define CS_WIN1253 54 /* Windows cp 1253 */
#define CS_WIN1254 55 /* Windows cp 1254 */
#define CS_DOS_866 48
#define CS_DOS_869 49
#define CS_BIG5 56 /* Big Five unicode cs */
#define CS_GB2312 57 /* GB 2312-80 cs */
#define CS_CYRL 50
#define CS_WIN1250 51 /* Windows cp 1250 */
#define CS_WIN1251 52 /* Windows cp 1251 */
#define CS_WIN1252 53 /* Windows cp 1252 */
#define CS_WIN1253 54 /* Windows cp 1253 */
#define CS_WIN1254 55 /* Windows cp 1254 */
#define CS_BIG5 56 /* Big Five unicode cs */
#define CS_GB2312 57 /* GB 2312-80 cs */
#define CS_WIN1255 58 /* Windows cp 1255 */
#define CS_WIN1256 59 /* Windows cp 1256 */
#define CS_WIN1257 60 /* Windows cp 1257 */
#define CS_dynamic 127 /* Pseudo number for runtime charset */
#define CS_MAX_CS_NUMBER 58
/* Alias name */
#define CS_UNICODE CS_UNICODE_110
#define CS_UNICODE101 CS_UNICODE_110 /* temporary rename */
#define CS_UNICODE110 CS_UNICODE_110 /* temporary rename */
#define CS_NEXT CS_NeXTSTEP /* NeXT charset */
#define CS_MAX_CS_NUMBER 60
#ifdef __cplusplus
} /* extern "C" */

8
src/intl/conversions/tx437_lat1.h
View File

@ -16,8 +16,8 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*/
/* 437 to Latin1 character set conversion table */
static CONST UCHAR cvt_437_to_Latin1[256] = {
/* 437 to iso88591 character set conversion table */
static CONST UCHAR cvt_437_to_iso88591[256] = {
/*NEW OLD UINC NAME */
0x00 /* 00 0000 NULL */ ,
0x01 /* 01 0001 START OF HEADING */ ,
@ -287,8 +287,8 @@ static CONST UCHAR cvt_437_to_Latin1[256] = {
};
/* Latin1 to 437 character set conversion table */
static CONST UCHAR cvt_Latin1_to_437[256] = {
/* iso88591 to 437 character set conversion table */
static CONST UCHAR cvt_iso88591_to_437[256] = {
/*NEW OLD UINC NAME */
0x00 /* 00 0000 NULL */ ,
0x01 /* 01 0001 START OF HEADING */ ,

8
src/intl/conversions/tx865_lat1.h
View File

@ -16,8 +16,8 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*/
/* 865 to Latin1 character set conversion table */
static CONST UCHAR cvt_865_to_Latin1[256] = {
/* 865 to iso8859_1 character set conversion table */
static CONST UCHAR cvt_865_to_iso88591[256] = {
/*NEW OLD UINC NAME */
0x00 /* 00 0000 NULL */ ,
0x01 /* 01 0001 START OF HEADING */ ,
@ -287,8 +287,8 @@ static CONST UCHAR cvt_865_to_Latin1[256] = {
};
/* Latin1 to 865 character set conversion table */
static CONST UCHAR cvt_Latin1_to_865[256] = {
/* iso8859_1 to 865 character set conversion table */
static CONST UCHAR cvt_iso88591_to_865[256] = {
/*NEW OLD UINC NAME */
0x00 /* 00 0000 NULL */ ,
0x01 /* 01 0001 START OF HEADING */ ,

4
src/intl/cs_big5.c
View File

@ -44,10 +44,10 @@ CHARSET_ENTRY(CS_big_5)
csptr->charset_space_character = (BYTE *) " ";
csptr->charset_well_formed = (FPTR_SHORT) CVBIG5_check_big5;
CV_convert_init(&csptr->charset_to_unicode, CS_UNICODE, CS_BIG5,
CV_convert_init(&csptr->charset_to_unicode, CS_UNICODE_UCS2, CS_BIG5,
CVBIG5_big5_to_unicode, to_unicode_mapping_array,
to_unicode_map);
CV_convert_init(&csptr->charset_from_unicode, CS_BIG5, CS_UNICODE,
CV_convert_init(&csptr->charset_from_unicode, CS_BIG5, CS_UNICODE_UCS2,
CVBIG5_unicode_to_big5, from_unicode_mapping_array,
from_unicode_map);

4
src/intl/cs_gb2312.c
View File

@ -45,10 +45,10 @@ CHARSET_ENTRY(CS_gb_2312)
csptr->charset_space_character = (BYTE *) " "; /* 0x20 */
csptr->charset_well_formed = (FPTR_SHORT) CVGB_check_gb2312;
CV_convert_init(&csptr->charset_to_unicode, CS_UNICODE, CS_GB2312,
CV_convert_init(&csptr->charset_to_unicode, CS_UNICODE_UCS2, CS_GB2312,
CVGB_gb2312_to_unicode, to_unicode_mapping_array,
to_unicode_map);
CV_convert_init(&csptr->charset_from_unicode, CS_GB2312, CS_UNICODE,
CV_convert_init(&csptr->charset_from_unicode, CS_GB2312, CS_UNICODE_UCS2,
CVGB_unicode_to_gb2312, from_unicode_mapping_array,
from_unicode_map);

4
src/intl/cs_jis.c
View File

@ -48,9 +48,9 @@ CHARSET_ENTRY(CS_jis_0208_1990)
csptr->charset_space_character = (BYTE *) & space; /* 0x20 */
csptr->charset_well_formed = (FPTR_SHORT) NULL;
CV_convert_init(&csptr->charset_to_unicode, CS_UNICODE101, CS_JIS_0208,
CV_convert_init(&csptr->charset_to_unicode, CS_UNICODE_UCS2, CS_JIS_0208,
CV_wc_to_wc, to_unicode_mapping_array, to_unicode_map);
CV_convert_init(&csptr->charset_from_unicode, CS_JIS_0208, CS_UNICODE101,
CV_convert_init(&csptr->charset_from_unicode, CS_JIS_0208, CS_UNICODE_UCS2,
CV_wc_to_wc, from_unicode_mapping_array,
from_unicode_map);
CHARSET_RETURN;

4
src/intl/cs_ksc.c
View File

@ -43,10 +43,10 @@ CHARSET_ENTRY(CS_ksc_5601)
csptr->charset_space_character = (BYTE *) & space;
csptr->charset_well_formed = (FPTR_SHORT) CVKSC_check_ksc;
CV_convert_init(&csptr->charset_to_unicode, CS_UNICODE, CS_KSC5601,
CV_convert_init(&csptr->charset_to_unicode, CS_UNICODE_UCS2, CS_KSC5601,
CVKSC_ksc_to_unicode, to_unicode_mapping_array,
to_unicode_map);
CV_convert_init(&csptr->charset_from_unicode, CS_KSC5601, CS_UNICODE,
CV_convert_init(&csptr->charset_from_unicode, CS_KSC5601, CS_UNICODE_UCS2,
CVKSC_unicode_to_ksc, from_unicode_mapping_array,
from_unicode_map);

178
src/intl/cs_narrow.c
View File

@ -46,27 +46,99 @@ static void common_8bit_init(csptr, id, name, to_unicode_tbl,
csptr->charset_space_length = 1;
csptr->charset_space_character = (BYTE *) " ";
csptr->charset_well_formed = (FPTR_SHORT) NULL;
CV_convert_init(&csptr->charset_to_unicode, CS_UNICODE101, id,
CV_convert_init(&csptr->charset_to_unicode, CS_UNICODE_UCS2, id,
CV_nc_to_unicode, to_unicode_tbl, NULL);
CV_convert_init(&csptr->charset_from_unicode, id, CS_UNICODE101,
CV_convert_init(&csptr->charset_from_unicode, id, CS_UNICODE_UCS2,
CV_unicode_to_nc, from_unicode_tbl1, from_unicode_tbl2);
}
CHARSET_ENTRY(CS_iso_latin1)
CHARSET_ENTRY(CS_iso_ISO8859_1)
{
#include "../intl/charsets/cs_latin1.h"
#include "../intl/charsets/cs_iso8859_1.h"
common_8bit_init(csptr, CS_LATIN1, "LATIN1", to_unicode_map,
common_8bit_init(csptr, CS_ISO8859_1, "ISO88591", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY (CS_iso_latin2)
CHARSET_ENTRY (CS_iso_ISO8859_2)
{
#include "../intl/charsets/cs_latin2.h"
#include "../intl/charsets/cs_iso8859_2.h"
common_8bit_init (csptr, CS_LATIN2, "LATIN2", to_unicode_map,
common_8bit_init (csptr, CS_ISO8859_2, "ISO88592", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY (CS_iso_ISO8859_3)
{
#include "../intl/charsets/cs_iso8859_3.h"
common_8bit_init (csptr, CS_ISO8859_3, "ISO88593", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY (CS_iso_ISO8859_4)
{
#include "../intl/charsets/cs_iso8859_4.h"
common_8bit_init (csptr, CS_ISO8859_4, "ISO88594", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY (CS_iso_ISO8859_5)
{
#include "../intl/charsets/cs_iso8859_5.h"
common_8bit_init (csptr, CS_ISO8859_5, "ISO88595", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY (CS_iso_ISO8859_6)
{
#include "../intl/charsets/cs_iso8859_6.h"
common_8bit_init (csptr, CS_ISO8859_6, "ISO88596", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY (CS_iso_ISO8859_7)
{
#include "../intl/charsets/cs_iso8859_7.h"
common_8bit_init (csptr, CS_ISO8859_7, "ISO88597", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY (CS_iso_ISO8859_8)
{
#include "../intl/charsets/cs_iso8859_8.h"
common_8bit_init (csptr, CS_ISO8859_8, "ISO88598", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY (CS_iso_ISO8859_9)
{
#include "../intl/charsets/cs_iso8859_9.h"
common_8bit_init (csptr, CS_ISO8859_9, "ISO88599", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY (CS_iso_ISO8859_13)
{
#include "../intl/charsets/cs_iso8859_13.h"
common_8bit_init (csptr, CS_ISO8859_13, "ISO885913", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
@ -143,6 +215,69 @@ CHARSET_ENTRY(CS_dos_863)
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_dos_737)
{
#include "../intl/charsets/cs_737.h"
common_8bit_init(csptr, CS_DOS_737, "DOS737", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_dos_775)
{
#include "../intl/charsets/cs_775.h"
common_8bit_init(csptr, CS_DOS_775, "DOS775", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_dos_858)
{
#include "../intl/charsets/cs_858.h"
common_8bit_init(csptr, CS_DOS_858, "DOS858", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_dos_862)
{
#include "../intl/charsets/cs_862.h"
common_8bit_init(csptr, CS_DOS_862, "DOS862", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_dos_864)
{
#include "../intl/charsets/cs_864.h"
common_8bit_init(csptr, CS_DOS_864, "DOS864", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_dos_866)
{
#include "../intl/charsets/cs_866.h"
common_8bit_init(csptr, CS_DOS_866, "DOS866", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_dos_869)
{
#include "../intl/charsets/cs_869.h"
common_8bit_init(csptr, CS_DOS_869, "DOS869", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_cyrl)
{
#include "../intl/charsets/cs_cyrl.h"
@ -197,6 +332,33 @@ CHARSET_ENTRY(CS_win1254)
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_win1255)
{
#include "../intl/charsets/cs_w1255.h"
common_8bit_init(csptr, CS_WIN1255, "WIN1255", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_win1256)
{
#include "../intl/charsets/cs_w1256.h"
common_8bit_init(csptr, CS_WIN1256, "WIN1256", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_win1257)
{
#include "../intl/charsets/cs_w1257.h"
common_8bit_init(csptr, CS_WIN1257, "WIN1257", to_unicode_map,
from_unicode_mapping_array, from_unicode_map);
CHARSET_RETURN;
}
CHARSET_ENTRY(CS_next)
{
#include "../intl/charsets/cs_next.h"

18
src/intl/cv_narrow.c
View File

@ -293,21 +293,21 @@ static USHORT eight_bit_convert(obj, dest_ptr, dest_len, src_ptr, src_len,
CONVERT_ENTRY(CS_LATIN1, CS_DOS_865, CV_dos_865_x_latin1)
CONVERT_ENTRY(CS_ISO8859_1, CS_DOS_865, CV_dos_865_x_iso8859_1)
{
#include "../intl/conversions/tx865_lat1.h"
if (dest_cs == CS_LATIN1)
if (dest_cs == CS_ISO8859_1)
CV_convert_init(csptr, dest_cs, source_cs, eight_bit_convert,
cvt_865_to_Latin1, NULL);
cvt_865_to_iso88591, NULL);
else
CV_convert_init(csptr, dest_cs, source_cs, eight_bit_convert,
cvt_Latin1_to_865, NULL);
cvt_iso88591_to_865, NULL);
CONVERT_RETURN;
}
CONVERT_ENTRY(CS_LATIN1, CS_DOS_437, CV_dos_437_x_dos_865)
CONVERT_ENTRY(CS_ISO8859_1, CS_DOS_437, CV_dos_437_x_dos_865)
{
#include "../intl/conversions/tx437_865.h"
if (dest_cs == CS_DOS_865)
@ -322,15 +322,15 @@ CONVERT_ENTRY(CS_LATIN1, CS_DOS_437, CV_dos_437_x_dos_865)
CONVERT_ENTRY(CS_LATIN1, CS_DOS_437, CV_dos_437_x_latin1)
CONVERT_ENTRY(CS_ISO8859_1, CS_DOS_437, CV_dos_437_x_iso8859_1)
{
#include "../intl/conversions/tx437_lat1.h"
if (dest_cs == CS_LATIN1)
if (dest_cs == CS_ISO8859_1)
CV_convert_init(csptr, dest_cs, source_cs, eight_bit_convert,
cvt_437_to_Latin1, NULL);
cvt_437_to_iso88591, NULL);
else
CV_convert_init(csptr, dest_cs, source_cs, eight_bit_convert,
cvt_Latin1_to_437, NULL);
cvt_iso88591_to_437, NULL);
CONVERT_RETURN;
}

118
src/intl/depends.mak
View File

@ -104,7 +104,16 @@ cs_narrow.o: charsets/cs_861.h
cs_narrow.o: charsets/cs_863.h
cs_narrow.o: charsets/cs_865.h
cs_narrow.o: charsets/cs_cyrl.h
cs_narrow.o: charsets/cs_latin1.h
cs_narrow.o: charsets/cs_iso8859_1.h
cs_narrow.o: charsets/cs_iso8859_2.h
cs_narrow.o: charsets/cs_iso8859_3.h
cs_narrow.o: charsets/cs_iso8859_4.h
cs_narrow.o: charsets/cs_iso8859_5.h
cs_narrow.o: charsets/cs_iso8859_6.h
cs_narrow.o: charsets/cs_iso8859_7.h
cs_narrow.o: charsets/cs_iso8859_8.h
cs_narrow.o: charsets/cs_iso8859_9.h
cs_narrow.o: charsets/cs_iso8859_13.h
cs_narrow.o: charsets/cs_narrow.c
cs_narrow.o: charsets/cs_next.h
cs_narrow.o: charsets/cs_w1250.h
@ -112,6 +121,9 @@ cs_narrow.o: charsets/cs_w1251.h
cs_narrow.o: charsets/cs_w1252.h
cs_narrow.o: charsets/cs_w1253.h
cs_narrow.o: charsets/cs_w1254.h
cs_narrow.o: charsets/cs_w1255.h
cs_narrow.o: charsets/cs_w1256.h
cs_narrow.o: charsets/cs_w1257.h
cs_narrow.o: langdrv.h
cs_narrow.o: ld.h
cs_narrow.o: ldcommon.h
@ -129,7 +141,7 @@ cs_narrow.o: source/jrd/ods.h
cs_narrow.o: source/jrd/thd.h
cs_unicode.o: charsets.h
cs_unicode.o: country_codes.h
cs_unicode.o: cs_unicode.c
cs_unicode.o: cs_unicode_ucs2.c
cs_unicode.o: langdrv.h
cs_unicode.o: ld.h
cs_unicode.o: ldcommon.h
@ -147,7 +159,7 @@ cs_unicode.o: source/jrd/ods.h
cs_unicode.o: source/jrd/thd.h
cs_utffss.o: charsets.h
cs_utffss.o: country_codes.h
cs_utffss.o: cs_utffss.c
cs_utffss.o: cs_unicode_fss.c
cs_utffss.o: langdrv.h
cs_utffss.o: ld.h
cs_utffss.o: ldcommon.h
@ -454,55 +466,55 @@ lc_ksc.o: source/jrd/license.h
lc_ksc.o: source/jrd/ods.h
lc_ksc.o: source/jrd/thd.h
lc_ksc.o: collations/undef.h
lc_latin1.o: collations/pw1251cyrr.h
lc_latin1.o: collations/pw1250czech.h
lc_latin1.o: collations/pw1253greek1.h
lc_latin1.o: collations/pw1250hundc.h
lc_latin1.o: collations/pw1250polish.h
lc_latin1.o: collations/pw1252i850.h
lc_latin1.o: collations/pw1252intl.h
lc_latin1.o: collations/pw1252nor4.h
lc_latin1.o: collations/pw1250slov.h
lc_latin1.o: collations/pw1252span.h
lc_latin1.o: collations/pw1252swfn.h
lc_latin1.o: collations/pw1254turk.h
lc_latin1.o: collations/bl88591ca0.h
lc_latin1.o: collations/bl88591da0.h
lc_latin1.o: collations/bl88591de0.h
lc_latin1.o: collations/bl88591es0.h
lc_latin1.o: collations/bl88591fi0.h
lc_latin1.o: collations/bl88591fr0.h
lc_latin1.o: collations/bl88591is0.h
lc_latin1.o: collations/bl88591it0.h
lc_latin1.o: collations/bl88591nl0.h
lc_latin1.o: collations/bl88591no0.h
lc_latin1.o: collations/bl88591pt0.h
lc_latin1.o: collations/bl88591sv0.h
lc_latin1.o: collations/bl88591uk0.h
lc_latin1.o: collations/bl88591us0.h
lc_latin1.o: collations/blNEXTde0.h
lc_latin1.o: collations/blNEXTfr0.h
lc_latin1.o: collations/blNEXTit0.h
lc_latin1.o: collations/blNEXTus0.h
lc_latin1.o: charsets.h
lc_latin1.o: country_codes.h
lc_latin1.o: langdrv.h
lc_latin1.o: lc_latin1.c
lc_latin1.o: ld.h
lc_latin1.o: ldcommon.h
lc_latin1.o: source/jrd/blk.h
lc_latin1.o: source/jrd/btr.h
lc_latin1.o: source/jrd/common.h
lc_latin1.o: source/jrd/dsc.h
lc_latin1.o: source/jrd/gdsassert.h
lc_latin1.o: source/jrd/intl.h
lc_latin1.o: source/jrd/intlobj.h
lc_latin1.o: source/jrd/isc.h
lc_latin1.o: source/jrd/jrd.h
lc_latin1.o: source/jrd/kanji.h
lc_latin1.o: source/jrd/ods.h
lc_latin1.o: source/jrd/thd.h
lc_latin1.o: collations/undef.h
lc_iso8859_1.o: collations/pw1251cyrr.h
lc_iso8859_1.o: collations/pw1250czech.h
lc_iso8859_1.o: collations/pw1253greek1.h
lc_iso8859_1.o: collations/pw1250hundc.h
lc_iso8859_1.o: collations/pw1250polish.h
lc_iso8859_1.o: collations/pw1252i850.h
lc_iso8859_1.o: collations/pw1252intl.h
lc_iso8859_1.o: collations/pw1252nor4.h
lc_iso8859_1.o: collations/pw1250slov.h
lc_iso8859_1.o: collations/pw1252span.h
lc_iso8859_1.o: collations/pw1252swfn.h
lc_iso8859_1.o: collations/pw1254turk.h
lc_iso8859_1.o: collations/bl88591ca0.h
lc_iso8859_1.o: collations/bl88591da0.h
lc_iso8859_1.o: collations/bl88591de0.h
lc_iso8859_1.o: collations/bl88591es0.h
lc_iso8859_1.o: collations/bl88591fi0.h
lc_iso8859_1.o: collations/bl88591fr0.h
lc_iso8859_1.o: collations/bl88591is0.h
lc_iso8859_1.o: collations/bl88591it0.h
lc_iso8859_1.o: collations/bl88591nl0.h
lc_iso8859_1.o: collations/bl88591no0.h
lc_iso8859_1.o: collations/bl88591pt0.h
lc_iso8859_1.o: collations/bl88591sv0.h
lc_iso8859_1.o: collations/bl88591uk0.h
lc_iso8859_1.o: collations/bl88591us0.h
lc_iso8859_1.o: collations/blNEXTde0.h
lc_iso8859_1.o: collations/blNEXTfr0.h
lc_iso8859_1.o: collations/blNEXTit0.h
lc_iso8859_1.o: collations/blNEXTus0.h
lc_iso8859_1.o: charsets.h
lc_iso8859_1.o: country_codes.h
lc_iso8859_1.o: langdrv.h
lc_iso8859_1.o: lc_iso8859_1.c
lc_iso8859_1.o: ld.h
lc_iso8859_1.o: ldcommon.h
lc_iso8859_1.o: source/jrd/blk.h
lc_iso8859_1.o: source/jrd/btr.h
lc_iso8859_1.o: source/jrd/common.h
lc_iso8859_1.o: source/jrd/dsc.h
lc_iso8859_1.o: source/jrd/gdsassert.h
lc_iso8859_1.o: source/jrd/intl.h
lc_iso8859_1.o: source/jrd/intlobj.h
lc_iso8859_1.o: source/jrd/isc.h
lc_iso8859_1.o: source/jrd/jrd.h
lc_iso8859_1.o: source/jrd/kanji.h
lc_iso8859_1.o: source/jrd/ods.h
lc_iso8859_1.o: source/jrd/thd.h
lc_iso8859_1.o: collations/undef.h
lc_narrow.o: charsets.h
lc_narrow.o: country_codes.h
lc_narrow.o: langdrv.h
@ -524,7 +536,7 @@ lc_narrow.o: source/jrd/thd.h
lc_unicode.o: charsets.h
lc_unicode.o: country_codes.h
lc_unicode.o: langdrv.h
lc_unicode.o: lc_unicode.c
lc_unicode.o: lc_unicode_ucs2.c
lc_unicode.o: ld.h
lc_unicode.o: ldcommon.h
lc_unicode.o: source/jrd/blk.h

213
src/intl/lc_ascii.c
View File

@ -91,22 +91,110 @@ TEXTTYPE_ENTRY(DOS160_init)
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(LATIN1_cp_init)
TEXTTYPE_ENTRY(ISO88591_cp_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_1";
FAMILY_ASCII(parm1, LATIN1_cp_init, CS_LATIN1, CC_C);
FAMILY_ASCII(parm1, ISO88591_cp_init, CS_ISO8859_1, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY (LATIN2_cp_init)
TEXTTYPE_ENTRY (ISO88592_cp_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_2";
FAMILY_ASCII (parm1, LATIN2_cp_init, CS_LATIN2, CC_C);
FAMILY_ASCII (parm1, ISO88592_cp_init, CS_ISO8859_2, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY (ISO88593_cp_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_3";
FAMILY_ASCII (parm1, ISO88593_cp_init, CS_ISO8859_3, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY (ISO88594_cp_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_4";
FAMILY_ASCII (parm1, ISO88594_cp_init, CS_ISO8859_4, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY (ISO88595_cp_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_5";
FAMILY_ASCII (parm1, ISO88595_cp_init, CS_ISO8859_5, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY (ISO88596_cp_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_6";
FAMILY_ASCII (parm1, ISO88596_cp_init, CS_ISO8859_6, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY (ISO88597_cp_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_7";
FAMILY_ASCII (parm1, ISO88597_cp_init, CS_ISO8859_7, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY (ISO88598_cp_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_8";
FAMILY_ASCII (parm1, ISO88598_cp_init, CS_ISO8859_8, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY (ISO88599_cp_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_9";
FAMILY_ASCII (parm1, ISO88599_cp_init, CS_ISO8859_9, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY (ISO885913_cp_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_13";
FAMILY_ASCII (parm1, ISO885913_cp_init, CS_ISO8859_13, CC_C);
TEXTTYPE_RETURN;
}
@ -173,6 +261,90 @@ TEXTTYPE_ENTRY(DOS863_c0_init)
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(DOS737_c0_init)
{
static CONST ASCII POSIX[] = "C.DOS737";
FAMILY_ASCII(parm1, DOS737_c0_init, CS_DOS_737, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(DOS775_c0_init)
{
static CONST ASCII POSIX[] = "C.DOS775";
FAMILY_ASCII(parm1, DOS775_c0_init, CS_DOS_775, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(DOS858_c0_init)
{
static CONST ASCII POSIX[] = "C.DOS858";
FAMILY_ASCII(parm1, DOS858_c0_init, CS_DOS_858, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(DOS862_c0_init)
{
static CONST ASCII POSIX[] = "C.DOS862";
FAMILY_ASCII(parm1, DOS862_c0_init, CS_DOS_862, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(DOS864_c0_init)
{
static CONST ASCII POSIX[] = "C.DOS864";
FAMILY_ASCII(parm1, DOS864_c0_init, CS_DOS_864, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(DOS866_c0_init)
{
static CONST ASCII POSIX[] = "C.DOS866";
FAMILY_ASCII(parm1, DOS866_c0_init, CS_DOS_866, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(DOS869_c0_init)
{
static CONST ASCII POSIX[] = "C.DOS869";
FAMILY_ASCII(parm1, DOS869_c0_init, CS_DOS_869, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(CYRL_c0_init)
{
static CONST ASCII POSIX[] = "C.CYRL";
@ -244,6 +416,39 @@ TEXTTYPE_ENTRY(WIN1254_c0_init)
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(WIN1255_c0_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_5";
FAMILY_ASCII(parm1, WIN1255_c0_init, CS_WIN1255, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(WIN1256_c0_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_1";
FAMILY_ASCII(parm1, WIN1256_c0_init, CS_WIN1256, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(WIN1257_c0_init)
{
static CONST ASCII POSIX[] = "C.ISO8859_1";
FAMILY_ASCII(parm1, WIN1257_c0_init, CS_WIN1257, CC_C);
TEXTTYPE_RETURN;
}
#include "../intl/collations/undef.h"
TEXTTYPE_ENTRY(NEXT_c0_init)
{

121
src/intl/ld.c
View File

@ -87,36 +87,51 @@ EXTERN_texttype(DOS861_c1_init);
EXTERN_texttype(DOS863_c0_init);
EXTERN_texttype(DOS863_c1_init);
EXTERN_texttype(DOS737_c0_init);
EXTERN_texttype(DOS775_c0_init);
EXTERN_texttype(DOS858_c0_init);
EXTERN_texttype(DOS862_c0_init);
EXTERN_texttype(DOS864_c0_init);
EXTERN_texttype(DOS866_c0_init);
EXTERN_texttype(DOS869_c0_init);
EXTERN_texttype(CYRL_c0_init);
EXTERN_texttype(CYRL_c1_init);
EXTERN_texttype(CYRL_c2_init);
/* Latin 1 character set */
EXTERN_texttype(LATIN1_cp_init);
EXTERN_texttype(ISO88591_cp_init);
/* Latin 1 collations */
EXTERN_texttype(LAT139_init);
EXTERN_texttype(LAT140_init);
EXTERN_texttype(LAT141_init);
EXTERN_texttype(LAT142_init);
EXTERN_texttype(LAT143_init);
EXTERN_texttype(LAT144_init);
EXTERN_texttype(LAT145_init);
EXTERN_texttype(LAT146_init);
EXTERN_texttype(LAT148_init);
EXTERN_texttype(LAT149_init);
EXTERN_texttype(LAT151_init);
EXTERN_texttype(LAT152_init);
EXTERN_texttype(LAT153_init);
EXTERN_texttype(LAT154_init);
EXTERN_texttype(ISO88591_39_init);
EXTERN_texttype(ISO88591_40_init);
EXTERN_texttype(ISO88591_41_init);
EXTERN_texttype(ISO88591_42_init);
EXTERN_texttype(ISO88591_43_init);
EXTERN_texttype(ISO88591_44_init);
EXTERN_texttype(ISO88591_45_init);
EXTERN_texttype(ISO88591_46_init);
EXTERN_texttype(ISO88591_48_init);
EXTERN_texttype(ISO88591_49_init);
EXTERN_texttype(ISO88591_51_init);
EXTERN_texttype(ISO88591_52_init);
EXTERN_texttype(ISO88591_53_init);
EXTERN_texttype(ISO88591_54_init);
/* Latin 2 character set */
EXTERN_texttype (LATIN2_cp_init);
EXTERN_texttype (ISO88592_cp_init);
/* latin 2 collations */
EXTERN_texttype (ISO88592_c1_init);
EXTERN_texttype (ISO88593_cp_init);
EXTERN_texttype (ISO88594_cp_init);
EXTERN_texttype (ISO88595_cp_init);
EXTERN_texttype (ISO88596_cp_init);
EXTERN_texttype (ISO88597_cp_init);
EXTERN_texttype (ISO88598_cp_init);
EXTERN_texttype (ISO88599_cp_init);
EXTERN_texttype (ISO885913_cp_init);
EXTERN_texttype(WIN1250_c0_init);
EXTERN_texttype(WIN1250_c1_init);
@ -142,6 +157,10 @@ EXTERN_texttype(WIN1253_c1_init);
EXTERN_texttype(WIN1254_c0_init);
EXTERN_texttype(WIN1254_c1_init);
EXTERN_texttype(WIN1255_c0_init);
EXTERN_texttype(WIN1256_c0_init);
EXTERN_texttype(WIN1257_c0_init);
EXTERN_texttype(NEXT_c0_init);
EXTERN_texttype(NEXT_c1_init);
EXTERN_texttype(NEXT_c2_init);
@ -166,13 +185,24 @@ EXTERN_texttype(UNI201_init);
EXTERN_texttype(JIS220_init);
EXTERN_texttype(JIS230_init);
EXTERN_charset(CS_iso_latin1);
EXTERN_charset(CS_iso_latin2);
EXTERN_charset(CS_iso_ISO8859_1);
EXTERN_charset(CS_iso_ISO8859_2);
EXTERN_charset(CS_iso_ISO8859_3);
EXTERN_charset(CS_iso_ISO8859_4);
EXTERN_charset(CS_iso_ISO8859_5);
EXTERN_charset(CS_iso_ISO8859_6);
EXTERN_charset(CS_iso_ISO8859_7);
EXTERN_charset(CS_iso_ISO8859_8);
EXTERN_charset(CS_iso_ISO8859_9);
EXTERN_charset(CS_iso_ISO8859_13);
EXTERN_charset(CS_win1250);
EXTERN_charset(CS_win1251);
EXTERN_charset(CS_win1252);
EXTERN_charset(CS_win1253);
EXTERN_charset(CS_win1254);
EXTERN_charset(CS_win1255);
EXTERN_charset(CS_win1256);
EXTERN_charset(CS_win1257);
EXTERN_charset(CS_next);
EXTERN_charset(CS_cyrl);
EXTERN_charset(CS_dos_437);
@ -183,7 +213,14 @@ EXTERN_charset(CS_dos_860);
EXTERN_charset(CS_dos_861);
EXTERN_charset(CS_dos_863);
EXTERN_charset(CS_dos_865);
EXTERN_charset(CS_unicode_101);
EXTERN_charset(CS_dos_737);
EXTERN_charset(CS_dos_775);
EXTERN_charset(CS_dos_858);
EXTERN_charset(CS_dos_862);
EXTERN_charset(CS_dos_864);
EXTERN_charset(CS_dos_866);
EXTERN_charset(CS_dos_869);
EXTERN_charset(CS_unicode_ucs2);
EXTERN_charset(CS_unicode_fss);
EXTERN_charset(CS_sjis);
EXTERN_charset(CS_euc_j);
@ -197,8 +234,8 @@ EXTERN_texttype(BIG5_init);
EXTERN_texttype(KSC_5601_init);
EXTERN_texttype(GB_2312_init);
EXTERN_convert(CV_dos_437_x_latin1);
EXTERN_convert(CV_dos_865_x_latin1);
EXTERN_convert(CV_dos_437_x_iso8859_1);
EXTERN_convert(CV_dos_865_x_iso8859_1);
EXTERN_convert(CV_dos_437_x_dos_865);
EXTERN_convert(CVJIS_sjis_x_eucj);
@ -311,8 +348,8 @@ USHORT DLL_EXPORT LD_lookup(USHORT objtype,
DRIVER (CS_DOS_437, DOS101_init);
DRIVER (CS_DOS_850, DOS160_init);
DRIVER (CS_DOS_865, DOS107_init);
DRIVER (CS_LATIN1, LATIN1_cp_init);
DRIVER (CS_LATIN2, LATIN2_cp_init);
DRIVER (CS_ISO8859_1, ISO88591_cp_init);
DRIVER (CS_ISO8859_2, ISO88592_cp_init);
DRIVER (CS_UNICODE_FSS, UNI201_init);
DRIVER (CS_SJIS, JIS220_init);
DRIVER (CS_EUCJ, JIS230_init);
@ -322,20 +359,20 @@ USHORT DLL_EXPORT LD_lookup(USHORT objtype,
DRIVER (105, DOS105_init);
DRIVER (106, DOS106_init);
DRIVER (107, DOS107_init);
DRIVER (139, LAT139_init);
DRIVER (140, LAT140_init);
DRIVER (141, LAT141_init);
DRIVER (142, LAT142_init);
DRIVER (143, LAT143_init);
DRIVER (144, LAT144_init);
DRIVER (145, LAT145_init);
DRIVER (146, LAT146_init);
DRIVER (148, LAT148_init);
DRIVER (149, LAT149_init);
DRIVER (151, LAT151_init);
DRIVER (152, LAT152_init);
DRIVER (153, LAT153_init);
DRIVER (154, LAT154_init);
DRIVER (139, ISO88591_39_init);
DRIVER (140, ISO88591_40_init);
DRIVER (141, ISO88591_41_init);
DRIVER (142, ISO88591_42_init);
DRIVER (143, ISO88591_43_init);
DRIVER (144, ISO88591_44_init);
DRIVER (145, ISO88591_45_init);
DRIVER (146, ISO88591_46_init);
DRIVER (148, ISO88591_48_init);
DRIVER (149, ISO88591_49_init);
DRIVER (151, ISO88591_51_init);
DRIVER (152, ISO88591_52_init);
DRIVER (153, ISO88591_53_init);
DRIVER (154, ISO88591_54_init);
DRIVER (160, DOS160_init);
DRIVER (200, UNI200_init);
DRIVER (201, UNI201_init);
@ -369,11 +406,11 @@ USHORT DLL_EXPORT LD_lookup(USHORT objtype,
#undef COLLATE_ALIAS
/*
CHARSET_INIT (CS_LATIN1, CS_iso_latin1);
CHARSET_INIT (CS_ISO8859_1, CS_iso_ISO8859_1);
CHARSET_INIT (CS_DOS_437, CS_dos_437);
CHARSET_INIT (CS_DOS_850, CS_dos_850);
CHARSET_INIT (CS_DOS_865, CS_dos_865);
CHARSET_INIT (CS_UNICODE101, CS_unicode_101);
CHARSET_INIT (CS_UNICODE_UCS2, CS_unicode_ucs2);
CHARSET_INIT (CS_UNICODE_FSS, CS_unicode_fss);
CHARSET_INIT (CS_SJIS, CS_sjis);
CHARSET_INIT (CS_EUCJ, CS_euc_j);
@ -384,8 +421,8 @@ USHORT DLL_EXPORT LD_lookup(USHORT objtype,
};
case type_csconvert:
{
CONVERT_INIT_BI(CS_DOS_437, CS_LATIN1, CV_dos_437_x_latin1);
CONVERT_INIT_BI(CS_DOS_865, CS_LATIN1, CV_dos_865_x_latin1);
CONVERT_INIT_BI(CS_DOS_437, CS_ISO8859_1, CV_dos_437_x_iso8859_1);
CONVERT_INIT_BI(CS_DOS_865, CS_ISO8859_1, CV_dos_865_x_iso8859_1);
CONVERT_INIT_BI(CS_DOS_437, CS_DOS_865, CV_dos_437_x_dos_865);
CONVERT_INIT_BI(CS_SJIS, CS_EUCJ, CVJIS_sjis_x_eucj);
*fun = NULL;

12
src/intl/moved_files.txt
View File

@ -6,6 +6,14 @@ cs_jis_20208_1990.c
cs2jis_p.h
mac_*
-------------------------------------> Changed name
lc_unicode.c > lc_unicode_ucs2.c
cs_unicode.c > cs_unicode_ucs2.c
cs_utffss.c > cs_unicode_fss.c
cs_latin1.c > cs_iso8859_1.c
cs_latin2.c > cs_iso8859_2.c
-------------------------------------> Moved to charsets
cs_437.h
@ -20,8 +28,8 @@ cs_big5.h
cs_gb2312.h
cs_jis_0208_1990.h
cs_ksc5601.h
cs_latin1.h
cs_latin2.h
cs_latin1.h > cs_iso8859_1.h
cs_latin2.h > cs_iso8859_2.h
cs_next.h
cs_sjis.h
cs_w1250.h

2
src/intl/utils/mapdump.c
View File

@ -45,7 +45,7 @@ fixed with errors
so this is not an error
No errors
#include "../intl/cs_latin1.h"
#include "../intl/cs_iso8859_1.h"
*/
/*

2
src/intl/utils/maptest.cpp
View File

@ -45,7 +45,7 @@ fixed with errors
so this is not an error
No errors
#include "../intl/cs_latin1.h"
#include "../intl/cs_iso8859_1.h"
*/
/*

2
src/intl/utils/maptest2.c
View File

@ -210,7 +210,7 @@ fixed with errors
so this is not an error
No errors
#include "../intl/cs_latin1.h"
#include "../intl/cs_iso8859_1.h"
*/
/*