2003-06-18 02:05 UTC+0200 Przemyslaw Czerpak <druzus@polbox.com>
* harbour/source/codepage/Makefile
* harbour/source/codepage/cdpesdos.c
* harbour/source/codepage/cdpeswin.c
* harbour/source/codepage/cdpgedos.c
* harbour/source/codepage/cdppliso.c
* harbour/source/codepage/cdpplmaz.c
* harbour/source/codepage/cdpplwin.c
* harbour/source/codepage/cdpslwin.c
- harbour/source/codepage/cdpla850.c
+ harbour/source/codepage/cdppt850.c
+ harbour/source/codepage/cdpptiso.c
* xharbour/makefile.bc
* xharbour/makefile.nt
* xharbour/makefile.vc
* corrections in code page description.
- removed cdpla850.c ("PT" codepage)
+ PT850 and PTISO codepages added.
* makefiles updated - Sorry, I cannot test all of them.
This commit is contained in:
@@ -432,7 +432,8 @@ CODEPAGE_LIB_OBJS = \
|
||||
$(OBJ_DIR)\cdpeswin.obj \
|
||||
$(OBJ_DIR)\cdpgedos.obj \
|
||||
$(OBJ_DIR)\cdpgewin.obj \
|
||||
$(OBJ_DIR)\cdpla850.obj \
|
||||
$(OBJ_DIR)\cdppt850.obj \
|
||||
$(OBJ_DIR)\cdpptiso.obj \
|
||||
$(OBJ_DIR)\cdppl852.obj \
|
||||
$(OBJ_DIR)\cdppliso.obj \
|
||||
$(OBJ_DIR)\cdpplmaz.obj \
|
||||
@@ -2219,7 +2220,11 @@ $(OBJ_DIR)\cdpgewin.obj : $(CODEPAGE_DIR)\cdpgewin.c
|
||||
$(CC) $(CLIBFLAGS) -o$@ $**
|
||||
tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,,
|
||||
|
||||
$(OBJ_DIR)\cdpla850.obj : $(CODEPAGE_DIR)\cdpla850.c
|
||||
$(OBJ_DIR)\cdppt850.obj : $(CODEPAGE_DIR)\cdppt850.c
|
||||
$(CC) $(CLIBFLAGS) -o$@ $**
|
||||
tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,,
|
||||
|
||||
$(OBJ_DIR)\cdpptiso.obj : $(CODEPAGE_DIR)\cdpptiso.c
|
||||
$(CC) $(CLIBFLAGS) -o$@ $**
|
||||
tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,,
|
||||
|
||||
|
||||
@@ -492,7 +492,8 @@ CODEPAGE_LIB_OBJS = \
|
||||
$(OBJ_DIR)\cdpeswin.obj \
|
||||
$(OBJ_DIR)\cdpgedos.obj \
|
||||
$(OBJ_DIR)\cdpgewin.obj \
|
||||
$(OBJ_DIR)\cdpla850.obj \
|
||||
$(OBJ_DIR)\cdppt850.obj \
|
||||
$(OBJ_DIR)\cdpptiso.obj \
|
||||
$(OBJ_DIR)\cdppl852.obj \
|
||||
$(OBJ_DIR)\cdppliso.obj \
|
||||
$(OBJ_DIR)\cdpplmaz.obj \
|
||||
|
||||
@@ -457,7 +457,8 @@ CODEPAGE_LIB_OBJS = \
|
||||
$(OBJ_DIR)\cdpeswin.obj \
|
||||
$(OBJ_DIR)\cdpgedos.obj \
|
||||
$(OBJ_DIR)\cdpgewin.obj \
|
||||
$(OBJ_DIR)\cdpla850.obj \
|
||||
$(OBJ_DIR)\cdppt850.obj \
|
||||
$(OBJ_DIR)\cdpptiso.obj \
|
||||
$(OBJ_DIR)\cdppl852.obj \
|
||||
$(OBJ_DIR)\cdppliso.obj \
|
||||
$(OBJ_DIR)\cdpplmaz.obj \
|
||||
|
||||
@@ -9,11 +9,12 @@ C_SOURCES=\
|
||||
cdpeswin.c \
|
||||
cdpgedos.c \
|
||||
cdpgewin.c \
|
||||
cdpla850.c \
|
||||
cdppl852.c \
|
||||
cdppliso.c \
|
||||
cdpplmaz.c \
|
||||
cdpplwin.c \
|
||||
cdppt850.c \
|
||||
cdpptiso.c \
|
||||
cdpru866.c \
|
||||
cdprukoi.c \
|
||||
cdpruwin.c \
|
||||
|
||||
@@ -51,9 +51,9 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/* Language name: Spanish MS-DOS */
|
||||
/* ISO language code (2 chars): ES (please look it up in /doc/lang_id.txt) */
|
||||
/* Codepage: ES */
|
||||
/* Language name: Spanish */
|
||||
/* ISO language code (2 chars): ES */
|
||||
/* Codepage: 850 */
|
||||
|
||||
#include <ctype.h>
|
||||
#include "hbapi.h"
|
||||
@@ -95,4 +95,4 @@ HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_ES )
|
||||
HB_CALL_ON_STARTUP_END( hb_codepage_Init_ES )
|
||||
#if ! defined(__GNUC__) && ! defined(_MSC_VER)
|
||||
#pragma startup hb_codepage_Init_ES
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -95,4 +95,4 @@ HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_ESWIN )
|
||||
HB_CALL_ON_STARTUP_END( hb_codepage_Init_ESWIN )
|
||||
#if ! defined(__GNUC__) && ! defined(_MSC_VER)
|
||||
#pragma startup hb_codepage_Init_ESWIN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -51,9 +51,9 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/* Language name: German MS-DOS*/
|
||||
/* ISO language code (2 chars): DE (please look it up in /doc/lang_id.txt) */
|
||||
/* Codepage: DE */
|
||||
/* Language name: German */
|
||||
/* ISO language code (2 chars): DE */
|
||||
/* Codepage: 850 */
|
||||
|
||||
#include <ctype.h>
|
||||
#include "hbapi.h"
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
/* Language name: Polish */
|
||||
/* ISO language code (2 chars): PL */
|
||||
/* Codepage: ISO */
|
||||
/* Codepage: ISO-8859-2 */
|
||||
|
||||
#include <ctype.h>
|
||||
#include "hbapi.h"
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
/* Language name: Polish */
|
||||
/* ISO language code (2 chars): PL */
|
||||
/* Codepage: MAZ */
|
||||
/* Codepage: Mazovia */
|
||||
|
||||
#include <ctype.h>
|
||||
#include "hbapi.h"
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
/* Language name: Polish */
|
||||
/* ISO language code (2 chars): PL */
|
||||
/* Codepage: WIN */
|
||||
/* Codepage: Windows-1250 */
|
||||
|
||||
#include <ctype.h>
|
||||
#include "hbapi.h"
|
||||
|
||||
@@ -6,8 +6,10 @@
|
||||
* Harbour Project source code:
|
||||
* National Collation Support Module ( Latin 850 )
|
||||
*
|
||||
* Copyright 2002 Luiz Rafael Culik Guimaraes <culikr@uol.com.br>
|
||||
* Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
|
||||
* www - http://www.harbour-project.org
|
||||
* Portuguese collating sequence (PT850) done
|
||||
* by Luiz Rafael Culik Guimaraes <culikr@uol.com.br>
|
||||
*
|
||||
* 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
|
||||
@@ -50,9 +52,9 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/* Language name: <Your language> */
|
||||
/* ISO language code (2 chars): (please look it up in /doc/lang_id.txt) */
|
||||
/* Codepage: <Your codepage> */
|
||||
/* Language name: Portuguese
|
||||
/* ISO language code (2 chars): PT
|
||||
/* Codepage: 850 */
|
||||
|
||||
#include <ctype.h>
|
||||
#include "hbapi.h"
|
||||
@@ -83,16 +85,15 @@
|
||||
same excepting the characters case, of course.
|
||||
*/
|
||||
|
||||
static HB_CODEPAGE s_codepage = { "PT",NUMBER_OF_CHARACTERS,
|
||||
static HB_CODEPAGE s_codepage = { "PT850",NUMBER_OF_CHARACTERS,
|
||||
"Aオキカヌ撮CDE赤メFGHIヨ゙ラリJKLMN・O璢粢儕QRSTU鴉齲VWXYZ","a<EFBFBD><EFBFBD>ニ<EFBFBD>c㌧ej<EFBFBD>ghi。轟桔klmn、o「蕪苳pqrstu」蘭」wxyz",
|
||||
IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL };
|
||||
|
||||
HB_CODEPAGE_ANNOUNCE( PT );
|
||||
HB_CODEPAGE_ANNOUNCE( PT850 );
|
||||
|
||||
HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_PT )
|
||||
HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_PT850 )
|
||||
hb_cdpRegister( &s_codepage );
|
||||
HB_CALL_ON_STARTUP_END( hb_codepage_Init_PT )
|
||||
HB_CALL_ON_STARTUP_END( hb_codepage_Init_PT850 )
|
||||
#if ! defined(__GNUC__) && ! defined(_MSC_VER)
|
||||
#pragma startup hb_codepage_Init_PT
|
||||
#pragma startup hb_codepage_Init_PT850
|
||||
#endif
|
||||
|
||||
99
harbour/source/codepage/cdpptiso.c
Normal file
99
harbour/source/codepage/cdpptiso.c
Normal file
@@ -0,0 +1,99 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* National Collation Support Module ( PTISO )
|
||||
*
|
||||
* Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
|
||||
* www - http://www.harbour-project.org
|
||||
* Portuguese collating sequence (PTISO) done
|
||||
* by Przemyslaw Czerpak <druzus@polbox.com>
|
||||
*
|
||||
* 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: Portuguese
|
||||
/* ISO language code (2 chars): PT
|
||||
/* Codepage: iso-8859-1 */
|
||||
|
||||
#include <ctype.h>
|
||||
#include "hbapi.h"
|
||||
#include "hbapicdp.h"
|
||||
|
||||
#define NUMBER_OF_CHARACTERS 49 /* 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 = { "PTISO",NUMBER_OF_CHARACTERS,
|
||||
"AÁÀÂÃÄBCÇDEÉÈÊFGHIÍÌÎÏJKLMNÑOÓÒÔÕÖPQRSTUÚÙÛÜVWXYZ","aáàâãäbcçdeéèêfghiíìîïjklmnñoóòôõöpqrstuúùûüvwxyz",
|
||||
IS_LATIN,ACCENTED_EQUAL,ACCENTED_INTERLEAVED,0,NULL,NULL,NULL,NULL,0,NULL };
|
||||
|
||||
HB_CODEPAGE_ANNOUNCE( PTISO );
|
||||
|
||||
HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_PTISO )
|
||||
hb_cdpRegister( &s_codepage );
|
||||
HB_CALL_ON_STARTUP_END( hb_codepage_Init_PTISO )
|
||||
#if ! defined(__GNUC__) && ! defined(_MSC_VER)
|
||||
#pragma startup hb_codepage_Init_PTISO
|
||||
#endif
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
/* Language name: Slovenian */
|
||||
/* ISO language code (2 chars): SL */
|
||||
/* Codepage: 1250 */
|
||||
/* Codepage: Windows-1250 */
|
||||
|
||||
#include <ctype.h>
|
||||
#include "hbapi.h"
|
||||
|
||||
Reference in New Issue
Block a user