See changelog 2000-11-02 19:20 GMT -3

2000-11-02 22:33:00 +00:00
parent b22eaab82f
commit f2080fb802
12 changed files with 144 additions and 30 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,5 +1,25 @@
+2000-11-02 19:20 GMT -3 Luiz Rafael Culik <culik@sl.conex.net>
+   *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 <culik@sl.conex.net>
-   *doc/en/trowse.txt
+   *doc/en/tbrowse.txt
     *Small changes
   *doc/en/terminal.txt
     +Row(),COL(),PROW(),PCOL() documentes
--- a/harbour/doc/en/garbage.txt
+++ b/harbour/doc/en/garbage.txt
@@ -1,6 +1,6 @@
-//
-// $Id$
-//
+/*
+ * $Id$
+*/

 /*  $DOC$
 *  $FUNCNAME$
--- a/harbour/doc/en/idle.txt
+++ b/harbour/doc/en/idle.txt
@@ -1,6 +1,7 @@
-//
-// $Id$
-//
+/*
+ * $Id$
+*/
+
 /*  $DOC$
 *  $FUNCNAME$
 *      The idle states
--- 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.
--- a/harbour/doc/en/tbrowse.txt
+++ b/harbour/doc/en/tbrowse.txt
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */

 /*  $CLASSDOC$
 *  $FUNCNAME$
--- 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
--- 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
--- 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( "</pre>" )
+                  else
                  oChm:WriteText( "</p></dd>" )
+                  lWasTestExamples:=.f.
+                  endif
+
+                  lEndDesc := .f.
+
               ENDIF
               oChm:WriteText( '<br>' )
               oChm:WriteText( '<br>' )
@@ -408,10 +415,10 @@ FUNCTION ProcessChm()
               //  Now start writing out what we know

               IF lData
-                  oChm:WriteText( "<H1>DATA " + ALLTRIM( PAD( cFuncName, 21 ) ) + "</H1>" )
+                  oChm:WriteText( "<H1>DATA " + ALLTRIM(  cFuncName ) + "</H1>" )
                  oChm:WriteText( "<p>" + cOneline + "</p>" + hb_osnewline() )
               ELSEIF lMethod
-                  oChm:WriteText( "<H1> METHOD " + ALLTRIM( PAD( cFuncName, 21 ) ) + "</H1>" )
+                  oChm:WriteText( "<H1>"+ LEFT( cFileName, AT( ".", cFileName ) - 1 )+ ":" + ALLTRIM( cFuncName ) + "</H1>" )
                  oChm:WriteText( "<p>" + cOneline + "</p>" + hb_osnewline() )
               ELSE
                  oChm:WriteText( "<H1>" + ALLTRIM( PAD( cFuncName, 21 ) ) + "</H1>" )
@@ -473,6 +480,54 @@ end
                  lAddBlank := .T.
                  lEndDesc  := .t.
               end
+
+               ELSEIF AT( cdatalink, cBuffer ) > 0
+                  IF GetItem( cBuffer, nCurdoc )
+                     IF !lBlankLine
+oChm:writeText("<br>")  //:endpar()
+//                     oChm:WriteParBold( " Data" )
+                        oChm:WriteText( "</dl><dl><dt><b>Data</b></dt>" )
+//oChm:writeText("<br>")  //:endpar()
+                     endif
+                     nMode     := D_DATALINK
+  //                   lAddBlank := .T.
+
+                     lIsDataLink := .T.
+                  END
+               ELSEIF AT( cDatanolink, cBuffer ) > 0
+                  IF GetItem( cBuffer, nCurdoc )
+                     IF !lIsDataLink
+                    oChm:writeText("<br>")                //:endpar()
+                        oChm:WriteText( "</dl><dl><dt><b>Data</b></dt>" )
+//                    oChm:writeText("<br>")                //:endpar()
+                     ENDIF
+                     nMode     := D_NORMAL
+                     lAddBlank := .T.
+
+                  END
+               ELSEIF AT( cMethodslink, cBuffer ) > 0
+                  IF GetItem( cBuffer, nCurdoc )
+                 oChm:writeText("<br>")                //:endpar()
+                     oChm:WriteParBold( " Method" )
+//oChm:writeText("<br>")  //:endpar()
+                     nMode     := D_METHODLINK
+                     lAddBlank := .T.
+
+                     lIsMethodLink := .T.
+                  END
+               ELSEIF AT( cMethodsnolink, cBuffer ) > 0
+                  IF GetItem( cBuffer, nCurdoc )
+                     IF !lIsMethodLink
+                    oChm:writeText("<br>")                //:endpar()
+                        oChm:WriteParBold( " Methods" )
+                       oChm:writepar("<br>")                //:endpar()
+                     ENDIF
+//                       oChm:writeText("<br>")                //: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( "<dd><a href=" + cFileName + "#" +  cTemp  + ">" + cBuffer + '</a></dd>' )
+                     oChm:writetext('<dd><br></dd>')
+                  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( "<dd><a href=" + cFileName + "#" +  cTemp  + ">" + cBuffer + '</a></dd>' )
+                     oChm:writetext('<dd><br></dd>')
+                    endif
+
                  ELSEIF nMode = D_INCLUDE
                     //  read next line
                     IF .NOT. EMPTY( cBuffer )
--- a/harbour/utils/hbdoc/genhtm.prg
+++ b/harbour/utils/hbdoc/genhtm.prg
@@ -449,7 +449,7 @@ FUNCTION ProcessWww()
                  oHtm:WriteText( "<H1>DATA " + ALLTRIM(  cFuncName ) + "</H1>" )
                  oHtm:WriteText( "<p>" + cOneline + "</p>" + hb_osnewline() )
               ELSEIF lMethod
-                  oHtm:WriteText( "<H1> METHOD " + ALLTRIM( cFuncName ) + "</H1>" )
+                  oHtm:WriteText( "<H1>"+ LEFT( cFileName, AT( ".", cFileName ) - 1 )+ ":" + ALLTRIM( cFuncName ) + "</H1>" )
                  oHtm:WriteText( "<p>" + cOneline + "</p>" + hb_osnewline() )
               ELSE
                  oHtm:WriteText( "<H1>" + ALLTRIM(  cFuncName ) + "</H1>" )
--- 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.

--- 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, '<BODY BGCOLOR="#FFFFFF" TEXT="#000000">' + 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,'<OBJECT TYPE="'+cType+'" CLASSID="'+cClassId+'">'+CRLF)
+      FWRITE( Self:nHandle,'<Object type="'+cType+'" classid="'+cClassId+'">'+CRLF)
   ELSE
-      FWRITE( Self:nHandle,'<OBJECT TYPE="'+ cType +'">'+CRLF)
+      FWRITE( Self:nHandle,'<Object type="'+ cType +'">'+CRLF)
   ENDIF
 RETURN Self
 METHOD  ENDOBJECT() Class THTML
   FWRITE( Self:nHandle,"</OBJECT>"+CRLF)
 RETURN Self
 METHOD ADDPARAM(cType,cValue) Class THTML
-   FWRITE( Self:nHandle,'<PARAM NAME="'+cType+ '" VALUE="'+cValue +'">'  +CRLF)
+   FWRITE( Self:nHandle,'<param name="'+cType+ '" value="'+cValue +'">'  +CRLF)
 RETURN Self

 METHOD NewContent( cFile ) CLASS THTML
--- 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