--- gforth/ds2texi.fs	1995/11/07 18:06:36	1.9
+++ gforth/ds2texi.fs	1997/02/01 14:59:28	1.12
@@ -71,24 +71,24 @@ create description-buffer 4096 chars all
     +loop ;
     
 : condition-stack-effect ( c-addr1 u1 -- c-addr2 u2 )
-    save-string 2dup replace-_ ;
+    save-mem 2dup replace-_ ;
     
 : condition-wordset ( c-addr1 u1 -- c-addr2 u2 )
     dup 0=
     if
 	2drop s" unknown"
     else
-	save-string
+	save-mem
     endif ;
 
 : condition-pronounciation ( c-addr1 u1 -- c-addr2 u2 )
-    save-string 2dup replace-_ ;
+    save-mem 2dup replace-_ ;
 
 : make-doc ( -- )
     get-current documentation set-current
     create
 	last @ name>string 2,		\ name
-	[char] ) parse save-string 2,	\ stack-effect
+	[char] ) parse save-mem 2,	\ stack-effect
 	bl parse-word condition-wordset 2,	\ wordset
 	bl parse-word dup		\ pronounciation
 	if
@@ -97,7 +97,7 @@ create description-buffer 4096 chars all
 	    2drop last @ name>string
 	endif
 	2,
-	get-description save-string 2,
+	get-description save-mem 2,
     set-current ;
 
 : emittexi ( c -- )
@@ -123,6 +123,9 @@ create description-buffer 4096 chars all
     ."  @var{ " r@ doc-stack-effect 2@ type ."  }  "
     r@ doc-wordset 2@ type
     cr
+    ." @cindex "
+    ." @code{" r@ doc-name 2@ typetexi ." }"
+    cr
     ." @format" cr
     ." @code{" r@ doc-name 2@ typetexi ." }       "
     ." @i{" r@ doc-stack-effect 2@ type ." }       "
@@ -217,10 +220,3 @@ create docline doclinelength chars allot
     else
 	." undocumented: " wordname type cr
     endif ;
-
-script? [IF]
-require prims2x.fs
-s" primitives.b" ' register-doc process-file
-require crossdoc.fd
-require doc.fd
-[THEN]