From 4adf066d99bb7147cb8b9e848580a3a01eac43ee Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 3 Nov 2008 23:15:41 +0000 Subject: [PATCH] 2008-11-04 00:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * common.mak * source/codepage/Makefile + source/codepage/cpitwin.c + Added ITWIN. Same as ITISO, with a different attached CP and name. --- harbour/ChangeLog | 7 ++ harbour/common.mak | 1 + harbour/source/codepage/Makefile | 1 + harbour/source/codepage/cpitwin.c | 103 ++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+) create mode 100644 harbour/source/codepage/cpitwin.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6ae37f004c..7c7d2f4d4d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-04 00:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * common.mak + * source/codepage/Makefile + + source/codepage/cpitwin.c + + Added ITWIN. Same as ITISO, with a different attached CP + and name. + 2008-11-03 17:49 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbthread.h * include in OpenWatcom OS2 builds diff --git a/harbour/common.mak b/harbour/common.mak index b75013cd91..7289100fee 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -859,6 +859,7 @@ CODEPAGE_LIB_OBJS = \ $(OBJ_DIR)\cpit850$(OBJEXT) \ $(OBJ_DIR)\cpitisb$(OBJEXT) \ $(OBJ_DIR)\cpitiso$(OBJEXT) \ + $(OBJ_DIR)\cpitwin$(OBJEXT) \ $(OBJ_DIR)\cpltwin$(OBJEXT) \ $(OBJ_DIR)\cppl852$(OBJEXT) \ $(OBJ_DIR)\cppliso$(OBJEXT) \ diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile index 3227f6021b..c9df38c417 100644 --- a/harbour/source/codepage/Makefile +++ b/harbour/source/codepage/Makefile @@ -39,6 +39,7 @@ C_SOURCES=\ cpit850.c \ cpitisb.c \ cpitiso.c \ + cpitwin.c \ cpltwin.c \ cppl852.c \ cppliso.c \ diff --git a/harbour/source/codepage/cpitwin.c b/harbour/source/codepage/cpitwin.c new file mode 100644 index 0000000000..b82a13877e --- /dev/null +++ b/harbour/source/codepage/cpitwin.c @@ -0,0 +1,103 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * National Collation Support Module (Italian Windows-1252) + * + * Copyright 2002 Alexander S.Kresin + * 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: Italian */ +/* ISO language code (2 chars): IT */ +/* Codepage: Windows-1252 */ + +#include +#include "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARACTERS 40 /* 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. + */ + +static HB_CODEPAGE s_codepage = { "ITWIN", + HB_CPID_1252, HB_UNITB_1252_1, NUMBER_OF_CHARACTERS, + "AÀÁÂÃÄÅBCDEÈÉFGHIÌÍJKLMNOÒÓPQRSTUÙÚVWXYZ", + "aàáâãäåbcdeèéfghiìíjklmnoòópqrstuùúvwxyz", + IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; + +HB_CODEPAGE_INIT( ITWIN ) + +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_codepage_Init_ITWIN +#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_ITWIN = hb_codepage_Init_ITWIN; + #pragma data_seg() +#endif