From b7a1bda9c02558e39e1cd2660e0f47636309edf9 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 10 Nov 2009 17:25:29 +0000 Subject: [PATCH] 2009-11-10 18:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/tests/cpinfo.prg * harbour/include/hbapicdp.h * harbour/include/hbcdpreg.h * modified format used for CP definition using binary tables + added Latin character striping from non Latin based CPs * changed warning message to be more clear. In most of cases when this message is shown: Warning: irregular CP which needs verification for human readable definition in Harbour it should be possible to create human non binary CP definition. Usually it should be enough to copy HB_CP_UPPER and HB_CP_LOWER strings and verify if final result are compatible by comparing automatically generated .c file with binary tables. If you will find some CPs where it's not compatible then please inform me about it and I'll try to update cpinfo.prg When this message is shown: Warning: irregular CP which needs special definition in Harbour using binary tables generated by this program then binary tables have to be used to replicate exact CP conditions. If no warning message is shown then human readable form of CP definition can be used without (I hope ;)) additional verification. * harbour/src/codepage/cpno865.c * harbour/src/codepage/cpit850m.c * harbour/src/codepage/cpis850.c * harbour/src/codepage/cpfr850.c * harbour/src/codepage/cpes850c.c * harbour/src/codepage/cpsv850m.c * harbour/src/codepage/cpde850m.c * harbour/src/codepage/cppt860.c * harbour/src/codepage/cpnl850m.c * harbour/src/codepage/cpnl850.c * harbour/src/codepage/cpde850.c * harbour/src/codepage/cpfi850.c * harbour/src/codepage/cpit850.c * harbour/src/codepage/cpis861.c * harbour/src/codepage/cpes850m.c * harbour/src/codepage/cpfr850m.c * harbour/src/codepage/cpsv437c.c * harbour/src/codepage/cpdk865.c * harbour/src/codepage/cpgr437.c * updated for new format --- harbour/ChangeLog | 44 ++++++++++++ harbour/include/hbapicdp.h | 2 +- harbour/include/hbcdpreg.h | 19 ++++- harbour/src/codepage/cpde850.c | 25 ++----- harbour/src/codepage/cpde850m.c | 25 ++----- harbour/src/codepage/cpdk865.c | 25 ++----- harbour/src/codepage/cpes850c.c | 25 ++----- harbour/src/codepage/cpes850m.c | 25 ++----- harbour/src/codepage/cpfi850.c | 25 ++----- harbour/src/codepage/cpfr850.c | 25 ++----- harbour/src/codepage/cpfr850m.c | 25 ++----- harbour/src/codepage/cpgr437.c | 25 ++----- harbour/src/codepage/cpis850.c | 25 ++----- harbour/src/codepage/cpis861.c | 25 ++----- harbour/src/codepage/cpit850.c | 25 ++----- harbour/src/codepage/cpit850m.c | 25 ++----- harbour/src/codepage/cpnl850.c | 25 ++----- harbour/src/codepage/cpnl850m.c | 25 ++----- harbour/src/codepage/cpno865.c | 25 ++----- harbour/src/codepage/cppt860.c | 25 ++----- harbour/src/codepage/cpsv437c.c | 24 ++----- harbour/src/codepage/cpsv850m.c | 25 ++----- harbour/tests/cpinfo.prg | 119 +++++++++++++++++++++++--------- 23 files changed, 245 insertions(+), 413 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0aafdf0bde..45e184b04e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,50 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-10 18:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/tests/cpinfo.prg + * harbour/include/hbapicdp.h + * harbour/include/hbcdpreg.h + * modified format used for CP definition using binary tables + + added Latin character striping from non Latin based CPs + * changed warning message to be more clear. In most of cases when + this message is shown: + Warning: irregular CP which needs verification for human + readable definition in Harbour + it should be possible to create human non binary CP definition. + Usually it should be enough to copy HB_CP_UPPER and HB_CP_LOWER + strings and verify if final result are compatible by comparing + automatically generated .c file with binary tables. If you will + find some CPs where it's not compatible then please inform me + about it and I'll try to update cpinfo.prg + When this message is shown: + Warning: irregular CP which needs special definition in Harbour + using binary tables generated by this program + then binary tables have to be used to replicate exact CP conditions. + If no warning message is shown then human readable form of CP + definition can be used without (I hope ;)) additional verification. + + * harbour/src/codepage/cpno865.c + * harbour/src/codepage/cpit850m.c + * harbour/src/codepage/cpis850.c + * harbour/src/codepage/cpfr850.c + * harbour/src/codepage/cpes850c.c + * harbour/src/codepage/cpsv850m.c + * harbour/src/codepage/cpde850m.c + * harbour/src/codepage/cppt860.c + * harbour/src/codepage/cpnl850m.c + * harbour/src/codepage/cpnl850.c + * harbour/src/codepage/cpde850.c + * harbour/src/codepage/cpfi850.c + * harbour/src/codepage/cpit850.c + * harbour/src/codepage/cpis861.c + * harbour/src/codepage/cpes850m.c + * harbour/src/codepage/cpfr850m.c + * harbour/src/codepage/cpsv437c.c + * harbour/src/codepage/cpdk865.c + * harbour/src/codepage/cpgr437.c + * updated for new format + 2009-11-09 08:26 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/hbqt_slots.cpp * contrib/hbxbp/xbpgeneric.prg diff --git a/harbour/include/hbapicdp.h b/harbour/include/hbapicdp.h index 38b123034c..a11a35978d 100644 --- a/harbour/include/hbapicdp.h +++ b/harbour/include/hbapicdp.h @@ -159,7 +159,7 @@ typedef struct _HB_CODEPAGE #define HB_CPID_KOI_8 "koi-8" #define HB_CPID_KOI_8U "koi-8u" #define HB_CPID_KAM "kamenicky" -#define HB_CPID_MAZ "plmaz" +#define HB_CPID_MAZ "mazovia" #define HB_CPID_MIK "bg-mik" #define HB_CPID_037 "cp037" #define HB_CPID_424 "cp424" diff --git a/harbour/include/hbcdpreg.h b/harbour/include/hbcdpreg.h index b6bd31e2f8..a2e97b224d 100644 --- a/harbour/include/hbcdpreg.h +++ b/harbour/include/hbcdpreg.h @@ -57,7 +57,24 @@ HB_CODEPAGE_ANNOUNCE( HB_CP_ID ) HB_CALL_ON_STARTUP_BEGIN( _hb_codepage_Init_ ) #if defined( HB_CP_RAW ) - hb_cdpRegisterRaw( HB_CP_RAW ); + static HB_CODEPAGE s_codePage = + { + HB_MACRO2STRING( HB_CP_ID ), + HB_CP_INFO, + HB_CP_UNITB, + s_flags, + s_upper, + s_lower, + s_sort, + NULL, + 0, + 0, + 0, + NULL, + NULL, + NULL, + }; + hb_cdpRegisterRaw( &s_codePage ); #else hb_cdpRegisterNew( HB_MACRO2STRING( HB_CP_ID ), HB_CP_INFO, HB_CP_UNITB, HB_CP_UPPER, HB_CP_LOWER, HB_CP_ACSORT ); diff --git a/harbour/src/codepage/cpde850.c b/harbour/src/codepage/cpde850.c index 6fcf964cdb..48a1802140 100644 --- a/harbour/src/codepage/cpde850.c +++ b/harbour/src/codepage/cpde850.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID DE850 +#define HB_CP_INFO "German CP-850 (ntxger.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,6,0,0,6,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,6,0,0,0,0,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,154,130,131,142,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,153,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,132,143,144,145,146,147,148,149,150,151,152,148,129,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,67,68,69,70,71,72,73,74,75,76,77,78,79,80,82,83,84,85,86,87,89,90,91,92,93,94,95,96,97,98,99,100,102,103,104,105,106,107,108,109,110,111,112,113,114,115,117,118,119,120,122,123,125,126,127,128,129,130,131,132,133,134,135,124,136,137,101,138,139,140,141,142,143,144,145,146,66,147,148,149,150,151,116,152,153,154,155,81,88,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,121,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "DE850", - "German CP-850 (ntxger.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpde850m.c b/harbour/src/codepage/cpde850m.c index 71046313a5..dd0691b901 100644 --- a/harbour/src/codepage/cpde850m.c +++ b/harbour/src/codepage/cpde850m.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID DE850M +#define HB_CP_INFO "German CP-850 (mdxger.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,10,6,6,6,6,6,6,6,6,6,6,6,6,6,10,10,10,6,10,6,6,6,6,6,6,10,10,0,0,0,0,0,6,6,6,6,6,10,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,154,144,65,142,65,143,128,69,69,69,73,73,73,142,143,144,146,146,79,153,79,85,85,89,153,154,155,156,157,158,159,65,73,79,85,165,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,135,129,130,131,132,133,134,135,136,137,138,139,140,141,132,134,130,145,145,147,148,149,150,151,152,148,129,155,156,157,158,159,160,161,162,163,164,164,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,194,195,196,197,198,199,200,201,202,203,176,177,178,179,180,181,182,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,183,184,185,186,187,188,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,189,190,191,192,193,95,126,108,102,103,101,104,107,110,111,109,115,114,113,92,93,96,105,94,119,120,118,125,124,127,98,99,0,1,2,3,4,100,112,117,123,116,97,106,121,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,122,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91 }; -static HB_CODEPAGE s_codePage = -{ - "DE850M", - "German CP-850 (mdxger.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpdk865.c b/harbour/src/codepage/cpdk865.c index 207a3a877d..8aa79f84fd 100644 --- a/harbour/src/codepage/cpdk865.c +++ b/harbour/src/codepage/cpdk865.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID DK865 +#define HB_CP_INFO "Danish CP-865 (ntxdan.obj compatible)" +#define HB_CP_UNITB HB_UNITB_865 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,6,0,0,6,0,6,0,0,0,6,0,0,0,10,10,10,6,10,0,6,0,0,0,0,10,10,6,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,154,130,131,142,133,143,135,136,137,144,139,140,141,142,143,144,146,146,147,153,149,150,151,152,153,154,157,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,132,134,130,145,145,147,148,149,150,151,152,148,129,155,156,155,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,92,98,99,100,101,102,103,104,105,106,107,108,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,131,137,138,139,140,141,142,130,143,144,133,145,136,146,147,148,109,149,150,151,94,97,70,132,93,152,135,153,154,155,156,96,91,134,157,95,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "DK865", - "Danish CP-865 (ntxdan.obj compatible)", - HB_UNITB_865, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpes850c.c b/harbour/src/codepage/cpes850c.c index 8bd4a86445..7450b1c42d 100644 --- a/harbour/src/codepage/cpes850c.c +++ b/harbour/src/codepage/cpes850c.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID ES850C +#define HB_CP_INFO "Spanish CP-850 (ntxspa.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,6,6,0,6,0,6,0,0,0,0,0,0,0,10,10,10,0,0,0,6,0,0,6,0,10,10,0,0,0,0,0,6,6,6,0,6,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,154,144,131,142,133,143,135,136,137,138,139,140,141,142,143,144,145,146,147,153,149,150,151,152,153,154,155,156,157,158,159,65,73,79,85,165,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,132,134,130,145,146,147,148,149,150,151,152,148,129,155,156,157,158,159,160,161,162,163,164,164,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,71,72,73,74,75,76,77,78,79,81,82,83,84,85,86,87,88,89,90,91,93,97,98,99,100,101,102,103,105,106,107,108,110,111,112,113,115,116,117,118,119,121,123,124,125,126,127,128,130,131,132,133,135,139,140,141,142,143,144,134,109,145,137,146,136,147,148,149,150,151,152,153,95,94,70,154,155,156,138,157,158,129,159,96,92,160,161,162,163,164,104,114,122,165,120,80,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "ES850", - "Spanish CP-850 (ntxspa.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpes850m.c b/harbour/src/codepage/cpes850m.c index 04abf4562c..10493d58a9 100644 --- a/harbour/src/codepage/cpes850m.c +++ b/harbour/src/codepage/cpes850m.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID ES850M +#define HB_CP_INFO "Spanish CP-850 (mdxspa.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,10,6,6,6,6,6,6,6,6,6,6,6,6,6,10,10,10,6,10,6,6,6,6,6,6,10,10,0,0,0,0,0,6,6,6,6,6,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,154,69,65,142,65,143,128,69,69,69,73,73,73,142,143,144,146,146,79,153,79,85,85,89,153,154,155,156,157,158,159,65,73,79,85,165,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,135,129,130,131,132,133,134,135,136,137,138,139,140,141,132,134,144,145,145,147,148,149,150,151,152,148,129,155,156,157,158,159,160,161,162,163,164,164,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 128,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,129,210,218,216,217,204,215,220,193,194,205,202,130,203,206,211,131,132,133,134,135,136,137,138,139,140,208,207,199,201,200,209,214,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,195,212,196,221,223,219,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,197,213,198,222,255,2,28,13,9,10,8,11,12,15,16,14,19,20,18,0,1,3,38,39,24,25,23,29,27,30,5,6,33,34,35,36,37,7,17,22,26,21,4,41,42,31,43,44,45,46,32,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,40,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127 }; -static HB_CODEPAGE s_codePage = -{ - "ES850M", - "Spanish CP-850 (mdxspa.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpfi850.c b/harbour/src/codepage/cpfi850.c index 8ce1003106..2889710a20 100644 --- a/harbour/src/codepage/cpfi850.c +++ b/harbour/src/codepage/cpfi850.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID FI850 +#define HB_CP_INFO "Finnish CP-850 (ntxfin.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,6,6,0,6,0,6,0,0,0,0,0,0,0,10,10,10,0,0,0,6,0,0,0,0,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,154,144,131,142,133,143,135,136,137,138,139,140,141,142,143,144,145,146,147,153,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,132,134,130,145,146,147,148,149,150,151,152,148,129,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,92,96,97,98,99,100,101,102,103,104,105,106,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,129,133,134,135,136,137,138,128,107,139,131,140,130,141,142,143,144,145,146,147,94,93,70,148,149,150,132,151,152,153,154,95,91,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "FI850", - "Finnish CP-850 (ntxfin.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpfr850.c b/harbour/src/codepage/cpfr850.c index f6f074e655..71716013b1 100644 --- a/harbour/src/codepage/cpfr850.c +++ b/harbour/src/codepage/cpfr850.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID FR850 +#define HB_CP_INFO "French CP-850 (ntxfre.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,6,6,6,6,6,0,0,6,6,6,6,6,6,0,0,0,0,0,6,6,6,6,6,0,0,0,0,0,0,0,0,6,6,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,85,69,65,65,65,134,135,69,69,69,73,73,73,142,143,144,145,146,79,79,79,85,85,152,153,154,155,156,157,158,159,65,73,79,85,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,102,103,104,105,110,111,112,113,118,119,120,121,122,123,128,129,130,131,132,133,138,139,140,141,142,143,144,145,146,147,148,137,106,100,101,99,149,150,108,109,107,117,116,115,151,152,153,154,155,126,127,125,136,135,156,157,158,159,160,161,162,163,98,114,124,134,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "FR850", - "French CP-850 (ntxfre.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpfr850m.c b/harbour/src/codepage/cpfr850m.c index 94f45d221b..3a1f893b72 100644 --- a/harbour/src/codepage/cpfr850m.c +++ b/harbour/src/codepage/cpfr850m.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID FR850M +#define HB_CP_INFO "French CP-850 (mdxfre.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,10,6,6,6,6,6,6,6,6,6,6,6,6,6,10,10,10,6,10,6,6,6,6,6,6,10,10,0,0,0,0,0,6,6,6,6,6,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,85,69,65,142,65,143,67,69,69,69,73,73,73,142,143,144,146,146,79,153,79,85,85,89,153,154,155,156,157,158,159,65,73,79,85,165,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,132,134,144,145,145,147,148,149,150,151,152,148,154,155,156,157,158,159,160,161,162,163,164,164,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 128,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,129,210,218,216,217,203,215,220,192,193,204,201,206,202,205,211,130,131,132,133,134,135,136,137,138,139,208,207,198,200,199,209,214,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,194,212,195,221,223,219,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,196,213,197,222,255,2,29,13,9,10,8,11,12,15,16,14,20,19,18,0,1,3,37,38,24,25,23,28,27,30,5,6,32,33,34,36,35,7,17,22,26,21,4,40,41,31,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,39,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127 }; -static HB_CODEPAGE s_codePage = -{ - "FR850M", - "French CP-850 (mdxfre.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpgr437.c b/harbour/src/codepage/cpgr437.c index e762b9eda7..f3ae1e3da7 100644 --- a/harbour/src/codepage/cpgr437.c +++ b/harbour/src/codepage/cpgr437.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID GR437 +#define HB_CP_INFO "Greek CP-437 (ntxgr437.obj compatible)" +#define HB_CP_UNITB HB_UNITB_437 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,145,146,147,148,149,150,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,151,128,132,134,136,136,142,147,147,151,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,171,172,173,174,175,224,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,131,133,135,137,140,142,145,147,151,153,155,157,159,161,164,166,168,171,173,177,179,181,183,129,132,134,136,138,141,143,146,148,152,154,156,158,160,162,165,167,169,170,172,174,178,180,182,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,184,130,139,144,150,149,163,175,176,185,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "GR437", - "Greek CP-437 (ntxgr437.obj compatible)", - HB_UNITB_437, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpis850.c b/harbour/src/codepage/cpis850.c index 53811e1c26..90be3be009 100644 --- a/harbour/src/codepage/cpis850.c +++ b/harbour/src/codepage/cpis850.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID IS850 +#define HB_CP_INFO "Icelandic CP-850 (ntxic850.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,10,6,10,0,6,0,0,0,0,10,0,0,0,0,0,0,6,6,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,10,0,0,0,0,10,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,6,10,10,0,0,6,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,129,144,131,132,133,134,135,136,137,138,139,140,141,142,143,144,146,146,147,153,149,150,151,152,153,154,155,156,157,158,159,181,214,224,233,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,209,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,232,232,233,234,235,237,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,130,145,145,147,148,149,150,151,152,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,160,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,208,210,211,212,213,161,215,216,217,218,219,220,221,222,223,162,225,226,227,228,229,230,231,231,163,234,235,236,236,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,67,68,69,71,73,74,75,76,78,79,80,81,82,83,85,86,87,88,89,90,92,93,94,95,97,101,102,103,104,105,106,107,109,110,111,113,115,116,117,118,120,121,122,123,124,125,127,128,129,130,131,132,134,135,136,137,139,143,144,145,146,147,148,149,114,150,151,152,153,154,155,156,157,158,159,160,161,162,72,141,99,163,142,164,165,166,167,100,168,169,170,171,172,173,108,119,126,133,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,66,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,112,70,217,218,219,220,77,221,222,223,224,225,226,227,228,229,84,230,231,232,233,234,235,140,98,91,236,237,138,96,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "IS850", - "Icelandic CP-850 (ntxic850.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpis861.c b/harbour/src/codepage/cpis861.c index b77f6ba0ee..a1b48ce043 100644 --- a/harbour/src/codepage/cpis861.c +++ b/harbour/src/codepage/cpis861.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID IS861 +#define HB_CP_INFO "Icelandic CP-861 (ntxic861.obj compatible)" +#define HB_CP_UNITB HB_UNITB_861 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,10,6,10,0,0,10,6,10,0,6,6,0,10,6,10,0,0,0,0,0,0,6,6,6,6,10,10,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,129,144,131,132,133,134,135,136,137,138,139,139,141,142,143,144,146,146,147,153,141,150,151,151,153,154,155,156,157,158,159,164,165,166,167,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,140,140,149,142,143,130,145,145,147,148,149,150,152,152,148,154,155,156,157,158,159,160,161,162,163,160,161,162,163,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,67,68,69,71,73,74,75,76,78,79,80,81,82,83,85,86,87,88,89,90,92,93,94,95,97,101,102,103,104,105,106,107,109,110,111,113,115,116,117,118,120,121,122,123,124,125,127,128,129,130,131,132,134,135,136,137,139,143,144,145,146,147,148,149,114,150,151,152,153,154,155,156,157,70,112,98,158,159,72,141,99,160,142,140,161,96,138,100,162,163,164,165,166,167,108,119,126,133,66,77,84,91,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "IS861", - "Icelandic CP-861 (ntxic861.obj compatible)", - HB_UNITB_861, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpit850.c b/harbour/src/codepage/cpit850.c index aa4bc01642..291e20d058 100644 --- a/harbour/src/codepage/cpit850.c +++ b/harbour/src/codepage/cpit850.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID IT850 +#define HB_CP_INFO "Italian CP-850 (ntxita.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,0,6,0,0,6,0,0,0,0,6,0,0,6,0,0,10,0,0,0,0,6,0,6,0,0,0,0,0,0,0,0,6,6,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,129,144,131,132,65,134,135,136,137,69,139,140,73,142,143,144,145,146,147,148,79,150,85,152,153,154,155,156,157,158,159,65,73,79,85,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,130,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,101,102,103,104,107,108,109,110,113,114,115,116,117,118,121,122,123,124,125,126,129,130,131,132,133,134,135,136,137,138,139,140,105,141,142,99,143,144,145,146,106,147,148,111,149,150,70,151,152,153,154,119,155,127,156,157,158,159,160,161,162,163,100,112,120,128,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "IT850", - "Italian CP-850 (ntxita.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpit850m.c b/harbour/src/codepage/cpit850m.c index cbf40a9d97..068da73e5f 100644 --- a/harbour/src/codepage/cpit850m.c +++ b/harbour/src/codepage/cpit850m.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID IT850M +#define HB_CP_INFO "Italian CP-850 (mdxita.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,10,6,6,6,6,6,6,6,6,6,6,6,6,6,10,10,10,6,10,6,6,6,6,6,6,10,10,0,0,0,0,0,6,6,6,6,6,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,154,69,65,142,65,143,128,69,69,69,73,73,73,142,143,144,146,146,79,153,79,85,85,89,153,154,155,156,157,158,159,65,73,79,85,165,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,135,129,130,131,132,133,134,135,136,137,138,139,140,141,132,134,144,145,145,147,148,149,150,151,152,148,129,155,156,157,158,159,160,161,162,163,164,164,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 128,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,129,210,218,216,217,203,215,220,192,193,204,201,206,202,205,211,130,131,132,133,134,135,136,137,138,139,208,207,198,200,199,209,214,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,194,212,195,221,223,219,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,196,213,197,222,255,2,29,13,9,10,8,11,12,15,16,14,20,19,18,0,1,3,37,38,24,25,23,28,27,30,5,6,32,33,34,36,35,7,17,22,26,21,4,40,41,31,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,39,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127 }; -static HB_CODEPAGE s_codePage = -{ - "IT850M", - "Italian CP-850 (mdxita.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpnl850.c b/harbour/src/codepage/cpnl850.c index 000790c894..153b9c3635 100644 --- a/harbour/src/codepage/cpnl850.c +++ b/harbour/src/codepage/cpnl850.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID NL850 +#define HB_CP_INFO "Dutch CP-850 (ntxdut.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,10,6,6,6,6,6,6,6,6,6,6,6,6,6,10,10,10,0,0,6,6,6,6,6,6,10,10,0,0,0,0,0,6,6,6,6,6,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,85,144,65,65,65,65,128,69,69,69,73,73,73,142,143,144,145,146,79,79,79,85,85,89,153,154,155,156,157,158,159,65,73,79,85,165,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,135,129,130,131,132,133,134,135,136,137,138,139,140,141,132,134,130,145,146,147,148,149,150,151,152,148,129,155,156,157,158,159,160,161,162,163,164,164,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,68,69,71,72,74,75,76,77,78,79,80,81,82,84,86,87,88,89,90,91,93,94,95,96,97,98,99,100,101,102,103,104,110,111,113,114,119,120,121,122,128,129,130,131,132,134,139,140,141,142,144,145,150,151,152,153,154,155,156,157,158,159,70,146,115,105,106,107,108,112,116,117,118,123,124,125,66,67,73,160,161,135,136,137,147,148,127,85,92,162,163,164,165,166,109,126,138,149,133,83,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,143,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "NL850", - "Dutch CP-850 (ntxdut.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpnl850m.c b/harbour/src/codepage/cpnl850m.c index 34ba279503..db2585b54c 100644 --- a/harbour/src/codepage/cpnl850m.c +++ b/harbour/src/codepage/cpnl850m.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID NL850M +#define HB_CP_INFO "Dutch CP-850 (mdxdut.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,10,6,6,6,6,6,6,6,6,6,6,6,6,6,10,10,10,6,10,6,6,6,6,6,6,10,10,0,0,0,0,0,6,6,6,6,6,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,154,144,65,142,65,143,128,69,69,69,73,73,73,142,143,144,146,146,79,153,79,85,85,89,153,154,155,156,157,158,159,65,73,79,85,165,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,135,129,130,131,132,133,134,135,136,137,138,139,140,141,132,134,130,145,145,147,148,149,150,151,152,148,129,155,156,157,158,159,160,161,162,163,164,164,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 128,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,129,210,218,216,217,203,215,220,192,193,204,201,206,202,205,211,130,131,132,133,134,135,136,137,138,139,208,207,198,200,199,209,214,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,194,212,195,221,223,219,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,196,213,197,222,255,2,29,13,9,10,8,11,12,15,16,14,20,19,18,0,1,3,37,38,24,25,23,28,27,30,5,6,32,33,34,36,35,7,17,22,26,21,4,40,41,31,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,39,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127 }; -static HB_CODEPAGE s_codePage = -{ - "NL850M", - "Dutch CP-850 (mdxdut.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpno865.c b/harbour/src/codepage/cpno865.c index 01e8e7cb62..6a79427850 100644 --- a/harbour/src/codepage/cpno865.c +++ b/harbour/src/codepage/cpno865.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID NO865 +#define HB_CP_INFO "Norwegian CP-865 (ntxnor.obj compatible)" +#define HB_CP_UNITB HB_UNITB_865 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,6,6,0,0,0,6,0,0,0,6,0,0,0,0,10,10,6,10,0,0,0,0,0,0,0,10,6,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,154,130,131,132,133,143,135,136,137,144,139,140,141,142,143,144,146,146,147,148,149,150,151,152,153,154,157,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,134,138,145,145,147,148,149,150,151,152,153,129,155,156,155,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,92,96,97,98,99,100,101,102,103,104,105,106,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,129,134,135,136,137,138,139,128,131,140,141,142,133,143,144,145,107,146,147,148,149,95,70,130,93,150,151,152,153,154,155,156,91,132,157,94,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "NO865", - "Norwegian CP-865 (ntxnor.obj compatible)", - HB_UNITB_865, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cppt860.c b/harbour/src/codepage/cppt860.c index 15c4ee6b0c..24b3c46839 100644 --- a/harbour/src/codepage/cppt860.c +++ b/harbour/src/codepage/cppt860.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID PT860 +#define HB_CP_INFO "Portuguese CP-860 (ntxpor.obj compatible)" +#define HB_CP_UNITB HB_UNITB_860 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "PT860", - "Portuguese CP-860 (ntxpor.obj compatible)", - HB_UNITB_860, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpsv437c.c b/harbour/src/codepage/cpsv437c.c index 6b9b1a9cd0..93cc0d5214 100644 --- a/harbour/src/codepage/cpsv437c.c +++ b/harbour/src/codepage/cpsv437c.c @@ -92,32 +92,16 @@ #define HB_CP_LOWER "abcdeŠfghijklmnopqrstuvwxyz†„”" */ -#include "hbapicdp.h" +#define HB_CP_ID SV437C +#define HB_CP_INFO "Swedish CP-437 (ntxswe.obj compatible)" +#define HB_CP_UNITB HB_UNITB_437 -#define HB_CP_RAW &s_codePage +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,0,6,0,0,6,0,6,0,0,0,6,0,0,0,10,10,10,0,0,0,6,0,0,0,0,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,154,130,131,142,133,143,135,136,137,144,139,140,141,142,143,144,145,146,147,153,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,132,134,130,145,146,147,148,149,150,151,152,148,129,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,92,96,97,98,99,100,101,102,103,104,105,106,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,129,133,134,135,136,137,138,128,139,140,131,141,130,142,145,146,107,147,148,149,94,93,70,144,143,150,132,151,152,153,154,95,91,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static HB_CODEPAGE s_codePage = -{ - "SVCLIP", - "Swedish CP-437 (ntxswe.obj compatible)", - HB_UNITB_437, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpsv850m.c b/harbour/src/codepage/cpsv850m.c index a3b16e68d1..9fbf9d8630 100644 --- a/harbour/src/codepage/cpsv850m.c +++ b/harbour/src/codepage/cpsv850m.c @@ -11,32 +11,17 @@ * * This file is generated automatically by cpinfo.prg */ -#include "hbapicdp.h" -#define HB_CP_RAW &s_codePage +#define HB_CP_ID SV850M +#define HB_CP_INFO "Swedish CP-850 (mdxswe.obj compatible)" +#define HB_CP_UNITB HB_UNITB_850 + +#define HB_CP_RAW static const unsigned char s_flags[ 256 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,0,0,0,0,0,10,6,6,6,6,6,6,6,6,6,6,6,6,6,10,10,10,6,10,6,6,6,6,6,6,10,10,0,0,0,0,0,6,6,6,6,6,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static const unsigned char s_upper[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,154,144,65,142,65,143,128,69,69,69,73,73,73,142,143,144,146,146,79,153,79,85,85,89,153,154,155,156,157,158,159,65,73,79,85,165,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_lower[ 256 ] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,135,129,130,131,132,133,134,135,136,137,138,139,140,141,132,134,130,145,145,147,148,149,150,151,152,148,129,155,156,157,158,159,160,161,162,163,164,164,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; static const unsigned char s_sort [ 256 ] = { 128,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,129,210,218,216,217,203,215,220,192,193,204,201,206,202,205,211,130,131,132,133,134,135,136,137,138,139,208,207,198,200,199,209,214,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,194,212,195,221,223,219,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,196,213,197,222,255,0,27,11,9,30,8,29,10,13,14,12,18,17,16,5,4,1,31,32,22,33,21,26,25,28,6,3,35,36,37,39,38,7,15,20,24,19,2,40,41,34,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,23,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127 }; -static HB_CODEPAGE s_codePage = -{ - "SV850M", - "Swedish CP-850 (mdxswe.obj compatible)", - HB_UNITB_850, - s_flags, - s_upper, - s_lower, - s_sort, - NULL, - 0, - 0, - 0, - NULL, - NULL, - NULL, -}; - /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/tests/cpinfo.prg b/harbour/tests/cpinfo.prg index 2055e0344c..99a8246a33 100644 --- a/harbour/tests/cpinfo.prg +++ b/harbour/tests/cpinfo.prg @@ -17,7 +17,8 @@ proc main( cdp, info, unicode ) - local cUp, cLo, cOrd, cOrd2, c, i, a, lWarn, lBin, lEqual + local cUp, cLo, cUp2, cLo2, cOrd, cOrd2, c, i, a + local lWarn, lBin, lSort, lEqual set alternate to cpinfo.txt additive set alternate on @@ -48,14 +49,14 @@ proc main( cdp, info, unicode ) ? "Character encoding: " + _natSortVersion() #endif ? repl( "=", 50 ) - lBin := .t. + lSort := .f. for i := 1 to len( a ) - 1 if a[ i ] > a[ i + 1 ] - lBin := .f. + lSort := .t. exit endif next - if lBin + if !lSort ? "simple byte sorting !!!" endif lBin := lWarn := .f. @@ -64,7 +65,7 @@ proc main( cdp, info, unicode ) if i < len(a) .and. a[i] > a[ i + 1 ] .and. !isalpha( chr( a[ i ] ) ) ? "non alpha character " + charval( chr( a[ i ] ) ) + ; " sorted in non ASCII order !!!" - lWarn := .t. + lBin := lWarn := .t. endif c := chr( a[ i ] ) if i < len(a) @@ -146,16 +147,20 @@ proc main( cdp, info, unicode ) c := substr( cUp, i, 1 ) if c + chr( 0 ) > substr( cUp, i + 1, 1 ) + chr( 0 ) ? "letter " + charis( c ) + " is wrongly sorted" - lWarn := .t. + lBin := lWarn := .t. endif next for i := 1 to len( cLo ) - 1 c := substr( cLo, i, 1 ) if c + chr( 0 ) > substr( cLo, i + 1, 1 ) + chr( 0 ) ? "letter " + charis( c ) + " is wrongly sorted" - lWarn := .t. + lBin := lWarn := .t. endif next + if ! len( cUp ) == len( cLo ) + ? "number of upper and lower characters is different" + lWarn := .t. + endif cOrd2 := "" for i := 0 to 255 if i == asc( cUp ) @@ -164,22 +169,72 @@ proc main( cdp, info, unicode ) cOrd2 += cLo endif c := chr( i ) - if ! c $ cUp + cLo + if ! c $ cUp .and. ! c $ cLo cOrd2 += chr( i ) endif next - if ! len( cUp ) == len( cLo ) - ? "number of upper and lower characters is different" - lWarn := .t. - endif if ! cOrd == cOrd2 - ? "letters are not sorted continuously" - lWarn := .t. + if cUp = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" .and. ; + cLo = "abcdefghijklmnopqrstuvwxyz" + cUp2 := substr( cUp, 27 ) + cLo2 := substr( cLo, 27 ) + cOrd2 := "" + for i := 0 to 255 + c := chr( i ) + if c $ cUp2 + if ! c $ cOrd2 + cOrd2 += cUp2 + endif + elseif c $ cLo2 + if ! c $ cOrd2 + cOrd2 += cLo2 + endif + else + cOrd2 += chr( i ) + endif + next + if cOrd == cOrd2 + cUp := cUp2 + cLo := cLo2 + else + cOrd2 := "" + for i := 0 to 255 + if i == asc( cUp2 ) + cOrd2 += cUp2 + elseif i == asc( cLo2 ) + cOrd2 += cLo2 + endif + c := chr( i ) + if ! c $ cUp2 .and. ! c $ cLo2 + cOrd2 += chr( i ) + endif + next + if cOrd == cOrd2 + cUp := cUp2 + cLo := cLo2 + if lSort + ? "letters are not sorted continuously" + ; + " (padded to 1-st non latin character)" + lBin := lWarn := .t. + endif + elseif cUp2 >= chr( 127 ) .and. cLo2 >= chr( 127 ) + cUp := cUp2 + cLo := cLo2 + endif + endif + endif + if ! cOrd == cOrd2 .and. lSort + ? "letters are not sorted continuously" + lBin := lWarn := .t. + endif endif if lWarn - ? "Warning: irregular CP which needs special definition in Harbour" if lBin + ? "Warning: irregular CP which needs special definition in Harbour" ? " using binary tables generated by this program" + else + ? "Warning: irregular CP which needs verification for human" + ? " readable definition in Harbour" endif endif ? ' upper: "' + cUp + '"' @@ -268,7 +323,20 @@ static function genCP( id, info, unicode ) info := _natSortVer() endif if empty( unicode ) +#ifdef __HARBOUR__ + unicode := hb_cdpUniID() + if unicode = "cp" + unicode := substr( unicode, 3 ) + elseif unicode = "iso" .or. unicode = "bg-" + unicode := substr( unicode, 4 ) + endif + unicode := upper( strtran( unicode, "-", "_" ) ) + if unicode = "KAM" .or. unicode = "MAZ" .or. unicode = "MIC" + unicode := left( unicode, 3 ) + endif +#else unicode := "437" +#endif else unicode := upper( unicode ) endif @@ -310,27 +378,16 @@ static function genCPfile( id, info, unicode, flags, upper, lower, sort ) ' * www - http://www.harbour-project.org' + EOL + ; ' *' + EOL + ; ' * This file is generated automatically by cpinfo.prg' + EOL + ; - ' */' + EOL + ; - '#include "hbapicdp.h"' + EOL + EOL + ; - '#define HB_CP_RAW &s_codePage' + EOL + EOL + ; + ' */' + EOL + EOL + ; + '#define HB_CP_ID $1' + EOL + ; + '#define HB_CP_INFO "$2"' + EOL + ; + '#define HB_CP_UNITB HB_UNITB_$3' + EOL + EOL + ; + '#define HB_CP_RAW' + EOL + EOL + ; 'static const unsigned char s_flags[ 256 ] = { $f };' + EOL + ; 'static const unsigned char s_upper[ 256 ] = { $u };' + EOL + ; 'static const unsigned char s_lower[ 256 ] = { $l };' + EOL + ; 'static const unsigned char s_sort [ 256 ] = { $s };' + EOL + ; EOL + ; - 'static HB_CODEPAGE s_codePage =' + EOL + ; - '{' + EOL + ; - ' "$1",' + EOL + ; - ' "$2",' + EOL + ; - ' HB_UNITB_$3,' + EOL + ; - ' s_flags,' + EOL + ; - ' s_upper,' + EOL + ; - ' s_lower,' + EOL + ; - ' s_sort,' + EOL + ; - ' NULL,' + EOL + ; - ' 0,' + EOL + ' 0,' + EOL + ' 0,' + EOL + ; - ' NULL,' + EOL + ' NULL,' + EOL + ' NULL,' + EOL + ; - '};' + EOL + EOL + ; '/* include CP registration code */' + EOL + ; '#include "hbcdpreg.h"' + EOL