--- gforth/ds2texi.fs	2003/01/26 20:56:37	1.26
+++ gforth/ds2texi.fs	2007/12/31 18:40:24	1.31
@@ -1,12 +1,12 @@
 \ documentation source to texi format converter
 
-\ Copyright (C) 1995,1996,1997,1998,1999 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,1999,2003,2005 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 \ documentation source can contain lines in the form `doc-word' and
 \ `short-word'. These are converted to appropriate full or short
@@ -94,14 +93,14 @@ create description-buffer 4096 chars all
 : make-doc ( -- )
     get-current documentation set-current
     create
-	last @ name>string skip-prefix 2,		\ name
+	latest name>string skip-prefix 2,		\ name
 	[char] ) parse save-mem 2,	\ stack-effect
 	bl sword condition-wordset 2,	\ wordset
 	bl sword dup	\ pronounciation
 	if
 	    condition-pronounciation
 	else
-	    2drop last @ name>string skip-prefix
+	    2drop latest name>string skip-prefix
 	endif
 	2,
 	get-description save-mem 2,
@@ -167,7 +166,7 @@ create description-buffer 4096 chars all
     >r dup >r
     3 pick over str=
     if \ addr2 u2 is a prefix of addr1 u1
-	r> /string documentation search-wordlist
+	r> /string -trailing documentation search-wordlist
 	if \ the rest of addr1 u1 is in documentation
 	    execute r> execute true
 	else