From fd9c6b84c35cfcb7f49fb4be1bf9df23ea47f2bd Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 6 Feb 2009 19:03:27 +0000 Subject: [PATCH] 2009-02-06 20:02 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/codepage/cptr857.c * source/codepage/cphu852s.c * source/codepage/cphuwins.c * source/codepage/cphuisos.c * source/codepage/cpes850c.c ! Fixed accents Far Manager (one of its new plugins probably) messed up. --- harbour/ChangeLog | 9 +++++++++ harbour/source/codepage/cpes850c.c | 4 ++-- harbour/source/codepage/cphu852s.c | 12 ++++++------ harbour/source/codepage/cphuisos.c | 12 ++++++------ harbour/source/codepage/cphuwins.c | 12 ++++++------ harbour/source/codepage/cptr857.c | 12 ++++++------ 6 files changed, 35 insertions(+), 26 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5801ee087f..7713fac372 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-06 20:02 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * source/codepage/cptr857.c + * source/codepage/cphu852s.c + * source/codepage/cphuwins.c + * source/codepage/cphuisos.c + * source/codepage/cpes850c.c + ! Fixed accents Far Manager (one of its new plugins probably) + messed up. + 2009-02-06 19:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * include/hbdefs.h + Added HB_ISALNUM() macro. diff --git a/harbour/source/codepage/cpes850c.c b/harbour/source/codepage/cpes850c.c index 3279391068..12e8c3ac91 100644 --- a/harbour/source/codepage/cpes850c.c +++ b/harbour/source/codepage/cpes850c.c @@ -83,9 +83,9 @@ same excepting the characters case, of course. */ -static HB_CODEPAGE s_codepage = { "ES850C", +static HB_CODEPAGE s_codepage = { "ES850C", HB_CPID_850, HB_UNITB_850, NUMBER_OF_CHARACTERS, - "AuBCDE_FGHIÖJKLMN¥OàPQRSTUéšVWXYZ", + "AµBCDEFGHIÖJKLMN¥OàPQRSTUéšVWXYZ", "a bcde‚fghi¡jklmn¤o¢pqrstu£vwxyz", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; diff --git a/harbour/source/codepage/cphu852s.c b/harbour/source/codepage/cphu852s.c index 8df23c7046..23c4b96fbd 100644 --- a/harbour/source/codepage/cphu852s.c +++ b/harbour/source/codepage/cphu852s.c @@ -62,13 +62,13 @@ here, accented - are considered. */ #define IS_LATIN 1 /* Should be 1, if the national alphabet is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character +#define ACCENTED_EQUAL 0 /* Should be 1, if accented character has the same weight as appropriate unaccented. */ #define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same + only if the unaccented versions of all + characters being compared are the same ( interleaving ) */ /* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the @@ -82,10 +82,10 @@ same excepting the characters case, of course. */ -/* NOTE: Ž/" has been added to make it fully compatible with sixhu852.obj for +/* NOTE: Ž/„ has been added to make it fully compatible with sixhu852.obj for S*ccessWare SIx Driver. - Moreover the extra chars had to be replicated in the alternative - codepages (WIN, ISO) too, to keep the Harbour codepage translation + Moreover the extra chars had to be replicated in the alternative + codepages (WIN, ISO) too, to keep the Harbour codepage translation work. [vszakats] */ static HB_CODEPAGE s_codepage = { "HU852S", diff --git a/harbour/source/codepage/cphuisos.c b/harbour/source/codepage/cphuisos.c index 7b84d55f74..bb48952588 100644 --- a/harbour/source/codepage/cphuisos.c +++ b/harbour/source/codepage/cphuisos.c @@ -62,13 +62,13 @@ here, accented - are considered. */ #define IS_LATIN 1 /* Should be 1, if the national alphabet is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character +#define ACCENTED_EQUAL 0 /* Should be 1, if accented character has the same weight as appropriate unaccented. */ #define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same + only if the unaccented versions of all + characters being compared are the same ( interleaving ) */ /* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the @@ -82,10 +82,10 @@ same excepting the characters case, of course. */ -/* NOTE: Ž/" has been added to make it fully compatible with sixhu852.obj for +/* NOTE: Ž/„ has been added to make it fully compatible with sixhu852.obj for S*ccessWare SIx Driver. - Moreover the extra chars had to be replicated in the alternative - codepages (WIN, ISO) too, to keep the Harbour codepage translation + Moreover the extra chars had to be replicated in the alternative + codepages (WIN, ISO) too, to keep the Harbour codepage translation work. [vszakats] */ static HB_CODEPAGE s_codepage = { "HUISOS", diff --git a/harbour/source/codepage/cphuwins.c b/harbour/source/codepage/cphuwins.c index 5712694c78..70858517bf 100644 --- a/harbour/source/codepage/cphuwins.c +++ b/harbour/source/codepage/cphuwins.c @@ -62,13 +62,13 @@ here, accented - are considered. */ #define IS_LATIN 1 /* Should be 1, if the national alphabet is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character +#define ACCENTED_EQUAL 0 /* Should be 1, if accented character has the same weight as appropriate unaccented. */ #define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same + only if the unaccented versions of all + characters being compared are the same ( interleaving ) */ /* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the @@ -82,10 +82,10 @@ same excepting the characters case, of course. */ -/* NOTE: Ž/" has been added to make it fully compatible with sixhu852.obj for +/* NOTE: Ž/„ has been added to make it fully compatible with sixhu852.obj for S*ccessWare SIx Driver. - Moreover the extra chars had to be replicated in the alternative - codepages (WIN, ISO) too, to keep the Harbour codepage translation + Moreover the extra chars had to be replicated in the alternative + codepages (WIN, ISO) too, to keep the Harbour codepage translation work. [vszakats] */ static HB_CODEPAGE s_codepage = { "HUWINS", diff --git a/harbour/source/codepage/cptr857.c b/harbour/source/codepage/cptr857.c index 33aa4070c1..4985868761 100644 --- a/harbour/source/codepage/cptr857.c +++ b/harbour/source/codepage/cptr857.c @@ -6,7 +6,7 @@ * Harbour Project source code: * National Collation Support Module ( Turkish -- DOS ) * - * Copyright 2006 Bicahi Esgici + * Copyright 2006 Bicahi Esgici * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -62,13 +62,13 @@ here, accented - are considered. */ #define IS_LATIN 1 /* Should be 1, if the national alphabet is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character +#define ACCENTED_EQUAL 0 /* Should be 1, if accented character has the same weight as appropriate unaccented. */ #define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same + only if the unaccented versions of all + characters being compared are the same ( interleaving ) */ /* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the @@ -84,8 +84,8 @@ static HB_CODEPAGE s_codepage = { "TR857", HB_CPID_857,HB_UNITB_857,NUMBER_OF_CHARACTERS, - "A¶BC_DEÒFG|HI_×JKLMNOâtPRSžTUêšVYZ", - "a_bc+de_fg§hiŒjklmno""prsŸtu-_vyz", + "A¶BC€DEÒFG¦HI˜×JKLMNOâ™PRSžTUêšVYZ", + "aƒbc‡deˆfg§hiŒjklmno“”prsŸtu–vyz", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; HB_CODEPAGE_INIT( TR857 )