[Vim-latex-cvs] vimfiles/ftplugin/latex-suite folding.vim,1.25,1.26 main.vim,1.89,1.90

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

Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11866

Modified Files:
	folding.vim main.vim 
Log Message:
Bug: latex-suite doesn't create fold text for figure captions of the form
     \cpation[shortdesc]{fulldesc} (Boris Dušek)
Fix: Handle the case for \caption[shortdesc]{fulldesc} (Boris Dušek).


Index: folding.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/folding.vim,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** folding.vim	14 Dec 2003 07:20:26 -0000	1.25
--- folding.vim	3 Jan 2006 08:40:39 -0000	1.26
***************
*** 351,356 ****
  		while i <= v:foldend
  			if getline(i) =~ '\\caption'
! 				let caption = matchstr(getline(i), '\\caption{\zs.*')
! 				let caption = substitute(caption, '\zs}[^}]*$', '', '')
  			elseif getline(i) =~ '\\label'
  				let label = matchstr(getline(i), '\\label{\zs.*')
--- 351,364 ----
  		while i <= v:foldend
  			if getline(i) =~ '\\caption'
! 				" distinguish between
! 				" \caption{fulldesc} - fulldesc will be displayed
! 				" \caption[shortdesc]{fulldesc} - shortdesc will be displayed
! 				if getline(i) =~ '\\caption\['
! 					let caption = matchstr(getline(i), '\\caption\[\zs[^\]]*')
! 					let caption = substitute(caption, '\zs\]{.*}[^}]*$', '', '')
! 				else
! 					let caption = matchstr(getline(i), '\\caption{\zs.*')
! 					let caption = substitute(caption, '\zs}[^}]*$', '', '')
! 				end
  			elseif getline(i) =~ '\\label'
  				let label = matchstr(getline(i), '\\label{\zs.*')

Index: main.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/main.vim,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** main.vim	1 Jan 2006 07:54:25 -0000	1.89
--- main.vim	3 Jan 2006 08:40:39 -0000	1.90
***************
*** 638,642 ****
  "			keep that as a stable point.
  function! Tex_Version()
! 	return "Latex-Suite: version 1.8.03"
  endfunction 
  
--- 638,642 ----
  "			keep that as a stable point.
  function! Tex_Version()
! 	return "Latex-Suite: version 1.8.04"
  endfunction