fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-11-03 08:57 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* common.mak
  * source/codepage/Makefile
  + source/codepage/cproiso.c
  + source/codepage/cpfriso.c
  + source/codepage/cpfrwin.c
    + Added new CPs.

  - source/codepage/cphr1250.c
  + source/codepage/cphrwin.c
    * Renamed to follow the rest of the CPs.
      INCOMPATIBLE.

  * source/codepage/cpfr850.c
    ! Fixed uppercase chars.
      [TOMERGE 1.0]
This commit is contained in:
Viktor Szakats
2008-11-03 07:58:22 +00:00
parent b89516b58d
commit f3e34b59f1
8 changed files with 346 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
harbour/ChangeLog
View File

@@ -8,6 +8,23 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-11-03 08:57 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* common.mak
* source/codepage/Makefile
+ source/codepage/cproiso.c
+ source/codepage/cpfriso.c
+ source/codepage/cpfrwin.c
+ Added new CPs.
- source/codepage/cphr1250.c
+ source/codepage/cphrwin.c
* Renamed to follow the rest of the CPs.
INCOMPATIBLE.
* source/codepage/cpfr850.c
! Fixed uppercase chars.
[TOMERGE 1.0]
2008-11-03 00:56 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/vm/thread.c
+ added temporary workaround for non GCC OS2 ST builds
@@ -243,7 +260,7 @@
* source/vm/itemapi.c
! snprintf() -> hb_snprintf()
This got incidentally reverted in previous commit by mistake.
This got reverted in previous commit by mistake.
2008-11-02 07:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* include/hbstdgen.ch
@@ -266,7 +283,7 @@
- __PLATFORM__* (not for all possible situations)
; TOFIX: Cleanup REVISION/SVN term usage in source.
; TOFIX: Remove HB_VER_* predefined macro usage on .prg level.
; TODO: Removed some deprecated by hb_version() functions/macros.
; TODO: Remove some deprecated by hb_version() functions/macros.
* include/hbapi.h
* source/vm/itemapi.c

5
harbour/common.mak
View File

@@ -842,9 +842,11 @@ CODEPAGE_LIB_OBJS = \
$(OBJ_DIR)\cpesmwin$(OBJEXT) \
$(OBJ_DIR)\cpeswin$(OBJEXT) \
$(OBJ_DIR)\cpfr850$(OBJEXT) \
$(OBJ_DIR)\cphr1250$(OBJEXT) \
$(OBJ_DIR)\cpfriso$(OBJEXT) \
$(OBJ_DIR)\cpfrwin$(OBJEXT) \
$(OBJ_DIR)\cphr437$(OBJEXT) \
$(OBJ_DIR)\cphr852$(OBJEXT) \
$(OBJ_DIR)\cphrwin$(OBJEXT) \
$(OBJ_DIR)\cphu852$(OBJEXT) \
$(OBJ_DIR)\cphu852s$(OBJEXT) \
$(OBJ_DIR)\cphuiso$(OBJEXT) \
@@ -863,6 +865,7 @@ CODEPAGE_LIB_OBJS = \
$(OBJ_DIR)\cppt850$(OBJEXT) \
$(OBJ_DIR)\cpptiso$(OBJEXT) \
$(OBJ_DIR)\cpro852$(OBJEXT) \
$(OBJ_DIR)\cproiso$(OBJEXT) \
$(OBJ_DIR)\cprowin$(OBJEXT) \
$(OBJ_DIR)\cpru866$(OBJEXT) \
$(OBJ_DIR)\cpruiso$(OBJEXT) \

5
harbour/source/codepage/Makefile
View File

@@ -22,9 +22,11 @@ C_SOURCES=\
cpeswin.c \
cpesmwin.c \
cpfr850.c \
cphr1250.c \
cpfriso.c \
cpfrwin.c \
cphr437.c \
cphr852.c \
cphrwin.c \
cphu852.c \
cphu852s.c \
cphuiso.c \
@@ -43,6 +45,7 @@ C_SOURCES=\
cppt850.c \
cpptiso.c \
cpro852.c \
cproiso.c \
cprowin.c \
cpru866.c \
cpruiso.c \

