diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 90de8a1d47..c05f278f0a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,37 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-07 17:25 UTC+0200 Viktor Szakats (harbour syenar.net) + * src/debug/debugger.prg + ! replaced KEYBOARD cmd unicode compatible call + + * contrib/hbct/doc/en/token1.txt + * contrib/hbct/tests/charadd.prg + * contrib/hbct/tests/charand.prg + * contrib/hbct/tests/charor.prg + * contrib/hbct/tests/charsub.prg + * contrib/hbct/tests/tab.prg + * contrib/hbnf/doc/en/scancode.txt + * contrib/xhb/hterrsys.prg + * contrib/xhb/html.ch + * doc/en/file.txt + * doc/en/input.txt + * doc/en/memo.txt + * doc/en/misc.txt + * doc/en/set.txt + * doc/en/terminal.txt + * extras/gfspell/spell.prg + * extras/gtwvw/wvwedit.c + * extras/hbdoc/genhtml.prg + * extras/hbdoc/genxml.prg + * extras/hbdoc/hbdoc.prg + * extras/hbvpdf/hbvpdf.prg + * extras/httpsrv/cgifunc.prg + * extras/httpsrv/uhttpd.prg + * tests/rto_get.prg + * tests/rto_tb.prg + * formatting + 2012-10-07 15:10 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbnf/aavg.prg * contrib/hbnf/adessort.prg diff --git a/harbour/contrib/hbct/doc/en/token1.txt b/harbour/contrib/hbct/doc/en/token1.txt index d66ab96ab4..1c0bbbb883 100644 --- a/harbour/contrib/hbct/doc/en/token1.txt +++ b/harbour/contrib/hbct/doc/en/token1.txt @@ -16,8 +16,9 @@ * is the processed string * [] is a list of characters separating the tokens * in - * Default: chr(0)+chr(9)+chr(10)+chr(13)+chr(26)+ - * chr(32)+chr(32)+chr(138)+chr(141)+ + * Default: Chr( 0 ) + Chr( 9 ) + Chr( 10 ) + + * Chr( 13 ) + Chr( 26 ) + Chr( 32 ) + + * Chr( 32 ) + Chr( 138 ) + Chr( 141 ) + * ",.;:!\?/\\<>()#&%+-*" * [] specifies the count of the token whose * position should be calculated @@ -79,8 +80,9 @@ * is the processed string * [] is a list of characters separating the tokens * in - * Default: chr(0)+chr(9)+chr(10)+chr(13)+chr(26)+ - * chr(32)+chr(32)+chr(138)+chr(141)+ + * Default: Chr( 0 ) + Chr( 9 ) + Chr( 10 ) + + * Chr( 13 ) + Chr( 26 ) + Chr( 32 ) + + * Chr( 32 ) + Chr( 138 ) + Chr( 141 ) + * ",.;:!\?/\\<>()#&%+-*" * [] specifies the count of the token that * should be extracted @@ -180,9 +182,10 @@ * <[@]cString> is the processed string * [] is a list of characters separating the tokens * in - * Default: chr(0)+chr(9)+chr(10)+chr(13)+chr(26)+ - * chr(32)+chr(32)+chr(138)+chr(141)+ - * ",.;:!\?/\\<>()#&%+-*" + * Default: Chr( 0 ) + Chr( 9 ) + Chr( 10 ) + + * Chr( 13 ) + Chr( 26 ) + Chr( 32 ) + + * Chr( 32 ) + Chr( 138 ) + Chr( 141 ) + + * ",.;:!\?/\\<>()#&%+-*" * [] specifies the number of tokens that * should be processed * Default: all tokens @@ -241,9 +244,10 @@ * <[@]cString> is the processed string * [] is a list of characters separating the tokens * in - * Default: chr(0)+chr(9)+chr(10)+chr(13)+chr(26)+ - * chr(32)+chr(32)+chr(138)+chr(141)+ - * ",.;:!\?/\\<>()#&%+-*" + * Default: Chr( 0 ) + Chr( 9 ) + Chr( 10 ) + + * Chr( 13 ) + Chr( 26 ) + Chr( 32 ) + + * Chr( 32 ) + Chr( 138 ) + Chr( 141 ) + + * ",.;:!\?/\\<>()#&%+-*" * [] specifies the number of tokens that * should be processed * Default: all tokens diff --git a/harbour/contrib/hbct/tests/charadd.prg b/harbour/contrib/hbct/tests/charadd.prg index 509c61f515..ffec336c98 100644 --- a/harbour/contrib/hbct/tests/charadd.prg +++ b/harbour/contrib/hbct/tests/charadd.prg @@ -63,10 +63,10 @@ PROCEDURE Main() // simple tests ? "Simple tests:" - ? [ charadd("012345678", chr(1)) == "123456789" ? -> "] + charadd( "012345678", Chr(1 ) ) + ["] - ? [ charadd("012345678", chr(1)+chr(2)) == "133557799" ? -> "] + charadd( "012345678", Chr(1 ) + Chr(2 ) ) + ["] - ? [ charadd("123456789", chr(255)) == "012345678" ? -> "] + charadd( "123456789", Chr(255 ) ) + ["] - ? [ charadd("123456789", chr(255)+chr(254)) == "002244668" ? -> "] + charadd( "123456789", Chr(255 ) + Chr(254 ) ) + ["] + ? [ charadd("012345678", chr(1)) == "123456789" ? -> "] + charadd( "012345678", Chr( 1 ) ) + ["] + ? [ charadd("012345678", chr(1)+chr(2)) == "133557799" ? -> "] + charadd( "012345678", Chr( 1 ) + Chr( 2 ) ) + ["] + ? [ charadd("123456789", chr(255)) == "012345678" ? -> "] + charadd( "123456789", Chr( 255 ) ) + ["] + ? [ charadd("123456789", chr(255)+chr(254)) == "002244668" ? -> "] + charadd( "123456789", Chr( 255 ) + Chr( 254 ) ) + ["] ? "End test of CHARADD()" ? diff --git a/harbour/contrib/hbct/tests/charand.prg b/harbour/contrib/hbct/tests/charand.prg index 02789f94e1..9014bbe3a8 100644 --- a/harbour/contrib/hbct/tests/charand.prg +++ b/harbour/contrib/hbct/tests/charand.prg @@ -64,8 +64,8 @@ PROCEDURE Main() // simple tests ? "Simple tests:" - ? [ charand("012345678", chr(254)) == "002244668" ? --> "] + charand( "012345678", Chr(254 ) ) + ["] - ? [ charand("012345678", chr(254)+chr(252)) == "002044648" ? --> "] + charand( "012345678", Chr(254 ) + Chr(252 ) ) + ["] + ? [ charand("012345678", chr(254)) == "002244668" ? --> "] + charand( "012345678", Chr( 254 ) ) + ["] + ? [ charand("012345678", chr(254)+chr(252)) == "002044648" ? --> "] + charand( "012345678", Chr( 254 ) + Chr( 252 ) ) + ["] ? "End test of CHARAND()" ? diff --git a/harbour/contrib/hbct/tests/charor.prg b/harbour/contrib/hbct/tests/charor.prg index a88ca62ea3..f6060f545c 100644 --- a/harbour/contrib/hbct/tests/charor.prg +++ b/harbour/contrib/hbct/tests/charor.prg @@ -64,8 +64,8 @@ PROCEDURE Main() // simple tests ? "Simple tests:" - ? [ charor("012345678", chr(1)) == "113355779" ? --> "] + charor( "012345678", Chr(1 ) ) + ["] - ? [ charor("012345678", chr(1)+chr(3)) == "133357779" ? --> "] + charor( "012345678", Chr(1 ) + Chr(3 ) ) + ["] + ? [ charor("012345678", chr(1)) == "113355779" ? --> "] + charor( "012345678", Chr( 1 ) ) + ["] + ? [ charor("012345678", chr(1)+chr(3)) == "133357779" ? --> "] + charor( "012345678", Chr( 1 ) + Chr( 3 ) ) + ["] ? "End test of CHAROR()" ? diff --git a/harbour/contrib/hbct/tests/charsub.prg b/harbour/contrib/hbct/tests/charsub.prg index 7e3cf9a22e..9f3ea63166 100644 --- a/harbour/contrib/hbct/tests/charsub.prg +++ b/harbour/contrib/hbct/tests/charsub.prg @@ -63,10 +63,10 @@ PROCEDURE Main() // simple tests ? "Simple tests:" - ? [ charadd("123456789", chr(1)) == "012345678" ? -> "] + charsub( "123456789", Chr(1 ) ) + ["] - ? [ charadd("123456789", chr(1)+chr(2)) == "002244668" ? -> "] + charsub( "123456789", Chr(1 ) + Chr(2 ) ) + ["] - ? [ charadd("012345678", chr(255)) == "123456789" ? -> "] + charsub( "012345678", Chr(255 ) ) + ["] - ? [ charadd("012345678", chr(255)+chr(254)) == "133557799" ? -> "] + charsub( "012345678", Chr(255 ) + Chr(254 ) ) + ["] + ? [ charadd("123456789", chr(1)) == "012345678" ? -> "] + charsub( "123456789", Chr( 1 ) ) + ["] + ? [ charadd("123456789", chr(1)+chr(2)) == "002244668" ? -> "] + charsub( "123456789", Chr( 1 ) + Chr( 2 ) ) + ["] + ? [ charadd("012345678", chr(255)) == "123456789" ? -> "] + charsub( "012345678", Chr( 255 ) ) + ["] + ? [ charadd("012345678", chr(255)+Chr(254)) == "133557799" ? -> "] + charsub( "012345678", Chr( 255 ) + Chr( 254 ) ) + ["] ? "End test of CHARSUB()" ? diff --git a/harbour/contrib/hbct/tests/tab.prg b/harbour/contrib/hbct/tests/tab.prg index cb5b28f464..55d3895ba0 100644 --- a/harbour/contrib/hbct/tests/tab.prg +++ b/harbour/contrib/hbct/tests/tab.prg @@ -65,12 +65,12 @@ PROCEDURE Main() // simple tests ? "Simple tests:" - ? [ tabexpand("-"+chr(9)+"!") == "- !" ? -> "] + tabexpand( "-" + Chr(9 ) + "!" ) + ["] - ? [ tabexpand("----"+chr(9) +"!") == "---- !" ? -> "] + tabexpand( "----" + Chr(9 ) + "!" ) + ["] - ? [ tabexpand("-"+chr(9)+"!",, "+") == "-+++++++!" ? -> "] + tabexpand( "-" + Chr(9 ) + "!",, "+" ) + ["] - ? [ tabexpand("-"+chr(9)+ "!", 4) == "- !" ? -> "] + tabexpand( "-" + Chr(9 ) + "!", 4 ) + ["] - ? [ tabexpand("----"+chr(9)+ "!", 8) == "---- !" ? -> "] + tabexpand( "----" + Chr(9 ) + "!", 8 ) + ["] - ? [ tabexpand("----"+chr(9)+ "!", 8, "+") == "----++++!" ? -> "] + tabexpand( "----" + Chr(9 ) + "!", 8, "+" ) + ["] + ? [ tabexpand("-"+chr(9)+"!") == "- !" ? -> "] + tabexpand( "-" + Chr( 9 ) + "!" ) + ["] + ? [ tabexpand("----"+chr(9) +"!") == "---- !" ? -> "] + tabexpand( "----" + Chr( 9 ) + "!" ) + ["] + ? [ tabexpand("-"+chr(9)+"!",, "+") == "-+++++++!" ? -> "] + tabexpand( "-" + Chr( 9 ) + "!",, "+" ) + ["] + ? [ tabexpand("-"+chr(9)+ "!", 4) == "- !" ? -> "] + tabexpand( "-" + Chr( 9 ) + "!", 4 ) + ["] + ? [ tabexpand("----"+chr(9)+ "!", 8) == "---- !" ? -> "] + tabexpand( "----" + Chr( 9 ) + "!", 8 ) + ["] + ? [ tabexpand("----"+chr(9)+ "!", 8, "+") == "----++++!" ? -> "] + tabexpand( "----" + Chr( 9 ) + "!", 8, "+" ) + ["] ? ? "Tests with newline characters: ^J == LF, ^M == CR" @@ -92,9 +92,9 @@ PROCEDURE Main() ? ? "Tests with tab characters:" - ? [ tabexpand("-"+chr(9)+"-",,"+") == "-+++++++-" ? -> "] + tabexpand( "-" + Chr(9 ) + "-",,"+" ) + ["] + ? [ tabexpand("-"+chr(9)+"-",,"+") == "-+++++++-" ? -> "] + tabexpand( "-" + Chr( 9 ) + "-",, "+" ) + ["] ? [ tabexpand("-"+chr(9)+"-",,"+",,"-")] - ? [ == "++++++++^I+++++++" ? -> "] + StrTran( tabexpand("-" + Chr(9 ) + "-",,"+",,"-" ),Chr(9 ),"^I" ) + ["] + ? [ == "++++++++^I+++++++" ? -> "] + StrTran( tabexpand( "-" + Chr( 9 ) + "-",, "+",, "-" ), Chr( 9 ), "^I" ) + ["] ? ? "End test of TABEXPAND()" @@ -108,9 +108,9 @@ PROCEDURE Main() // simple tests ? "Simple tests: ^I == tab character" - ? [ tabpack("AAAAAAA*",, "*") == "AAAAAAA*" ? -> "] + StrTran( tabpack("AAAAAAA*",, "*" ),Chr(9 ),"^I" ) + ["] - ? [ tabpack("AAAAA***",, "*") == "AAAAA^I" ? -> "] + StrTran( tabpack("AAAAA***",, "*" ),Chr(9 ),"^I" ) + ["] - ? [ tabpack("AAAAA*****",, "*") == "AAAAA^I**" ? -> "] + StrTran( tabpack("AAAAA*****",, "*" ),Chr(9 ),"^I" ) + ["] + ? [ tabpack("AAAAAAA*",, "*") == "AAAAAAA*" ? -> "] + StrTran( tabpack("AAAAAAA*",, "*" ), Chr( 9 ), "^I" ) + ["] + ? [ tabpack("AAAAA***",, "*") == "AAAAA^I" ? -> "] + StrTran( tabpack("AAAAA***",, "*" ), Chr( 9 ), "^I" ) + ["] + ? [ tabpack("AAAAA*****",, "*") == "AAAAA^I**" ? -> "] + StrTran( tabpack("AAAAA*****",, "*" ), Chr( 9 ), "^I" ) + ["] ? ? "Tests with newline characters:" diff --git a/harbour/contrib/hbnf/doc/en/scancode.txt b/harbour/contrib/hbnf/doc/en/scancode.txt index 977fe82a8a..b9d04d3402 100644 --- a/harbour/contrib/hbnf/doc/en/scancode.txt +++ b/harbour/contrib/hbnf/doc/en/scancode.txt @@ -27,7 +27,7 @@ * For example, calling FT_SCANCODE() and pressing the Grey-minus * key will return a two character string: * - * CHR(45) + CHR(74) + * Chr( 45 ) + Chr( 74 ) * * LASTKEY() is not updated by FT_SCANCODE(), so don't try to * test LASTKEY() to see what was pressed during an FT_SCANCODE() @@ -42,9 +42,9 @@ * $EXAMPLES$ * cKey := FT_SCANCODE() * - * [grey-] returns: CHR(45) + CHR(74) - * [-] returns: CHR(45) + CHR(12) - * [grey+] returns: CHR(43) + CHR(78) - * [+] returns: CHR(43) + CHR(13) + * [grey-] returns: Chr( 45 ) + Chr( 74 ) + * [-] returns: Chr( 45 ) + Chr( 12 ) + * [grey+] returns: Chr( 43 ) + Chr( 78 ) + * [+] returns: Chr( 43 ) + Chr( 13 ) * $END$ */ diff --git a/harbour/contrib/xhb/hterrsys.prg b/harbour/contrib/xhb/hterrsys.prg index d1046c48c6..89f1e7d29c 100644 --- a/harbour/contrib/xhb/hterrsys.prg +++ b/harbour/contrib/xhb/hterrsys.prg @@ -50,7 +50,7 @@ #define DEF_ERR_HEADER "Date : " + DToC( Date() ) + "
" + "Time : " + Time() + "
" // put messages to STDERR -#command ? => ?? Chr(13) + Chr(10) ; ?? +#command ? => ?? Chr( 13 ) + Chr( 10 ) ; ?? #command ?? => OutErr( ) REQUEST HARDCR diff --git a/harbour/contrib/xhb/html.ch b/harbour/contrib/xhb/html.ch index de1100967c..927a1e715a 100644 --- a/harbour/contrib/xhb/html.ch +++ b/harbour/contrib/xhb/html.ch @@ -50,8 +50,10 @@ #include "htmlform.ch" #include "htmlclrs.ch" #include "cgi.ch" -#xtranslate CRLF() => ( + chr(13) + chr(10) ) -#xtranslate CRLF() => chr(13) + chr(10) + +#xtranslate CRLF( ) => ( + Chr( 13 ) + Chr( 10 ) ) +#xtranslate CRLF() => ( Chr( 13 ) + Chr( 10 ) ) + /* #xCommand DEFINE HTML ; [FILE ] ; diff --git a/harbour/doc/en/file.txt b/harbour/doc/en/file.txt index 6e3466488f..8a6e400f9c 100644 --- a/harbour/doc/en/file.txt +++ b/harbour/doc/en/file.txt @@ -628,9 +628,9 @@ * ter (ASCII 26) is found. * NOTE This function is similar to the FREAD() function, except that - * it will not read binary characters that may he required as part of - * a header of a file construct. Characters Such as CHR(0) and CHR(26) - * may keep this function from performing its intended operation. In this + * it will not read binary characters that may he required as part of + * a header of a file construct. Characters Such as CHR( 0 ) and CHR( 26 ) + * may keep this function from performing its intended operation. In this * event, the FREAD() function should he used in place of the FREADSTR() * function. * $EXAMPLES$ diff --git a/harbour/doc/en/input.txt b/harbour/doc/en/input.txt index 242c9bb5ff..3322394b09 100644 --- a/harbour/doc/en/input.txt +++ b/harbour/doc/en/input.txt @@ -133,19 +133,19 @@ * buffer after clearing it first. * * Note: The character ";" is converted - * to CHR(13) (this is an undocumented CA-Cl*pper feature). + * to Chr( 13 ) (this is an undocumented CA-Cl*pper feature). * $DESCRIPTION$ * Clears the Harbour keyboard typeahead buffer and then inserts an * optional string into it. * $EXAMPLES$ * // Stuff an Enter key into the keyboard buffer - * KEYBOARD Chr(13) + * KEYBOARD Chr( 13 ) * // Clear the keyboard buffer * CLEAR TYPEAHEAD * $TESTS$ - * KEYBOARD Chr(13); ? INKEY() ==> 13 - * KEYBOARD ";" ? INKEY() ==> 13 - * KEYBOARD "HELLO"; CLEAR TYPEAHEAD; ? INKEY() ==> 0 + * KEYBOARD Chr( 13 ); ? Inkey() ==> 13 + * KEYBOARD ";" ? Inkey() ==> 13 + * KEYBOARD "HELLO"; CLEAR TYPEAHEAD; ? Inkey() ==> 0 * $STATUS$ * R * $COMPLIANCE$ @@ -237,7 +237,7 @@ * ENDIF * ENDDO * $TESTS$ - * KEYBOARD "AB"; ? NEXTKEY(), NEXTKEY() ==> 65 65 + * KEYBOARD "AB"; ? NextKey(), NextKey() ==> 65 65 * $STATUS$ * R * $COMPLIANCE$ @@ -325,12 +325,12 @@ * Issuing a KEYBOARD " " will clear the keyboard buffer. * $EXAMPLES$ * // Stuff an Enter key into the keyboard buffer - * KEYBOARD CHR(13) + * KEYBOARD Chr( 13 ) * // Clear the keyboard buffer * CLEAR TYPEAHEAD * $TESTS$ - * KEYBOARD CHR(13); ? INKEY() ==> 13 - * KEYBOARD "HELLO"; CLEAR TYPEAHEAD; ? INKEY() ==> 0 + * KEYBOARD Chr( 13 ); ? Inkey() ==> 13 + * KEYBOARD "HELLO"; CLEAR TYPEAHEAD; ? Inkey() ==> 0 * $STATUS$ * R * $COMPLIANCE$ diff --git a/harbour/doc/en/memo.txt b/harbour/doc/en/memo.txt index b242da9b00..544e663a35 100644 --- a/harbour/doc/en/memo.txt +++ b/harbour/doc/en/memo.txt @@ -250,7 +250,7 @@ * $ONELINER$ * Write a memo field or character string to a text file on disk * $SYNTAX$ - * MEMOWRIT( , , [] ) --> lSuccess + * MEMOWRIT( , ) --> lSuccess * $ARGUMENTS$ * is the filename to read from disk. * It must include the file extension. If file to be read @@ -258,10 +258,6 @@ * * Is the memo field or character string, to be write to * . - * - * Is a logic variable that settle if the "end of file" - * character - CHR(26) - is written to disk. - * This parameter is optional. By default is true (.T.) * $RETURNS$ * Function returns true (.T.) if the writing operation was successful; * otherwise, it returns false (.F.). @@ -275,11 +271,6 @@ * CA-Cl*pper) which let to programmer change the default behavior of * - always - to write the EOF character, CHR(26) as in CA-Cl*pper. * - * If there is no third parameter, nothing change, EOF is written as - * in CA-Cl*pper, the same occurs when is set to .T. - * But, if is set to .F., EOF char is Not written to the - * end of the file. - * * MEMOWRIT() function is used together with MEMOREAD() and MEMOEDIT() * to save to disk text from several sources that was edited, searched, * replaced, displayed, etc. @@ -330,7 +321,7 @@ * . * * Is a logic variable that settle if the "end of file" - * character - CHR(26) - is written to disk. + * character - CHR( 26 ) - is written to disk. * This parameter is optional. By default is true (.T.) * $RETURNS$ * Function returns true (.T.) if the writing operation was successful; @@ -343,7 +334,7 @@ * * There is a third parameter (optional), , (not found in * CA-Cl*pper) which let to programmer change the default behavior of - * - always - to write the EOF character, CHR(26) as in CA-Cl*pper. + * - always - to write the EOF character, CHR( 26 ) as in CA-Cl*pper. * * If there is no third parameter, nothing change, EOF is written as * in CA-Cl*pper, the same occurs when is set to .T. diff --git a/harbour/doc/en/misc.txt b/harbour/doc/en/misc.txt index 9136ca0a40..7456176557 100644 --- a/harbour/doc/en/misc.txt +++ b/harbour/doc/en/misc.txt @@ -305,7 +305,7 @@ * TONE( 700, 5 ) * ENDIF * $TESTS$ - * TONE( 800, 1 ) // same as ? CHR(7) + * TONE( 800, 1 ) // same as ? CHR( 7 ) * TONE( 32000, 200 ) // any dogs around yet? * TONE( 130.80, 1 ) // musical note - C * TONE( 400, 0 ) // short beep diff --git a/harbour/doc/en/set.txt b/harbour/doc/en/set.txt index 204debdbe2..da1c0cc199 100644 --- a/harbour/doc/en/set.txt +++ b/harbour/doc/en/set.txt @@ -213,7 +213,7 @@ * _SET_EOF | * * Defaults to FALSE on UN*X, but defaults to TRUE on - * everything else. If set to FALSE, then CHR(26) does not + * everything else. If set to FALSE, then CHR( 26 ) does not * get written when using COPY TO DELIMITED, COPY TO SDF, * or when closing any of the various text files that are * created using various SET values. @@ -479,8 +479,8 @@ * $EXAMPLES$ * // Set F1 with a string * CLS - * __SetFunction( 1, "I Am Lazy" + CHR( 13 ) ) - * cTest := SPACE( 20 ) + * __SetFunction( 1, "I Am Lazy" + Chr( 13 ) ) + * cTest := Space( 20 ) * @ 10, 0 SAY "type something or F1 for lazy mode " GET cTest * READ * ? cTest diff --git a/harbour/doc/en/terminal.txt b/harbour/doc/en/terminal.txt index bf2846576b..dc039461fe 100644 --- a/harbour/doc/en/terminal.txt +++ b/harbour/doc/en/terminal.txt @@ -366,9 +366,9 @@ * (or thinks it is running on, if an OS emulator is being used). * * Under HB_OS_UNIX operating system the return value is the - * Line-Feed character (0x0a, CHR(10)); with other operating systems + * Line-Feed character (0x0a, Chr( 10) ); with other operating systems * (like DOS) the return value is the Carriage-Return plus Line-Feed - * characters (0x0d 0x0a, CHR(13)+CHR(10)). + * characters (0x0d 0x0a, Chr( 13 ) + Chr( 10 )). * $EXAMPLES$ * // Get the newline character(s) for the current OS. * // Get the newline character(s) for the current OS. diff --git a/harbour/extras/gfspell/spell.prg b/harbour/extras/gfspell/spell.prg index ec8d5f765f..40f4498ee1 100644 --- a/harbour/extras/gfspell/spell.prg +++ b/harbour/extras/gfspell/spell.prg @@ -28,13 +28,13 @@ #include "fileio.ch" -#xtranslate StoreWord() => Xform() -#xtranslate ExtractWord() => Xunform() +#xtranslate StoreWord( ) => Xform( ) +#xtranslate ExtractWord( ) => Xunform( ) #define NSIZE 26*26*6 #define EACH_WORD 6 -#define CRLF chr(13)+chr(10) -#define FOUR_BYTES chr(0)+chr(0)+chr(0)+chr(0) +#define CRLF Chr( 13 ) + Chr( 10 ) +#define FOUR_BYTES Chr( 0 ) + Chr( 0 ) + Chr( 0 ) + Chr( 0 ) #define MAX_STRING 40000 #define COMMON_WORDS aGlobal[ 1] @@ -1033,9 +1033,9 @@ if SP_Init() for z := nStart to nEnd - cTemp := SP_GetBuf(substr(cPattern,1,1)+chr(z+64) ) + cTemp := SP_GetBuf(substr(cPattern,1,1)+chr( z + 64 ) ) ii := len(cTemp) - cFirst := substr(cPattern,1,1)+chr(z+64) + cFirst := substr(cPattern,1,1)+chr( z + 64 ) if ii > 0 kk := 1 @@ -1243,10 +1243,10 @@ if nH >= 0 // Write out enough bytes to hold the index information // ///////////////////////////////////////////////////////////////////////// - fwrite(nH,"JJ"+l2bin(NSIZE+4)+replicate(chr(0),NSIZE)+space(10),NSIZE+16) + fwrite(nH,"JJ"+l2bin(NSIZE+4)+replicate(chr( 0 ),NSIZE)+space(10),NSIZE+16) for i := 1 to 26 - do while substr(DICT->word,1,1)==chr(i+64) .and. !eof() + do while substr(DICT->word,1,1)==chr( i + 64 ) .and. !eof() for j := 1 to 26 temp := "" cBits := FOUR_BYTES @@ -1256,7 +1256,7 @@ if nH >= 0 endif skip +1 enddo - do while substr(DICT->word,2,1)==chr(j+64) .and. !eof() + do while substr(DICT->word,2,1)==chr( j + 64 ) .and. !eof() if len(rtrim(DICT->word))=3 Bit(cBits,asc(substr(DICT->word,3,1))-64,.T.) elseif len(rtrim(DICT->word))==2 @@ -1400,7 +1400,7 @@ next for i := 1 to 26 for j := 1 to 26 - temp := chr(i+64)+chr(j+64) + temp := chr( i + 64 )+chr( j + 64 ) x := bin2l(substr(cOffsets,((i-1)*156)+((j-1)*EACH_WORD+1),4)) if !empty(x) y := bin2w(substr(cOffsets,((i-1)*156)+((j-1)*EACH_WORD+5),2)) @@ -1416,7 +1416,7 @@ for i := 1 to 26 for z := 1 to 26 if bit(cBuf,z) append blank - replace DICT->word with temp+chr(z+64) + replace DICT->word with temp+chr( z + 64 ) endif next if bit(cBuf,27) @@ -1426,7 +1426,7 @@ for i := 1 to 26 cBuf := substr(cBuf,5) z := 1 do while !empty(cBuf) - if substr(cBuf,z,1)>=Chr(128) + if substr(cBuf,z,1)>=Chr( 128 ) cWord := substr(cBuf,1,z) append blank replace DICT->word with temp+ExtractWord(cWord) @@ -1617,13 +1617,13 @@ z := 0 do while z <= nSize z++ y := asc(substr(cLine,z,1)) - if y >=48 .and. ! chr(y)$ ":;<=>?@[\^]_`{|}~" + if y >=48 .and. ! chr( y ) $ ":;<=>?@[\^]_`{|}~" nOffset := z - cWord := chr(y) + cWord := chr( y ) z++ y := asc(substr(cLine,z,1)) - while ( y >=48 .and. ! chr(y)$ ":;<=>?@[\^]_`{|}~" ) .or. y == 39 - cWord += chr(y) + while ( y >=48 .and. ! chr( y ) $ ":;<=>?@[\^]_`{|}~" ) .or. y == 39 + cWord += chr( y ) z++ if z > nSize exit diff --git a/harbour/extras/gtwvw/wvwedit.c b/harbour/extras/gtwvw/wvwedit.c index 12271a880e..9cf6501241 100644 --- a/harbour/extras/gtwvw/wvwedit.c +++ b/harbour/extras/gtwvw/wvwedit.c @@ -561,8 +561,8 @@ HB_FUNC( WVW_EBISMULTILINE ) * insert soft line break character (CR+CR+LF) at wordwrap positions * can be usefull to convert the text to MEMO format * eg. converting editbox's softbreaks into memoline softbreak: - * cStr := wvw_ebgettext(NIL, nEBid, .t.) - * cStr := strtran(cStr, CR+CR+LF, chr(141)+LF) + * cStr := wvw_ebgettext( NIL, nEBid, .T. ) + * cStr := StrTran( cStr, CR + CR + LF, Chr( 141 ) + LF ) * **returns "" in case of error (eg. nEBid not valid) */ diff --git a/harbour/extras/hbdoc/genhtml.prg b/harbour/extras/hbdoc/genhtml.prg index c3ee49d60c..408042cb33 100644 --- a/harbour/extras/hbdoc/genhtml.prg +++ b/harbour/extras/hbdoc/genhtml.prg @@ -236,7 +236,7 @@ METHOD OpenTag( cText, ... ) CLASS GenerateHTML LOCAL idx FOR idx := 2 TO Len( aArgs ) STEP 2 - cTag += " " + aArgs[ idx ] + "=" + Chr(34) + aArgs[ idx + 1 ] + Chr(34) + cTag += " " + aArgs[ idx ] + "=" + Chr( 34 ) + aArgs[ idx + 1 ] + Chr( 34 ) NEXT FWrite( ::nHandle, "<" + cTag + ">" + hb_eol() ) @@ -249,7 +249,7 @@ METHOD Tagged( cText, cTag, ... ) CLASS GenerateHTML LOCAL idx FOR idx := 3 TO Len( aArgs ) STEP 2 - cResult += " " + aArgs[ idx ] + "=" + Chr(34) + aArgs[ idx + 1 ] + Chr(34) + cResult += " " + aArgs[ idx ] + "=" + Chr( 34 ) + aArgs[ idx + 1 ] + Chr( 34 ) NEXT FWrite( ::nHandle, cResult + ">" + cText + "" + /* "4" + */ hb_eol() ) diff --git a/harbour/extras/hbdoc/genxml.prg b/harbour/extras/hbdoc/genxml.prg index a05fe9569d..6a6825b9f9 100644 --- a/harbour/extras/hbdoc/genxml.prg +++ b/harbour/extras/hbdoc/genxml.prg @@ -88,9 +88,9 @@ METHOD NewIndex( cFolder, cFilename, cTitle ) CLASS GenerateXML METHOD BeginSection( cSection, cFilename ) CLASS GenerateXML IF ::Depth == 0 - FWrite( ::nHandle, Replicate( Chr(9), ::Depth ) + [
] + hb_eol() ) + FWrite( ::nHandle, Replicate( Chr( 9 ), ::Depth ) + [
] + hb_eol() ) ELSE - FWrite( ::nHandle, Replicate( Chr(9), ::Depth ) + [
] + hb_eol() ) + FWrite( ::nHandle, Replicate( Chr( 9 ), ::Depth ) + [
] + hb_eol() ) ENDIF ::Depth++ RETURN self @@ -99,7 +99,7 @@ METHOD EndSection( cSection, cFilename ) CLASS GenerateXML HB_SYMBOL_UNUSED( cSection ) HB_SYMBOL_UNUSED( cFilename ) ::Depth-- - FWrite( ::nHandle, Replicate( Chr(9), ::Depth ) + [
] + hb_eol() ) + FWrite( ::nHandle, Replicate( Chr( 9 ), ::Depth ) + [
] + hb_eol() ) RETURN self METHOD AddIndex( oEntry ) CLASS GenerateXML @@ -147,9 +147,9 @@ METHOD PROCEDURE WriteEntry( cCaption, cEntry, lPreformatted ) CLASS GenerateXML NEXT cEntry := cResult - FWrite( ::nHandle, Replicate( Chr(9), ::Depth ) + "<" + cCaption + iif( lPreformatted, ' preformatted="yes"', "") + ">" ) + FWrite( ::nHandle, Replicate( Chr( 9 ), ::Depth ) + "<" + cCaption + iif( lPreformatted, ' preformatted="yes"', "") + ">" ) FWrite( ::nHandle, cEntry ) - FWrite( ::nHandle, /* Replicate( Chr(9), ::Depth ) + */ "" + hb_eol() ) + FWrite( ::nHandle, /* Replicate( Chr( 9 ), ::Depth ) + */ "" + hb_eol() ) ENDIF RETURN diff --git a/harbour/extras/hbdoc/hbdoc.prg b/harbour/extras/hbdoc/hbdoc.prg index d6fdd0e43f..2c7b719e43 100644 --- a/harbour/extras/hbdoc/hbdoc.prg +++ b/harbour/extras/hbdoc/hbdoc.prg @@ -224,9 +224,9 @@ PROCEDURE Main( ... ) OutStd( hb_eol() ) ASort( aContent, , , {| oL, oR | ; - hb_ntos( oL:CategoryIndex( oL:Category ) ) + " " + hb_ntos( oL:SubcategoryIndex( oL:Category, oL:Subcategory ) ) + Chr(1) + oL:Name + " " ; + hb_ntos( oL:CategoryIndex( oL:Category ) ) + " " + hb_ntos( oL:SubcategoryIndex( oL:Category, oL:Subcategory ) ) + Chr( 1 ) + oL:Name + " " ; <= ; - hb_ntos( oR:CategoryIndex( oR:Category ) ) + " " + hb_ntos( oR:SubcategoryIndex( oR:Category, oR:Subcategory ) ) + Chr(1) + oR:Name + " " ; + hb_ntos( oR:CategoryIndex( oR:Category ) ) + " " + hb_ntos( oR:SubcategoryIndex( oR:Category, oR:Subcategory ) ) + Chr( 1 ) + oR:Name + " " ; } ) // TODO: what is this for? it is sorting the category sub-arrays and removing empty (?) sub-arrays, but why? diff --git a/harbour/extras/hbvpdf/hbvpdf.prg b/harbour/extras/hbvpdf/hbvpdf.prg index 6a410a804d..dc66a77e3c 100644 --- a/harbour/extras/hbvpdf/hbvpdf.prg +++ b/harbour/extras/hbvpdf/hbvpdf.prg @@ -62,18 +62,18 @@ DEFAULT cId to "" ENDIF IF !empty( cString ) cString := pdfStringB( cString ) - IF right( cString, 1 ) == chr(255) //reverse + IF right( cString, 1 ) == Chr( 255 ) //reverse cString := left( cString, len( cString ) - 1 ) pdfBox( t_aReport[ PAGEY ] - nRow - t_aReport[ FONTSIZE ] + 2.0 , nCol, t_aReport[ PAGEY ] - nRow + 2.0, nCol + pdfM2X( pdfLen( cString )) + 1,,100, "D") t_aReport[ PAGEBUFFER ] += " 1 g " lReverse := .T. - ELSEIF right( cString, 1 ) == chr(254) //underline + ELSEIF right( cString, 1 ) == Chr( 254 ) //underline cString := left( cString, len( cString ) - 1 ) pdfBox( t_aReport[ PAGEY ] - nRow + 0.5, nCol, t_aReport[ PAGEY ] - nRow + 1, nCol + pdfM2X( pdfLen( cString )) + 1,,100, "D") ENDIF // version 0.01 - IF ( nAt := at( chr(253), cString )) > 0 // some color text inside + IF ( nAt := at( Chr( 253 ), cString )) > 0 // some color text inside t_aReport[ PAGEBUFFER ] += CRLF + ; Chr_RGB( substr( cString, nAt + 1, 1 )) + " " + ; Chr_RGB( substr( cString, nAt + 2, 1 )) + " " + ; @@ -319,8 +319,8 @@ return nil function pdfBox1( nTop, nLeft, nBottom, nRight, nBorderWidth, cBorderColor, cBoxColor ) /* =============================================================== */ DEFAULT nBorderWidth to 0.5 -DEFAULT cBorderColor to chr(0) + chr(0) + chr(0) -DEFAULT cBoxColor to chr(255) + chr(255) + chr(255) +DEFAULT cBorderColor to Chr( 0 ) + Chr( 0 ) + Chr( 0 ) +DEFAULT cBoxColor to Chr( 255 ) + Chr( 255 ) + Chr( 255 ) t_aReport[ PAGEBUFFER ] += CRLF + ; Chr_RGB( substr( cBorderColor, 1, 1 )) + " " + ; @@ -783,7 +783,7 @@ function pdfLen( cString ) /* local nWidth := 0.00, nI, nLen, nArr, nAdd := ( t_aReport[ FONTNAME ] - 1 ) % 4 nLen := len( cString ) - IF right( cString, 1 ) == chr(255) .or. right( cString, 1 ) == chr(254 )// reverse or underline + IF right( cString, 1 ) == Chr( 255 ) .or. right( cString, 1 ) == Chr( 254 ) // reverse or underline --nLen ENDIF IF pdfGetFontInfo("NAME") == "Times" @@ -1042,7 +1042,7 @@ return t_aReport[ REPORTPAGE ] ============================== */ function pdfReverse( cString ) /* ============================== */ -return cString + chr(255) +return cString + Chr( 255 ) /* ============================================================= */ function pdfRJust( cString, nRow, nCol, cUnits, lExact, cId ) /* @@ -1128,7 +1128,7 @@ return pdfText( cString, nTop, nLeft, nLength, nTab, nJustify, cUnits, .F. ) =================================================================================*/ function pdfText( cString, nTop, nLeft, nLength, nTab, nJustify, cUnits, cColor, lPrint )/* =================================================================================*/ -local cDelim := chr(0)+chr(9)+chr(10)+chr(13)+chr(26)+chr(32)+chr(138)+chr(141) +local cDelim := Chr( 0 ) + chr( 9 ) + chr( 10 ) + chr( 13 ) + chr( 26 ) + chr( 32 ) + chr( 138 ) + chr( 141 ) local nI, cTemp, cToken, k, nL, nRow, nLines, nLineLen, nStart local lParagraph, nSpace, nNew, nTokenLen, nCRLF, nTokens, nLen DEFAULT nTab to -1 @@ -1292,8 +1292,8 @@ local nAt, cAt, nCRLF, nNew, nRat, nRet := 0 // check if next spaces paragraph(s) nAt := attoken( cString, cDelim, nI ) + len( token( cString, cDelim, nI ) ) cAt := substr( cString, nAt, attoken( cString, cDelim, nI + 1 ) - nAt ) - nCRLF := numat( chr(13) + chr(10), cAt ) - nRat := rat( chr(13) + chr(10), cAt ) + nCRLF := numat( chr( 13 ) + chr( 10 ), cAt ) + nRat := rat( chr( 13 ) + chr( 10 ), cAt ) nNew := len( cAt ) - nRat - iif( nRat > 0, 1, 0 ) IF nCRLF > 1 .or. ( nCRLF == 1 .and. nNew > 0 ) nRet := nCRLF @@ -1303,7 +1303,7 @@ return nRet ================================ */ function pdfUnderLine( cString ) /* ================================ */ -return cString + chr(254) +return cString + chr( 254 ) /* =========================== */ static function pdfX2M( n ) /* @@ -1759,7 +1759,7 @@ local cTemp := upper(substr( cFile, rat('.', cFile) + 1 )), aTemp := {} return aTemp function pdfTIFFInfo( cFile ) -local c40 := chr(0)+chr(0)+chr(0)+chr(0) +local c40 := chr( 0 ) + chr( 0 ) + chr( 0 ) + chr( 0 ) //local aType := {"BYTE","ASCII","SHORT","LONG","RATIONAL","SBYTE","UNDEFINED","SSHORT","SLONG","SRATIONAL","FLOAT","DOUBLE"} local aCount := { 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8 } local nTemp, nHandle, cValues, c2, nFieldType, nCount, nPos, nTag, nValues @@ -2320,7 +2320,7 @@ local nSpace // := 3 // 3 - RGB, 1 - GREY, 4 - CMYK xRes := asc(substr( c255, 15, 1 )) * 256 + asc(substr( c255, 16, 1 )) yRes := asc( substr( c255, 17, 1 )) * 256 + asc(substr( c255, 18, 1 )) - nAt := rat( chr(255) + chr(192), c255 ) + 5 + nAt := rat( chr( 255 ) + chr( 192 ), c255 ) + 5 nHeight := asc(substr( c255, nAt, 1 )) * 256 + asc(substr( c255, nAt + 1, 1 )) nWidth := asc( substr( c255, nAt + 2, 1 )) * 256 + asc(substr( c255, nAt + 3, 1 )) @@ -2358,7 +2358,7 @@ RETURN AllToken( cString, cDelimiter, nPointer, 2 ) STATIC FUNCTION AllToken( cString, cDelimiter, nPointer, nAction ) LOCAL nTokens := 0, nPos := 1, nLen := len( cString ), nStart, cRet -DEFAULT cDelimiter to chr(0)+chr(9)+chr(10)+chr(13)+chr(26)+chr(32)+chr(138)+chr(141) +DEFAULT cDelimiter to chr( 0 ) + chr( 9 ) + chr( 10 ) + chr( 13 ) + chr( 26 ) + chr( 32 ) + chr( 138 ) + chr( 141 ) DEFAULT nAction to 0 // nAction == 0 - numtoken diff --git a/harbour/extras/httpsrv/cgifunc.prg b/harbour/extras/httpsrv/cgifunc.prg index 22d0e68432..35be6d8e9e 100644 --- a/harbour/extras/httpsrv/cgifunc.prg +++ b/harbour/extras/httpsrv/cgifunc.prg @@ -56,7 +56,7 @@ //#define HB_USE_HBTIP // Use functions from HBTIP - TOIMPLEMENT -#define CRLF (Chr(13)+Chr(10)) +#define CRLF ( Chr( 13 ) + Chr( 10 ) ) #xtranslate THROW( ) => ( Eval( ErrorBlock(), ), Break( ) ) #define HB_IHASH() HB_HSETCASEMATCH( {=>}, .F. ) @@ -285,7 +285,7 @@ FUNCTION uhttpd_SplitString( cString, cDelim, lRemDelim, nCount ) LOCAL aLines := {}, cLine LOCAL nHowMany := 0 - DEFAULT cDelim TO ( CHR(13) + CHR(10) ) + DEFAULT cDelim TO ( CHR( 13 ) + CHR( 10 ) ) DEFAULT lRemDelim TO .T. DEFAULT nCount TO -1 diff --git a/harbour/extras/httpsrv/uhttpd.prg b/harbour/extras/httpsrv/uhttpd.prg index 4d51c4fd80..3df7e366b3 100644 --- a/harbour/extras/httpsrv/uhttpd.prg +++ b/harbour/extras/httpsrv/uhttpd.prg @@ -139,8 +139,8 @@ REQUEST __HB_EXTERN__ // TOCHECK: Caching of HRB modules (Is this faster than loading HRBBody from file where OS will cache ?) #define HRB_ACTIVATE_CACHE .F. // if .T. caching of HRB modules will be enabled. (NOTE: changes of files will not be loaded until server is active) -#define CR_LF (CHR(13)+CHR(10)) -#define HB_IHASH() HB_HSETCASEMATCH( {=>}, .F. ) +#define CR_LF ( CHR( 13 ) + CHR( 10 ) ) +#define HB_IHASH() HB_HSETCASEMATCH( { => }, .F. ) #ifdef __PLATFORM__WINDOWS REQUEST HB_GT_WVT_DEFAULT diff --git a/harbour/src/debug/debugger.prg b/harbour/src/debug/debugger.prg index 65b94ec545..fbf6b5331f 100644 --- a/harbour/src/debug/debugger.prg +++ b/harbour/src/debug/debugger.prg @@ -3190,7 +3190,7 @@ STATIC PROCEDURE SetsKeyPressed( nKey, oBrwSets, nSets, oWnd, cCaption, bEdit ) ENDIF IF LastKey() == K_ENTER - KEYBOARD Chr( K_DOWN ) + hb_keyPut( K_DOWN ) ENDIF ENDCASE diff --git a/harbour/tests/rto_get.prg b/harbour/tests/rto_get.prg index 26fdcf2e08..95a3d87fd0 100644 --- a/harbour/tests/rto_get.prg +++ b/harbour/tests/rto_get.prg @@ -1600,11 +1600,11 @@ FUNCTION XToStr( xValue ) DO CASE CASE cType == "C" - xValue := StrTran( xValue, Chr(0), '"+Chr(0)+"' ) - xValue := StrTran( xValue, Chr(9), '"+Chr(9)+"' ) - xValue := StrTran( xValue, Chr(10), '"+Chr(10)+"' ) - xValue := StrTran( xValue, Chr(13), '"+Chr(13)+"' ) - xValue := StrTran( xValue, Chr(26), '"+Chr(26)+"' ) + xValue := StrTran( xValue, Chr( 0 ), '" + Chr( 0 ) + "' ) + xValue := StrTran( xValue, Chr( 9 ), '" + Chr( 9 ) + "' ) + xValue := StrTran( xValue, Chr( 10 ), '" + Chr( 10 ) + "' ) + xValue := StrTran( xValue, Chr( 13 ), '" + Chr( 13 ) + "' ) + xValue := StrTran( xValue, Chr( 26 ), '" + Chr( 26 ) + "' ) RETURN '"' + xValue + '"' @@ -1639,11 +1639,11 @@ FUNCTION XToStrE( xValue ) DO CASE CASE cType == "C" - xValue := StrTran( xValue, Chr(0), '"+Chr(0)+"' ) - xValue := StrTran( xValue, Chr(9), '"+Chr(9)+"' ) - xValue := StrTran( xValue, Chr(10), '"+Chr(10)+"' ) - xValue := StrTran( xValue, Chr(13), '"+Chr(13)+"' ) - xValue := StrTran( xValue, Chr(26), '"+Chr(26)+"' ) + xValue := StrTran( xValue, Chr( 0 ), '" + Chr( 0 ) + "' ) + xValue := StrTran( xValue, Chr( 9 ), '" + Chr( 9 ) + "' ) + xValue := StrTran( xValue, Chr( 10 ), '" + Chr( 10 ) + "' ) + xValue := StrTran( xValue, Chr( 13 ), '" + Chr( 13 ) + "' ) + xValue := StrTran( xValue, Chr( 26 ), '" + Chr( 26 ) + "' ) RETURN xValue @@ -1668,11 +1668,11 @@ FUNCTION XToStrX( xValue ) DO CASE CASE cType == "C" - xValue := StrTran( xValue, Chr(0), '"+Chr(0)+"' ) - xValue := StrTran( xValue, Chr(9), '"+Chr(9)+"' ) - xValue := StrTran( xValue, Chr(10), '"+Chr(10)+"' ) - xValue := StrTran( xValue, Chr(13), '"+Chr(13)+"' ) - xValue := StrTran( xValue, Chr(26), '"+Chr(26)+"' ) + xValue := StrTran( xValue, Chr( 0 ), '" + Chr( 0 ) + "' ) + xValue := StrTran( xValue, Chr( 9 ), '" + Chr( 9 ) + "' ) + xValue := StrTran( xValue, Chr( 10 ), '" + Chr( 10 ) + "' ) + xValue := StrTran( xValue, Chr( 13 ), '" + Chr( 13 ) + "' ) + xValue := StrTran( xValue, Chr( 26 ), '" + Chr( 26 ) + "' ) RETURN xValue diff --git a/harbour/tests/rto_tb.prg b/harbour/tests/rto_tb.prg index 896622b476..5e4c3f8750 100644 --- a/harbour/tests/rto_tb.prg +++ b/harbour/tests/rto_tb.prg @@ -597,11 +597,11 @@ FUNCTION XToStr( xValue ) DO CASE CASE cType == "C" - xValue := StrTran( xValue, Chr(0), '"+Chr(0)+"' ) - xValue := StrTran( xValue, Chr(9), '"+Chr(9)+"' ) - xValue := StrTran( xValue, Chr(10), '"+Chr(10)+"' ) - xValue := StrTran( xValue, Chr(13), '"+Chr(13)+"' ) - xValue := StrTran( xValue, Chr(26), '"+Chr(26)+"' ) + xValue := StrTran( xValue, Chr( 0 ), '" + Chr( 0 ) + "' ) + xValue := StrTran( xValue, Chr( 9 ), '" + Chr( 9 ) + "' ) + xValue := StrTran( xValue, Chr( 10 ), '" + Chr( 10 ) + "' ) + xValue := StrTran( xValue, Chr( 13 ), '" + Chr( 13 ) + "' ) + xValue := StrTran( xValue, Chr( 26 ), '" + Chr( 26 ) + "' ) RETURN '"' + xValue + '"' @@ -636,11 +636,11 @@ FUNCTION XToStrE( xValue ) DO CASE CASE cType == "C" - xValue := StrTran( xValue, Chr(0), '"+Chr(0)+"' ) - xValue := StrTran( xValue, Chr(9), '"+Chr(9)+"' ) - xValue := StrTran( xValue, Chr(10), '"+Chr(10)+"' ) - xValue := StrTran( xValue, Chr(13), '"+Chr(13)+"' ) - xValue := StrTran( xValue, Chr(26), '"+Chr(26)+"' ) + xValue := StrTran( xValue, Chr( 0 ), '" + Chr( 0 ) + "' ) + xValue := StrTran( xValue, Chr( 9 ), '" + Chr( 9 ) + "' ) + xValue := StrTran( xValue, Chr( 10 ), '" + Chr( 10 ) + "' ) + xValue := StrTran( xValue, Chr( 13 ), '" + Chr( 13 ) + "' ) + xValue := StrTran( xValue, Chr( 26 ), '" + Chr( 26 ) + "' ) RETURN xValue @@ -665,11 +665,11 @@ FUNCTION XToStrX( xValue ) DO CASE CASE cType == "C" - xValue := StrTran( xValue, Chr(0), '"+Chr(0)+"' ) - xValue := StrTran( xValue, Chr(9), '"+Chr(9)+"' ) - xValue := StrTran( xValue, Chr(10), '"+Chr(10)+"' ) - xValue := StrTran( xValue, Chr(13), '"+Chr(13)+"' ) - xValue := StrTran( xValue, Chr(26), '"+Chr(26)+"' ) + xValue := StrTran( xValue, Chr( 0 ), '" + Chr( 0 ) + "' ) + xValue := StrTran( xValue, Chr( 9 ), '" + Chr( 9 ) + "' ) + xValue := StrTran( xValue, Chr( 10 ), '" + Chr( 10 ) + "' ) + xValue := StrTran( xValue, Chr( 13 ), '" + Chr( 13 ) + "' ) + xValue := StrTran( xValue, Chr( 26 ), '" + Chr( 26 ) + "' ) RETURN xValue