[Vim-latex-cvs] vimfiles/ftplugin/tex texviewer.vim,1.14,1.15

[<mi...@us...>]

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

Modified Files:
	texviewer.vim 
Log Message:
Include $BIBINPUTS variable while looking for bib files.
(Soren Debois)


Index: texviewer.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/tex/texviewer.vim,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** texviewer.vim	8 May 2003 08:17:01 -0000	1.14
--- texviewer.vim	19 May 2003 14:50:44 -0000	1.15
***************
*** 386,406 ****
  
  	else
  		let bibfiles = ''
  		let bibfiles2 = ''
- 		let curdir = expand("%:p:h")
- 		let curdir = substitute(curdir, ' ', "\\", 'ge')
  
  		if search('\\bibliography{', 'w')
! 			let bibfiles = matchstr(getline('.'), '\\bibliography{\zs.\{-}\ze}')
! 			let bibfiles = substitute(bibfiles, '\(,\|$\)', '.bib ', 'ge')
! 			let bibfiles = substitute(bibfiles, '\(^\| \)', ' '.curdir.'/', 'ge')
! 		else
! 			let bibfiles = glob(curdir.'/*.bib')
! 			let bibfiles = substitute(bibfiles, '\n', ' ', 'ge')
  		endif
  
  		if Tex_GetMainFileName() != ''
  			let mainfname = Tex_GetMainFileName()
  			let mainfdir = fnamemodify(mainfname, ":p:h")
  			exe 'bot 1 split '.mainfname
  			if search('\\bibliography{', 'w')
--- 386,430 ----
  
  	else
+ 		let bibnames = ''
  		let bibfiles = ''
  		let bibfiles2 = ''
  
  		if search('\\bibliography{', 'w')
! 			let bibnames = matchstr(getline('.'), '\\bibliography{\zs.\{-}\ze}')
! 			let bibnames = substitute(bibnames, '\(,\|$\)', '.bib ', 'ge')
  		endif
  
+ 		let dirs = expand("%:p:h") . ":" . expand("$BIBINPUTS")
+ 		let dirs = substitute(dirs, ':\+', ':', 'g')
+ 
+ 		let i = 1
+ 		while Tex_Strntok(dirs, ':', i) != ''
+ 			let curdir = Tex_Strntok(dirs, ':', i) 
+ 			let curdir = substitute(curdir, ' ', "\\", 'ge')
+ 			let tmp = ''
+ 
+ 			if bibnames != ''
+ 				let j = 1
+ 				while Tex_Strntok(bibnames, ' ', j) != ''
+ 					let fname = curdir.'/'.Tex_Strntok(bibnames, ' ', j)
+ 					if filereadable(fname)
+ 						let tmp = tmp . ' ' . fname
+ 					endif
+ 					let j = j + 1
+ 				endwhile
+ 			else
+ 				let tmp = glob(curdir.'/*.bib')
+ 				let tmp = substitute(tmp, "\n", ' ', 'ge')
+ 			endif
+ 
+ 			let bibfiles = bibfiles . ' ' . tmp
+ 			let i = i + 1
+ 		endwhile
+ 
  		if Tex_GetMainFileName() != ''
  			let mainfname = Tex_GetMainFileName()
  			let mainfdir = fnamemodify(mainfname, ":p:h")
+                         let curdir = expand("%:p:h")
+                         let curdir = substitute(curdir, ' ', "\\", 'ge')
  			exe 'bot 1 split '.mainfname
  			if search('\\bibliography{', 'w')