Index: lyx_cb.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_cb.C,v
retrieving revision 1.38
diff -r1.38 lyx_cb.C
517,518c517,530
< 
< 	cmd = command + ' ' + QuoteName(name);
---
> 	/*
> 	 *	At this point we check whether the command contains the filename parameter
> 	 *	$$FName and if that's the case we substitute the real file name otherwise
> 	 *	the filename is simply appended.
> 	 *	rokrau 1/12/00
> 	 */
> 	cmd = command;
> 	std::string::size_type i;
>  	if ( (i=command.find("$$FName")) != std::string::npos)
> 	{
> 		cmd.replace(i,7,QuoteName(name));
> 	}
> 	else
> 		cmd = command + ' ' + QuoteName(name);
767c779,782
< 	string command = lyxrc->view_dvi_command + paper ;
---
> 	string command = lyxrc->view_dvi_command;
> 	//	yap the windows dvi previewer is allergic to the paper option
> 	if (command.find("yap")==std::string::npos) command += paper ;
>