From 8075ce48bfa112cd549b7fd4c02bb8950e6b13ff Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 31 Dec 2009 02:18:15 +0000 Subject: [PATCH] 2009-12-31 03:17 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbapicdp.h * harbour/src/codepage/Makefile - harbour/src/codepage/ucyuscii.c + harbour/src/codepage/uc646_yu.c * harbour/src/codepage/cphr437.c * harbour/src/codepage/cpsl437.c * renamed internal unicode table name YUSCII->ISO-646-YU --- harbour/ChangeLog | 9 +++++++++ harbour/include/hbapicdp.h | 6 +++--- harbour/src/codepage/Makefile | 2 +- harbour/src/codepage/cphr437.c | 4 ++-- harbour/src/codepage/cpsl437.c | 4 ++-- harbour/src/codepage/{ucyuscii.c => uc646_yu.c} | 4 ++-- 6 files changed, 19 insertions(+), 10 deletions(-) rename harbour/src/codepage/{ucyuscii.c => uc646_yu.c} (96%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 41e3cf0e99..2e05d722b2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,15 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-31 03:17 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbapicdp.h + * harbour/src/codepage/Makefile + - harbour/src/codepage/ucyuscii.c + + harbour/src/codepage/uc646_yu.c + * harbour/src/codepage/cphr437.c + * harbour/src/codepage/cpsl437.c + * renamed internal unicode table name YUSCII->ISO-646-YU + 2009-12-30 21:22 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/nortl/nortl.c ! added hb_xtraced() diff --git a/harbour/include/hbapicdp.h b/harbour/include/hbapicdp.h index 7893603490..cd33b815d8 100644 --- a/harbour/include/hbapicdp.h +++ b/harbour/include/hbapicdp.h @@ -179,7 +179,7 @@ typedef struct _HB_CODEPAGE #define HB_CPID_ATARIST "atarist" #define HB_CPID_NEXTSTEP "nextstep" #define HB_CPID_USASCII "us-ascii" -#define HB_CPID_YUSCII "yuscii" +#define HB_CPID_646YU "iso646-yu" #define HB_UNITB_437 &hb_uniTbl_437 #define HB_UNITB_737 &hb_uniTbl_737 @@ -244,7 +244,7 @@ typedef struct _HB_CODEPAGE #define HB_UNITB_ATARIST &hb_uniTbl_ATARIST #define HB_UNITB_NEXTSTEP &hb_uniTbl_NEXTSTEP #define HB_UNITB_USASCII &hb_uniTbl_USASCII -#define HB_UNITB_YUSCII &hb_uniTbl_YUSCII +#define HB_UNITB_646YU &hb_uniTbl_646YU #define HB_UNITB_UNDEF NULL /* ((PHB_UNITABLE) (-1)) */ extern HB_UNITABLE hb_uniTbl_437; @@ -310,7 +310,7 @@ extern HB_UNITABLE hb_uniTbl_10081; extern HB_UNITABLE hb_uniTbl_ATARIST; extern HB_UNITABLE hb_uniTbl_NEXTSTEP; extern HB_UNITABLE hb_uniTbl_USASCII; -extern HB_UNITABLE hb_uniTbl_YUSCII; +extern HB_UNITABLE hb_uniTbl_646YU; extern HB_EXPORT PHB_CODEPAGE hb_vmCDP( void ); extern HB_EXPORT void hb_vmSetCDP( PHB_CODEPAGE pCDP ); diff --git a/harbour/src/codepage/Makefile b/harbour/src/codepage/Makefile index 63b8ae0d47..ea04b60763 100644 --- a/harbour/src/codepage/Makefile +++ b/harbour/src/codepage/Makefile @@ -98,6 +98,7 @@ C_SOURCES := \ uc1256.c \ uc1257.c \ uc1258.c \ + uc646_yu.c \ uc737.c \ uc775.c \ uc850.c \ @@ -150,7 +151,6 @@ C_SOURCES := \ ucmacrom.c \ ucmactrk.c \ ucnext.c \ - ucyuscii.c \ LIBNAME := hbcpage diff --git a/harbour/src/codepage/cphr437.c b/harbour/src/codepage/cphr437.c index 2f8f42c7c8..fd671efecb 100644 --- a/harbour/src/codepage/cphr437.c +++ b/harbour/src/codepage/cphr437.c @@ -51,8 +51,8 @@ */ #define HB_CP_ID HR437 -#define HB_CP_INFO "Croatian YUSCII" -#define HB_CP_UNITB HB_UNITB_YUSCII +#define HB_CP_INFO "Croatian ISO-646 (CROSCII)" +#define HB_CP_UNITB HB_UNITB_646YU #define HB_CP_ACSORT HB_CDP_ACSORT_NONE #define HB_CP_UPPER "ABC^]D\\EFGHIJKLMNOPQRS[TUVWZ@XY" #define HB_CP_LOWER "abc~}d|efghijklmnopqrs{tuvwz`xy" diff --git a/harbour/src/codepage/cpsl437.c b/harbour/src/codepage/cpsl437.c index 1696f8385f..13943882a9 100644 --- a/harbour/src/codepage/cpsl437.c +++ b/harbour/src/codepage/cpsl437.c @@ -52,8 +52,8 @@ */ #define HB_CP_ID SL437 -#define HB_CP_INFO "Slovenian YUSCII" -#define HB_CP_UNITB HB_UNITB_YUSCII +#define HB_CP_INFO "Slovenian ISO-646 (SLOSCII)" +#define HB_CP_UNITB HB_UNITB_646YU #define HB_CP_ACSORT HB_CDP_ACSORT_NONE #define HB_CP_UPPER "ABC^]D\\EFGHIJKLMNOPQRS[TUVWZ@XY" #define HB_CP_LOWER "abc~}d|efghijklmnopqrs{tuvwz`xy" diff --git a/harbour/src/codepage/ucyuscii.c b/harbour/src/codepage/uc646_yu.c similarity index 96% rename from harbour/src/codepage/ucyuscii.c rename to harbour/src/codepage/uc646_yu.c index a9a1798ff0..870aa133fa 100644 --- a/harbour/src/codepage/ucyuscii.c +++ b/harbour/src/codepage/uc646_yu.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * YUSCII <-> Unicode conversion table + * ISO-646-YU / YUSCII / CROSCII / SLOSCII <-> Unicode conversion table * * Copyright 2009 Przemyslaw Czerpak * www - http://www.harbour-project.org @@ -90,4 +90,4 @@ static const HB_WCHAR s_uniCodes[ NUMBER_OF_CHARS ] = 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; -HB_UNITABLE hb_uniTbl_YUSCII = { HB_CPID_YUSCII, s_uniCodes, NULL, 0 }; +HB_UNITABLE hb_uniTbl_646YU = { HB_CPID_646YU, s_uniCodes, NULL, 0 };