From d553425a99d8eb295fd1b5ff8f003e269229e85b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 24 Jul 2007 18:12:13 +0000 Subject: [PATCH] 2007-07-24 20:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * common.mak * source/codepage/Makefile + source/codepage/cpsk852.c + source/codepage/cpskiso.c + source/codepage/cpskwin.c + source/codepage/cpskkam.c + Added Slovak codepages. Pls. test them if you are familiar with the language rules. --- harbour/ChangeLog | 10 +++ harbour/common.mak | 4 ++ harbour/source/codepage/Makefile | 4 ++ harbour/source/codepage/cpsk852.c | 105 ++++++++++++++++++++++++++++++ harbour/source/codepage/cpskiso.c | 105 ++++++++++++++++++++++++++++++ harbour/source/codepage/cpskkam.c | 105 ++++++++++++++++++++++++++++++ harbour/source/codepage/cpskwin.c | 105 ++++++++++++++++++++++++++++++ 7 files changed, 438 insertions(+) create mode 100644 harbour/source/codepage/cpsk852.c create mode 100644 harbour/source/codepage/cpskiso.c create mode 100644 harbour/source/codepage/cpskkam.c create mode 100644 harbour/source/codepage/cpskwin.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2d902351e1..937f80ac93 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-07-24 20:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * common.mak + * source/codepage/Makefile + + source/codepage/cpsk852.c + + source/codepage/cpskiso.c + + source/codepage/cpskwin.c + + source/codepage/cpskkam.c + + Added Slovak codepages. Pls. test them if you are + familiar with the language rules. + 2007-07-24 19:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * common.mak * makefile.vc diff --git a/harbour/common.mak b/harbour/common.mak index c2166ffe40..d2c9769253 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -715,6 +715,10 @@ CODEPAGE_LIB_OBJS = \ $(OBJ_DIR)\cpru866$(HB_OBJ_EXT) \ $(OBJ_DIR)\cprukoi$(HB_OBJ_EXT) \ $(OBJ_DIR)\cpruwin$(HB_OBJ_EXT) \ + $(OBJ_DIR)\cpsk852$(HB_OBJ_EXT) \ + $(OBJ_DIR)\cpskiso$(HB_OBJ_EXT) \ + $(OBJ_DIR)\cpskkam$(HB_OBJ_EXT) \ + $(OBJ_DIR)\cpskwin$(HB_OBJ_EXT) \ $(OBJ_DIR)\cpsl437$(HB_OBJ_EXT) \ $(OBJ_DIR)\cpsl852$(HB_OBJ_EXT) \ $(OBJ_DIR)\cpsliso$(HB_OBJ_EXT) \ diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile index 6feee9fe96..72fc292918 100644 --- a/harbour/source/codepage/Makefile +++ b/harbour/source/codepage/Makefile @@ -44,6 +44,10 @@ C_SOURCES=\ cpru866.c \ cprukoi.c \ cpruwin.c \ + cpsk852.c \ + cpskiso.c \ + cpskkam.c \ + cpskwin.c \ cpsl437.c \ cpsl852.c \ cpsliso.c \ diff --git a/harbour/source/codepage/cpsk852.c b/harbour/source/codepage/cpsk852.c new file mode 100644 index 0000000000..58e3a1ae8b --- /dev/null +++ b/harbour/source/codepage/cpsk852.c @@ -0,0 +1,105 @@ +/* + * $Id: cpcs852.c 7249 2007-04-18 08:45:07Z vszakats $ + */ + +/* + * Harbour Project source code: + * National Collation Support Module ( SK852 ) + * + * Copyright 2007 Viktor Szakats + * 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: Slovak */ +/* ISO language code (2 chars): SK */ +/* Codepage: 852 */ + +#include +#include "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARACTERS 46 /* 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 1 /* 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 = { "SK852", + HB_CPID_852, HB_UNITB_852, NUMBER_OF_CHARACTERS, + "A~~BCD~.DZ..D.E~FGH.CH.I~JKL~~MN~O~~PQR~ST~U~VWXY~Z", + "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z", + IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; + +HB_CODEPAGE_INIT( SK852 ); + +#if defined(HB_PRAGMA_STARTUP) + #pragma startup hb_codepage_Init_SK852 +#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_SK852 = hb_codepage_Init_SK852; + #pragma data_seg() +#endif diff --git a/harbour/source/codepage/cpskiso.c b/harbour/source/codepage/cpskiso.c new file mode 100644 index 0000000000..a8f54df822 --- /dev/null +++ b/harbour/source/codepage/cpskiso.c @@ -0,0 +1,105 @@ +/* + * $Id: cpcsiso.c 7249 2007-04-18 08:45:07Z vszakats $ + */ + +/* + * Harbour Project source code: + * National Collation Support Module ( SKISO ) + * + * Copyright 2007 Viktor Szakats + * 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: Slovak */ +/* ISO language code (2 chars): SK */ +/* Codepage: ISO-8859-2 */ + +#include +#include "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARACTERS 46 /* 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 1 /* 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 = { "SKISO", + HB_CPID_8859_2, HB_UNITB_8859_2, NUMBER_OF_CHARACTERS, + "A~~BCD~.DZ..D.E~FGH.CH.I~JKL~~MN~O~~PQR~ST~U~VWXY~Z", + "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z", + IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; + +HB_CODEPAGE_INIT( SKISO ); + +#if defined(HB_PRAGMA_STARTUP) + #pragma startup hb_codepage_Init_SKISO +#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_SKISO = hb_codepage_Init_SKISO; + #pragma data_seg() +#endif diff --git a/harbour/source/codepage/cpskkam.c b/harbour/source/codepage/cpskkam.c new file mode 100644 index 0000000000..d47cccfb02 --- /dev/null +++ b/harbour/source/codepage/cpskkam.c @@ -0,0 +1,105 @@ +/* + * $Id: cpcs852.c 7249 2007-04-18 08:45:07Z vszakats $ + */ + +/* + * Harbour Project source code: + * National Collation Support Module ( SKKAM ) + * + * Copyright 2007 Viktor Szakats + * 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: Slovak */ +/* ISO language code (2 chars): SK */ +/* Codepage: Kamenicky ("895") */ + +#include +#include "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARACTERS 46 /* 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 1 /* 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 = { "SKKAM", + HB_CPID_KAM, HB_UNITB_KAM, NUMBER_OF_CHARACTERS, + "A~~BCD~.DZ..D.E~FGH.CH.I~JKL~~MN~O~~PQR~ST~U~VWXY~Z", + "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z", + IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; + +HB_CODEPAGE_INIT( SKKAM ); + +#if defined(HB_PRAGMA_STARTUP) + #pragma startup hb_codepage_Init_SKKAM +#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_SKKAM = hb_codepage_Init_SKKAM; + #pragma data_seg() +#endif diff --git a/harbour/source/codepage/cpskwin.c b/harbour/source/codepage/cpskwin.c new file mode 100644 index 0000000000..98e7025051 --- /dev/null +++ b/harbour/source/codepage/cpskwin.c @@ -0,0 +1,105 @@ +/* + * $Id: cpcswin.c 7249 2007-04-18 08:45:07Z vszakats $ + */ + +/* + * Harbour Project source code: + * National Collation Support Module ( SKWIN ) + * + * Copyright 2007 Viktor Szakats + * 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: Slovak */ +/* ISO language code (2 chars): SK */ +/* Codepage: Windows-1520 */ + +#include +#include "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARACTERS 46 /* 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 1 /* 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 = { "SKWIN", + HB_CPID_1250, HB_UNITB_1250, NUMBER_OF_CHARACTERS, + "A~~BCD~.DZ..D.E~FGH.CH.I~JKL~~MN~O~~PQR~ST~U~VWXY~Z", + "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z", + IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; + +HB_CODEPAGE_INIT( SKWIN ); + +#if defined(HB_PRAGMA_STARTUP) + #pragma startup hb_codepage_Init_SKWIN +#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_SKWIN = hb_codepage_Init_SKWIN; + #pragma data_seg() +#endif