--- gforth/ds2texi.fs	1998/04/12 21:49:12	1.18
+++ gforth/ds2texi.fs	1999/10/15 23:18:19	1.22
@@ -1,6 +1,6 @@
 \ documentation source to texi format converter
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -63,7 +63,7 @@ create description-buffer 4096 chars all
 : skip-prefix ( c-addr1 u1 -- c-addr2 u2 )
     2dup 2 min s" --" compare 0=
     IF
-	[char] - skip [char] - scan [char] - skip
+	[char] - skip [char] - scan 1 /string
     THEN ;
 
 : replace-_ ( c-addr u -- )
@@ -96,8 +96,8 @@ create description-buffer 4096 chars all
     create
 	last @ name>string skip-prefix 2,		\ name
 	[char] ) parse save-mem 2,	\ stack-effect
-	bl parse-word condition-wordset 2,	\ wordset
-	bl parse-word dup	\ pronounciation
+	bl sword condition-wordset 2,	\ wordset
+	bl sword dup	\ pronounciation
 	if
 	    condition-pronounciation
 	else
@@ -133,6 +133,13 @@ create description-buffer 4096 chars all
     ." @cindex "
     ." @code{" r@ doc-name 2@ typetexi ." }"
     cr
+    r@ doc-name 2@ drop c@ [char] : <> if
+	\ cut out words starting with :, info-lookup cannot handle them
+	\ !! deal with : by replacing it here and in info-lookup?
+	." @kindex "
+	r@ doc-name 2@ typetexi
+	cr
+    endif
     ." @format" cr
     ." @code{" r@ doc-name 2@ typetexi ." }       "
     ." @i{" r@ doc-stack-effect 2@ type ." }       "