diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 14464a224a..82296acd90 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2012-07-23 13:28 UTC+0200 Viktor Szakats (harbour syenar.net) + - src/lang/msgzhb5.c + * include/hblang.hbx + * src/lang/Makefile + * src/rtl/langcomp.prg + % deleted ZHB5 language module, which is now converted + dynamically from UTF8 version + 2012-07-23 13:14 UTC+0200 Viktor Szakats (harbour syenar.net) - src/lang/msgbe866.c - src/lang/msgbewin.c @@ -110,16 +118,16 @@ * src/lang/msgelutf.c * minor formatting -2012-07-23 11:35 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-23 11:35 UTC+0200 Viktor Szakats (harbour syenar.net) * include/hblang.hbx + added new UTF language modules ! synced UEKOI8 and RUKOI8 with lang module changes -2012-07-23 02:07 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-23 02:07 UTC+0200 Viktor Szakats (harbour syenar.net) * src/lang/msgbgutf.c ! fix to prev -2012-07-23 02:00 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-23 02:00 UTC+0200 Viktor Szakats (harbour syenar.net) + src/lang/msgbeutf.c + src/lang/msgbgutf.c + src/lang/msgcautf.c @@ -155,32 +163,32 @@ ; these will allow to drop all the 8-bit specific flavors putting an end to the CP mess. -2012-07-23 01:51 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-23 01:51 UTC+0200 Viktor Szakats (harbour syenar.net) * src/lang/msgrukoi.c * src/lang/msguakoi.c ! fixed wrong module IDs. RUKOI8 -> RUKOI, UAKOI8 -> UAKOI -2012-07-23 01:50 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-23 01:50 UTC+0200 Viktor Szakats (harbour syenar.net) * src/lang/msgrukoi.c * src/lang/msguakoi.c ! some more -2012-07-23 01:42 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-23 01:42 UTC+0200 Viktor Szakats (harbour syenar.net) * src/lang/msgzhb5.c * src/lang/msgzhgb.c ! more minor header fixes -2012-07-23 01:29 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-23 01:29 UTC+0200 Viktor Szakats (harbour syenar.net) * src/lang/msgeswin.c ! wrong RFC ID -2012-07-23 01:26 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-23 01:26 UTC+0200 Viktor Szakats (harbour syenar.net) * src/lang/msgelwin.c * src/lang/msgeswin.c * src/lang/msgltwin.c ! more minor header cleanups -2012-07-23 00:43 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-23 00:43 UTC+0200 Viktor Szakats (harbour syenar.net) * src/lang/msg_tpl.c * src/lang/msgbe866.c * src/lang/msgbewin.c @@ -234,7 +242,7 @@ * src/lang/msguawin.c ! cleanups (to headers and metainfo) -2012-07-22 23:52 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-22 23:52 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbct/tests/ctwtest.prg * contrib/hbcups/tests/test.prg * contrib/hbfbird/tests/stress.prg @@ -267,12 +275,12 @@ * CLEAR SCREEN -> CLS * other minor cleanups -2012-07-22 21:46 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-22 21:46 UTC+0200 Viktor Szakats (harbour syenar.net) * extras/hbapollo/sxapi.h ! deleted some more duplicated definitions from 3rd party header * header guard renamed -2012-07-22 21:15 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-22 21:15 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbnf/doc/en/clrsel.txt * contrib/hbnf/doc/en/kspeed.txt * contrib/hbnf/doc/en/mouse1.txt @@ -296,18 +304,18 @@ * contrib/hbnf/tbwhile.prg ! further removing high 8-bit chars -2012-07-22 20:08 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-22 20:08 UTC+0200 Viktor Szakats (harbour syenar.net) * include/hbapigt.h * tests/db_brows.prg ! fixes to prev -2012-07-22 19:45 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-22 19:45 UTC+0200 Viktor Szakats (harbour syenar.net) * extras/hbapollo/hbapollo.hbp + utilize original COFF implibs provided by the vendor (it makes link-time warnings disappear, when using mingw and enables implib generation for all compilers) -2012-07-22 19:31 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-22 19:31 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbgt/doc/en/hbgt.txt * doc/en/gtslang.txt * extras/gfspell/spell.prg @@ -330,7 +338,7 @@ editor and use only UTF-8 chars when typing non-ASCII (7-bit) characters. -2012-07-22 18:46 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-22 18:46 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbct/ctnet.c * contrib/hbhpdf/annot.c * contrib/hbhpdf/core.c @@ -348,7 +356,7 @@ * extras/hbxlsxml/xlsxml.prg ! fixed to use CHR() for high 8-bit chars. Patch from Andi, thanks! -2012-07-22 16:09 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-22 16:09 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbtip/tests/dnldftp.prg * contrib/hbtip/tests/upld_ftp.prg ! translated output to English. At the same time removed @@ -384,7 +392,7 @@ * contrib/hbhpdf/core.c * formatting -2012-07-22 15:55 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-22 15:55 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbide/idestylesheets.prg * contrib/hbide/idetags.prg ! fixed wrong usage of hb_B*() raw string functions @@ -412,13 +420,13 @@ + extras/hbapollo/LICENCE + added license -2012-07-21 19:09 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-21 19:09 UTC+0200 Viktor Szakats (harbour syenar.net) + extras - examples * doc/dirstruc.txt * renamed 'examples' to what it is more: 'extras' -2012-07-21 18:31 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-21 18:31 UTC+0200 Viktor Szakats (harbour syenar.net) + tests/stripeol.hb + added script to strip spaces at EOL @@ -654,14 +662,14 @@ * formatting, fixed indentation, cleanups, deleting system specific information, optimizing out platform dependent code, using hb_ntos() -2012-07-21 14:17 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-21 14:17 UTC+0200 Viktor Szakats (harbour syenar.net) * examples/hbxlsxml/tests/example.prg * examples/hbxlsxml/tests/example2.prg * examples/hbxlsxml/tests/example3.prg * examples/hbxlsxml/xlsxml_s.prg ! deleted spaces at EOL -2012-07-21 14:05 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-21 14:05 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/gtwvg/tests/demowvg.prg * contrib/gtwvg/tests/demowvg1.prg * contrib/hbct/tests/datetime.prg @@ -674,7 +682,7 @@ * tests/usrrdd/exarr.prg * use SET DATE ANSI -2012-07-21 13:55 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-21 13:55 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbide/idemain.prg * contrib/hbmysql/tests/test.prg * contrib/hbmysql/utils/dbf2mysq.prg @@ -736,7 +744,7 @@ is opened only then take it from editing instance otherwise from disk. I suspect yesterday night I was too tired. -2012-07-20 21:30 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-20 21:30 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/gtwvg/tests/demowvg.prg * contrib/gtwvg/tests/wvgwvtclasses.prg * contrib/hbct/doc/en/dattime3.txt @@ -810,7 +818,7 @@ ! avoid setting SET DATE to arbirary formats * some formatting -2012-07-20 21:01 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-20 21:01 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbct/tests/charhist.prg * contrib/hbct/tests/csetarge.prg * contrib/hbgd/tests/gdtestcl.prg @@ -1063,7 +1071,7 @@ ! fixed warning on __max()/__min() macros by replacing them with Harbour macros -2012-07-19 20:49 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-07-19 20:49 UTC+0200 Viktor Szakats (harbour syenar.net) * examples/hbapollo/dbedit.prg ! fix (to a source redone for Harbour) @@ -3555,7 +3563,7 @@ * contrib/hbqt/qtcore/qth/filelist.hbm * removed generated harbour HBQSlots class -2012-06-14 15:20 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-06-14 15:20 UTC+0200 Viktor Szakats (harbour syenar.net) * package/winuni/mpkg_win_uni.bat * package/winuni/mpkg_win_uni.nsi + add all contrib .dlls for x86 and x64 windows builds @@ -3939,7 +3947,7 @@ * contrib/hbqt/qtcore/hbqt_misc.prg * reverted last commit -2012-06-13 12:34 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-06-13 12:34 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbqt/qtcore/hbqt_bind.cpp ! using core constant instead of arbirary buffer size % use HB_SIZEOFARRAY() instead of calculated explicit @@ -3948,7 +3956,7 @@ * contrib/hbqt/qtcore/hbqt_misc.prg * minor formatting -2012-06-13 11:41 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-06-13 11:41 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbqt/qtcore/hbqt_bind.cpp * contrib/hbqt/qtcore/hbqt_hbqevents.cpp * contrib/hbqt/qtcore/hbqt_hbqslots.cpp @@ -4077,7 +4085,7 @@ QDeclarative* classes are remmed and it break build on Qt 4.5 -2012-06-12 21:55 UTC+0200 Viktor Szakats (vszakats syenar.net) +2012-06-12 21:55 UTC+0200 Viktor Szakats (harbour syenar.net) - examples/hbapollo - examples/hbbtree - examples/hscript diff --git a/harbour/include/hblang.hbx b/harbour/include/hblang.hbx index 360619e2c7..e6a88ab312 100644 --- a/harbour/include/hblang.hbx +++ b/harbour/include/hblang.hbx @@ -67,7 +67,6 @@ DYNAMIC HB_LANG_KO DYNAMIC HB_LANG_SR852 DYNAMIC HB_LANG_SRISO DYNAMIC HB_LANG_UADOS -DYNAMIC HB_LANG_ZHB5 DYNAMIC HB_LANG_ZHGB #if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBLANG__REQUEST ) diff --git a/harbour/src/lang/Makefile b/harbour/src/lang/Makefile index 3686d01565..18877c8bdd 100644 --- a/harbour/src/lang/Makefile +++ b/harbour/src/lang/Makefile @@ -45,7 +45,6 @@ C_SOURCES += \ msgsr852.c \ msgsriso.c \ msguados.c \ - msgzhb5.c \ msgzhgb.c \ LIBNAME := hblang diff --git a/harbour/src/lang/msgzhb5.c b/harbour/src/lang/msgzhb5.c deleted file mode 100644 index 09047e8b4f..0000000000 --- a/harbour/src/lang/msgzhb5.c +++ /dev/null @@ -1,205 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * Language Support Module (ZHB5) - * - * Copyright 1999-2001 dongming - * or - * 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. - * - */ - -/* Language name: Chinese Traditional */ -/* ISO language code (2 chars): ZH */ -/* Codepage: 950 for ZH-HK,ZH-TW */ - -#include "hbapilng.h" - -static HB_LANG s_lang = -{ - { - /* Identification */ - - "ZHB5", /* ID */ - "Chinese Traditional", /* Name (in English) */ - "中文繁體BIG5", /* Name (in native language) */ - "ZH", /* RFC ID */ - "950", /* Codepage */ - "", /* Version */ - - /* Month names */ - - "一月", - "二月", - "三月", - "四月", - "五月", - "六月", - "七月", - "八月", - "九月", - "十月", - "十一月", - "十二月", - - /* Day names */ - - "星期日", - "星期一", - "星期二", - "星期三", - "星期四", - "星期五", - "星期六", - - /* CA-Cl*pper compatible natmsg items */ - - "數據庫檔案 # 記錄 最後更新 大小", - "需要更多的例子嗎?", - "頁碼:", - "** 小計 **", - "* 子小計 *", - "*** 合計 ***", - "插入", - " ", - "日期非法", - "範圍: ", - " - ", - "Y/N", - "非法表達式", - - /* Error description names */ - - "Unknown error", - "Argument error", - "Bound error", - "String overflow", - "Numeric overflow", - "Zero divisor", - "Numeric error", - "Syntax error", - "Operation too complex", - "", - "", - "Memory low", - "Undefined function", - "No exported method", - "Variable does not exist", - "Alias does not exist", - "No exported variable", - "Illegal characters in alias", - "Alias already in use", - "", - "Create error", - "Open error", - "Close error", - "Read error", - "Write error", - "Print error", - "", - "", - "", - "", - "Operation not supported", - "Limit exceeded", - "Corruption detected", - "Data type error", - "Data width error", - "Workarea not in use", - "Workarea not indexed", - "Exclusive required", - "Lock required", - "Write not allowed", - "Append lock failed", - "Lock Failure", - "", - "", - "", - "", - "array access", - "array assign", - "array dimension", - "not an array", - "conditional", - - /* Internal error names */ - - "Unrecoverable error %d: ", - "Error recovery failure", - "No ERRORBLOCK() for error", - "Too many recursive error handler calls", - "RDD invalid or failed to load", - "Invalid method type from %s", - "hb_xgrab can't allocate memory", - "hb_xrealloc called with a NULL pointer", - "hb_xrealloc called with an invalid pointer", - "hb_xrealloc can't reallocate memory", - "hb_xfree called with an invalid pointer", - "hb_xfree called with a NULL pointer", - "Can\'t locate the starting procedure: \'%s\'", - "No starting procedure", - "Unsupported VM opcode", - "Symbol item expected from %s", - "Invalid symbol type for self from %s", - "Codeblock expected from %s", - "Incorrect item type on the stack trying to pop from %s", - "Stack underflow", - "An item was going to be copied to itself from %s", - "Invalid symbol item passed as memvar %s", - "Memory buffer overflow", - "hb_xgrab requested to allocate zero bytes", - "hb_xrealloc requested to resize to zero bytes", - "hb_xalloc requested to allocate zero bytes", - - /* Texts */ - - "YYYY/MM/DD", - "Y", - "N" - } -}; - -#define HB_LANG_ID ZHB5 -#include "hbmsgreg.h" diff --git a/harbour/src/rtl/langcomp.prg b/harbour/src/rtl/langcomp.prg index 6e6163b4d9..ca6a019262 100644 --- a/harbour/src/rtl/langcomp.prg +++ b/harbour/src/rtl/langcomp.prg @@ -128,7 +128,7 @@ FUNCTION hb_langSelect( cLangID ) CASE "UAKOI" ; hb_langNew( cLangID, "UAKOI8", "UAUTF", "UTF8" ) ; EXIT CASE "UAKOI8" ; hb_langNew( cLangID, "UAKOI8", "UAUTF", "UTF8" ) ; EXIT CASE "UAWIN" ; hb_langNew( cLangID, "UA1125", "UAUTF", "UTF8" ) ; EXIT -// CASE "ZHB5" ; hb_langNew( cLangID, "?????" , "ZHUTF", "UTF8" ) ; EXIT + CASE "ZHB5" ; hb_langNew( cLangID, "CP950" , "ZHUTF", "UTF8" ) ; EXIT // CASE "ZHGB" ; hb_langNew( cLangID, "?????" , "ZHUTF", "UTF8" ) ; EXIT ENDSWITCH ENDIF