From f2080fb80218bf8400bc780530c372fc6a66930c Mon Sep 17 00:00:00 2001 From: Luiz Rafael Culik Date: Thu, 2 Nov 2000 22:33:00 +0000 Subject: [PATCH] See changelog 2000-11-02 19:20 GMT -3 --- harbour/ChangeLog | 22 ++++++++- harbour/doc/en/garbage.txt | 6 +-- harbour/doc/en/idle.txt | 7 +-- harbour/doc/en/rddord.txt | 5 -- harbour/doc/en/tbrowse.txt | 3 ++ harbour/doc/en/terminal.txt | 2 +- harbour/tests/testbrw.prg | 10 ++-- harbour/utils/hbdoc/genchm.prg | 88 ++++++++++++++++++++++++++++++++-- harbour/utils/hbdoc/genhtm.prg | 2 +- harbour/utils/hbdoc/genrtf.prg | 9 ++-- harbour/utils/hbdoc/html.prg | 7 +-- harbour/utils/hbdoc/rtf.prg | 13 +++-- 12 files changed, 144 insertions(+), 30 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b1895e58e9..a736bfa228 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,5 +1,25 @@ +2000-11-02 19:20 GMT -3 Luiz Rafael Culik + *doc/en/tbrowse.txt + *added missing CVS ID + *doc/en/terminal.txt + *Fixed typo on MAXROW() doc + *doc/en/rddord.txt + *Removed 5 dumb lines + *doc/en/idle.txt + doc/en/garbage.txt + *Changes // coments to /* */ + *utils/hbdoc/rtf.prg + utils/hbdoc/genrtf.prg + utils/hbdoc/hbdoc.prg + *Small Changes + *utils/hbdoc/genrtf.prg + utils/hbdoc/genrtf.prg + *Small Fix to work with $CLASSDOC$ style headers + *tests/testbrw.prg + *small fixes + 2000-11-02 00:10 GMT -3 Luiz Rafael Culik - *doc/en/trowse.txt + *doc/en/tbrowse.txt *Small changes *doc/en/terminal.txt +Row(),COL(),PROW(),PCOL() documentes diff --git a/harbour/doc/en/garbage.txt b/harbour/doc/en/garbage.txt index 95edf82acc..cece9592aa 100644 --- a/harbour/doc/en/garbage.txt +++ b/harbour/doc/en/garbage.txt @@ -1,6 +1,6 @@ -// -// $Id$ -// +/* + * $Id$ +*/ /* $DOC$ * $FUNCNAME$ diff --git a/harbour/doc/en/idle.txt b/harbour/doc/en/idle.txt index 8ee640f534..48bd4c0dc4 100644 --- a/harbour/doc/en/idle.txt +++ b/harbour/doc/en/idle.txt @@ -1,6 +1,7 @@ -// -// $Id$ -// +/* + * $Id$ +*/ + /* $DOC$ * $FUNCNAME$ * The idle states diff --git a/harbour/doc/en/rddord.txt b/harbour/doc/en/rddord.txt index 4ffa2a7225..7697c6aabd 100644 --- a/harbour/doc/en/rddord.txt +++ b/harbour/doc/en/rddord.txt @@ -1,11 +1,6 @@ /* * $Id$ */ - ordKey - ordFor - ordBagName - ordName - ordNumber /* * The following parts are Copyright of the individual authors. diff --git a/harbour/doc/en/tbrowse.txt b/harbour/doc/en/tbrowse.txt index cae386bb6f..7c9ec05da1 100644 --- a/harbour/doc/en/tbrowse.txt +++ b/harbour/doc/en/tbrowse.txt @@ -1,3 +1,6 @@ +/* + * $Id$ + */ /* $CLASSDOC$ * $FUNCNAME$ diff --git a/harbour/doc/en/terminal.txt b/harbour/doc/en/terminal.txt index 6e54721593..34a9f66a16 100644 --- a/harbour/doc/en/terminal.txt +++ b/harbour/doc/en/terminal.txt @@ -848,7 +848,7 @@ * $PLATFORMS$ * It works in all platform with some remarks:Under Linux and OS/2 the * number of columns avaliable depends of the current Terminal screen - * size.Under Win32, the return value of MAXCOL() function is only + * size.Under Win32, the return value of MAXROW() function is only * affected if called after an SETMODE() function * $FILES$ * Library is rtl diff --git a/harbour/tests/testbrw.prg b/harbour/tests/testbrw.prg index c6f2b17685..a99b01a938 100644 --- a/harbour/tests/testbrw.prg +++ b/harbour/tests/testbrw.prg @@ -50,6 +50,7 @@ function Main() nRow := Row() nCol := Col() @ 4,4,17,31 BOX "ÚÄ¿³ÙÄÀ³ " +#ifdef HB_COMPAT_C53 oBrowse:Setkey(0,{|ob,nkey| Defproc(ob,nKey)}) while .t. oBrowse:ForceStable() @@ -57,7 +58,8 @@ while .t. exit endif enddo -/* +#else +While !lEnd oBrowse:ForceStable() @@ -119,14 +121,15 @@ enddo endcase end -*/ +#endif DevPos( nRow, nCol ) SetColor( cColor ) SetCursor( nCursor ) return nil +#ifdef HB_COMPAT_C53 function defproc(ob,nkey) - +Local nTmpRow,nTmpCol if nKey = K_TAB nTmpRow := ROW() nTmpCol := COL() @@ -135,3 +138,4 @@ function defproc(ob,nkey) ob:Refreshall() endif return 1 +#endif diff --git a/harbour/utils/hbdoc/genchm.prg b/harbour/utils/hbdoc/genchm.prg index b123bbce45..b560e379aa 100644 --- a/harbour/utils/hbdoc/genchm.prg +++ b/harbour/utils/hbdoc/genchm.prg @@ -375,8 +375,15 @@ FUNCTION ProcessChm() cFuncname := SUBSTR( cFuncName, 1, AT( "(", cFuncName ) - 1 ) ENDIF IF lEndDesc .AND. lClassDoc - lEndDesc := .f. + if lWasTestExamples + oChm:WriteText( "" ) + else oChm:WriteText( "

