From 20b5875721c48c36df7a91c055d95b05b61b9482 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Fri, 27 May 2011 17:04:24 +0000 Subject: [PATCH] 2011-05-27 19:04 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbapicdp.h * harbour/src/codepage/Makefile + harbour/src/codepage/uc858.c + added CP858 - basically it's CP850 but contains EURO SIGN (U+20AC) at position 0xD5 instead of Turkish dotless-i (U+0131) --- harbour/ChangeLog | 7 +++ harbour/include/hbapicdp.h | 3 ++ harbour/src/codepage/Makefile | 1 + harbour/src/codepage/uc858.c | 93 +++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+) create mode 100644 harbour/src/codepage/uc858.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index aacc267747..10f0b3ce8e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2011-05-27 19:04 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbapicdp.h + * harbour/src/codepage/Makefile + + harbour/src/codepage/uc858.c + + added CP858 - basically it's CP850 but contains EURO SIGN (U+20AC) at position 0xD5 + instead of Turkish dotless-i (U+0131) + 2011-05-27 08:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/3rd/sqlite3/sqlite3.c * contrib/3rd/sqlite3/sqlite3.dif diff --git a/harbour/include/hbapicdp.h b/harbour/include/hbapicdp.h index ff11eb54a1..e38e407552 100644 --- a/harbour/include/hbapicdp.h +++ b/harbour/include/hbapicdp.h @@ -144,6 +144,7 @@ typedef struct _HB_CODEPAGE #define HB_CPID_852 "cp852" #define HB_CPID_855 "cp855" #define HB_CPID_857 "cp857" +#define HB_CPID_858 "cp858" #define HB_CPID_860 "cp860" #define HB_CPID_861 "cp861" #define HB_CPID_862 "cp862" @@ -210,6 +211,7 @@ typedef struct _HB_CODEPAGE #define HB_UNITB_852 &hb_uniTbl_852 #define HB_UNITB_855 &hb_uniTbl_855 #define HB_UNITB_857 &hb_uniTbl_857 +#define HB_UNITB_858 &hb_uniTbl_858 #define HB_UNITB_860 &hb_uniTbl_860 #define HB_UNITB_861 &hb_uniTbl_861 #define HB_UNITB_862 &hb_uniTbl_862 @@ -277,6 +279,7 @@ extern HB_UNITABLE hb_uniTbl_850; extern HB_UNITABLE hb_uniTbl_852; extern HB_UNITABLE hb_uniTbl_855; extern HB_UNITABLE hb_uniTbl_857; +extern HB_UNITABLE hb_uniTbl_858; extern HB_UNITABLE hb_uniTbl_860; extern HB_UNITABLE hb_uniTbl_861; extern HB_UNITABLE hb_uniTbl_862; diff --git a/harbour/src/codepage/Makefile b/harbour/src/codepage/Makefile index ff14a57574..2f5d45fb20 100644 --- a/harbour/src/codepage/Makefile +++ b/harbour/src/codepage/Makefile @@ -115,6 +115,7 @@ C_SOURCES := \ uc852.c \ uc855.c \ uc857.c \ + uc858.c \ uc860.c \ uc861.c \ uc862.c \ diff --git a/harbour/src/codepage/uc858.c b/harbour/src/codepage/uc858.c new file mode 100644 index 0000000000..71ab51a8fb --- /dev/null +++ b/harbour/src/codepage/uc858.c @@ -0,0 +1,93 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * IBM858 <-> Unicode conversion table + * + * Copyright 2011 Przemyslaw Czerpak + * www - http://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. + * + */ + +#include "hbapicdp.h" + +#define NUMBER_OF_CHARS 256 + +static const HB_WCHAR s_uniCodes[ NUMBER_OF_CHARS ] = +{ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, + 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5, + 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, + 0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, + 0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0, + 0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4, + 0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x20AC, 0x00CD, 0x00CE, + 0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580, + 0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE, + 0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4, + 0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, + 0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0 +}; + +HB_UNITABLE hb_uniTbl_858 = { HB_CPID_858, s_uniCodes, NULL, 0 };