From 9d1f7a33d96943e2564033deab612c87cd0ad973 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 25 Jul 2007 07:44:34 +0000 Subject: [PATCH] 2007-07-25 09:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * common.mak * source/codepage/Makefile + source/codepage/cpsv850.c + source/codepage/cpsvclip.c + source/codepage/cpsvwin.c + Added Swedish codapages from xHarbour. ; The codepages are now synced. --- harbour/ChangeLog | 9 ++ harbour/common.mak | 3 + harbour/source/codepage/Makefile | 3 + harbour/source/codepage/cpsv850.c | 112 +++++++++++++++++++++++++ harbour/source/codepage/cpsvclip.c | 127 +++++++++++++++++++++++++++++ harbour/source/codepage/cpsvwin.c | 105 ++++++++++++++++++++++++ 6 files changed, 359 insertions(+) create mode 100644 harbour/source/codepage/cpsv850.c create mode 100644 harbour/source/codepage/cpsvclip.c create mode 100644 harbour/source/codepage/cpsvwin.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0b534cc25b..a20451aa3f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-07-25 09:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * common.mak + * source/codepage/Makefile + + source/codepage/cpsv850.c + + source/codepage/cpsvclip.c + + source/codepage/cpsvwin.c + + Added Swedish codapages from xHarbour. + ; The codepages are now synced. + 2007-07-24 20:30 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * common.mak * include/hbapicdp.h diff --git a/harbour/common.mak b/harbour/common.mak index fadda47a63..db21ef858a 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -725,6 +725,9 @@ CODEPAGE_LIB_OBJS = \ $(OBJ_DIR)\cpsliso$(HB_OBJ_EXT) \ $(OBJ_DIR)\cpslwin$(HB_OBJ_EXT) \ $(OBJ_DIR)\cpsrwin$(HB_OBJ_EXT) \ + $(OBJ_DIR)\cpsv850$(HB_OBJ_EXT) \ + $(OBJ_DIR)\cpsvclip$(HB_OBJ_EXT) \ + $(OBJ_DIR)\cpsvwin$(HB_OBJ_EXT) \ $(OBJ_DIR)\cptrdos$(HB_OBJ_EXT) \ $(OBJ_DIR)\cptrwin$(HB_OBJ_EXT) \ $(OBJ_DIR)\cpua866$(HB_OBJ_EXT) \ diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile index 2da6401ef4..7c9be1025d 100644 --- a/harbour/source/codepage/Makefile +++ b/harbour/source/codepage/Makefile @@ -54,6 +54,9 @@ C_SOURCES=\ cpsliso.c \ cpslwin.c \ cpsrwin.c \ + cpsv850.c \ + cpsvclip.c \ + cpsvwin.c \ cptrdos.c \ cptrwin.c \ cpua866.c \ diff --git a/harbour/source/codepage/cpsv850.c b/harbour/source/codepage/cpsv850.c new file mode 100644 index 0000000000..28a3c6441f --- /dev/null +++ b/harbour/source/codepage/cpsv850.c @@ -0,0 +1,112 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * National Collation Support Module (SV850 - correct Swedish but not Clipper compatible) + * + * 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: 850 */ + +#include +#include "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARACTERS 54 /* 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. + */ + +/* NOTE: The collation sequence below is compatible with the collation rules + described in the book "Svenska skrivregler" (Swedish Writing Rules) by + Svenska Spr†knamnden (the Swedish Language Council). It is NOT Clipper + compatible. If you need to share data between Harbour and Clipper, use + the SVCLIP version instead. + */ + +static HB_CODEPAGE s_codepage = { "SV850", + HB_CPID_850,HB_UNITB_850,NUMBER_OF_CHARACTERS, + "A~µ~·~¶~ÇBC~€DE~~Ô~Ò~ÓFGHI~Ö~Þ~×~ØJKLMN~¥O~à~ã~â~åPQRSTU~é~ë~êV~WXY~í~šZŽ~’™~", + "a~ ~…~ƒ~Æbc~‡de~‚~Š~ˆ~‰fghi~¡~~Œ~‹jklmn~¤o~¢~•~“~äpqrstu~£~—~–v~wxy~ì~z†„~‘”~›", + IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; + +HB_CODEPAGE_INIT( SV850 ) + +#if defined(HB_PRAGMA_STARTUP) + #pragma startup hb_codepage_Init_SV850 +#elif defined(HB_MSC_STARTUP) + #if _MSC_VER >= 1010 + #pragma data_seg( ".CRT$XIY" ) + #pragma comment( linker, "/Merge:.CRT=.data" ) + #else + #pragma data_seg( "XIY" ) + #endif + static HB_$INITSYM hb_vm_auto_hb_codepage_Init_SV850 = hb_codepage_Init_SV850; + #pragma data_seg() +#endif diff --git a/harbour/source/codepage/cpsvclip.c b/harbour/source/codepage/cpsvclip.c new file mode 100644 index 0000000000..3475c98cf8 --- /dev/null +++ b/harbour/source/codepage/cpsvclip.c @@ -0,0 +1,127 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * National Collation Support Module (SVCLIP - Clipper compatible) + * + * 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: 437 */ + +#include +#include "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARACTERS 31 /* 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 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 + ( 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. + */ + +/* NOTE: The collation sequence below is almost compatible with Clipper's + NTXSWE.OBJ which does NOT provide a correct Swedish collation. The most + notable error in NTXSWE.OBJ is the uppercase E with an acute accent + versus the lowercase e with a grave accent. All other accented characters + are ignored and show up according to their ASCII values. Another oddity + in NTXSWE.OBJ is that the Danish "AE" and "ae" compound characters + (ASCII values 146 and 145 respectively) turn up between ASCII 135 and + 136, a rather pointless relocation IMHO. I found no way to replicate + that behaviour in the character strings below, so if you allow chr(146) + and chr(145) to be saved in indexed fields there WILL be index corruption + if data is shared between Clipper and Harbour. Upper()/Lower() converson + of those characters as well as all accented characters must be done + programatically just like in Clipper. + + For sharing data with Clipper, assuming that the chr(146) and chr(145) + problem is properly taken care of in your code, this codepage version + must be used. For correct collation according to the book "Svenska + skrivregler" (Swedish Writing Rules) by Svenska Spr†kn„mnden (the Swedish + Language Council), use the SV850 version instead. That will of course + not be Clipper compatible. + */ + +static HB_CODEPAGE s_codepage = { "SVCLIP", + HB_CPID_437,HB_UNITB_437,NUMBER_OF_CHARACTERS, + "ABCDEFGHIJKLMNOPQRSTUVWXYšZŽ™", + "abcdeŠfghijklmnopqrstuvwxyz†„”", + IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; + +HB_CODEPAGE_INIT( SVCLIP ) + +#if defined(HB_PRAGMA_STARTUP) + #pragma startup hb_codepage_Init_SVCLIP +#elif defined(HB_MSC_STARTUP) + #if _MSC_VER >= 1010 + #pragma data_seg( ".CRT$XIY" ) + #pragma comment( linker, "/Merge:.CRT=.data" ) + #else + #pragma data_seg( "XIY" ) + #endif + static HB_$INITSYM hb_vm_auto_hb_codepage_Init_SVCLIP = hb_codepage_Init_SVCLIP; + #pragma data_seg() +#endif diff --git a/harbour/source/codepage/cpsvwin.c b/harbour/source/codepage/cpsvwin.c new file mode 100644 index 0000000000..9bf0c83556 --- /dev/null +++ b/harbour/source/codepage/cpsvwin.c @@ -0,0 +1,105 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * National Collation Support Module (SVWIN) + * + * 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 = { "SVWIN", + 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( SVWIN ) + +#if defined(HB_PRAGMA_STARTUP) + #pragma startup hb_codepage_Init_SVWIN +#elif defined(HB_MSC_STARTUP) + #if _MSC_VER >= 1010 + #pragma data_seg( ".CRT$XIY" ) + #pragma comment( linker, "/Merge:.CRT=.data" ) + #else + #pragma data_seg( "XIY" ) + #endif + static HB_$INITSYM hb_vm_auto_hb_codepage_Init_SVWIN = hb_codepage_Init_SVWIN; + #pragma data_seg() +#endif