" ) + lWasTestExamples:=.f. + endif + + lEndDesc := .f. + ENDIF oChm:WriteText( '
' ) oChm:WriteText( '
' ) @@ -408,10 +415,10 @@ FUNCTION ProcessChm() // Now start writing out what we know IF lData - oChm:WriteText( "

DATA " + ALLTRIM( PAD( cFuncName, 21 ) ) + "

" ) + oChm:WriteText( "

DATA " + ALLTRIM( cFuncName ) + "

" ) oChm:WriteText( "

" + cOneline + "

" + hb_osnewline() ) ELSEIF lMethod - oChm:WriteText( "

METHOD " + ALLTRIM( PAD( cFuncName, 21 ) ) + "

" ) + oChm:WriteText( "

"+ LEFT( cFileName, AT( ".", cFileName ) - 1 )+ ":" + ALLTRIM( cFuncName ) + "

" ) oChm:WriteText( "

" + cOneline + "

" + hb_osnewline() ) ELSE oChm:WriteText( "

" + ALLTRIM( PAD( cFuncName, 21 ) ) + "

" ) @@ -473,6 +480,54 @@ end lAddBlank := .T. lEndDesc := .t. end + + ELSEIF AT( cdatalink, cBuffer ) > 0 + IF GetItem( cBuffer, nCurdoc ) + IF !lBlankLine +oChm:writeText("
") //:endpar() +// oChm:WriteParBold( " Data" ) + oChm:WriteText( "
Data
" ) +//oChm:writeText("
") //:endpar() + endif + nMode := D_DATALINK + // lAddBlank := .T. + + lIsDataLink := .T. + END + ELSEIF AT( cDatanolink, cBuffer ) > 0 + IF GetItem( cBuffer, nCurdoc ) + IF !lIsDataLink + oChm:writeText("
") //:endpar() + oChm:WriteText( "
Data
" ) +// oChm:writeText("
") //:endpar() + ENDIF + nMode := D_NORMAL + lAddBlank := .T. + + END + ELSEIF AT( cMethodslink, cBuffer ) > 0 + IF GetItem( cBuffer, nCurdoc ) + oChm:writeText("
") //:endpar() + oChm:WriteParBold( " Method" ) +//oChm:writeText("
") //:endpar() + nMode := D_METHODLINK + lAddBlank := .T. + + lIsMethodLink := .T. + END + ELSEIF AT( cMethodsnolink, cBuffer ) > 0 + IF GetItem( cBuffer, nCurdoc ) + IF !lIsMethodLink + oChm:writeText("
") //:endpar() + oChm:WriteParBold( " Methods" ) + oChm:writepar("
") //:endpar() + ENDIF +// oChm:writeText("
") //:endpar() + nMode := D_NORMAL + lAddBlank := .T. + + END + ELSEIF AT( cExam, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) IF !lBlankLine @@ -607,6 +662,33 @@ end IF .NOT. EMPTY( cBuffer ) cSeeAlso := StripFiles( ALLTRIM( cBuffer ) ) ENDIF + ELSEIF nMode = D_DATALINK + IF LEN( cBuffer ) > LONGLINE +// WRITE_ERROR( "General", cBuffer, nLineCnt, ; + // LONGLINE, aDirList[ i, F_NAME ] ) + ENDIF + lBlankLine := EMPTY( cBuffer ) + IF lAddBlank + lAddBlank := .F. + ENDIF + cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) ) + oChm:WriteText( "
" + cBuffer + '
' ) + oChm:writetext('

