[Vim-latex-cvs] vimfiles/ftplugin/tex brackets.vim,1.5,1.6 smartspace.vim,1.1,1.2

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

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

Modified Files:
	brackets.vim smartspace.vim 
Log Message:

This is a merge from the b-newimaps branch. The branch was started when a
need to robustify imaps.vim was felt. Before, it had a big dependence on
"funky" characters. Since imaps.vim affected a lot of files, this commit
has a lot of modified files.

Briefly, it changes the <<, >> and the <a-umlaut> characters throughout
latex-suite to 'unfunky' characters. 
<< --- <+
>> --- +>
<a-umlaut> --- <++>

The syntax of IMAP and IMAP_PutTextWithMovement was also changed to accept
2 new optional arguments which specify the placeholder characters in the
a:rhs. This allows scriptwriters to generate long term maps which will not
depend on the internals of imaps.vim

The b-newimaps tip at the time of this merge has been tagged as
b-newimaps-merge-sa-1



Index: brackets.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/tex/brackets.vim,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** brackets.vim	13 Dec 2002 17:24:31 -0000	1.5
--- brackets.vim	22 Dec 2002 03:01:08 -0000	1.6
***************
*** 2,6 ****
  " Author: Carl Mueller
  " 		  (incorporated into latex-suite by Srinath Avadhanula)
! " Last Change: Fri Dec 13 12:00 PM 2002 EST
  " Description:
  " 	This ftplugin provides the following maps:
--- 2,6 ----
  " Author: Carl Mueller
  " 		  (incorporated into latex-suite by Srinath Avadhanula)
! " Last Change: Thu Dec 19 03:00 AM 2002 PST
  " Description:
  " 	This ftplugin provides the following maps:
***************
*** 93,97 ****
  		return "\<BS>".'\mathcal{'.toupper(char).'}'
  	else
! 		return Tex_PutTextWithMovement('\cite{«»}«»')
  	endif
  endfunction
--- 93,97 ----
  		return "\<BS>".'\mathcal{'.toupper(char).'}'
  	else
! 		return IMAP_PutTextWithMovement('\cite{<++>}<++>')
  	endif
  endfunction
***************
*** 103,112 ****
  " If the character before typing <M-l> is one of '([{|<q', then do the
  " following:
! " 	1. (<M-l>		\left(«»\right«»
  " 	    	similarly for [, |
! " 	   {<M-l>		\left\{«»\right\}«»
! " 	2. <<M-l>		\langle«»\rangle«»
! " 	3. q<M-l>		\lefteqn{«»}«»
! " otherwise insert  \label{«»}«»
  function! Tex_LeftRight()
  	let line = getline(line("."))
--- 103,112 ----
  " If the character before typing <M-l> is one of '([{|<q', then do the
  " following:
! " 	1. (<M-l>		\left(<++>\right<++>
  " 	    	similarly for [, |
! " 	   {<M-l>		\left\{<++>\right\}<++>
! " 	2. <<M-l>		\langle<++>\rangle<++>
! " 	3. q<M-l>		\lefteqn{<++>}<++>
! " otherwise insert  \label{<++>}<++>
  function! Tex_LeftRight()
  	let line = getline(line("."))
***************
*** 121,131 ****
  		endif
  		let rhs = matchstr(matchedbrackets, char.'\zs.\ze')
! 		return "\<BS>".Tex_PutTextWithMovement('\left'.add.char.'«»\right'.add.rhs.'«»')
  	elseif char == '<'
! 		return "\<BS>".Tex_PutTextWithMovement('langle«»\rangle«»')
  	elseif char == 'q'
! 		return "\<BS>".Tex_PutTextWithMovement('\lefteqn{«»}«»')
  	else
! 		return '\label{«»}«»'
  	endif
  endfunction " }}}
--- 121,131 ----
  		endif
  		let rhs = matchstr(matchedbrackets, char.'\zs.\ze')
! 		return "\<BS>".IMAP_PutTextWithMovement('\left'.add.char.'<++>\right'.add.rhs.'<++>')
  	elseif char == '<'
! 		return "\<BS>".IMAP_PutTextWithMovement('langle<++>\rangle<++>')
  	elseif char == 'q'
! 		return "\<BS>".IMAP_PutTextWithMovement('\lefteqn{<++>}<++>')
  	else
! 		return '\label{<++>}<++>'
  	endif
  endfunction " }}}

Index: smartspace.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/tex/smartspace.vim,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** smartspace.vim	9 Dec 2002 20:17:15 -0000	1.1
--- smartspace.vim	22 Dec 2002 03:01:10 -0000	1.2
***************
*** 3,7 ****
  "      Author: Carl Muller
  "     Created: Fri Dec 06 12:00 AM 2002 PST
! " Last Change: Fri Dec 06 12:00 AM 2002 PST
  " 
  " Description: 
--- 3,7 ----
  "      Author: Carl Muller
  "     Created: Fri Dec 06 12:00 AM 2002 PST
! " Last Change: Mon Dec 09 12:00 PM 2002 PST
  " 
  " Description: 
***************
*** 28,33 ****
  if &l:tw > 0
  	let b:tw = &l:tw
- else
- 	let b:tw = 79
  endif
  setlocal tw=0
--- 28,31 ----