--- gforth/ds2texi.fs	1996/08/21 14:58:38	1.10
+++ gforth/ds2texi.fs	1997/05/21 20:39:23	1.15
@@ -26,12 +26,13 @@
 \ `documentation'. Each word resides there under its own name.
 
 script? [IF]
-warnings off
-require search-order.fs
-require glocals.fs
-require float.fs
-require struct.fs
-require debugging.fs
+    warnings off
+    require extend.fs
+    require search.fs
+    require glocals.fs
+    require float.fs
+    require struct.fs
+    require debugs.fs
 [THEN]
 
 wordlist constant documentation
@@ -123,6 +124,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 ." }       "
@@ -135,8 +139,9 @@ create description-buffer 4096 chars all
     r@ print-short
     r@ doc-description 2@ dup 0<>
     if
-	." @iftex" cr ." @vskip-3ex" cr ." @end iftex" cr
-	type cr cr \ ." @ifinfo" cr ." @*" cr ." @end ifinfo" cr cr
+	\ ." @iftex" cr ." @vskip-0ex" cr ." @end iftex" cr
+	type cr cr
+	\ ." @ifinfo" cr ." @*" cr ." @end ifinfo" cr cr
     else
 	2drop cr
     endif
@@ -217,10 +222,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]