8
harbour/source/codepage/cpfr850.c
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* National Collation Support Module ( French MS-DOS 850 )
* National Collation Support Module (French MS-DOS 850)
*
* Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
* www - http://www.harbour-project.org
@@ -65,7 +65,7 @@
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
#define ACCENTED_EQUAL 1 /* Should be 1, if accented character
has the same weight as appropriate
unaccented. */
#define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters
@@ -87,8 +87,8 @@
static HB_CODEPAGE s_codepage = { "FR850",
HB_CPID_850, HB_UNITB_850, NUMBER_OF_CHARACTERS,
"AAAAABCDEEEEEFGHIIIIIJKLMNOOOOOPQRSTUUUUUVWXYZ",
"a …ƒ„bcde‚Šˆ‰fghi¡<EFBFBD>Œ‹jklmno¢•“”pqrstu£—–<EFBFBD>vwxyz",
"A~µ~·~¶~ŽBCDE~<7E>~Ô~Ò~ÓFGHI~Ö~Þ~×~ØJKLMNO~à~ã~â~™PQRSTU~é~ë~ê~šVWXYZ",
"a~ ~…~ƒ~„bcde~‚~Š~ˆ~‰fghi~¡~<7E>~Œ~‹jklmno~¢~•~“~”pqrstu~£~—~–~<EFBFBD>vwxyz",
IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };
HB_CODEPAGE_INIT( FR850 )

103
harbour/source/codepage/cpfriso.c Normal file
View File

@@ -0,0 +1,103 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* National Collation Support Module (French ISO-8859-1)
*
* Copyright 2008 Viktor Szakats <viktor.szakats@syenar.hu>
* 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: French */
/* ISO language code (2 chars): FR */
/* Codepage: ISO-8859-1 */
#include <ctype.h>
#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 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 = { "FRISO",
HB_CPID_8859_1, HB_UNITB_8859_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( FRISO )
#if defined( HB_PRAGMA_STARTUP )
#pragma startup hb_codepage_Init_FRISO
#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_FRISO = hb_codepage_Init_FRISO;
#pragma data_seg()
#endif

103
harbour/source/codepage/cpfrwin.c Normal file
View File

@@ -0,0 +1,103 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* National Collation Support Module (French Windows-1252)
*
* Copyright 2008 Viktor Szakats <viktor.szakats@syenar.hu>
* 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: French */
/* ISO language code (2 chars): FR */
/* Codepage: Windows-1252 */
#include <ctype.h>
#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 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 = { "FRWIN",
HB_CPID_1252, HB_UNITB_1252, 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( FRWIN )
#if defined( HB_PRAGMA_STARTUP )
#pragma startup hb_codepage_Init_FRWIN
#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_FRWIN = hb_codepage_Init_FRWIN;
#pragma data_seg()
#endif

13
harbour/source/codepage/cphr1250.c → harbour/source/codepage/cphrwin.c
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* National Collation Support Module ( HR1250 )
* National Collation Support Module (HRWIN)
*
* Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
* www - http://www.harbour-project.org
@@ -54,7 +54,7 @@
/* Language name: Croatien */
/* ISO language code (2 chars): HR */
/* Codepage: 1250 */
/* Codepage: Windows-1250 */
#include <ctype.h>
#include "hbapi.h"
@@ -85,22 +85,21 @@
same excepting the characters case, of course.
*/
static HB_CODEPAGE s_codepage = { "HR1250",
static HB_CODEPAGE s_codepage = { "HRWIN",
HB_CPID_1250,HB_UNITB_1250,NUMBER_OF_CHARACTERS,
"ABCCCDÐEFGHIJKLMNOPQRSŠTUVWZŽXY",
"abcccddefghijklmnopqrsštuvwzžxy",
IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };
HB_CODEPAGE_INIT( HR1250 )
HB_CODEPAGE_INIT( HRWIN )
#if defined( HB_PRAGMA_STARTUP )
#pragma startup hb_codepage_Init_HR1250
#pragma startup hb_codepage_Init_HRWIN
#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_HR1250 = hb_codepage_Init_HR1250;
static HB_$INITSYM hb_vm_auto_hb_codepage_Init_HRWIN = hb_codepage_Init_HRWIN;
#pragma data_seg()
#endif

103
harbour/source/codepage/cproiso.c Normal file
View File

@@ -0,0 +1,103 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* National Collation Support Module (ROISO)
*
* Copyright 2008 Viktor Szakats <viktor.szakats@syenar.hu>
* 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: Romanian */
/* ISO language code (2 chars): RO */
/* Codepage: ISO-8859-2 */
#include <ctype.h>
#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.
*/
static HB_CODEPAGE s_codepage = { "ROISO",
HB_CPID_8859_2, HB_UNITB_8859_2, NUMBER_OF_CHARACTERS,
"AÃÂBCDEFGHIÎJKLMNOPQRSªTÞUVWXYZ",
"aãâbcdefghiîjklmnopqrsºtþuvwxyz",
IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };
HB_CODEPAGE_INIT( ROISO )
#if defined( HB_PRAGMA_STARTUP )
#pragma startup hb_codepage_Init_ROISO
#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_ROISO = hb_codepage_Init_ROISO;
#pragma data_seg()
#endif