From 916688f3d9916b60f2f383890684fde6b8738030 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 3 Nov 2008 13:32:08 +0000 Subject: [PATCH] 2008-11-03 14:31 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * common.mak * source/codepage/Makefile + source/codepage/cpsviso.c + Added SVISO, which is the same as SVWIN, except it's internally using ISO-8859-1 CP in sync with its name. * source/codepage/cpsvwin.c ! Changed internal CP to Windows-1252 from ISO-8859-1, so that it's in sync with its name. --- harbour/ChangeLog | 11 ++++ harbour/common.mak | 1 + harbour/source/codepage/Makefile | 1 + harbour/source/codepage/cpsviso.c | 103 ++++++++++++++++++++++++++++++ harbour/source/codepage/cpsvwin.c | 4 +- 5 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 harbour/source/codepage/cpsviso.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 12ecaee490..d8ff265fec 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-03 14:31 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * common.mak + * source/codepage/Makefile + + source/codepage/cpsviso.c + + Added SVISO, which is the same as SVWIN, except it's + internally using ISO-8859-1 CP in sync with its name. + + * source/codepage/cpsvwin.c + ! Changed internal CP to Windows-1252 from ISO-8859-1, + so that it's in sync with its name. + 2008-11-03 14:08 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbthread.h * harbour/source/vm/thread.c diff --git a/harbour/common.mak b/harbour/common.mak index dfe98a58d4..b75013cd91 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -884,6 +884,7 @@ CODEPAGE_LIB_OBJS = \ $(OBJ_DIR)\cpsrwin$(OBJEXT) \ $(OBJ_DIR)\cpsv850$(OBJEXT) \ $(OBJ_DIR)\cpsvclip$(OBJEXT) \ + $(OBJ_DIR)\cpsviso$(OBJEXT) \ $(OBJ_DIR)\cpsvwin$(OBJEXT) \ $(OBJ_DIR)\cptr857$(OBJEXT) \ $(OBJ_DIR)\cptrwin$(OBJEXT) \ diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile index 0381915f3a..3227f6021b 100644 --- a/harbour/source/codepage/Makefile +++ b/harbour/source/codepage/Makefile @@ -64,6 +64,7 @@ C_SOURCES=\ cpsrwin.c \ cpsv850.c \ cpsvclip.c \ + cpsviso.c \ cpsvwin.c \ cptr857.c \ cptrwin.c \ diff --git a/harbour/source/codepage/cpsviso.c b/harbour/source/codepage/cpsviso.c new file mode 100644 index 0000000000..59f66e90fb --- /dev/null +++ b/harbour/source/codepage/cpsviso.c @@ -0,0 +1,103 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * National Collation Support Module (SVISO) + * + * Copyright 2006 Klas Engwall + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +/* Language name: Swedish */ +/* ISO language code (2 chars): SV */ +/* Codepage: ISO-8859-1 */ + +#include +#include "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARACTERS 57 /* The number of single characters in the + alphabet, two-as-one aren't considered + 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 + has the same weight as appropriate + unaccented. */ +#define ACCENTED_INTERLEAVED 1 /* Should be 1, if accented characters + sort after their unaccented counterparts + 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 + accented characters with the symbol '~' before each of them, for example: + a~€ + If there is two-character sequence, which is considered as one, it should + be marked with '.' before and after it, for example: + ... h.ch.i ... + + The Upper case string and the Lower case string should be absolutely the + same excepting the characters case, of course. + */ + +static HB_CODEPAGE s_codepage = { "SVISO", + HB_CPID_8859_1,HB_UNITB_8859_1,NUMBER_OF_CHARACTERS, + "A~Á~À~Â~ÃBC~ÇD~ÐE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMN~ÑO~Ó~Ò~Ô~ÕPQRSTU~Ú~Ù~ÛV~WXY~Ý~Ÿ~ÜZÅÄ~ÆÖ~Ø~Œ", + "a~á~à~â~ãbc~çd~ðe~é~è~ê~ëfghi~í~ì~î~ïjklmn~ño~ó~ò~ô~õpqrstu~ú~ù~ûv~wxy~ý~ÿ~üzåä~æö~ø~œ", + IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; + +HB_CODEPAGE_INIT( SVISO ) + +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_codepage_Init_SVISO +#elif defined( HB_MSC_STARTUP ) + #if defined( HB_OS_WIN_64 ) + #pragma section( HB_MSC_START_SEGMENT, long, read ) + #endif + #pragma data_seg( HB_MSC_START_SEGMENT ) + static HB_$INITSYM hb_vm_auto_hb_codepage_Init_SVISO = hb_codepage_Init_SVISO; + #pragma data_seg() +#endif diff --git a/harbour/source/codepage/cpsvwin.c b/harbour/source/codepage/cpsvwin.c index d777134257..97a839cf32 100644 --- a/harbour/source/codepage/cpsvwin.c +++ b/harbour/source/codepage/cpsvwin.c @@ -52,7 +52,7 @@ /* Language name: Swedish */ /* ISO language code (2 chars): SV */ -/* Codepage: ISO-8859-1 */ +/* Codepage: Windows-1252 */ #include #include "hbapi.h" @@ -84,7 +84,7 @@ */ static HB_CODEPAGE s_codepage = { "SVWIN", - HB_CPID_8859_1,HB_UNITB_8859_1,NUMBER_OF_CHARACTERS, + HB_CPID_1252,HB_UNITB_1252,NUMBER_OF_CHARACTERS, "A~Á~À~Â~ÃBC~ÇD~ÐE~É~È~Ê~ËFGHI~Í~Ì~Î~ÏJKLMN~ÑO~Ó~Ò~Ô~ÕPQRSTU~Ú~Ù~ÛV~WXY~Ý~Ÿ~ÜZÅÄ~ÆÖ~Ø~Œ", "a~á~à~â~ãbc~çd~ðe~é~è~ê~ëfghi~í~ì~î~ïjklmn~ño~ó~ò~ô~õpqrstu~ú~ù~ûv~wxy~ý~ÿ~üzåä~æö~ø~œ", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };