--- gforth/ds2texi.fs	1995/11/07 18:06:36	1.9
+++ gforth/ds2texi.fs	1997/08/03 20:21:34	1.17
@@ -26,22 +26,23 @@
 \ `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
 
 struct
-    2 cells: field doc-name
-    2 cells: field doc-stack-effect
-    2 cells: field doc-wordset
-    2 cells: field doc-pronounciation
-    2 cells: field doc-description
+    cell% 2* field doc-name
+    cell% 2* field doc-stack-effect
+    cell% 2* field doc-wordset
+    cell% 2* field doc-pronounciation
+    cell% 2* field doc-description
 end-struct doc-entry
 
 create description-buffer 4096 chars allot
@@ -59,6 +60,12 @@ create description-buffer 4096 chars all
     repeat then
     description-buffer tuck - ;
 
+: skip-prefix ( c-addr1 u1 -- c-addr2 u2 )
+    2dup 2 min s" --" compare 0=
+    IF
+	[char] - skip [char] - scan [char] - skip
+    THEN ;
+
 : replace-_ ( c-addr u -- )
     \ replaces _ with -
     chars bounds
@@ -71,33 +78,33 @@ 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
+	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 parse-word dup	\ pronounciation
 	if
 	    condition-pronounciation
 	else
-	    2drop last @ name>string
+	    2drop last @ name>string skip-prefix
 	endif
 	2,
-	get-description save-string 2,
+	get-description save-mem 2,
     set-current ;
 
 : emittexi ( c -- )
@@ -123,6 +130,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 +145,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 +228,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]