From 836215df9d1cdb9cb34b849e54d7fae6bcd8c72a Mon Sep 17 00:00:00 2001 From: Chen Kedem Date: Thu, 12 Apr 2007 08:14:52 +0000 Subject: [PATCH] 2007-04-12 11:14 UTC+0300 Chen Kedem --- harbour/ChangeLog | 14 ++++++++++++++ harbour/doc/dirstruc.txt | 18 ++++++++++++++++++ harbour/doc/en/lang.txt | 8 +++++++- harbour/source/lang/msgtrdos.c | 8 ++++---- harbour/source/lang/msgtrwin.c | 6 +++--- harbour/source/rtl/tget.prg | 23 ++++++++++++----------- 6 files changed, 58 insertions(+), 19 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f46584c23f..10690d95f6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,20 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-04-12 11:14 UTC+0300 Chen Kedem + * source/rtl/tget.prg + ! Fix bug#1672233 - Picture masks for Logical GET variables. + + * source/lang/msgtrdos.c + * source/lang/msgtrwin.c + ! Change ID from TR to TR857 and TRWIN. + + * doc/en/lang.txt + + Update language and codepage lists with the latests additions. + + * doc/dirstruc.txt + + Add short description to the newly added directories. + 2007-04-11 22:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/common.mak + added compiler.lib to linked libraries diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt index 6033ca2c5c..036a962b45 100644 --- a/harbour/doc/dirstruc.txt +++ b/harbour/doc/dirstruc.txt @@ -74,6 +74,14 @@ in order to remove empty directories) | | | +---dot - Pre-Processor/Dot prompt environment. | | +| +---gd - HBGD wrapper for gdLibrary. +| | | +| | +---tests - Test programs and samples. +| | | +| | +-images_in - +| | | +| | +-images_out- +| | | +---hbclip - Harbour Compatibility Library (HCL) for | | CA-Clipper 5.x | | @@ -134,6 +142,10 @@ in order to remove empty directories) | | | +---pdflib - PDF low level Api for HBDOC to inteface with PDFlib. | | +| +---pgsql - Harbour Low Level API for Postgres RDBMS. +| | | +| | +---tests - Test programs. +| | | +---rdd_ads - RDD for Advantage Database Server. | | | | | +---doc - Documents for Advantage Database Server RDD. @@ -145,6 +157,8 @@ in order to remove empty directories) | | | +---samples - Miscellaneous contribution files. | | +| +---tip - TIP Class oriented Internet Protocol library. +| | | +---tprepro - PreProcessor class based on Harbour Preprocessor | runtime library. | @@ -196,6 +210,8 @@ in order to remove empty directories) | | | +---macro - Macro compiler. | | +| +---main - Harbour compiler main source. +| | | +---pp - Harbour Preprocessor. | | | +---rdd - Replaceable Database Driver (RDD). @@ -272,6 +288,8 @@ in order to remove empty directories) | +---hbpp - Harbour Preprocessor as a standalone module. | + +---hbpptest - Regression tests for the preprocessor. + | +---hbrun - Standalone Harbour Portable Object file runner. | +---hbtest - Regression tests for the Run-Time library. diff --git a/harbour/doc/en/lang.txt b/harbour/doc/en/lang.txt index 92d83619ce..d6c1b97434 100644 --- a/harbour/doc/en/lang.txt +++ b/harbour/doc/en/lang.txt @@ -180,6 +180,7 @@ * Czech ISO-8859-2 CSISO * Czech KAM CSKAM * Czech Windows-1250 CSWIN + * Dutch 437 NL * English 437 EN * Esperanto 850 EO * French 850 FR @@ -216,6 +217,8 @@ * Slovenian Windows-1250 SLWIN * Spanish 850 ES * Spanish ANSI ANSI ESWIN + * Turkish 857 TR857 + * Turkish Windows-1254 TRWIN * * $RETURNS$ * The old language indentifier @@ -292,7 +295,8 @@ * German ISO-8859-1 DEWIN * Greek 737 EL * Greek Windows-1253 ELWIN - * Hungarian 852 HU852 + * Hungarian (ntxhu852) 852 HU852 + * Hungarian (sixhu852) 852 HU852S * Hungarian ISO-8859-2 HUISO * Hungarian Windows-1250 HUWIN * Italian 437 IT437 @@ -317,6 +321,8 @@ * Spanish 850 ES * Spanish ISO-8859-1 ESWIN * Spanish Modern ISO-8859-1 ESMWIN + * Turkish 857 TR857 + * Turkish Windows-1254 TRWIN * Ukrainian 866 UA866 * Ukrainian KOI-8U UAKOI8 * Ukrainian Windows-1251 UA1251 diff --git a/harbour/source/lang/msgtrdos.c b/harbour/source/lang/msgtrdos.c index cdff508b7e..3d2d0f084a 100644 --- a/harbour/source/lang/msgtrdos.c +++ b/harbour/source/lang/msgtrdos.c @@ -51,8 +51,8 @@ */ /* Language name: Turkish */ -/* ISO language code : TR */ -/* Codepage: 857 ( OEM ) */ +/* ISO language code : TR */ +/* Codepage: 857 ( OEM ) */ #include "hbapilng.h" @@ -61,11 +61,11 @@ static HB_LANG s_lang = { /* Identification */ - "TR", /* ID */ + "TR857", /* ID */ "Turkish", /* Name (in English) */ "Trk‡e", /* Name (in native language) */ "TR", /* RFC ID */ - "857", /* Codepage */ + "857", /* Codepage */ "$Revision$ $Date$", /* Version */ /* Month names */ diff --git a/harbour/source/lang/msgtrwin.c b/harbour/source/lang/msgtrwin.c index a24d2e895a..459934279a 100644 --- a/harbour/source/lang/msgtrwin.c +++ b/harbour/source/lang/msgtrwin.c @@ -51,8 +51,8 @@ */ /* Language name: Turkish */ -/* ISO language code : TR */ -/* Codepage: 1254 */ +/* ISO language code : TR */ +/* Codepage: 1254 */ #include "hbapilng.h" @@ -61,7 +61,7 @@ static HB_LANG s_lang = { /* Identification */ - "TR", /* ID */ + "TRWIN", /* ID */ "Turkish", /* Name (in English) */ "Türkçe", /* Name (in native language) */ "TR", /* RFC ID */ diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg index b8f4a425d0..a501998f57 100644 --- a/harbour/source/rtl/tget.prg +++ b/harbour/source/rtl/tget.prg @@ -376,9 +376,9 @@ METHOD Display( lForced ) CLASS Get DEFAULT lForced TO .t. - // ; TOFIX: VarGet() has to be called everytime here to stay + // ; TOFIX: VarGet() has to be called everytime here to stay // CA-Cl*pper compatible. - // Currently the caller needs to set :buffer to NIL + // Currently the caller needs to set :buffer to NIL // to force that in Harbour. [vszakats] if ::buffer == nil @@ -578,7 +578,7 @@ METHOD VarPut( xValue, lReFormat ) CLASS Get NEXT aValue[ aSubs[ i ] ] := xValue ENDIF - + if lReFormat if !::hasfocus ::Original := xValue @@ -614,7 +614,7 @@ METHOD VarGet() CLASS Get ELSE xValue := NIL ENDIF - + return xValue //---------------------------------------------------------------------------// @@ -1106,7 +1106,7 @@ METHOD IsEditable( nPos ) CLASS Get case ::cType == "D" return cChar == "9" case ::cType == "L" - return cChar $ "TFYN" + return cChar $ "LY#" /* Clipper 5.2 undocumented: # allow T,F,Y,N for Logical [ckedem] */ endcase return .f. @@ -1175,18 +1175,19 @@ METHOD Input( cChar ) CLASS Get cChar := "" endif - case cPic == "#" - if ! IsDigit( cChar ) .and. !( cChar == " " ) .and. !( cChar $ ".+-" ) - cChar := "" - endif - - case cPic == "L" + /* Clipper 5.2 undocumented: # allow T,F,Y,N for Logical [ckedem] */ + case cPic == "L" .or. ( cPic == "#" .and. ::cType == "L" ) if !( Upper( cChar ) $ "YNTF" + ; hb_langmessage( HB_LANG_ITEM_BASE_TEXT + 1 ) + ; hb_langmessage( HB_LANG_ITEM_BASE_TEXT + 2 ) ) cChar := "" endif + case cPic == "#" + if ! IsDigit( cChar ) .and. !( cChar == " " ) .and. !( cChar $ ".+-" ) + cChar := "" + endif + case cPic == "Y" if !( Upper( cChar ) $ "YN" ) cChar := ""