[Vim-latex-cvs] vimfiles/ftplugin/latex-suite main.vim,1.32,1.33

[<sri...@us...>]

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

Modified Files:
	main.vim 
Log Message:
- made greek letter expansions also use g:Tex_Leader. This provides another
  way in which users can avoid unexpected expansions... (I dont know why
  this was not the case till now...)
  TODO: make greek letters optional.

- Bug fix: Tex_CreatePrompt was not using a:sep throughout, causing it to
  be broken for lists which were not , seperated.

- New function Tex_ChooseFromPrompt. This function will in the future
  replace the Tex_ChooseFile function...


Index: main.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/main.vim,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** main.vim	15 Jan 2003 16:16:27 -0000	1.32
--- main.vim	16 Jan 2003 02:49:57 -0000	1.33
***************
*** 94,134 ****
  	" }}}
  	" Greek Letters {{{
! 	call IMAP('`a', '\alpha', 'tex') " {{{
! 	call IMAP('`b', '\beta', 'tex')
! 	call IMAP('`c', '\chi', 'tex')
! 	call IMAP('`d', '\delta', 'tex')
! 	call IMAP('`e', '\varepsilon', 'tex')
! 	call IMAP('`f', '\varphi', 'tex')
! 	call IMAP('`g', '\gamma', 'tex')
! 	call IMAP('`h', '\eta', 'tex')
! 	call IMAP('`k', '\kappa', 'tex')
! 	call IMAP('`l', '\lambda', 'tex')
! 	call IMAP('`m', '\mu', 'tex')
! 	call IMAP('`n', '\nu', 'tex')
! 	call IMAP('`p', '\pi', 'tex')
! 	call IMAP('`q', '\theta', 'tex')
! 	call IMAP('`r', '\rho', 'tex')
! 	call IMAP('`s', '\sigma', 'tex')
! 	call IMAP('`t', '\tau', 'tex')
! 	call IMAP('`u', '\upsilon', 'tex')
! 	call IMAP('`v', '\varsigma', 'tex')
! 	call IMAP('`w', '\omega', 'tex')
! 	call IMAP('`w', '\wedge', 'tex')  " AUCTEX style
! 	call IMAP('`x', '\xi', 'tex')
! 	call IMAP('`y', '\psi', 'tex')
! 	call IMAP('`z', '\zeta', 'tex')
  	" not all capital greek letters exist in LaTeX!
  	" reference: http://www.giss.nasa.gov/latex/ltx-405.html
! 	call IMAP('`D', '\Delta', 'tex')
! 	call IMAP('`F', '\Phi', 'tex')
! 	call IMAP('`G', '\Gamma', 'tex')
! 	call IMAP('`Q', '\Theta', 'tex')
! 	call IMAP('`L', '\Lambda', 'tex')
! 	call IMAP('`X', '\Xi', 'tex')
! 	call IMAP('`Y', '\Psi', 'tex')
! 	call IMAP('`S', '\Sigma', 'tex')
! 	call IMAP('`U', '\Upsilon', 'tex')
! 	call IMAP('`W', '\Omega', 'tex')
! 	" }}}
  	" }}}
  	" ProtectLetters: sets up indentity maps for things like ``a {{{
--- 94,133 ----
  	" }}}
  	" Greek Letters {{{
! 	call IMAP(g:Tex_Leader.'a', '\alpha', 'tex')
! 	call IMAP(g:Tex_Leader.'b', '\beta', 'tex')
! 	call IMAP(g:Tex_Leader.'c', '\chi', 'tex')
! 	call IMAP(g:Tex_Leader.'d', '\delta', 'tex')
! 	call IMAP(g:Tex_Leader.'e', '\varepsilon', 'tex')
! 	call IMAP(g:Tex_Leader.'f', '\varphi', 'tex')
! 	call IMAP(g:Tex_Leader.'g', '\gamma', 'tex')
! 	call IMAP(g:Tex_Leader.'h', '\eta', 'tex')
! 	call IMAP(g:Tex_Leader.'k', '\kappa', 'tex')
! 	call IMAP(g:Tex_Leader.'l', '\lambda', 'tex')
! 	call IMAP(g:Tex_Leader.'m', '\mu', 'tex')
! 	call IMAP(g:Tex_Leader.'n', '\nu', 'tex')
! 	call IMAP(g:Tex_Leader.'p', '\pi', 'tex')
! 	call IMAP(g:Tex_Leader.'q', '\theta', 'tex')
! 	call IMAP(g:Tex_Leader.'r', '\rho', 'tex')
! 	call IMAP(g:Tex_Leader.'s', '\sigma', 'tex')
! 	call IMAP(g:Tex_Leader.'t', '\tau', 'tex')
! 	call IMAP(g:Tex_Leader.'u', '\upsilon', 'tex')
! 	call IMAP(g:Tex_Leader.'v', '\varsigma', 'tex')
! 	call IMAP(g:Tex_Leader.'w', '\omega', 'tex')
! 	call IMAP(g:Tex_Leader.'w', '\wedge', 'tex')  " AUCTEX style
! 	call IMAP(g:Tex_Leader.'x', '\xi', 'tex')
! 	call IMAP(g:Tex_Leader.'y', '\psi', 'tex')
! 	call IMAP(g:Tex_Leader.'z', '\zeta', 'tex')
  	" not all capital greek letters exist in LaTeX!
  	" reference: http://www.giss.nasa.gov/latex/ltx-405.html
! 	call IMAP(g:Tex_Leader.'D', '\Delta', 'tex')
! 	call IMAP(g:Tex_Leader.'F', '\Phi', 'tex')
! 	call IMAP(g:Tex_Leader.'G', '\Gamma', 'tex')
! 	call IMAP(g:Tex_Leader.'Q', '\Theta', 'tex')
! 	call IMAP(g:Tex_Leader.'L', '\Lambda', 'tex')
! 	call IMAP(g:Tex_Leader.'X', '\Xi', 'tex')
! 	call IMAP(g:Tex_Leader.'Y', '\Psi', 'tex')
! 	call IMAP(g:Tex_Leader.'S', '\Sigma', 'tex')
! 	call IMAP(g:Tex_Leader.'U', '\Upsilon', 'tex')
! 	call IMAP(g:Tex_Leader.'W', '\Omega', 'tex')
  	" }}}
  	" ProtectLetters: sets up indentity maps for things like ``a {{{
***************
*** 366,370 ****
  		let j = 0
  		while j < a:cols && i + j <= num_common
! 			let com = Tex_Strntok(a:promptList, ',', i+j)
  			let promptStr = promptStr.'('.(i+j).') '. 
  						\ com."\t".( strlen(com) < 4 ? "\t" : '' )
--- 365,369 ----
  		let j = 0
  		while j < a:cols && i + j <= num_common
! 			let com = Tex_Strntok(a:promptList, a:sep, i+j)
  			let promptStr = promptStr.'('.(i+j).') '. 
  						\ com."\t".( strlen(com) < 4 ? "\t" : '' )
***************
*** 412,415 ****
--- 411,424 ----
  
  " }}}
+ " Tex_ChooseFromPrompt: process a user input to a prompt string {{{
+ " " Description: 
+ function! Tex_ChooseFromPrompt(dialog, list, sep)
+ 	let inp = input(a:dialog)
+ 	if inp =~ '\d\+'
+ 		return Tex_Strntok(a:list, a:sep, inp)
+ 	else
+ 		return inp
+ 	endif
+ endfunction " }}}
  " Tex_ChooseFile: produces a file list and prompts for choice {{{
  " Description: