[Vim-latex-cvs] vimfiles/ftplugin/tex texviewer.vim,1.11,1.11.2.1

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

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

Modified Files:
      Tag: texproject-branch
	texviewer.vim 
Log Message:
Introduction of texproject:
1. explorer.vim
Changes responsible for showing only files belonging to project
2. texmenuconf.vim
Menu for project
3. main.vim
Sourcing of latex-suite/texproject.vim
4. texviewer.vim
Changes responsible for ref/cite completion from project (if exists)
5. texproject.vim
Functions and command for project actions
6. projecttemplate.vim
Template of project file.



Index: texviewer.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/tex/texviewer.vim,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** texviewer.vim	11 Apr 2003 23:31:10 -0000	1.11
--- texviewer.vim	18 Apr 2003 19:32:05 -0000	1.11.2.1
***************
*** 77,80 ****
--- 77,81 ----
  			if bibfiles != ''
  				exe 'silent! grepadd! "@.*{'.s:prefix.'" '.bibfiles
+ 				let g:bbb = 'silent! grepadd! "@.*{'.s:prefix.'" '.bibfiles
  			endif
  			if bblfiles != ''
***************
*** 182,188 ****
  	nnoremap <buffer> <silent> K :wincmd j<cr><c-y>:wincmd k<cr>
  
! 	exe 'nnoremap <buffer> <silent> q :'.s:winnum.' wincmd w<cr>:pclose!<cr>:cclose<cr>'
  
  endfunction " }}}
  " Tex_explore_window: settings for completion of filenames {{{
  " Description: 
--- 183,198 ----
  	nnoremap <buffer> <silent> K :wincmd j<cr><c-y>:wincmd k<cr>
  
! 	exe 'nnoremap <buffer> <silent> q :call Tex_CloseSmallWindows()<cr>'
  
  endfunction " }}}
+ " Tex_CloseSmallWindows: {{{
+ " Description:
+ "
+ function! Tex_CloseSmallWindows()
+ 	exe s:winnum.' wincmd w'
+ 	pclose!
+ 	cclose
+ 	exe s:pos
+ endfunction " }}}
  " Tex_explore_window: settings for completion of filenames {{{
  " Description: 
***************
*** 360,393 ****
  function! s:Tex_FindBibFiles()
  
! 	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')
! 			let bibfiles2 = matchstr(getline('.'), '\\bibliography{\zs.\{-}\ze}')
! 			let bibfiles2 = substitute(bibfiles2, '\(,\|$\)', '.bib ', 'ge')
! 			let bibfiles2 = substitute(bibfiles2, '\(^\| \)', ' '.curdir.'/', 'ge')
! 		elseif mainfdir != curdir
! 			let bibfiles2 = glob(mainfdir.'/*.bib')
! 			let bibfiles2 = substitute(bibfiles2, '\n', ' ', 'ge')
  		endif
- 		wincmd q
- 	endif
  
! 	return bibfiles.' '.bibfiles2
  
  endfunction " }}}
--- 370,420 ----
  function! s:Tex_FindBibFiles()
  
! 	if g:projFiles != ''
! 		let bibfiles = ''
! 		let i = 1
! 		while Tex_Strntok(g:projFiles, ',', i) != ''
! 			let curfile = Tex_Strntok(g:projFiles, ',', i)
! 			if curfile =~ '\.bib'
! 				let curfile = substitute(curfile, '.*', s:search_directory.'\0', '')
! 				let bibfiles = bibfiles.'"'.curfile.'" '
! 			endif
! 			let i = i + 1
! 		endwhile
! 
! 		let g:bibf = bibfiles
! 		return bibfiles
  
  	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')
! 				let bibfiles2 = matchstr(getline('.'), '\\bibliography{\zs.\{-}\ze}')
! 				let bibfiles2 = substitute(bibfiles2, '\(,\|$\)', '.bib ', 'ge')
! 				let bibfiles2 = substitute(bibfiles2, '\(^\| \)', ' '.curdir.'/', 'ge')
! 			elseif mainfdir != curdir
! 				let bibfiles2 = glob(mainfdir.'/*.bib')
! 				let bibfiles2 = substitute(bibfiles2, '\n', ' ', 'ge')
! 			endif
! 			wincmd q
! 		endif
! 
! 		return bibfiles.' '.bibfiles2
! 	endif
  
  endfunction " }}}
***************
*** 397,419 ****
  function! s:Tex_FindBblFiles()
  
! 	let bblfiles = ''
! 	let bblfiles2 = ''
! 	let curdir = expand("%:p:h")
  
! 	let bblfiles = glob(curdir.'/*.tex')
! 	let bblfiles = substitute(bblfiles, '\n', ' ', 'ge')
  
! 	if Tex_GetMainFileName() != ''
! 		let mainfname = Tex_GetMainFileName()
! 		let mainfdir = fnamemodify(mainfname, ":p:h")
  
- 		if mainfdir != curdir
- 			let bblfiles = glob(mainfdir.'/*.tex')
- 			let bblfiles = substitute(bblfiles, '\n', ' ', 'ge')
  		endif
  
  	endif
- 
- 	return bblfiles.' '.bblfiles2
  
  endfunction " }}}
--- 424,462 ----
  function! s:Tex_FindBblFiles()
  
! 	if g:projFiles != ''
! 		let bblfiles = ''
! 		let i = 1
! 		while Tex_Strntok(g:projFiles, ',', i) != ''
! 			let curfile = Tex_Strntok(g:projFiles, ',', i)
! 			if curfile =~ '\.tex'
! 				let curfile = substitute(curfile, '.*', s:search_directory.'\0', '')
! 				let bblfiles = bblfiles.'"'.curfile.'" '
! 			endif
! 			let i = i + 1
! 		endwhile
  
! 		return bblfiles
  
! 	else
! 		let bblfiles = ''
! 		let bblfiles2 = ''
! 		let curdir = expand("%:p:h")
! 
! 		let bblfiles = glob(curdir.'/*.tex')
! 		let bblfiles = substitute(bblfiles, '\n', ' ', 'ge')
! 
! 		if Tex_GetMainFileName() != ''
! 			let mainfname = Tex_GetMainFileName()
! 			let mainfdir = fnamemodify(mainfname, ":p:h")
! 
! 			if mainfdir != curdir
! 				let bblfiles = glob(mainfdir.'/*.tex')
! 				let bblfiles = substitute(bblfiles, '\n', ' ', 'ge')
! 			endif
  
  		endif
  
+ 		return bblfiles.' '.bblfiles2
  	endif
  
  endfunction " }}}