[Vim-latex-cvs] vimfiles/ftplugin/latex-suite compiler.vim,1.3,1.4 main.vim,1.2,1.3 texrc,1.6,1.7

[<ma...@us...>]

Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite
In directory usw-pr-cvs1:/tmp/cvs-serv32166/ftplugin/latex-suite

Modified Files:
	compiler.vim main.vim texrc 
Log Message:
makefile:  I fixed a little mistake I made
main.vim:  I commented out "runtime compiler/tex.vim".  See further comments in the file.
compiler.vim and texrc:  1. I added some support for Mac OSX, using
if has('macunix') ...
2. Instead of "--interaction=nonstopmode" I use "\nonstopmode \input{$*}"
as in compiler/tex.vim .  Not all versions of tex support the --interaction option, so this is more robust.  Then, the "\" and "{}" have to be escaped for
the shell.  I simplified "let &l:makeprg ..." with curly-brace variables.


Index: compiler.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/compiler.vim,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** compiler.vim	28 Oct 2002 06:40:11 -0000	1.3
--- compiler.vim	4 Nov 2002 15:39:24 -0000	1.4
***************
*** 21,25 ****
  	if exists('g:Tex_'.a:type.'Rule_'.target)
  		if a:type == 'Compile'
! 			exec 'let &l:makeprg = g:Tex_CompileRule_'.target
  		elseif a:type == 'View'
  			exec 'let s:viewer = g:Tex_'.a:type.'Rule_'.target
--- 21,26 ----
  	if exists('g:Tex_'.a:type.'Rule_'.target)
  		if a:type == 'Compile'
! 			let &l:makeprg = escape(g:Tex_CompileRule_{target}, '{}\')
! 			" exec 'let &l:makeprg = g:Tex_CompileRule_'.target
  		elseif a:type == 'View'
  			exec 'let s:viewer = g:Tex_'.a:type.'Rule_'.target
***************
*** 140,144 ****
  		" editor from the command line. that would have really helped ensure
  		" that this particular vim and yap are connected.
! 		exec '!start '.s:viewer.' '.mainfname.'.'.s:target
  	else
  		" taken from Dimitri Antoniou's tip on vim.sf.net (tip #225).
--- 141,147 ----
  		" editor from the command line. that would have really helped ensure
  		" that this particular vim and yap are connected.
! 		exec '!start' s:viewer mainfname . '.' . s:target
! 	elseif has('macunix')
! 		execute '!open -a' s:viewer mainfname . '.' . s:target
  	else
  		" taken from Dimitri Antoniou's tip on vim.sf.net (tip #225).

Index: main.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/main.vim,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.vim	4 May 2002 21:08:19 -0000	1.2
--- main.vim	4 Nov 2002 15:39:25 -0000	1.3
***************
*** 473,477 ****
  	" compiler. if the user has put another compiler before ours, then we dont
  	" get into our compiler/tex.vim.
! 	runtime compiler/tex.vim
  endfunction
  
--- 473,481 ----
  	" compiler. if the user has put another compiler before ours, then we dont
  	" get into our compiler/tex.vim.
! 	" BNF 11/4/2002:  I commented out the next line, since it seems to
! 	" override the effects of ftplugin/latex-suite/compiler.vim .
! 	" This is a short-term solution.  Eventually, the work done in
! 	" ftplugin/latex-suite/compiler.vim should be done in compiler/tex.vim .
! 	" runtime compiler/tex.vim
  endfunction
  

Index: texrc
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/texrc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** texrc	28 Oct 2002 06:53:45 -0000	1.6
--- texrc	4 Nov 2002 15:39:25 -0000	1.7
***************
*** 72,79 ****
  " values, but if use some other compiler, then you will want to change this.
  if has('win32')
! 	TexLet g:Tex_CompileRule_dvi = 'latex --src-specials --interaction=nonstopmode $*'
  else
! 	TexLet g:Tex_CompileRule_dvi = 'latex --interaction=nonstopmode $*'
  endif
  
  TexLet g:Tex_CompileRule_ps = 'dvips -Ppdf -o $*.ps $*.dvi'
--- 72,81 ----
  " values, but if use some other compiler, then you will want to change this.
  if has('win32')
! 	let s:CompileFlags = ' --src-specials '
  else
! 	let s:CompileFlags = ' '
  endif
+ TexLet g:Tex_CompileRule_dvi = 'latex' . s:CompileFlags .
+ 			\ '\nonstopmode \input{$*}'
  
  TexLet g:Tex_CompileRule_ps = 'dvips -Ppdf -o $*.ps $*.dvi'
***************
*** 82,86 ****
  " NOTE: pdflatex generates the same output as latex. therefore quickfix is
  "       possible.
! TexLet g:Tex_CompileRule_pdf = 'pdflatex $*.tex'
  " TexLet g:Tex_CompileRule_pdf = 'ps2pdf $*.ps'
  " TexLet g:Tex_CompileRule_pdf = 'dvipdfm $*.dvi'
--- 84,88 ----
  " NOTE: pdflatex generates the same output as latex. therefore quickfix is
  "       possible.
! TexLet g:Tex_CompileRule_pdf = 'pdflatex \nonstopmode \input {$*.tex}'
  " TexLet g:Tex_CompileRule_pdf = 'ps2pdf $*.ps'
  " TexLet g:Tex_CompileRule_pdf = 'dvipdfm $*.dvi'