') + ELSEIF nMode = D_METHODLINK + IF LEN( cBuffer ) > LONGLINE +// WRITE_ERROR( "General", cBuffer, nLineCnt, ; + // LONGLINE, aDirList[ i, F_NAME ] ) + ENDIF + lBlankLine := EMPTY( cBuffer ) + IF lAddBlank + lAddBlank := .F. + ENDIF + cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( "(", cBuffer ) - 1 ) ) + if !lBlankline + oChm:WriteText( "
" + cBuffer + '
' ) + oChm:writetext('

') + endif + ELSEIF nMode = D_INCLUDE // read next line IF .NOT. EMPTY( cBuffer ) diff --git a/harbour/utils/hbdoc/genhtm.prg b/harbour/utils/hbdoc/genhtm.prg index cfb92a2efd..24b79feee6 100644 --- a/harbour/utils/hbdoc/genhtm.prg +++ b/harbour/utils/hbdoc/genhtm.prg @@ -449,7 +449,7 @@ FUNCTION ProcessWww() oHtm:WriteText( "

DATA " + ALLTRIM( cFuncName ) + "

" ) oHtm:WriteText( "

" + cOneline + "

" + hb_osnewline() ) ELSEIF lMethod - oHtm:WriteText( "

METHOD " + ALLTRIM( cFuncName ) + "

" ) + oHtm:WriteText( "

"+ LEFT( cFileName, AT( ".", cFileName ) - 1 )+ ":" + ALLTRIM( cFuncName ) + "

" ) oHtm:WriteText( "

" + cOneline + "

" + hb_osnewline() ) ELSE oHtm:WriteText( "

" + ALLTRIM( cFuncName ) + "

