--- gforth/ds2texi.fs	1995/07/06 15:57:26	1.5
+++ gforth/ds2texi.fs	1995/10/07 17:38:11	1.7
@@ -9,9 +9,10 @@
 
 script? [IF]
 warnings off
-include search-order.fs
-include struct.fs
-include debugging.fs
+require search-order.fs
+require float.fs
+require struct.fs
+require debugging.fs
 [THEN]
 
 wordlist constant documentation
@@ -72,7 +73,13 @@ create description-buffer 4096 chars all
     drop ;
 
 : print-short ( doc-entry -- )
-    >r ." @format" cr
+    >r
+    ." @findex "
+    r@ doc-name 2@ typetexi
+    ."  @var{ " r@ doc-stack-effect 2@ type ."  }  "
+    r@ doc-wordset 2@ type
+    cr
+    ." @format" cr
     ." @code{" r@ doc-name 2@ typetexi ." }       "
     ." @i{" r@ doc-stack-effect 2@ type ." }       "
     r@ doc-wordset 2@ type ."        ``"
@@ -84,7 +91,8 @@ create description-buffer 4096 chars all
     r@ print-short
     r@ doc-description 2@ dup 0<>
     if
-	type ." @*" cr
+	." @iftex" cr ." @vskip-3ex" cr ." @end iftex" cr
+	type cr cr \ ." @ifinfo" cr ." @*" cr ." @end ifinfo" cr cr
     else
 	2drop cr
     endif
@@ -132,7 +140,7 @@ create docline doclinelength chars allot
     drop rdrop ;
 
 script? [IF]
-include prims2x.fs
+require prims2x.fs
 s" primitives.b" ' register-doc process-file
 require doc.fd
 require crossdoc.fd