From a6544861435e8c3f65fb15754dabe987d666cc7d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 24 Jul 2007 18:34:13 +0000 Subject: [PATCH] 2007-07-24 20:30 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * common.mak * include/hbapicdp.h * source/codepage/Makefile + source/codepage/ucmik.c + source/codepage/cpbgmik.c + Added BGMIK codepage and Bulgarian MIK unicode conversion table from xHarbour. ! Changed internal ID "MIK" to "bg-mik". * include/hbapicdp.h * source/codepage/uckam.c ! Changed internal ID "CSKAM" to "Kamenicky". --- harbour/ChangeLog | 14 ++++ harbour/common.mak | 2 + harbour/include/hbapicdp.h | 9 ++- harbour/source/codepage/Makefile | 2 + harbour/source/codepage/cpbgmik.c | 105 ++++++++++++++++++++++++++++++ harbour/source/codepage/uckam.c | 2 +- harbour/source/codepage/ucmik.c | 93 ++++++++++++++++++++++++++ 7 files changed, 223 insertions(+), 4 deletions(-) create mode 100644 harbour/source/codepage/cpbgmik.c create mode 100644 harbour/source/codepage/ucmik.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 937f80ac93..0b534cc25b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,20 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-07-24 20:30 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * common.mak + * include/hbapicdp.h + * source/codepage/Makefile + + source/codepage/ucmik.c + + source/codepage/cpbgmik.c + + Added BGMIK codepage and Bulgarian MIK unicode conversion + table from xHarbour. + ! Changed internal ID "MIK" to "bg-mik". + + * include/hbapicdp.h + * source/codepage/uckam.c + ! Changed internal ID "CSKAM" to "Kamenicky". + 2007-07-24 20:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * common.mak * source/codepage/Makefile diff --git a/harbour/common.mak b/harbour/common.mak index d2c9769253..fadda47a63 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -679,6 +679,7 @@ PCRE_LIB_OBJS = \ CODEPAGE_LIB_OBJS = \ $(OBJ_DIR)\cpbg866$(HB_OBJ_EXT) \ $(OBJ_DIR)\cpbgiso$(HB_OBJ_EXT) \ + $(OBJ_DIR)\cpbgmik$(HB_OBJ_EXT) \ $(OBJ_DIR)\cpbgwin$(HB_OBJ_EXT) \ $(OBJ_DIR)\cpcs852$(HB_OBJ_EXT) \ $(OBJ_DIR)\cpcsiso$(HB_OBJ_EXT) \ @@ -747,6 +748,7 @@ CODEPAGE_LIB_OBJS = \ $(OBJ_DIR)\uckoi8u$(HB_OBJ_EXT) \ $(OBJ_DIR)\ucmaz$(HB_OBJ_EXT) \ $(OBJ_DIR)\uckam$(HB_OBJ_EXT) \ + $(OBJ_DIR)\ucmik$(HB_OBJ_EXT) \ #********************************************************** diff --git a/harbour/include/hbapicdp.h b/harbour/include/hbapicdp.h index 9ad1760120..14e5d9a43c 100644 --- a/harbour/include/hbapicdp.h +++ b/harbour/include/hbapicdp.h @@ -130,8 +130,9 @@ typedef struct _HB_CODEPAGE #define HB_CPID_8859_5 "iso8859-5" #define HB_CPID_KOI_8 "koi-8" #define HB_CPID_KOI_8U "koi-8u" +#define HB_CPID_KAM "kamenicky" #define HB_CPID_MAZ "plmaz" -#define HB_CPID_KAM "cskam" +#define HB_CPID_MIK "bg-mik" #define HB_UNITB_437 &hb_uniTbl_437 #define HB_UNITB_737 &hb_uniTbl_737 #define HB_UNITB_850 &hb_uniTbl_850 @@ -149,8 +150,9 @@ typedef struct _HB_CODEPAGE #define HB_UNITB_8859_5 &hb_uniTbl_8859_5 #define HB_UNITB_KOI_8 &hb_uniTbl_KOI_8 #define HB_UNITB_KOI_8U &hb_uniTbl_KOI_8U -#define HB_UNITB_KAM &hb_uniTbl_kam +#define HB_UNITB_KAM &hb_uniTbl_kamenicky #define HB_UNITB_MAZ &hb_uniTbl_mazovia +#define HB_UNITB_MIK &hb_uniTbl_MIK #define HB_UNITB_UNDEF NULL /* ((PHB_UNITABLE) (-1)) */ extern HB_UNITABLE hb_uniTbl_437; @@ -170,8 +172,9 @@ extern HB_UNITABLE hb_uniTbl_8859_2; extern HB_UNITABLE hb_uniTbl_8859_5; extern HB_UNITABLE hb_uniTbl_KOI_8; extern HB_UNITABLE hb_uniTbl_KOI_8U; +extern HB_UNITABLE hb_uniTbl_kamenicky; extern HB_UNITABLE hb_uniTbl_mazovia; -extern HB_UNITABLE hb_uniTbl_kam; +extern HB_UNITABLE hb_uniTbl_MIK; extern HB_EXPORT BOOL hb_cdpRegister( PHB_CODEPAGE ); extern HB_EXPORT char * hb_cdpSelectID( const char * ); diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile index 72fc292918..2da6401ef4 100644 --- a/harbour/source/codepage/Makefile +++ b/harbour/source/codepage/Makefile @@ -8,6 +8,7 @@ ROOT = ../../ C_SOURCES=\ cpbg866.c \ cpbgiso.c \ + cpbgmik.c \ cpbgwin.c \ cpcs852.c \ cpcsiso.c \ @@ -76,6 +77,7 @@ C_SOURCES=\ uckoi8.c \ uckoi8u.c \ ucmaz.c \ + ucmik.c \ LIBNAME=codepage diff --git a/harbour/source/codepage/cpbgmik.c b/harbour/source/codepage/cpbgmik.c new file mode 100644 index 0000000000..a84f9b438b --- /dev/null +++ b/harbour/source/codepage/cpbgmik.c @@ -0,0 +1,105 @@ +/* + * $Id: cpbgmik.c,v 1.1 2005/11/19 15:52:04 likewolf Exp $ + */ + +/* + * xHarbour Project source code: + * National Collation Support Module (BGMIK) + * + * Copyright 2005 Rosen Vladimirov + * www - http://www.xharbour.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: Bulgarian */ +/* ISO language code (2 chars): BG */ +/* Codepage: MIK */ + +#include +#include "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARACTERS 32 /* The number of single characters in the + alphabet, two-as-one aren't considered + here, accented - are considered. */ +#define IS_LATIN 0 /* 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 = { "BGMIK", + HB_CPID_MIK, HB_UNITB_MIK, NUMBER_OF_CHARACTERS, + "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ", + " กขฃคฅฆงจฉชซฌญฎฏเแโใไๅๆ็่้๊๋์ํ๎๏", + IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; + +HB_CODEPAGE_INIT( BGMIK ) + +#if defined(HB_PRAGMA_STARTUP) + #pragma startup hb_codepage_Init_BGMIK +#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_BGMIK = hb_codepage_Init_BGMIK; + #pragma data_seg() +#endif diff --git a/harbour/source/codepage/uckam.c b/harbour/source/codepage/uckam.c index bca6cc0035..923a29ca59 100644 --- a/harbour/source/codepage/uckam.c +++ b/harbour/source/codepage/uckam.c @@ -90,4 +90,4 @@ static USHORT uniCodes[NUMBER_OF_CHARS] = { 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0, }; -HB_UNITABLE hb_uniTbl_kam = { HB_CPID_KAM, NUMBER_OF_CHARS, FALSE, uniCodes }; +HB_UNITABLE hb_uniTbl_kamenicky = { HB_CPID_KAM, NUMBER_OF_CHARS, FALSE, uniCodes }; diff --git a/harbour/source/codepage/ucmik.c b/harbour/source/codepage/ucmik.c new file mode 100644 index 0000000000..45ce9b087a --- /dev/null +++ b/harbour/source/codepage/ucmik.c @@ -0,0 +1,93 @@ +/* + * $Id: ucmik.c,v 1.2 2005/12/11 12:36:58 druzus Exp $ + */ + +/* + * xHarbour Project source code: + * Bulgarian MIK <--> Unicode conversion table + * + * Copyright 2005 Phil Krylov + * www - http://www.xharbour.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 "hbapi.h" +#include "hbapicdp.h" + +#define NUMBER_OF_CHARS 256 + +static USHORT uniCodes[NUMBER_OF_CHARS] = { + 0x0020, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022, + 0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C, + 0x25BA, 0x25C4, 0x2195, 0x203C, 0x00B6, 0x00A7, 0x25AC, 0x21A8, + 0x2191, 0x2193, 0x2192, 0x2190, 0x2319, 0x2194, 0x25B2, 0x25BC, + 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, 0x2302, + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, + 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, + 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, + 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, + 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, + 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, + 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x2563, 0x2551, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2510, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2116, 0x00A7, 0x2557, + 0x255D, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, + 0x03B1, 0x03B2, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x03BC, 0x03C4, + 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x2205, 0x2208, 0x2229, + 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, + 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0, +}; + +HB_UNITABLE hb_uniTbl_MIK = { HB_CPID_MIK, NUMBER_OF_CHARS, FALSE, uniCodes };