--- gforth/doc/makedoc.fs	2003/03/09 15:17:01	1.6
+++ gforth/doc/makedoc.fs	2007/07/06 12:54:56	1.11
@@ -1,6 +1,6 @@
 \ create a documentation file
 
-\ Copyright (C) 1995,1999,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1999,2000,2003,2004 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -67,14 +67,23 @@ s" \ automatically generated by makedoc.
     source >in ! drop ; immediate
 
 : put-doc-entry ( -- )
-    locals-list @ 0=	\ not in a colon def, i.e., not a local name
-    last @ 0<> and	\ not an anonymous (i.e. noname) header
+    dpp @ normal-dp =   \ not defining locals
+    latest 0<> and	\ not an anonymous (i.e. noname) header
     if
 	s" " >fileCR
 	s" make-doc " >file
-	>in @ >r
-	[char] ( parse 2drop
-	[char] ) parse
+        >in @ >r
+        parse-name 2dup s" (" str= if
+            2drop ') parse
+        else
+            2dup s" {" str= if
+                2drop '} parse
+            else \ no stack comment or locals
+                2drop
+                r@ >in ! \ restore "\"
+                s" unknown " \ default stack comment
+            endif
+        endif
 	[char] \ parse 2drop
 	>in @
 	bl word  dup c@
@@ -89,7 +98,8 @@ s" \ automatically generated by makedoc.
 	ELSE
 	    drop >in !
 	THEN
-	last @ name>string >file
+        latest name>string >file
+        s"  " >file
 	>file
 	s"  )" >file
 	POSTPONE \g