--- gforth/doc/makedoc.fs	2003/08/25 14:17:50	1.8
+++ gforth/doc/makedoc.fs	2010/12/31 18:09:02	1.15
@@ -1,12 +1,12 @@
 \ create a documentation file
 
-\ Copyright (C) 1995,1999,2000,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1999,2000,2003,2004,2007,2010 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 
 \ the stack effect of loading this file is: ( addr u -- )
@@ -67,29 +66,39 @@ 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
+    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@
+        >in @
+        parse-name dup
 	IF
-	    dup count 1- chars + c@ [char] - =
+	    2dup 1- chars + c@ [char] - =
 	    IF
 		s" --" >file
-		count >file drop
+		>file drop
 	    ELSE
-		drop >in !
+		2drop >in !
 	    THEN
 	ELSE
-	    drop >in !
+	    2drop >in !
 	THEN
-	latest name>string >file
+        latest name>string >file
+        s"  " >file
 	>file
 	s"  )" >file
 	POSTPONE \g