From 1059369bfd9b54a79592b2cb879e9da61eca032e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 3 May 2011 21:19:41 +0000 Subject: [PATCH] 2011-05-03 23:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbct/doc/en/tab.txt * contrib/xhb/hbcompat.ch * doc/pragma.txt * doc/en/terminal.txt * doc/en/file.txt * hb_osnewline() -> hb_eol() * doc/Makefile ! deleted howtobld.txt --- harbour/ChangeLog | 11 +++++++++++ harbour/contrib/hbct/doc/en/tab.txt | 16 ++++++++-------- harbour/contrib/xhb/hbcompat.ch | 4 ++-- harbour/doc/Makefile | 1 - harbour/doc/en/file.txt | 3 +-- harbour/doc/en/terminal.txt | 10 +++++----- harbour/doc/pragma.txt | 3 +-- 7 files changed, 28 insertions(+), 20 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1efef7f154..fb19e0aa23 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2011-05-03 23:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbct/doc/en/tab.txt + * contrib/xhb/hbcompat.ch + * doc/pragma.txt + * doc/en/terminal.txt + * doc/en/file.txt + * hb_osnewline() -> hb_eol() + + * doc/Makefile + ! deleted howtobld.txt + 2011-05-03 13:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + added more text to how to identify log sections relevant diff --git a/harbour/contrib/hbct/doc/en/tab.txt b/harbour/contrib/hbct/doc/en/tab.txt index cd55d70f0f..3559db7178 100644 --- a/harbour/contrib/hbct/doc/en/tab.txt +++ b/harbour/contrib/hbct/doc/en/tab.txt @@ -19,18 +19,18 @@ * * string indicating new line, * default is the string returned by - * hb_osnewline() + * hb_eol() * character indicating a tab stop, * default is chr(9) * .T., if the soft-CR used by MEMOEDIT() * should be ignored as a newline indicator, * default is .F. (functions uses chr(141)) * $RETURNS$ - * + * * $DESCRIPTION$ * TODO: add documentation * $EXAMPLES$ - * + * * $TESTS$ * tabexpand("-"+chr(9)+"!") == "- !" * tabexpand("----"+chr(9) +"!") == "---- !" @@ -38,7 +38,7 @@ * tabexpand("-"+chr(9)+ "!", 4) == "- !" * tabexpand("----"+chr(9)+ "!", 8) == "---- !" * tabexpand("----"+chr(9)+ "!", 8, "+") == "----++++!" - * tabexpand("-"+chr(9)+"!"+hb_osnewline()+"----"+chr(9)+ "!",, "+") == "-+++++++!"+hb_osnewline()+"----++++!" + * tabexpand("-"+chr(9)+"!"+hb_eol()+"----"+chr(9)+ "!",, "+") == "-+++++++!"+hb_eol()+"----++++!" * $STATUS$ * Started * $COMPLIANCE$ @@ -71,20 +71,20 @@ * * string indicating new line, * default is the string returned by - * hb_osnewline() + * hb_eol() * character indicating a tab stop, * default is chr(9) * .T., if the soft-CR used by MEMOEDIT() * should be ignored as a newline indicator, * default is .F. (functions uses chr(141)) * $RETURNS$ - * + * * $DESCRIPTION$ * TODO: add documentation * $EXAMPLES$ - * + * * $TESTS$ - * + * * $STATUS$ * Started * $COMPLIANCE$ diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index dfe16aeb89..8abfaea63f 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -297,7 +297,7 @@ #xtranslate SetKey([]) => hb_SetKey() /* TEXT INTO */ - #xcommand TEXT INTO => #pragma __text|+=%s+HB_OSNEWLINE();:="" + #xcommand TEXT INTO => #pragma __text|+=%s+hb_eol();:="" /* SWITCH ... ; case ... ; DEFAULT ; ... ; END */ #xcommand DEFAULT => OTHERWISE @@ -306,7 +306,7 @@ #xtranslate hb_enumIndex() => :__enumIndex() /* TRY / CATCH / FINALLY / END */ - #xcommand TRY => BEGIN SEQUENCE WITH {|oErr| Break( oErr )} + #xcommand TRY => BEGIN SEQUENCE WITH {| oErr | Break( oErr ) } #xcommand CATCH [] => RECOVER [USING ] <-oErr-> #xcommand FINALLY => ALWAYS diff --git a/harbour/doc/Makefile b/harbour/doc/Makefile index 5213ea5a7b..7e2219bc52 100644 --- a/harbour/doc/Makefile +++ b/harbour/doc/Makefile @@ -17,7 +17,6 @@ DOC_FILES := \ gmake.txt \ gtapi.txt \ hdr_tpl.txt \ - howtobld.txt \ howtorel.txt \ howtosvn.txt \ inet.txt \ diff --git a/harbour/doc/en/file.txt b/harbour/doc/en/file.txt index d571cad0d9..47e70947ad 100644 --- a/harbour/doc/en/file.txt +++ b/harbour/doc/en/file.txt @@ -526,14 +526,13 @@ * // cB = a string buffer passed-by-reference to hold the result * // nMaxLine = maximum number of bytes to read * - * #define EOL HB_OSNEWLINE() * FUNCTION FREADln( nH, cB, nMaxLine ) * LOCAL cLine, nSavePos, nEol, nNumRead * cLine := space( nMaxLine ) * cB := '' * nSavePos := FSEEK( nH, 0, FS_RELATIVE ) * nNumRead := FREAD( nH, @cLine, nMaxLine ) - * IF ( nEol := AT( EOL, substr( cLine, 1, nNumRead ) ) ) == 0 + * IF ( nEol := AT( hb_eol(), substr( cLine, 1, nNumRead ) ) ) == 0 * cB := cLine * ELSE * cB := SUBSTR( cLine, 1, nEol - 1 ) diff --git a/harbour/doc/en/terminal.txt b/harbour/doc/en/terminal.txt index cb7632b9bb..b166327df2 100644 --- a/harbour/doc/en/terminal.txt +++ b/harbour/doc/en/terminal.txt @@ -346,7 +346,7 @@ * $TEMPLATE$ * Function * $NAME$ - * HB_OSNEWLINE() + * hb_eol() * $CATEGORY$ * API * $SUBCATEGORY$ @@ -354,7 +354,7 @@ * $ONELINER$ * Returns the newline character(s) to use with the current OS * $SYNTAX$ - * HB_OSNewLine() --> cString + * hb_eol() --> cString * $RETURNS$ * A character string containing the character or characters * required to move the screen cursor or print head to the start of a @@ -374,12 +374,12 @@ * // Get the newline character(s) for the current OS. * STATIC s_cNewLine * ... - * s_cNewLine := HB_OSNewLine() + * s_cNewLine := hb_eol() * ... * OutStd( "Hello World!" + s_cNewLine ) * $TESTS$ - * ? valtype( HB_OSNewLine() ) == "C" - * ? LEN( HB_OSNewLine() ) == 1 + * ? ValType( hb_eol() ) == "C" + * ? Len( hb_eol() ) == 1 * $STATUS$ * R * $COMPLIANCE$ diff --git a/harbour/doc/pragma.txt b/harbour/doc/pragma.txt index 4246ba792f..dbef4c4ef8 100644 --- a/harbour/doc/pragma.txt +++ b/harbour/doc/pragma.txt @@ -117,7 +117,7 @@ Syntax: ? -#xcommand TEXT INTO => #pragma __text|+=%s+HB_OSNEWLINE();:="" +#xcommand TEXT INTO => #pragma __text|+=%s+hb_eol();:="" ? #pragma __stream @@ -198,4 +198,3 @@ Syntax: For example: #pragma RECURSELEVEL 2048 -