" ) diff --git a/harbour/utils/hbdoc/genrtf.prg b/harbour/utils/hbdoc/genrtf.prg index 52c5d060f1..f09fcc6e41 100644 --- a/harbour/utils/hbdoc/genrtf.prg +++ b/harbour/utils/hbdoc/genrtf.prg @@ -243,11 +243,12 @@ FUNCTION ProcessRtf() oRtf:WriteParBold( "See Also" ) oRtf:WritePar( "" ) //:endpar() aAlso:=ListAsArray2(cSeeAlso,",") - if Len(aAlso) <3 - ProcRtfalso( oRtf, cSeealso ) - else +// if Len(aAlso) <3 +// ProcRtfalso( oRtf, cSeealso ) +// oRtf:WriteKLink(aAlso,.f.) +// else oRtf:WriteKLink(aAlso) - endif +// endif ENDIF lDoc := .F. diff --git a/harbour/utils/hbdoc/html.prg b/harbour/utils/hbdoc/html.prg index 88736c413f..9a1e86805c 100644 --- a/harbour/utils/hbdoc/html.prg +++ b/harbour/utils/hbdoc/html.prg @@ -218,21 +218,22 @@ METHOD NewChm( cFile ,aMetaContents,cFuncName) CLASS THTML FWRITE( Self:nHandle, '' + CRLF ) ::AddObject("application/x-oleobject","clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e") ::ADDPARAM("Keyword",cFuncName) + ::AddParam("ALink Name",cFuncName) ::ENDOBJECT() RETURN Self method ADDOBJECT(cType,cClassId) Class THTML IF VALTYPE(cClassId)<>NIL .and. VALTYPE(cClassId)=="C" - FWRITE( Self:nHandle,''+CRLF) + FWRITE( Self:nHandle,''+CRLF) ELSE - FWRITE( Self:nHandle,''+CRLF) + FWRITE( Self:nHandle,''+CRLF) ENDIF RETURN Self METHOD ENDOBJECT() Class THTML FWRITE( Self:nHandle,""+CRLF) RETURN Self METHOD ADDPARAM(cType,cValue) Class THTML - FWRITE( Self:nHandle,'' +CRLF) + FWRITE( Self:nHandle,'' +CRLF) RETURN Self METHOD NewContent( cFile ) CLASS THTML diff --git a/harbour/utils/hbdoc/rtf.prg b/harbour/utils/hbdoc/rtf.prg index 1a695c664f..8ad25c12bc 100644 --- a/harbour/utils/hbdoc/rtf.prg +++ b/harbour/utils/hbdoc/rtf.prg @@ -57,7 +57,7 @@ CLASS TRTF METHOD WriteParBox( cPar ) METHOD WriteLink( clink ) METHOD WriteJumpLink( clink ) - METHOD WritekLink( aLink ) + METHOD WritekLink( aLink ,lAlink) METHOD WriteJumpLink1( cLink, cName, cText ) METHOD CLOSE() METHOD WriteParBold( cPar, lCenter ) @@ -284,10 +284,12 @@ METHOD WriteJumpLink1( cLink, cName, cText ) CLASS TRTF RETURN Self -METHOD WritekLink( aLink ) CLASS TRTF +METHOD WritekLink( aLink ,lAlink) CLASS TRTF Local cItem:=' ' Local nPos:=0 Local nSize:=Len(aLink) + +if nSize >2 For nPos:=1 to nSize if nPos==nSize cItem+= aLink[nPos] @@ -296,8 +298,13 @@ For nPos:=1 to nSize cItem+=";" endif next +cItem:=Alltrim(cItem) FWRITE( Self:nHandle, '\par \pard\cf1\fs20 {\f6\uldb Related Topic }'+'{\v\f6 !ALink(" '+cItem + '", 2) }'+ CRLF ) - +else +For nPos:=1 to nSize + FWRITE( Self:nHandle, '\par \pard\cf1\fs20 {\f6\uldb '+aLink[nPos] +' }{\v\f6 !KLink(" '+UPPERLOWER(aLink[nPos]) + '", 2) }'+ CRLF ) +next +endif RETURN Self *+ EOF: RTF.PRG