vim-latex-cvs — Mailing list for commit announcements

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite envmacros.vim,1.34,1.35

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

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

Modified Files:
	envmacros.vim 
Log Message:
New: customization of environments via new variables of the form
     g:Tex_Env_name as described in the manual. As of now, the
     customization only works with the first three methods (press <F5> on
     an empty line or with a word and the <S-F1> through <S-F4> keys).
     Making it work with things like EMA etc will take quite a bit of work
     because there is a lot of different ways in which the 3 letter macros
     are setup. Most of them do not use Tex_DoEnvironment.


Index: envmacros.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/envmacros.vim,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** envmacros.vim	27 Jun 2003 22:20:16 -0000	1.34
--- envmacros.vim	12 Sep 2003 10:29:33 -0000	1.35
***************
*** 555,559 ****
  		return VEnclose('\begin{'.a:env.'}', '\end{'.a:env.'}', '\begin{'.a:env.'}', '\end{'.a:env.'}')
  	else
! 		if a:env =~ 'equation*\|eqnarray*\|theorem\|lemma\|equation\|eqnarray\|align\*\|align\>\|multline'
  			let g:aa = a:env
  			return Tex_eqnarray(a:env)
--- 555,565 ----
  		return VEnclose('\begin{'.a:env.'}', '\end{'.a:env.'}', '\begin{'.a:env.'}', '\end{'.a:env.'}')
  	else
! 		" The user can define something like 
! 		" let g:Tex_Env_theorem = "\\begin{theorem}\<CR><++>\<CR>\\end{theorem}"
! 		" This will effectively over-write the default definition of the
! 		" theorem environment which uses a \label.
! 		if exists("g:Tex_Env_{'".a:env."'}")
! 			return IMAP_PutTextWithMovement(g:Tex_Env_{a:env})
! 		elseif a:env =~ 'equation*\|eqnarray*\|theorem\|lemma\|equation\|eqnarray\|align\*\|align\>\|multline'
  			let g:aa = a:env
  			return Tex_eqnarray(a:env)

[Vim-latex-cvs] vimfiles/doc latex-suite.xml,1.18,1.19 latex-suite.txt,1.41,1.42

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

Update of /cvsroot/vim-latex/vimfiles/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv13755

Modified Files:
	latex-suite.xml latex-suite.txt 
Log Message:
- documentation about the new Tex_Env_name settings to customize
  environment expansions.


Index: latex-suite.xml
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** latex-suite.xml	3 Sep 2003 20:51:24 -0000	1.18
--- latex-suite.xml	12 Sep 2003 10:25:20 -0000	1.19
***************
*** 221,225 ****
     &latex; environments.
     <section id="insert-mode-environment-mappings">
!     <title>Insert-mode Mappings</title>
      <para> 
       These mappings insert LaTeX "environments" such as:
--- 221,225 ----
     &latex; environments.
     <section id="insert-mode-environment-mappings">
!     <title id="insert-mode-environment-mappings.title">Insert-mode Mappings</title>
      <para> 
       These mappings insert LaTeX "environments" such as:
***************
*** 232,235 ****
--- 232,239 ----
       might also include common fields associated with it.
      </para>
+     <para>
+      See <link linkend="Tex_Env_name">this section</link> for details on
+      how to customize the way &ls; will expand various environments.
+     </para>
      <section id="ls-imap-f5">
       <title>Method 1</title>
***************
*** 998,1001 ****
--- 1002,1006 ----
             indented just as if you had typed it in normally.
            </para>
+           <anchor id="IMAP_PutTextWithMovement" />
            <para>
             You can also set up a &ls; style mapping which calls a custom function
***************
*** 3054,3057 ****
--- 3059,3112 ----
       key unmapped.
      </para>
+    </section>
+    <section id="Tex_Env_name">
+     <title>Tex_Env_name</title>
+      <para>
+       If you wish to wish to expand certain environments differently from
+       the way &ls; does it, you can define custom expansions using global
+       variables of the form <literal>Tex_Env_{name}</literal> where
+       <literal>name</literal> corresponds to the environment. This
+       over-riding setting only works for Methods 1-3 described in the
+       section <link linkend="insert-mode-environment-mappings"
+        endterm="insert-mode-environment-mappings.title"></link>.
+       In the future, it will work with the fourth method too.
+      </para>
+      <para>
+       For example, if you press <literal>&lt;F5&gt;</literal> after typing
+       <literal>theorem</literal>, &ls; will by default expand it to
+       <programlisting>\begin{theorem}
+      \label{&ph;}&ph;
+ \end{theorem}&ph;</programlisting>
+        However, if you wish change this to
+       <programlisting>\begin{theorem}
+      &ph;
+ \end{theorem}&ph;</programlisting>
+        then define the following variable
+       <programlisting>let g:Tex_Env_theorem = "\\begin{theorem}\&lt;CR&gt;&ph;\&lt;CR&gt;\\end{theorem}"</programlisting>
+       </para>
+      <para>
+       Notice how special characters such as carriage return are specified
+       using the <literal>"\&lt;key&gt;"</literal> notation. Also use double
+       quotes if you wish to enter such special keys. Also backslashes have
+       to be doubled.
+      </para>
+      <para>
+       You could even use strings returned by functions as the expansion by
+       using the <link
+        linkend="IMAP_PutTextWithMovement">IMAP_PutTextWithMovement()</link>
+       function.
+      </para>
+      <para>
+       If the name of the environment contains special characters (for
+       example, the <literal>eqnarray*</literal> environment), then use the
+       following form:
+       <programlisting>let g:Tex_Env_{'eqnarray*'} = 
+         \ "\\begin{eqnarray*}\&lt;CR&gt;&ph; &amp;=&amp; &ph;\&lt;CR&gt;\\end{eqnarray*}&ph;"</programlisting>
+        This will make pressing <literal>&lt;F5&gt;</literal> after
+        <literal>eqnarray*</literal> expand to
+        <programlisting>\begin{eqnarray*}
+ 	&ph; &amp;=&amp; &ph;
+ \end{eqnarray*}&ph;</programlisting>
+      </para>
     </section>
    </section>

Index: latex-suite.txt
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.txt,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** latex-suite.txt	3 Sep 2003 20:51:24 -0000	1.41
--- latex-suite.txt	12 Sep 2003 10:25:20 -0000	1.42
***************
*** 1,2852 ****
!                               Latex-Suite Reference
!                                 *latex-suite.txt*
!                  Srinath Avadhanula <srinath AT fastmail DOT fm>
!                     Mikolaj Machowski <mikmach AT wp DOT pl>
!                                         
! 
! 
!                                     Abstract
!                                     ========
! Latex-Suite attempts to provide a comprehensive set of tools to view, edit and
[...5721 lines suppressed...]
! ================================================================================
! About this file
! 
! This file was created automatically from its XML variant using db2vim. db2vim is
! a python script which understands a very limited subset of the Docbook XML 4.2
! DTD and outputs a plain text file in vim help format.
! 
! db2vim can be obtained via anonymous CVS from sourceforge.net. Use
! 
! cvs -d:pserver:ano...@cv...:/cvsroot/vim-latex co db2vim
! 
! Or you can visit the web-interface to sourceforge CVS at:
! http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/vim-latex/db2vim/
! 
! The following modelines should nicely fold up this help manual.
! 
! vim:ft=help:fdm=expr:nowrap
! vim:foldexpr=getline(v\:lnum-1)=~'-\\{80}'?'>2'\:getline(v\:lnum-1)=~'=\\{80}'?'>1'\:getline(v\:lnum)=~'=\\{80}'?'0'\:getline(v\:lnum)=~'-\\{80}'?'1'\:'='
! vim:foldtext=substitute(v\:folddashes.substitute(getline(v\:foldstart),'\\s*\\*.*',"",""),'^--','\ \ \ \ \ \ ','')
! ================================================================================

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite texrc,1.35,1.36

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

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

Modified Files:
	texrc 
Log Message:
Comment on Tex_UseMakefile usage (Alan Schmitt)


Index: texrc
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/texrc,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** texrc	3 Sep 2003 05:56:22 -0000	1.35
--- texrc	7 Sep 2003 17:23:33 -0000	1.36
***************
*** 116,119 ****
--- 116,121 ----
  TexLet g:Tex_CompileRule_bib = 'bibtex $*'
  
+ " Set Tex_UseMakefile to 0 if you want to ignore the presence of a Makefile 
+ " when deciding how to compile
  TexLet g:Tex_UseMakefile = 1
  

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite compiler.vim,1.46,1.47

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

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

Modified Files:
	compiler.vim 
Log Message:
Bug: Use of g:Tex_UseMakefile was broken. (Alan Schmitt)
Fix: Test for Tex_UseMakefile before checking for makefile etc. (Alan
     Schmitt)


Index: compiler.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/compiler.vim,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** compiler.vim	6 Sep 2003 06:34:05 -0000	1.46
--- compiler.vim	7 Sep 2003 17:22:09 -0000	1.47
***************
*** 118,122 ****
  	" extracted from *.latexmain (if possible) log file name depends on the
  	" main file which will be compiled.
! 	if !g:Tex_UseMakefile || glob('makefile') != '' || glob('Makefile') != ''
  		let _makeprg = &l:makeprg
  		let &l:makeprg = 'make $*'
--- 118,122 ----
  	" extracted from *.latexmain (if possible) log file name depends on the
  	" main file which will be compiled.
! 	if g:Tex_UseMakefile && (glob('makefile') != '' || glob('Makefile') != '')
  		let _makeprg = &l:makeprg
  		let &l:makeprg = 'make $*'

[Vim-latex-cvs] vimfiles/plugin imaps.vim,1.32,1.33

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

Update of /cvsroot/vim-latex/vimfiles/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv12803

Modified Files:
	imaps.vim 
Log Message:
Bug: @/ would sometimes change from its previous value when using
     IMAP_Jumpfunc().
Why: s:RemoveLastHistoryItem sets @/ to the last search item in the @/
     history, but @/ is not necessarily always the last item in the @/
     history.
Fix: Remember @/ in Tex_LastSearchPattern and then restore it.


Index: imaps.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/plugin/imaps.vim,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** imaps.vim	19 Jun 2003 01:21:33 -0000	1.32
--- imaps.vim	6 Sep 2003 20:07:25 -0000	1.33
***************
*** 428,431 ****
--- 428,435 ----
  	let movement = "\<C-o>v/\\V".pheUser."/e\<CR>".extramove
  
+ 	" First remember what the search pattern was. s:RemoveLastHistoryItem will
+ 	" reset @/ to this pattern so we do not create new highlighting.
+ 	let g:Tex_LastSearchPattern = @/
+ 
  	" Now either goto insert mode or select mode.
  	if placeHolderEmpty && g:Imap_DeleteEmptyPlaceHolders
***************
*** 541,544 ****
--- 545,552 ----
  		let normcmd = normcmd."`<v".len."l\<C-\>\<C-N>"
  
+ 		" First remember what the search pattern was. s:RemoveLastHistoryItem
+ 		" will reset @/ to this pattern so we do not create new highlighting.
+ 		let g:Tex_LastSearchPattern = @/
+ 
  		silent! exe normcmd
  		" this is to restore the r register.
***************
*** 632,636 ****
  " s:RemoveLastHistoryItem: removes last search item from search history {{{
  " Description: Execute this string to clean up the search history.
! let s:RemoveLastHistoryItem = ':call histdel("/", -1)|let @/=histget("/", -1)'
  
  " }}}
--- 640,644 ----
  " s:RemoveLastHistoryItem: removes last search item from search history {{{
  " Description: Execute this string to clean up the search history.
! let s:RemoveLastHistoryItem = ':call histdel("/", -1)|let @/=Tex_LastSearchPattern'
  
  " }}}

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite compiler.vim,1.45,1.46

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

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

Modified Files:
	compiler.vim 
Log Message:
Bug: Syntax error in Tex_ForwardSearchLaTeX()
     elseif after else (Bart Kastermans)
Fix: guess.


Index: compiler.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/compiler.vim,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** compiler.vim	3 Sep 2003 05:56:22 -0000	1.45
--- compiler.vim	6 Sep 2003 06:34:05 -0000	1.46
***************
*** 335,344 ****
  					\ (viewer == "xdvi" || viewer == "xdvik") 
  			exec '!'.viewer.' -name xdvi -sourceposition '.line('.').expand('%').' -editor "gvim --servername '.v:servername.' --remote-silent +\%l \%f" '.mainfname.'.dvi &'
- 		else
- 			exec '!'.viewer.' -name xdvi -sourceposition '.line('.').expand('%').' '.mainfname.'.dvi &'
  		elseif exists('g:Tex_UseEditorSettingInDVIViewer') &&
  					\ g:Tex_UseEditorSettingInDVIViewer == 1 &&
  					\ viewer == "kdvi"
  			exec '!kdvi --unique file:'.mainfname.'.dvi\#src:'.line('.').Tex_GetMainFileName(":p:t:r").' &'
  		endif
  		redraw!
--- 335,344 ----
  					\ (viewer == "xdvi" || viewer == "xdvik") 
  			exec '!'.viewer.' -name xdvi -sourceposition '.line('.').expand('%').' -editor "gvim --servername '.v:servername.' --remote-silent +\%l \%f" '.mainfname.'.dvi &'
  		elseif exists('g:Tex_UseEditorSettingInDVIViewer') &&
  					\ g:Tex_UseEditorSettingInDVIViewer == 1 &&
  					\ viewer == "kdvi"
  			exec '!kdvi --unique file:'.mainfname.'.dvi\#src:'.line('.').Tex_GetMainFileName(":p:t:r").' &'
+ 		else
+ 			exec '!'.viewer.' -name xdvi -sourceposition '.line('.').expand('%').' '.mainfname.'.dvi &'
  		endif
  		redraw!

[Vim-latex-cvs] vimfiles/doc latex-suite.txt,1.40,1.41 latex-suite.xml,1.17,1.18

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

Update of /cvsroot/vim-latex/vimfiles/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv31442

Modified Files:
	latex-suite.txt latex-suite.xml 
Log Message:
update about Tshortcuts - math

Index: latex-suite.txt
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.txt,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** latex-suite.txt	3 Sep 2003 06:49:12 -0000	1.40
--- latex-suite.txt	3 Sep 2003 20:51:24 -0000	1.41
***************
*** 2101,2104 ****
--- 2101,2105 ----
  f    Font shortcuts
  s    Section shortcuts
+ m    Math shortcuts
  a    All shortcuts
  

Index: latex-suite.xml
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** latex-suite.xml	3 Sep 2003 06:49:12 -0000	1.17
--- latex-suite.xml	3 Sep 2003 20:51:24 -0000	1.18
***************
*** 2669,2672 ****
--- 2669,2673 ----
          <row><entry>f</entry><entry>Font shortcuts</entry></row>
          <row><entry>s</entry><entry>Section shortcuts</entry></row>
+         <row><entry>m</entry><entry>Math shortcuts</entry></row>
          <row><entry>a</entry><entry>All shortcuts</entry></row>
         </tbody>

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite wizardfuncs.vim,1.18,1.19

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

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

Modified Files:
	wizardfuncs.vim 
Log Message:
add m argument to Tshortcuts - show mathc shortcuts

Index: wizardfuncs.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/wizardfuncs.vim,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wizardfuncs.vim	7 Jul 2003 08:06:21 -0000	1.18
--- wizardfuncs.vim	3 Sep 2003 20:50:54 -0000	1.19
***************
*** 243,253 ****
  function! Tex_shortcuts(...)
  	if a:0 == 0
! 		let shorts = input( " Allowed arguments are:"
  		\."\n g     General"
  		\."\n e     Environments"
  		\."\n f     Fonts"
  		\."\n s     Sections"
  		\."\n a     All"
! 		\."\n Enter your choice : ")
  		call Tex_shortcuts(shorts)
  	elseif a:1 == 'g'
--- 243,254 ----
  function! Tex_shortcuts(...)
  	if a:0 == 0
! 		let shorts = input(" Allowed arguments are:"
  		\."\n g     General"
  		\."\n e     Environments"
  		\."\n f     Fonts"
  		\."\n s     Sections"
+ 		\."\n m     Math"
  		\."\n a     All"
! 		\."\n Enter your choice (<Enter> quits) : ")
  		call Tex_shortcuts(shorts)
  	elseif a:1 == 'g'
***************
*** 259,262 ****
--- 260,265 ----
  	elseif a:1 == 's'
  		echo g:sectionshortcuts
+ 	elseif a:1 == 'm'
+ 		echo g:mathshortcuts
  	elseif a:1 == 'a'
  		echo g:generalshortcuts
***************
*** 264,267 ****
--- 267,271 ----
  		echo g:fontshortcuts
  		echo g:sectionshortcuts
+ 		echo g:mathshortcuts
  	endif
  
***************
*** 333,336 ****
--- 337,376 ----
  \."\n SPG   ".g:Tex_Leader2."pg   paragraph"
  \."\n SSP   ".g:Tex_Leader2."sp   subparagraph"
+ " }}}
+ " Math shortcuts {{{
+ let g:mathshortcuts = ''
+ \."\n Math shortcuts - Insert mode"
+ \."\n `a     \\alpha            `b     \\beta"
+ \."\n `g     \\gamma            `d     \\delta"
+ \."\n `e     \\varepsilon       `z     \\zeta"
+ \."\n `h     \\eta              `q     \\theta"
+ \."\n `i     \\iota             `k     \\kappa"
+ \."\n `l     \\lambda           `m     \\mu"
+ \."\n `n     \\nu               `x     \\xi"
+ \."\n `p     \\pi               `r     \\rho"
+ \."\n `s     \\sigma            `v     \\varsigma"
+ \."\n `t     \\tau              `u     \\upsilon"
+ \."\n `f     \\varphi           `c     \\chi"
+ \."\n `y     \\psi              `w     \\omega"
+ \."\n `A     \\Alpha            `B     \\Beta"
+ \."\n `G     \\Gamma            `D     \\Delta"
+ \."\n `E     \\Epsilon          `Z     \\mathrm{Z}"
+ \."\n `H     \\Eta              `K     \\Kappa"
+ \."\n `L     \\Lambda           `M     \\Mu"
+ \."\n `N     \\Nu               `X     \\Xi"
+ \."\n `P     \\Pi               `R     \\Rho"
+ \."\n `S     \\Sigma            `T     \\Tau"
+ \."\n `U     \\Upsilon          `C     \\Chi"
+ \."\n `Y     \\Psi              `W     \\Omega"
+ \."\n `(     \\subset           `)     \\Subset"
+ \."\n `=     \\equiv            =~     \\approx"
+ \."\n `-     \\bigcap           `+     \\bigcup"
+ \."\n `.     \\cdot             `*     \\times"
+ \."\n `\\     \\setminus         `@     \\circ"
+ \."\n `&     \\wedge            `,     \\nonumber"
+ \."\n `8     \\infty            `_     \\bar{}"
+ \."\n `:     \\ddot{}           `;     \\dot{}"
+ \."\n `^     \\hat{}            `~     \\tilde{}"
+ \."\n `6     \\partial"
  " }}}
  

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite multicompile.vim,1.6,1.7

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

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

Modified Files:
	multicompile.vim 
Log Message:
Fixed typo which caused makeindex not be run

Index: multicompile.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/multicompile.vim,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** multicompile.vim	2 Sep 2003 07:07:23 -0000	1.6
--- multicompile.vim	3 Sep 2003 07:19:13 -0000	1.7
***************
*** 62,66 ****
  		" If .idx file changed, then run makeindex to generate the new .ind
  		" file and remember to rerun latex.
! 		if runCount == 0 && glob(idxFileName) != '' && idxlinesAfter != idxlinesAfter
  			echomsg "Running makeindex..."
  			let temp_mp = &mp | let &mp='makeindex $*.idx'
--- 62,66 ----
  		" If .idx file changed, then run makeindex to generate the new .ind
  		" file and remember to rerun latex.
! 		if runCount == 0 && glob(idxFileName) != '' && idxlinesBefore != idxlinesAfter
  			echomsg "Running makeindex..."
  			let temp_mp = &mp | let &mp='makeindex $*.idx'
***************
*** 77,81 ****
  
  			let biblinesBefore = Tex_CatFile(bibFileName)
- 			call Tex_Debug('bibbefore = ['.biblinesBefore.']', 'comp')
  
  			echomsg "Running bibtex..."
--- 77,80 ----
***************
*** 85,89 ****
  
  			let biblinesAfter = Tex_CatFile(bibFileName)
- 			call Tex_Debug('bibafter = ['.biblinesAfter.']', 'comp')
  
  			" If the .bbl file changed after running bibtex, we need to
--- 84,87 ----

[Vim-latex-cvs] vimfiles makefile,1.17,1.18

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

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

Modified Files:
	makefile 
Log Message:
removing explorer.vim and adding filebrowser.vim in the archives

Index: makefile
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** makefile	18 Jul 2003 02:21:00 -0000	1.17
--- makefile	3 Sep 2003 07:00:33 -0000	1.18
***************
*** 11,16 ****
  	zip -q latexSuite.zip plugin/SyntaxFolds.vim
  	zip -q latexSuite.zip plugin/libList.vim
- 	zip -q latexSuite.zip plugin/explorer.vim
  	zip -q latexSuite.zip plugin/remoteOpen.vim
  	# ftplugins
  	zip -q latexSuite.zip ftplugin/tex_latexSuite.vim
--- 11,16 ----
  	zip -q latexSuite.zip plugin/SyntaxFolds.vim
  	zip -q latexSuite.zip plugin/libList.vim
  	zip -q latexSuite.zip plugin/remoteOpen.vim
+ 	zip -q latexSuite.zip plugin/filebrowser.vim
  	# ftplugins
  	zip -q latexSuite.zip ftplugin/tex_latexSuite.vim

[Vim-latex-cvs] vimfiles/doc latex-suite.xml,1.16,1.17 latex-suite.txt,1.39,1.40

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

Update of /cvsroot/vim-latex/vimfiles/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv9012

Modified Files:
	latex-suite.xml latex-suite.txt 
Log Message:
- descriptions of the new g:Tex_UseMakefile and also g:Tex_UsePython and
  g:Tex_Debug options.


Index: latex-suite.xml
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** latex-suite.xml	2 Sep 2003 07:08:28 -0000	1.16
--- latex-suite.xml	3 Sep 2003 06:49:12 -0000	1.17
***************
*** 2707,2710 ****
--- 2707,2753 ----
     behavior which they influence. 
    </para>
+   <section id="ls-general-purpose-settings">
+    <title>General Settings</title>
+    <section id="Tex_Debug">
+     <title>Tex_Debug</title>
+     <para>
+      <informaltable frame="all">
+       <tgroup cols="2">
+        <tbody>
+         <row><entry>Type</entry><entry>boolean</entry></row>
+         <row><entry>Default Value</entry>
+          <entry><literal>0</literal></entry></row>
+        </tbody>
+       </tgroup>
+      </informaltable>
+      <para>
+       If set to 1, then latex-suite will create certain global debug
+       statements which can be printed by doing
+       <programlisting>:call Tex_PrintDebug()</programlisting>
+      </para>
+     </para>
+    </section>
+    <section id="Tex_UsePython">
+     <title>Tex_UsePython</title>
+     <para>
+      <informaltable frame="all">
+       <tgroup cols="2">
+        <tbody>
+         <row><entry>Type</entry><entry>boolean</entry></row>
+         <row><entry>Default Value</entry>
+          <entry><literal>1</literal></entry></row>
+        </tbody>
+       </tgroup>
+      </informaltable>
+      <para>
+       If &ls; detects that your vim is python enabled (using
+       <literal>has('python')</literal>), then it tries to use python in
+       certain places to speed things up. If this misbehaves, you can set
+       this to zero, in which case, &ls; will use vimscript to accomplish
+       the same.
+      </para>
+     </para>
+    </section>
+   </section>
    <section id="customizing-place-holders">
     <title>Place-Holder Customization</title>
***************
*** 3341,3344 ****
--- 3384,3416 ----
      </para>
     </section>
+    <section id="Tex_UseMakefile">
+     <title>Tex_UseMakefile</title>
+     <para>
+      <informaltable frame="all">
+       <tgroup cols="2">
+        <tbody>
+         <row><entry>Type</entry><entry>boolean</entry></row>
+         <row><entry>Default Value</entry>
+          <entry><literal>1</literal></entry></row>
+        </tbody>
+       </tgroup>
+      </informaltable>
+      <para>
+       When set to 1, then if a <literal>makefile</literal> or
+       <literal>Makefile</literal> is present in the current directory, then
+       &ls; sets the <literal>makeprg</literal> option to just
+       <literal>"make &lt;target&gt;"</literal>, where
+       <literal>&lt;target&gt;</literal> is the target format chosen using
+       the <literal>TCTarget</literal> or <literal>TTarget</literal>
+       commands.
+      </para>
+      <para>
+       When set to 0, then &ls; will set the <literal>makeprg</literal>
+       setting to whatever is defined by the <link
+        linkend="Tex_CompileRule_format">g:Tex_CompileRule_target</link>
+       setting.
+      </para>
+     </para>
+    </section>
    </section>
    <section id="viewer-customization">
***************
*** 3624,3627 ****
--- 3696,3704 ----
      <tbody>
       <row>
+       <entry>Artur R. Czechowski</entry>
+       <entry>maintains the BSD package of latex-suite. Lots of valuable
+        feedback.</entry>
+      </row>
+      <row>
        <entry>
         Lubomir Host      
***************
*** 3629,3633 ****
        <entry>
         provided the diacritics and also helped in development.
!        <para></para>
        </entry>
       </row>
--- 3706,3710 ----
        <entry>
         provided the diacritics and also helped in development.
!        
        </entry>
       </row>
***************
*** 3638,3642 ****
        <entry>
         valuable suggestions during development.
!        <para></para>
        </entry>
       </row>
--- 3715,3719 ----
        <entry>
         valuable suggestions during development.
!        
        </entry>
       </row>
***************
*** 3648,3652 ****
         his variation of Stephen Riehm's bracketing system is used
         in latex-suite.
!        <para></para>
        </entry>
       </row>
--- 3725,3729 ----
         his variation of Stephen Riehm's bracketing system is used
         in latex-suite.
!        
        </entry>
       </row>
***************
*** 3659,3663 ****
         The implementation of the templates also borrows from
         mu-template.vim by him.
!        <para></para>
        </entry>
       </row>
--- 3736,3740 ----
         The implementation of the templates also borrows from
         mu-template.vim by him.
!        
        </entry>
       </row>
***************
*** 3669,3673 ****
         author of ltags and also provided the nice tip about
         forward / reverse search on DVI documents.
!        <para></para>
        </entry>
       </row>
--- 3746,3750 ----
         author of ltags and also provided the nice tip about
         forward / reverse search on DVI documents.
!        
        </entry>
       </row>
***************
*** 3678,3682 ****
        <entry>
         the extremely helpful bracketing system is from him.
!        <para></para>
        </entry>
       </row>
--- 3755,3759 ----
        <entry>
         the extremely helpful bracketing system is from him.
!        
        </entry>
       </row>
***************
*** 3686,3691 ****
        </entry>
        <entry>
!        provided some macros/folding elements.
!        <para></para>
        </entry>
       </row>
--- 3763,3769 ----
        </entry>
        <entry>
!        provided macros/folding elements. Continued feedback,
!        bug-reports/fixes.
!        
        </entry>
       </row>
***************
*** 3697,3701 ****
         for ExecMap(), the clever little function which makes
         typing visual mode mappings so much easier and error-free.
!        <para></para>
        </entry>
       </row>
--- 3775,3779 ----
         for ExecMap(), the clever little function which makes
         typing visual mode mappings so much easier and error-free.
!        
        </entry>
       </row>
***************
*** 3707,3711 ****
         for the comprehensive BibT() function for entering bibtex
         entries.
!        <para></para>
        </entry>
       </row>
--- 3785,3789 ----
         for the comprehensive BibT() function for entering bibtex
         entries.
!        
        </entry>
       </row>
***************
*** 3716,3720 ****
        <entry>
         for libList.vim
!        <para></para>
        </entry>
       </row>
--- 3794,3798 ----
        <entry>
         for libList.vim
!        
        </entry>
       </row>
***************
*** 3726,3730 ****
         useful discussion and also a lot of bug fixes.
         the %%fakesection in folding.vim.
!        <para></para>
        </entry>
       </row>
--- 3804,3808 ----
         useful discussion and also a lot of bug fixes.
         the %%fakesection in folding.vim.
!        
        </entry>
       </row>

Index: latex-suite.txt
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.txt,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** latex-suite.txt	2 Sep 2003 07:08:28 -0000	1.39
--- latex-suite.txt	3 Sep 2003 06:49:12 -0000	1.40
***************
*** 12,16 ****
  macros to speed up editing LaTeX documents to functions for forward searching
  .dvi documents. Latex-suite has been possible because of the contributions of
! many people. Please see latex-suite-credits [|ls_a_dt|] for a list of people who
  have helped.
  
--- 12,16 ----
  macros to speed up editing LaTeX documents to functions for forward searching
  .dvi documents. Latex-suite has been possible because of the contributions of
! many people. Please see latex-suite-credits [|ls_a_dx|] for a list of people who
  have helped.
[...1321 lines suppressed...]
! Alan G Isac            for the comprehensive BibT() function for entering bibtex
!                        entries.
! Gontran Baerts         for libList.vim
! Peter Heslin           useful discussion and also a lot of bug fixes. the
!                        %%fakesection in folding.vim.
  
  A large number of functions in latex-suite come from various other people. Some
***************
*** 2785,2789 ****
  out who has done what.
  
!                                               *latex-suite-maintainer* *ls_a_dX*
  The current maintainer(s) of latex-suite is(are)
  
--- 2812,2816 ----
  out who has done what.
  
!                                               *latex-suite-maintainer* *ls_a_eb*
  The current maintainer(s) of latex-suite is(are)
  

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite compiler.vim,1.44,1.45 texrc,1.34,1.35

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

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

Modified Files:
	compiler.vim texrc 
Log Message:
- implement Alan Schmitt's idea of a Tex_UseMakefile option. Setting this
  to zero means that latex-suite will completeley ignore the presence of a
  makefile in the current directory.


Index: compiler.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/compiler.vim,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** compiler.vim	2 Sep 2003 07:05:59 -0000	1.44
--- compiler.vim	3 Sep 2003 05:56:22 -0000	1.45
***************
*** 5,8 ****
--- 5,9 ----
  " 
  "  Description: functions for compiling/viewing/searching latex documents
+ "          CVS: $Id$
  "=============================================================================
  
***************
*** 108,125 ****
  	" Extract the complete file name including the extension.
  	let mainfname = Tex_GetMainFileName(':r')
  	if exists('b:fragmentFile') || mainfname == ''
  		let mainfname = escape(expand('%:t'), ' ')
  	endif
  
! 	" if a makefile exists, then use that irrespective of whether *.latexmain
! 	" exists or not. mainfname is still extracted from *.latexmain (if
! 	" possible) log file name depends on the main file which will be compiled.
! 	if glob('makefile') != '' || glob('Makefile') != ''
  		let _makeprg = &l:makeprg
  		let &l:makeprg = 'make $*'
  		if exists('s:target')
! 			exec 'make '.s:target
  		else
! 			exec 'make'
  		endif
  		let &l:makeprg = _makeprg
--- 109,130 ----
  	" Extract the complete file name including the extension.
  	let mainfname = Tex_GetMainFileName(':r')
+ 	call Tex_Debug('Tex_CompileLatex: getting mainfname = ['.mainfname.'] from Tex_GetMainFileName', 'comp')
  	if exists('b:fragmentFile') || mainfname == ''
  		let mainfname = escape(expand('%:t'), ' ')
  	endif
  
! 	" if a makefile exists and the user wants to use it, then use that
! 	" irrespective of whether *.latexmain exists or not. mainfname is still
! 	" extracted from *.latexmain (if possible) log file name depends on the
! 	" main file which will be compiled.
! 	if !g:Tex_UseMakefile || glob('makefile') != '' || glob('Makefile') != ''
  		let _makeprg = &l:makeprg
  		let &l:makeprg = 'make $*'
  		if exists('s:target')
! 			call Tex_Debug('Tex_CompileLatex: execing [make! '.s:target.']', 'comp')
! 			exec 'make! '.s:target
  		else
! 			call Tex_Debug('Tex_CompileLatex: execing [make!]', 'comp')
! 			exec 'make!'
  		endif
  		let &l:makeprg = _makeprg
***************
*** 130,134 ****
  			let mainfname = fnamemodify(mainfname, ':r')
  		endif
! 		exec 'make '.mainfname
  	endif
  	redraw!
--- 135,140 ----
  			let mainfname = fnamemodify(mainfname, ':r')
  		endif
! 		call Tex_Debug('Tex_CompileLatex: execing [make! '.mainfname.']', 'comp')
! 		exec 'make! '.mainfname
  	endif
  	redraw!
***************
*** 460,464 ****
  	" land us on the error in a.tex.
  	if errfile != ''
! 		exec 'bot pedit +/(\\(\\f\\|\\[\\|\]\\)*'.errfile.'/ '.a:filename
  	else
  		exec 'bot pedit +0 '.a:filename
--- 466,470 ----
  	" land us on the error in a.tex.
  	if errfile != ''
! 		exec 'silent! bot pedit +/(\\(\\f\\|\\[\\|\]\\|\\s\\)*'.errfile.'/ '.a:filename
  	else
  		exec 'bot pedit +0 '.a:filename

Index: texrc
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/texrc,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** texrc	29 Aug 2003 02:55:48 -0000	1.34
--- texrc	3 Sep 2003 05:56:22 -0000	1.35
***************
*** 116,119 ****
--- 116,121 ----
  TexLet g:Tex_CompileRule_bib = 'bibtex $*'
  
+ TexLet g:Tex_UseMakefile = 1
+ 
  " }}}
  " ------------------------------------------------------------------------------ 

[Vim-latex-cvs] vimfiles/ftplugin/tex texviewer.vim,1.31,1.32

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

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

Modified Files:
	texviewer.vim 
Log Message:
- merge from the file-browser branch. restructuring to get the correct
  style and also to use filebrowser.vim instead of explorer.vim


Index: texviewer.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/tex/texviewer.vim,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** texviewer.vim	10 Jul 2003 09:52:10 -0000	1.31
--- texviewer.vim	2 Sep 2003 07:15:30 -0000	1.32
***************
*** 17,21 ****
  " Tex_SetTexViewerMaps: sets maps for this ftplugin {{{
  function! Tex_SetTexViewerMaps()
! 	inoremap <silent> <Plug>Tex_Completion <Esc>:call Tex_completion("default","text")<CR>
  	if !hasmapto('<Plug>Tex_Completion', 'i')
  		if has('gui_running')
--- 17,21 ----
  " Tex_SetTexViewerMaps: sets maps for this ftplugin {{{
  function! Tex_SetTexViewerMaps()
! 	inoremap <silent> <Plug>Tex_Completion <Esc>:call Tex_Complete("default","text")<CR>
  	if !hasmapto('<Plug>Tex_Completion', 'i')
  		if has('gui_running')
***************
*** 30,73 ****
  call Tex_SetTexViewerMaps()
  " }}}
  
! command -nargs=1 TLook call <SID>Tex_look(<q-args>)
! command -nargs=1 TLookAll call <SID>Tex_lookall(<q-args>)
! command -nargs=1 TLookBib call <SID>Tex_lookbib(<q-args>)
! 
! function! s:Tex_lookall(what)
! 	call Tex_completion(a:what, "all")
! endfunction
! 
! function! s:Tex_lookbib(what)
! 	call Tex_completion(a:what, "bib")
! endfunction
! 
! function! s:Tex_look(what)
! 	call Tex_completion(a:what, "tex")
! endfunction
! 
! if getcwd() != expand("%:p:h")
! 	let s:search_directory = expand("%:p:h") . '/'
! else
! 	let s:search_directory = ''
! endif
! 
! " CompletionVars: similar variables can be set in package files {{{
! let g:Tex_completion_bibliographystyle = 'abbr,alpha,plain,unsrt'
! let g:Tex_completion_addtocontents = 'lof}{,lot}{,toc}{'
! let g:Tex_completion_addcontentsline = 'lof}{figure}{,lot}{table}{,toc}{chapter}{,toc}{part}{,'.
! 									\ 'toc}{section}{,toc}{subsection}{,toc}{paragraph}{,'.
! 									\ 'toc}{subparagraph}{'
! " }}}
! 
! " Tex_completion: main function {{{
  " Description:
! "
! function! Tex_completion(what, where)
  
  	" Get info about current window and position of cursor in file
  	let s:winnum = winnr()
  	let s:pos = line('.').' | normal! '.virtcol('.').'|'
! 	let s:col = col('.')
  
  	if a:where == "text"
--- 30,57 ----
  call Tex_SetTexViewerMaps()
  " }}}
+ command -nargs=1 TLook    call Tex_Complete(<q-args>, 'tex')
+ command -nargs=1 TLookAll call Tex_Complete(<q-args>, 'all')
+ command -nargs=1 TLookBib call Tex_Complete(<q-args>, 'bib')
  
! " ==============================================================================
! " Main completion function
! " ==============================================================================
! " Tex_Complete: main function {{{
  " Description:
! function! Tex_Complete(what, where)
  
  	" Get info about current window and position of cursor in file
  	let s:winnum = winnr()
+ 
+ 	" Change to the directory of the file being edited before running all the
+ 	" :grep commands. We will change back to the original directory after we
+ 	" finish with the grep.
+ 	let s:origdir = getcwd()
+ 	cd %:p:h
+ 
  	let s:pos = line('.').' | normal! '.virtcol('.').'|'
! 
! 	unlet! s:type
! 	unlet! s:typeoption
  
  	if a:where == "text"
***************
*** 89,102 ****
  			let s:typeoption = substitute(s:curline, pattern, '\2', 'e')
  			call Tex_Debug('s:type = '.s:type.', typeoption = '.s:typeoption, 'view')
- 		else
- 			unlet! s:type
- 			unlet! s:typeoption
  		endif
  
  		if exists("s:type") && s:type =~ 'ref'
! 			call Tex_Debug("silent! grep! '".Tex_EscapeForGrep('\label{'.s:prefix)."' ".s:search_directory.'*.tex', 'view')
! 			exec "silent! grep! '".Tex_EscapeForGrep('\label{'.s:prefix)."' ".s:search_directory.'*.tex'
  			redraw!
! 			call <SID>Tex_c_window_setup()
  
  		elseif exists("s:type") && s:type =~ 'cite'
--- 73,83 ----
  			let s:typeoption = substitute(s:curline, pattern, '\2', 'e')
  			call Tex_Debug('s:type = '.s:type.', typeoption = '.s:typeoption, 'view')
  		endif
  
  		if exists("s:type") && s:type =~ 'ref'
! 			call Tex_Debug("silent! grep! '".Tex_EscapeForGrep('\label{'.s:prefix)."' *.tex", 'view')
! 			exec "silent! grep! '".Tex_EscapeForGrep('\label{'.s:prefix)."' *.tex"
  			redraw!
! 			call <SID>Tex_SetupCWindow()
  
  		elseif exists("s:type") && s:type =~ 'cite'
***************
*** 109,118 ****
  			silent! grep! ____HIGHLY_IMPROBABLE___ %
  			if g:Tex_RememberCiteSearch && exists('s:citeSearchHistory')
! 				call <SID>Tex_c_window_setup(s:citeSearchHistory)
  			else
  				call Tex_Debug('calling Tex_GrepForBibItems', 'bib')
  				call Tex_GrepForBibItems(s:prefix)
  				redraw!
! 				call <SID>Tex_c_window_setup()
  			endif
  			if g:Tex_RememberCiteSearch && &ft == 'qf'
--- 90,99 ----
  			silent! grep! ____HIGHLY_IMPROBABLE___ %
  			if g:Tex_RememberCiteSearch && exists('s:citeSearchHistory')
! 				call <SID>Tex_SetupCWindow(s:citeSearchHistory)
  			else
  				call Tex_Debug('calling Tex_GrepForBibItems', 'bib')
  				call Tex_GrepForBibItems(s:prefix)
  				redraw!
! 				call <SID>Tex_SetupCWindow()
  			endif
  			if g:Tex_RememberCiteSearch && &ft == 'qf'
***************
*** 124,154 ****
  
  		elseif exists("s:type") && (s:type =~ 'includegraphics' || s:type == 'psfig') 
! 			let s:storehidefiles = g:explHideFiles
! 			let g:explHideFiles = '^\.,\.tex$,\.bib$,\.bbl$,\.zip$,\.gz$'
! 			exe 'silent! Sexplore '.s:search_directory.g:Tex_ImageDir
! 			call <SID>Tex_explore_window("includegraphics")
  			
  		elseif exists("s:type") && s:type == 'bibliography'
! 			let s:storehidefiles = g:explHideFiles
! 			let g:explHideFiles = '^\.,\.[^b]..$'
! 			exe 'silent! Sexplore '.s:search_directory
! 			call <SID>Tex_explore_window("bibliography")
  
  		elseif exists("s:type") && s:type =~ 'include\(only\)\='
! 			let s:storehidefiles = g:explHideFiles
! 			let g:explHideFiles = '^\.,\.[^t]..$'
! 			exe 'silent! Sexplore '.s:search_directory
! 			call <SID>Tex_explore_window("includefile")
  
  		elseif exists("s:type") && s:type == 'input'
! 			exe 'silent! Sexplore '.s:search_directory
! 			call <SID>Tex_explore_window("input")
  
  		elseif exists('s:type') && exists("g:Tex_completion_".s:type)
! 			call <SID>CompleteName('plugin_'.s:type)
! 
! 		elseif exists("s:type") && g:Tex_completion_explorer =~ ','.s:type
! 			exe 'silent! Sexplore '.s:search_directory
! 			call <SID>Tex_explore_window("plugintype")
  
  		else
--- 105,133 ----
  
  		elseif exists("s:type") && (s:type =~ 'includegraphics' || s:type == 'psfig') 
! 			call Tex_SetupFileCompletion(
! 				\ '', 
! 				\ '^\.\\|\.tex$\\|\.bib$\\|\.bbl$\\|\.zip$\\|\.gz$', 
! 				\ 'noext')
  			
  		elseif exists("s:type") && s:type == 'bibliography'
! 			call Tex_SetupFileCompletion(
! 				\ '\.b..$',
! 				\ '',
! 				\ 'noext')
  
  		elseif exists("s:type") && s:type =~ 'include\(only\)\='
! 			call Tex_SetupFileCompletion(
! 				\ '\.t..$', 
! 				\ '',
! 				\ 'noext')
  
  		elseif exists("s:type") && s:type == 'input'
! 			call Tex_SetupFileCompletion(
! 				\ '', 
! 				\ '',
! 				\ 'ext')
  
  		elseif exists('s:type') && exists("g:Tex_completion_".s:type)
! 			call <SID>Tex_CompleteRefCiteCustom('plugin_'.s:type)
  
  		else
***************
*** 164,197 ****
  				endif
  			endif
! 			call Tex_Debug("silent! grep! '\\<".s:word."' ".s:search_directory.'*.tex', 'view')
! 			exe "silent! grep! '\\<".s:word."' ".s:search_directory.'*.tex'
! 			call <SID>Tex_c_window_setup()
  
  		endif
  		
  	elseif a:where == 'tex'
  		" Process :TLook command
! 		exe "silent! grep! '".a:what."' ".s:search_directory.'*.tex'
! 		call <SID>Tex_c_window_setup()
  
  	elseif a:where == 'bib'
  		" Process :TLookBib command
! 		exe "silent! grep! '".a:what."' ".s:search_directory.'*.bib'
! 		exe "silent! grepadd! '".a:what."' ".s:search_directory.'*.bbl'
! 		call <SID>Tex_c_window_setup()
  
  	elseif a:where == 'all'
  		" Process :TLookAll command
! 		exe "silent! grep! '".a:what."' ".s:search_directory.'*'
! 		call <SID>Tex_c_window_setup()
  
  	endif
  endfunction " }}}
! " Tex_c_window_setup: set maps and local settings for cwindow {{{
  " Description: Set local maps jkJKq<cr> for cwindow. Also size and basic
  " settings
  "
! function! s:Tex_c_window_setup(...)
! 	call Tex_Debug('+Tex_c_window_setup', 'view')
  	cclose
  	exe 'copen '. g:Tex_ViewerCwindowHeight
--- 143,268 ----
  				endif
  			endif
! 			call Tex_Debug("silent! grep! '\\<".s:word."' *.tex", 'view')
! 			exe "silent! grep! '\\<".s:word."' *.tex"
  
+ 			call <SID>Tex_SetupCWindow()
  		endif
  		
  	elseif a:where == 'tex'
  		" Process :TLook command
! 		exe "silent! grep! '".a:what."' *.tex"
! 		call <SID>Tex_SetupCWindow()
  
  	elseif a:where == 'bib'
  		" Process :TLookBib command
! 		exe "silent! grep! '".a:what."' *.bib"
! 		exe "silent! grepadd! '".a:what."' *.bbl"
! 		call <SID>Tex_SetupCWindow()
  
  	elseif a:where == 'all'
  		" Process :TLookAll command
! 		exe "silent! grep! '".a:what."' *"
! 		call <SID>Tex_SetupCWindow()
! 	endif
! 
! endfunction " }}}
  
+ " Tex_CompleteWord: inserts a word at the chosen location {{{
+ " Description: 
+ function! Tex_CompleteWord(completeword)
+ 	exe s:pos
+ 
+ 	" Complete word, check if add closing }
+ 	exe 'normal! a'.a:completeword."\<Esc>"
+ 
+ 	if getline('.')[col('.')-1] !~ '{' && getline('.')[col('.')] !~ '}'
+ 		exe "normal! a}\<Esc>"
+ 	endif
+ 	
+ 	" Return to Insert mode
+ 	if col('.') == strlen(getline('.'))
+ 		startinsert!
+ 	else
+ 		normal! l
+ 		startinsert
  	endif
  endfunction " }}}
! 
! " ==============================================================================
! " File name completion helper functons
! " ============================================================================== 
! " Tex_SetupFileCompletion:  {{{
! " Description: 
! function! Tex_SetupFileCompletion(accept, reject, ext)
! 	call FB_SetVar('FB_AllowRegexp', a:accept)
! 	call FB_SetVar('FB_RejectRegexp', a:reject)
! 	call FB_SetVar('FB_CallBackFunction', 'Tex_CompleteFileName')
! 	call FB_SetVar('FB_CallBackFunctionArgs', '"'.a:ext.'"')
! 
! 	call FB_OpenFileBrowser('.')
! endfunction " }}}
! " Tex_CompleteFileName:  {{{
! " Description: 
! function! Tex_CompleteFileName(filename, ext)
! 	call Tex_Debug('getting filename = '.a:filename, 'view')
! 
! 	let completeword = Tex_RelPath(a:filename, expand('%:p'))
! 	if a:ext == 'noext'
! 		let completeword = fnamemodify(completeword, ':r')
! 	endif
! 
! 	call Tex_CompleteWord(completeword)
! endfunction " }}}
! " Tex_Common: common part of strings {{{
! function! s:Tex_Common(path1, path2)
! 	" Assume the caller handles 'ignorecase'
! 	if a:path1 == a:path2
! 		return a:path1
! 	endif
! 	let n = 0
! 	while a:path1[n] == a:path2[n]
! 		let n = n+1
! 	endwhile
! 	return strpart(a:path1, 0, n)
! endfunction " }}}
! " Tex_NormalizePath:  {{{
! " Description: 
! function! Tex_NormalizePath(path)
! 	let retpath = a:path
! 	if has("win32") || has("win16") || has("dos32") || has("dos16")
! 		let retpath = substitute(retpath, '\\', '/', 'ge')
! 	endif
! 	if isdirectory(retpath) && retpath !~ '/$'
! 		let retpath = retpath.'/'
! 	endif
! 	return retpath
! endfunction " }}}
! " Tex_RelPath: ultimate file name {{{
! function! Tex_RelPath(explfilename,texfilename)
! 	let path1 = Tex_NormalizePath(a:explfilename)
! 	let path2 = Tex_NormalizePath(a:texfilename)
! 
! 	let n = matchend(<SID>Tex_Common(path1, path2), '.*/')
! 	let path1 = strpart(path1, n)
! 	let path2 = strpart(path2, n)
! 	if path2 !~ '/'
! 		let subrelpath = ''
! 	else
! 		let subrelpath = substitute(path2, '[^/]\{-}/', '../', 'ge')
! 		let subrelpath = substitute(subrelpath, '[^/]*$', '', 'ge')
! 	endif
! 	let relpath = subrelpath.path1
! 	return escape(Tex_NormalizePath(relpath), ' ')
! endfunction " }}}
! 
! " ==============================================================================
! " Ref/Cite completion helper functions
! " ==============================================================================
! " Tex_SetupCWindow: set maps and local settings for cwindow {{{
  " Description: Set local maps jkJKq<cr> for cwindow. Also size and basic
  " settings
  "
! function! s:Tex_SetupCWindow(...)
! 	call Tex_Debug('+Tex_SetupCWindow', 'view')
  	cclose
  	exe 'copen '. g:Tex_ViewerCwindowHeight
***************
*** 208,212 ****
  
  	let s:scrollOffVal = &scrolloff
! 	call <SID>UpdateViewerWindow()
  
  	" If everything went well, then we should be situated in the quickfix
--- 279,283 ----
  
  	let s:scrollOffVal = &scrolloff
! 	call <SID>Tex_SyncPreviewWindow()
  
  	" If everything went well, then we should be situated in the quickfix
***************
*** 218,277 ****
  	endif
  
!     nnoremap <buffer> <silent> j j:call <SID>UpdateViewerWindow()<CR>
!     nnoremap <buffer> <silent> k k:call <SID>UpdateViewerWindow()<CR>
!     nnoremap <buffer> <silent> <up> <up>:call <SID>UpdateViewerWindow()<CR>
!     nnoremap <buffer> <silent> <down> <down>:call <SID>UpdateViewerWindow()<CR>
  
  	" Change behaviour of <cr> only for 'ref' and 'cite' context. 
! 	if exists("s:type") && s:type =~ 'ref'
! 		exec 'nnoremap <buffer> <silent> <cr> :set scrolloff='.s:scrollOffVal.'<CR>:silent! call <SID>CompleteName("ref")<CR>'
! 
! 	elseif exists("s:type") && s:type =~ 'cite'
! 		exec 'nnoremap <buffer> <silent> <cr> :set scrolloff='.s:scrollOffVal.'<CR>:silent! call <SID>CompleteName("cite")<CR>'
  
  	else
  		" In other contexts jump to place described in cwindow and close small
  		" windows
! 		exec 'nnoremap <buffer> <silent> <cr> :set scrolloff='.s:scrollOffVal.'<CR>:call <SID>GoToLocation()<cr>'
  
  	endif
  
  	nnoremap <buffer> <silent> J :wincmd j<cr><c-e>:wincmd k<cr>
  	nnoremap <buffer> <silent> K :wincmd j<cr><c-y>:wincmd k<cr>
  
! 	exe 'nnoremap <buffer> <silent> q :set scrolloff='.s:scrollOffVal.'<CR>: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: 
  "
! function! s:Tex_explore_window(type) 
  
! 	exe g:Tex_ExplorerHeight.' wincmd _'
  
! 	if a:type =~ 'includegraphics\|bibliography\|includefile'
! 		nnoremap <silent> <buffer> <cr> :silent! call <SID>CompleteName("expl_noext")<CR>
! 	elseif a:type =~ 'input\|plugintype'
! 		nnoremap <silent> <buffer> <cr> :silent! call <SID>CompleteName("expl_ext")<CR>
! 	endif
  
! 	nnoremap <silent> <buffer> q :wincmd q<cr>
  
  endfunction " }}}
! " UpdateViewerWindow: update error and preview window {{{
  " Description: Usually quickfix engine takes care about most of these things
  " but we discard it for better control of events.
  "
! function! s:UpdateViewerWindow()
! 	 call Tex_Debug('+UpdateViewerWindow', 'view')
  
  	let viewfile = matchstr(getline('.'), '^\f*\ze|\d')
--- 289,357 ----
  	endif
  
!     nnoremap <buffer> <silent> j j:call <SID>Tex_SyncPreviewWindow()<CR>
!     nnoremap <buffer> <silent> k k:call <SID>Tex_SyncPreviewWindow()<CR>
!     nnoremap <buffer> <silent> <up> <up>:call <SID>Tex_SyncPreviewWindow()<CR>
!     nnoremap <buffer> <silent> <down> <down>:call <SID>Tex_SyncPreviewWindow()<CR>
  
  	" Change behaviour of <cr> only for 'ref' and 'cite' context. 
! 	if exists("s:type") && s:type =~ 'ref\|cite'
! 		exec 'nnoremap <buffer> <silent> <cr> '
! 			\ .':set scrolloff='.s:scrollOffVal.'<CR>'
! 			\ .':cd '.s:origdir.'<CR>'
! 			\ .':silent! call <SID>Tex_CompleteRefCiteCustom("'.s:type.'")<CR>'
  
  	else
  		" In other contexts jump to place described in cwindow and close small
  		" windows
! 		exec 'nnoremap <buffer> <silent> <cr> '
! 			\ .':set scrolloff='.s:scrollOffVal.'<CR>'
! 			\ .':cd '.s:origdir.'<CR>'
! 			\ .':call <SID>Tex_GoToLocation()<cr>'
  
  	endif
  
+ 	" Scroll the preview window while in the quickfix window
  	nnoremap <buffer> <silent> J :wincmd j<cr><c-e>:wincmd k<cr>
  	nnoremap <buffer> <silent> K :wincmd j<cr><c-y>:wincmd k<cr>
  
! 	" Exit the quickfix window without doing anything.
! 	exe 'nnoremap <buffer> <silent> q '
! 		\ .':set scrolloff='.s:scrollOffVal.'<CR>'
! 		\ .':cd '.s:origdir.'<CR>'
! 		\ .':call Tex_CloseSmallWindows()<CR>'
  
  endfunction " }}}
! " Tex_CompleteRefCiteCustom: complete/insert name for current item {{{
! " Description: handle completion of items depending on current context
  "
! function! s:Tex_CompleteRefCiteCustom(type)
  
! 	if a:type =~ 'cite'
! 		if getline('.') =~ '\\bibitem{'
! 			let bibkey = matchstr(getline('.'), '\\bibitem{\zs.\{-}\ze}')
! 		else
! 			let bibkey = matchstr(getline('.'), '{\zs.\{-}\ze,')
! 		endif
! 		let completeword = strpart(bibkey, strlen(s:prefix))
  
! 	elseif a:type =~ 'ref'
! 		let label = matchstr(getline('.'), '\\label{\zs.\{-}\ze}')
! 		let completeword = strpart(label, strlen(s:prefix))
  
! 	elseif a:type =~ '^plugin_'
! 		let type = substitute(a:type, '^plugin_', '', '')
! 		let completeword = <SID>Tex_DoCompletion(type)
! 		
! 	endif
  
+ 	call Tex_CloseSmallWindows()
+ 	call Tex_CompleteWord(completeword)
  endfunction " }}}
! " Tex_SyncPreviewWindow: synchronize quickfix and preview window {{{
  " Description: Usually quickfix engine takes care about most of these things
  " but we discard it for better control of events.
  "
! function! s:Tex_SyncPreviewWindow()
! 	 call Tex_Debug('+Tex_SyncPreviewWindow', 'view')
  
  	let viewfile = matchstr(getline('.'), '^\f*\ze|\d')
***************
*** 311,315 ****
  		endif
  		let v:errmsg = ''
! 		call Tex_Debug('UpdateViewerWindow: got error E32, no matches found, quitting', 'view')
  		return 0
  	endif
--- 391,395 ----
  		endif
  		let v:errmsg = ''
! 		call Tex_Debug('Tex_SyncPreviewWindow: got error E32, no matches found, quitting', 'view')
  		return 0
  	endif
***************
*** 336,430 ****
  
  endfunction " }}}
! " CompleteName: complete/insert name for current item {{{
! " Description: handle completion of items depending on current context
  "
! function! s:CompleteName(type)
! 
! 	if a:type =~ 'cite'
! 		if getline('.') =~ '\\bibitem{'
! 			let bibkey = matchstr(getline('.'), '\\bibitem{\zs.\{-}\ze}')
! 		else
! 			let bibkey = matchstr(getline('.'), '{\zs.\{-}\ze,')
! 		endif
! 		let completeword = strpart(bibkey, strlen(s:prefix))
! 
! 	elseif a:type =~ 'ref'
! 		let label = matchstr(getline('.'), '\\label{\zs.\{-}\ze}')
! 		let completeword = strpart(label, strlen(s:prefix))
! 
! 	elseif a:type =~ 'expl_ext\|expl_noext'
! 		let line = substitute(strpart(getline('.'),0,b:maxFileLen),'\s\+$','','')
! 		if isdirectory(b:completePath.line)
! 			call EditEntry("", "edit")
! 			exe 'nnoremap <silent> <buffer> <cr> :silent! call <SID>CompleteName("'.a:type.'")<CR>'
! 			nnoremap <silent> <buffer> q :wincmd q<cr>
! 			return
! 
! 		else
! 			if a:type == 'expl_noext'
! 				let ifile = substitute(line, '\..\{-}$', '', '')
! 			else
! 				let ifile = line
! 			endif
! 			let filename = b:completePath.ifile
! 			
! 			if g:Tex_ImageDir != '' && s:type =~ 'includegraphics'
! 				let imagedir = s:curfile . g:Tex_ImageDir
! 				let completeword = <SID>Tex_RelPath(filename, imagedir)
! 			else
! 				let completeword = <SID>Tex_RelPath(filename, s:curfile)
! 			endif
! 
! 			let g:explHideFiles = s:storehidefiles
! 		endif
! 
! 	elseif a:type =~ '^plugin_'
! 		let type = substitute(a:type, '^plugin_', '', '')
! 		let completeword = <SID>Tex_DoCompletion(type)
! 		
! 	endif
! 
! 	" Return to proper place in main window, close small windows
! 	if s:type =~ 'cite\|ref' 
! 		exe s:winnum.' wincmd w'
! 		pclose!
! 		cclose
! 	elseif a:type =~ 'expl_ext\|expl_noext'
! 		q
! 	endif
! 
  	exe s:pos
- 
- 
- 	" Complete word, check if add closing }
- 	exe 'normal! a'.completeword."\<Esc>"
- 
- 	if getline('.')[col('.')-1] !~ '{' && getline('.')[col('.')] !~ '}'
- 		exe "normal! a}\<Esc>"
- 	endif
- 
- 	" Return to Insert mode
- 	if col('.') == strlen(getline('.'))
- 		startinsert!
- 
- 	else
- 		normal! l
- 		startinsert
- 
- 	endif
- 
  endfunction " }}}
! " GoToLocation: Go to chosen location {{{
  " Description: Get number of current line and go to this number
  "
! function! s:GoToLocation()
! 
  	pclose!
! 	exe 'cc ' . line('.')
  	cclose
! 
  endfunction " }}}
  
  " Bibliography specific functions
  " Tex_GrepForBibItems: grep main filename for bib items {{{
  " Description: 
--- 416,449 ----
  
  endfunction " }}}
! " Tex_CloseSmallWindows: {{{
! " Description:
  "
! function! Tex_CloseSmallWindows()
! 	exe s:winnum.' wincmd w'
! 	pclose!
! 	cclose
  	exe s:pos
  endfunction " }}}
! 
! " Tex_GoToLocation: Go to chosen location {{{
  " Description: Get number of current line and go to this number
  "
! function! s:Tex_GoToLocation()
  	pclose!
! 	let errmsg = v:errmsg
! 	let v:errmsg = ''
! 	exe 'silent! cc ' . line('.')
! 	" If the current buffer is modified, then split
! 	if v:errmsg =~ '^E37:'
! 		split
! 		exe 'silent! cc ' . line('.')
! 	endif
  	cclose
! 	let v:errmsg = errmsg
  endfunction " }}}
  
+ " ==============================================================================
  " Bibliography specific functions
+ " ============================================================================== 
  " Tex_GrepForBibItems: grep main filename for bib items {{{
  " Description: 
***************
*** 578,584 ****
  endfunction " }}}
  
! " PromptForCompletion: prompts for a completion {{{
  " Description: 
! function! s:PromptForCompletion(texcommand,ask)
  
  	let common_completion_prompt = 
--- 597,613 ----
  endfunction " }}}
  
! " ==============================================================================
! " Custom Completion help functions/settings
! " ==============================================================================
! " Tex_completion_{var}: similar variables can be set in package files {{{
! let g:Tex_completion_bibliographystyle = 'abbr,alpha,plain,unsrt'
! let g:Tex_completion_addtocontents = 'lof}{,lot}{,toc}{'
! let g:Tex_completion_addcontentsline = 'lof}{figure}{,lot}{table}{,toc}{chapter}{,toc}{part}{,'.
! 									\ 'toc}{section}{,toc}{subsection}{,toc}{paragraph}{,'.
! 									\ 'toc}{subparagraph}{'
! " }}}
! " Tex_PromptForCompletion: prompts for a completion {{{
  " Description: 
! function! s:Tex_PromptForCompletion(texcommand,ask)
  
  	let common_completion_prompt = 
***************
*** 599,603 ****
  "
  function! s:Tex_DoCompletion(texcommand)
! 	let completion = <SID>PromptForCompletion(a:texcommand,'Choose a completion to insert: ')
  	if completion != ''
  		return completion
--- 628,632 ----
  "
  function! s:Tex_DoCompletion(texcommand)
! 	let completion = <SID>Tex_PromptForCompletion(a:texcommand, 'Choose a completion to insert: ')
  	if completion != ''
  		return completion
***************
*** 605,644 ****
  		return ''
  	endif
- endfunction " }}}
- 
- " Tex_Common: common part of strings {{{
- function! s:Tex_Common(path1, path2)
- 	" Assume the caller handles 'ignorecase'
- 	if a:path1 == a:path2
- 		return a:path1
- 	endif
- 	let n = 0
- 	while a:path1[n] == a:path2[n]
- 		let n = n+1
- 	endwhile
- 	return strpart(a:path1, 0, n)
- endfunction " }}}
- " Tex_RelPath: ultimate file name {{{
- function! s:Tex_RelPath(explfilename,texfilename)
- 	let path1 = a:explfilename
- 	let path2 = a:texfilename
- 	if has("win32") || has("win16") || has("dos32") || has("dos16")
- 		let path1 = substitute(path1, '\\', '/', 'ge')
- 		let path2 = substitute(path2, '\\', '/', 'ge')
- 	endif
- 	let n = matchend(<SID>Tex_Common(path1, path2), '.*/')
- 	let path1 = strpart(path1, n)
- 	let path2 = strpart(path2, n)
- 	if path2 !~ '/'
- 		let subrelpath = ''
- 	else
- 		let subrelpath = substitute(path2, '[^/]\{-}/', '../', 'ge')
- 		let subrelpath = substitute(subrelpath, '[^/]*$', '', 'ge')
- 	endif
- 	let relpath = subrelpath.path1
- 	if has("win32") || has("win16") || has("dos32") || has("dos16")
- 		let relpath = substitute(relpath, '/', "\\", 'ge')
- 	endif
- 	return relpath
  endfunction " }}}
  
--- 634,637 ----

[Vim-latex-cvs] vimfiles/plugin filebrowser.vim,1.2,1.3

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

Update of /cvsroot/vim-latex/vimfiles/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv28154

Added Files:
	filebrowser.vim 
Log Message:
- new lightweight replacement for explorer.vim

[Vim-latex-cvs] vimfiles/plugin explorer.vim,1.4,NONE

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

Update of /cvsroot/vim-latex/vimfiles/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv28043

Removed Files:
	explorer.vim 
Log Message:
no longer need explorer.vim in latex-suite

--- explorer.vim DELETED ---

[Vim-latex-cvs] vimfiles/plugin explorer.vim,1.4,NONE

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

Update of /cvsroot/vim-latex/vimfiles/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv27922

Removed Files:
      Tag: filebrowser-branch
	explorer.vim 
Log Message:
- no longer need explorer.vim in latex-suite.


--- explorer.vim DELETED ---

[Vim-latex-cvs] vimfiles/doc latex-suite.xml,1.15,1.16 latex-suite.txt,1.38,1.39

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

Update of /cvsroot/vim-latex/vimfiles/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv27188

Modified Files:
	latex-suite.xml latex-suite.txt 
Log Message:
- Some minore outstanding changes.


Index: latex-suite.xml
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** latex-suite.xml	31 Aug 2003 09:20:36 -0000	1.15
--- latex-suite.xml	2 Sep 2003 07:08:28 -0000	1.16
***************
*** 1668,1672 ****
   </section>
   <section id="latex-compiling">
!   <title>Compiling &latex; files via &ls;</title>
    <para>
     This functionality, available via the TeX-Suite menu, provides various tools
--- 1668,1672 ----
   </section>
   <section id="latex-compiling">
!   <title>&latex; Compiling</title>
    <para>
     This functionality, available via the TeX-Suite menu, provides various tools

Index: latex-suite.txt
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.txt,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** latex-suite.txt	31 Aug 2003 09:20:36 -0000	1.38
--- latex-suite.txt	2 Sep 2003 07:08:28 -0000	1.39
***************
*** 51,55 ****
      |ls_5_4| Latex-Suite filename completion
      |ls_5_5| Custom command completion
! |ls_6| Compiling LaTeX files via Latex-Suite
      |ls_6_1| Setting Compilation rules
      |ls_6_2| Handling dependencies in compilation
--- 51,55 ----
      |ls_5_4| Latex-Suite filename completion
      |ls_5_5| Custom command completion
! |ls_6| LaTeX Compiling
      |ls_6_1| Setting Compilation rules
      |ls_6_2| Handling dependencies in compilation
***************
*** 1351,1355 ****
  
  ================================================================================
! Compiling LaTeX files via Latex-Suite                           *ls_6* *ls_a_bT*
                                                                 *latex-compiling*
  
--- 1351,1355 ----
  
  ================================================================================
! LaTeX Compiling                                                 *ls_6* *ls_a_bT*
                                                                 *latex-compiling*
  

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite multicompile.vim,1.5,1.6

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

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

Modified Files:
	multicompile.vim 
Log Message:
- A little rearrangement to make some functions faster.


Index: multicompile.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/multicompile.vim,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** multicompile.vim	2 Sep 2003 01:56:47 -0000	1.5
--- multicompile.vim	2 Sep 2003 07:07:23 -0000	1.6
***************
*** 119,123 ****
  " buffer list.
  " Tex_GotoTempFile: open a temp file. reuse from next time on {{{
- " Description: 
  function! Tex_GotoTempFile()
  	if !exists('s:tempFileName')
--- 119,122 ----
***************
*** 127,135 ****
  endfunction " }}}
  " Tex_IsPresentInFile: finds if a string str, is present in filename {{{
! " Description: 
! function! Tex_IsPresentInFile(regexp, filename)
! 	if has('python') && g:Tex_UsePython
  		exec 'python isPresentInFile(r"'.a:regexp.'", r"'.a:filename.'")'
! 	else
  		call Tex_GotoTempFile()
  
--- 126,137 ----
  endfunction " }}}
  " Tex_IsPresentInFile: finds if a string str, is present in filename {{{
! if has('python') && g:Tex_UsePython
! 	function! Tex_IsPresentInFile(regexp, filename)
  		exec 'python isPresentInFile(r"'.a:regexp.'", r"'.a:filename.'")'
! 
! 		return retval
! 	endfunction
! else
! 	function! Tex_IsPresentInFile(regexp, filename)
  		call Tex_GotoTempFile()
  
***************
*** 149,162 ****
  		endif
  		silent! bd
! 	endif
! 
! 	return retval
! endfunction " }}}
  " Tex_CatFile: returns the contents of a file in a <NL> seperated string {{{
! function! Tex_CatFile(filename)
! 	if has('python') && g:Tex_UsePython
  		" catFile assigns a value to retval
  		exec 'python catFile("'.a:filename.'")'
! 	else
  		if glob(a:filename) == ''
  			return ''
--- 151,167 ----
  		endif
  		silent! bd
! 		return retval
! 	endfunction
! endif " }}}
  " Tex_CatFile: returns the contents of a file in a <NL> seperated string {{{
! if has('python') && g:Tex_UsePython
! 	function! Tex_CatFile(filename)
  		" catFile assigns a value to retval
  		exec 'python catFile("'.a:filename.'")'
! 
! 		return retval
! 	endfunction
! else
! 	function! Tex_CatFile(filename)
  		if glob(a:filename) == ''
  			return ''
***************
*** 181,187 ****
  		let &report = _report
  		let &sc = _sc
! 	endif
! 	return retval
! endfunction
  " }}}
  
--- 186,192 ----
  		let &report = _report
  		let &sc = _sc
! 		return retval
! 	endfunction
! endif
  " }}}
  

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite compiler.vim,1.43,1.44

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

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

Modified Files:
	compiler.vim 
Log Message:
- Do not use the :silent! in \ll etc even if has('gui') because
  1. seeing all the "will rerun because .bbl file changed" etc is very
     helpful.
  2. More often that not, it prevents the user from being able to see bugs
     which he can report.
  I will go back to the original way if I receive comments otherwise.
- remove the <F10> map because latex-suite doesn't use it anymore.


Index: compiler.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/compiler.vim,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** compiler.vim	29 Aug 2003 02:29:35 -0000	1.43
--- compiler.vim	2 Sep 2003 07:05:59 -0000	1.44
***************
*** 556,583 ****
  endfunction " }}}
  " SetCompilerMaps: sets maps for compiling/viewing/searching {{{
! " " Description: 
  function! <SID>SetCompilerMaps()
  	if exists('b:Tex_doneCompilerMaps')
  		return
  	endif
! 	let b:Tex_doneCompilerMaps = 1
! 	" viewing/searching
! 	if !hasmapto('RunLaTeX')
! 		if has("gui")
! 			nnoremap <buffer> <Leader>ll :silent! call RunLaTeX()<cr>
! 			vnoremap <buffer> <Leader>ll :call Tex_PartCompile()<cr>
! 			nnoremap <buffer> <Leader>lv :silent! call ViewLaTeX()<cr>
! 			nnoremap <buffer> <Leader>ls :silent! call Tex_ForwardSearchLaTeX()<cr>
! 		else
! 			nnoremap <buffer> <Leader>ll :call RunLaTeX()<cr>
! 			vnoremap <buffer> <Leader>ll :call Tex_PartCompile()<cr>
! 			nnoremap <buffer> <Leader>lv :call ViewLaTeX()<cr>
! 			nnoremap <buffer> <Leader>ls :call Tex_ForwardSearchLaTeX()<cr>
! 		end
! 	end
! 	vnoremap <buffer> <silent> <Plug>Tex_PartCompile :call Tex_PartCompile()<CR>
! 	if !hasmapto('<Plug>Tex_PartCompilation',"v")
! 		vmap <buffer> <silent> <F10> <Plug>Tex_PartCompile
! 	endif
  endif
  
--- 556,568 ----
  endfunction " }}}
  " SetCompilerMaps: sets maps for compiling/viewing/searching {{{
! " Description: 
  function! <SID>SetCompilerMaps()
  	if exists('b:Tex_doneCompilerMaps')
  		return
  	endif
! 	nnoremap <buffer> <Leader>ll :call RunLaTeX()<cr>
! 	vnoremap <buffer> <Leader>ll :call Tex_PartCompile()<cr>
! 	nnoremap <buffer> <Leader>lv :call ViewLaTeX()<cr>
! 	nnoremap <buffer> <Leader>ls :call Tex_ForwardSearchLaTeX()<cr>
  endif
  

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite multicompile.vim,1.4,1.5

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

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

Modified Files:
	multicompile.vim 
Log Message:
- Improved behavior: If there is an error in any of the compilation steps,
  return without rerunning anything else.


Index: multicompile.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/multicompile.vim,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** multicompile.vim	31 Aug 2003 09:04:41 -0000	1.4
--- multicompile.vim	2 Sep 2003 01:56:47 -0000	1.5
***************
*** 19,24 ****
  	endif
  
! 	let idxFileName = mainFileName_root.'.idx'
  
  
  	let runCount = 0
--- 19,34 ----
  	endif
  
! 	" First ignore undefined references and the 
! 	" "rerun to get cross-references right" message from 
! 	" the compiler output.
! 	let origlevel = g:Tex_IgnoreLevel
! 	let origpats = g:Tex_IgnoredWarnings
  
+ 	let g:Tex_IgnoredWarnings = g:Tex_IgnoredWarnings."\n"
+ 		\ . 'Reference %.%# undefined'."\n"
+ 		\ . 'Rerun to get cross-references right'
+ 	TCLevel 1000
+ 
+ 	let idxFileName = mainFileName_root.'.idx'
  
  	let runCount = 0
***************
*** 30,36 ****
  		let idxlinesBefore = Tex_CatFile(idxFileName)
  
! 		" first run latex once.
  		echomsg "latex run number : ".(runCount+1)
  		silent! call Tex_CompileLatex()
  
  		let idxlinesAfter = Tex_CatFile(idxFileName)
--- 40,60 ----
  		let idxlinesBefore = Tex_CatFile(idxFileName)
  
! 		" first run latex.
  		echomsg "latex run number : ".(runCount+1)
  		silent! call Tex_CompileLatex()
+ 		
+ 		" If there are errors in any latex compilation step, immediately
+ 		" return.
+ 		let _a = @a
+ 		redir @a | silent! clist | redir END
+ 		let errlist = @a
+ 		let @a = _a
+ 
+ 		if errlist =~ '\d\+\s\f\+:\d\+\serror'
+ 			let g:Tex_IgnoredWarnings = origpats
+ 			exec 'TCLevel '.origlevel
+ 
+ 			return
+ 		endif
  
  		let idxlinesAfter = Tex_CatFile(idxFileName)
***************
*** 47,51 ****
  		endif
  
! 		" The first time we see if we need to run bibtex
  		if runCount == 0 && Tex_IsPresentInFile('\\bibdata', mainFileName_root.'.aux')
  			let bibFileName = mainFileName_root . '.bbl'
--- 71,76 ----
  		endif
  
! 		" The first time we see if we need to run bibtex and if the .bbl file
! 		" changes, we will rerun latex.
  		if runCount == 0 && Tex_IsPresentInFile('\\bibdata', mainFileName_root.'.aux')
  			let bibFileName = mainFileName_root . '.bbl'
***************
*** 81,84 ****
--- 106,111 ----
  	echomsg "Ran latex ".runCount." time(s)"
  
+ 	let g:Tex_IgnoredWarnings = origpats
+ 	exec 'TCLevel '.origlevel
  	" After all compiler calls are done, reparse the .log file for
  	" errors/warnings to handle the situation where the clist might have been

[Vim-latex-cvs] vimfiles/doc latex-suite.xml,1.14,1.15 latex-suite.txt,1.37,1.38

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

Update of /cvsroot/vim-latex/vimfiles/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv3376

Modified Files:
	latex-suite.xml latex-suite.txt 
Log Message:
- resync the multiple compilation documentation with the current algorithm.


Index: latex-suite.xml
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** latex-suite.xml	29 Aug 2003 03:44:34 -0000	1.14
--- latex-suite.xml	31 Aug 2003 09:20:36 -0000	1.15
***************
*** 1807,1829 ****
     <para>
      <orderedlist>
!      <listitem>First <literal>latex</literal> is run.</listitem>
!      <listitem>If the <literal>.aux</literal> file generated from the first
!       step above contains a <literal>\bibdata</literal> line, then it
!       means that we are using a <literal>.bib</literal> file. Therefore,
!       &ls; runs <literal>bibtex</literal>.</listitem>
       <listitem>
!       If the <literal>.bbl</literal> file changes because of this, then we
!       note that we need to rerun &latex; again.
       </listitem>
-      <listitem>If running latex generates a <literal>.idx</literal> file,
-       then we run <literal>makeindex</literal>. If the
-       <literal>.idx</literal> file is changed by
-       <literal>makeindex</literal>, then we note that we need to rerun
-       latex.</listitem>
       <listitem>Also, we check to see if the &latex; compiler gives certain
        standard warnings which notify that we need to compile once again. In
!       this case also, we note that we need to rerun &latex;.</listitem>
!      <listitem>If we found that we needed to rerun latex, then we repeat
!       the steps above.</listitem>
      </orderedlist>
     </para>
--- 1807,1845 ----
     <para>
      <orderedlist>
!      <listitem>If there was a <literal>.idx</literal> file, then remember
!       its contents.</listitem>
!      <listitem>Run <literal>latex</literal>.</listitem>
!      <listitem>If the <literal>.idx</literal> file changed due to the latex
!       compiler, then run <literal>makeindex</literal> to redo the
!       <literal>.ind</literal> file and then remember to rerun latex.
!      </listitem>
       <listitem>
!       <para>
!        If the <literal>.aux</literal> file generated by the latex
!        compiler contains a <literal>\bibdata</literal> line, then it
!        means that we are using a <literal>.bib</literal> file. Therefore,
!        run <literal>bibtex</literal>.
!       </para>
!       <note>
!        <para>
!         This means that we will always run <literal>bibtex</literal>
!         whenever we use the <literal>\bibliography</literal> command
!         whether or not we actually need to. At this time, &ls; does not
!         parse the <literal>.aux</literal> file before and after the latex
!         compiler to see if we are required to rerun
!         <literal>bibtex</literal>.
!        </para>
!       </note>
!      </listitem>
!      <listitem>
!       If the <literal>.bbl</literal> file changes because of this, then
!       remember to rerun latex again.
       </listitem>
       <listitem>Also, we check to see if the &latex; compiler gives certain
        standard warnings which notify that we need to compile once again. In
!       this case also, remember to rerun &latex;.</listitem>
!      <listitem>If we found we had to rerun latex, then we repeat
!       the steps above but not running <literal>makeindex</literal> or
!       <literal>bibtex</literal> again.</listitem>
      </orderedlist>
     </para>

Index: latex-suite.txt
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.txt,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** latex-suite.txt	29 Aug 2003 03:44:34 -0000	1.37
--- latex-suite.txt	31 Aug 2003 09:20:36 -0000	1.38
***************
*** 1475,1495 ****
  be some other compiler such as pdflatex for generating pdf output.
  
! 1. First latex is run.
  
! 2. If the .aux file generated from the first step above contains a \bibdata
!    line, then it means that we are using a .bib file. Therefore, Latex-Suite
!    runs bibtex.
  
! 3. If the .bbl file changes because of this, then we note that we need to rerun
!    LaTeX again.
  
! 4. If running latex generates a .idx file, then we run makeindex. If the .idx
!    file is changed by makeindex, then we note that we need to rerun latex.
  
! 5. Also, we check to see if the LaTeX compiler gives certain standard warnings
!    which notify that we need to compile once again. In this case also, we note
!    that we need to rerun LaTeX.
  
! 6. If we found that we needed to rerun latex, then we repeat the steps above.
  
  The LaTeX file is compiled atmost 5 times using this logic. These steps will
--- 1475,1501 ----
  be some other compiler such as pdflatex for generating pdf output.
  
! 1. If there was a .idx file, then remember its contents.
  
! 2. Run latex.
  
! 3. If the .idx file changed due to the latex compiler, then run makeindex to
!    redo the .ind file and then remember to rerun latex.
  
! 4. If the .aux file generated by the latex compiler contains a \bibdata line,
!    then it means that we are using a .bib file. Therefore, run bibtex.
!    
!    NOTE: This means that we will always run bibtex whenever we use the
!          \bibliography command whether or not we actually need to. At this time,
!          Latex-Suite does not parse the .aux file before and after the latex
!          compiler to see if we are required to rerun bibtex.
  
! 5. If the .bbl file changes because of this, then remember to rerun latex again.
  
! 6. Also, we check to see if the LaTeX compiler gives certain standard warnings
!    which notify that we need to compile once again. In this case also, remember
!    to rerun LaTeX.
! 
! 7. If we found we had to rerun latex, then we repeat the steps above but not
!    running makeindex or bibtex again.
  
  The LaTeX file is compiled atmost 5 times using this logic. These steps will

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite multicompile.vim,1.3,1.4

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

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

Modified Files:
	multicompile.vim 
Log Message:
Bug: If compiling latex causes an error and bibtex/makeindex is run
     afterwards, the errors dissapear from the clist, causing us to think
     there were no errors in the document.
Fix: Always re-parse the .log file after all compilers have been called to
     ensure that we will always be able to find problems with the latex
     compilation.


Index: multicompile.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/multicompile.vim,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** multicompile.vim	31 Aug 2003 08:25:15 -0000	1.3
--- multicompile.vim	31 Aug 2003 09:04:41 -0000	1.4
***************
*** 31,34 ****
--- 31,35 ----
  
  		" first run latex once.
+ 		echomsg "latex run number : ".(runCount+1)
  		silent! call Tex_CompileLatex()
  
***************
*** 38,42 ****
  		" file and remember to rerun latex.
  		if runCount == 0 && glob(idxFileName) != '' && idxlinesAfter != idxlinesAfter
! 			echomsg "running makeindex..."
  			let temp_mp = &mp | let &mp='makeindex $*.idx'
  			exec 'silent! make '.mainFileName_root
--- 39,43 ----
  		" file and remember to rerun latex.
  		if runCount == 0 && glob(idxFileName) != '' && idxlinesAfter != idxlinesAfter
! 			echomsg "Running makeindex..."
  			let temp_mp = &mp | let &mp='makeindex $*.idx'
  			exec 'silent! make '.mainFileName_root
***************
*** 51,56 ****
  
  			let biblinesBefore = Tex_CatFile(bibFileName)
  
! 			echomsg "running bibtex..."
  			let temp_mp = &mp | let &mp='bibtex'
  			exec 'silent! make '.mainFileName_root
--- 52,58 ----
  
  			let biblinesBefore = Tex_CatFile(bibFileName)
+ 			call Tex_Debug('bibbefore = ['.biblinesBefore.']', 'comp')
  
! 			echomsg "Running bibtex..."
  			let temp_mp = &mp | let &mp='bibtex'
  			exec 'silent! make '.mainFileName_root
***************
*** 58,66 ****
  
  			let biblinesAfter = Tex_CatFile(bibFileName)
  
  			" If the .bbl file changed after running bibtex, we need to
  			" latex again.
  			if biblinesAfter != biblinesBefore
! 				echomsg 'need to rerun because bibliography file changed...'
  				let needToRerun = 1
  			endif
--- 60,69 ----
  
  			let biblinesAfter = Tex_CatFile(bibFileName)
+ 			call Tex_Debug('bibafter = ['.biblinesAfter.']', 'comp')
  
  			" If the .bbl file changed after running bibtex, we need to
  			" latex again.
  			if biblinesAfter != biblinesBefore
! 				echomsg 'Need to rerun because bibliography file changed...'
  				let needToRerun = 1
  			endif
***************
*** 69,73 ****
  		" check if latex asks us to rerun
  		if Tex_IsPresentInFile('Rerun to get cross-references right', mainFileName_root.'.log')
! 			echomsg "need to rerun to get cross-references right..."
  			let needToRerun = 1
  		endif
--- 72,76 ----
  		" check if latex asks us to rerun
  		if Tex_IsPresentInFile('Rerun to get cross-references right', mainFileName_root.'.log')
! 			echomsg "Need to rerun to get cross-references right..."
  			let needToRerun = 1
  		endif
***************
*** 76,86 ****
  	endwhile
  
! 	" finally set up the error window and the preview of the log
! 	silent! call Tex_SetupErrorWindow()
  endfunction " }}}
  
  " Various helper functions used by Tex_CompileMultipleTimes(). These functions
  " use python where available (and allowed) otherwise do it in native vim at
! " the cost of some slowdown and some new temporary buffers being opened.
  " Tex_GotoTempFile: open a temp file. reuse from next time on {{{
  " Description: 
--- 79,94 ----
  	endwhile
  
! 	echomsg "Ran latex ".runCount." time(s)"
! 
! 	" After all compiler calls are done, reparse the .log file for
! 	" errors/warnings to handle the situation where the clist might have been
! 	" emptied because of bibtex/makeindex being run as the last step.
! 	exec 'silent! cfile '.mainFileName_root.'.log'
  endfunction " }}}
  
  " Various helper functions used by Tex_CompileMultipleTimes(). These functions
  " use python where available (and allowed) otherwise do it in native vim at
! " the cost of some slowdown and a new temporary buffer being added to the
! " buffer list.
  " Tex_GotoTempFile: open a temp file. reuse from next time on {{{
  " Description: 
***************
*** 161,165 ****
  def catFile(filename):
  	try:
! 		file = open(fname)
  		lines = ''.join(file.readlines())
  		file.close()
--- 169,173 ----
  def catFile(filename):
  	try:
! 		file = open(filename)
  		lines = ''.join(file.readlines())
  		file.close()

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite multicompile.vim,1.2,1.3

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

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

Modified Files:
	multicompile.vim 
Log Message:
- Refactored code to only have one copy of the main function
  Tex_CompileMultipleTimes() instead of maintaining a duplicate. Just
  duplicate the helper functions.

- Also removed a bug in the original version where a change in the index
  terms was not causing latex to be rerun.


Index: multicompile.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/multicompile.vim,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** multicompile.vim	29 Aug 2003 02:32:51 -0000	1.2
--- multicompile.vim	31 Aug 2003 08:25:15 -0000	1.3
***************
*** 10,36 ****
  " ============================================================================
  
! " Tex_CompileMultipleTimes: compile a latex file multiple times {{{
! " Description: compile a latex file multiple times to get cross-references asd
! "              right.
  function! Tex_CompileMultipleTimes()
! 	if has('python') && g:Tex_UsePython
! 		python compileMultipleTimes()
! 	else
! 		call Tex_CompileMultipleTimes_Vim()
  			endif
! endfunction " }}}
  
! if !has('python') || !g:Tex_UsePython
! 	" Tex_GotoTempFile: open a temp file. reuse from next time on {{{
! 	" Description: 
! 	function! Tex_GotoTempFile()
! 		if !exists('s:tempFileName')
! 			let s:tempFileName = tempname()
  		endif
! 		exec 'silent! split '.s:tempFileName
! 	endfunction " }}}
! 	" Tex_IsPresentInFile: finds if a string str, is present in filename {{{
! 	" Description: 
! 	function! Tex_IsPresentInFile(regexp, filename)
  		call Tex_GotoTempFile()
  
--- 10,100 ----
  " ============================================================================
  
! " Tex_CompileMultipleTimes: The main function {{{
! " Description: compiles a file multiple times to get cross-references right.
  function! Tex_CompileMultipleTimes()
! 	let mainFileName_root = Tex_GetMainFileName(':p:t:r:r')
! 
! 	if mainFileName_root == ''
! 		let mainFileName_root = expand("%:p:t:r")
! 	endif
! 
! 	let idxFileName = mainFileName_root.'.idx'
! 
! 
! 	let runCount = 0
! 	let needToRerun = 1
! 	while needToRerun == 1 && runCount < 5
! 		" assume we need to run only once.
! 		let needToRerun = 0
! 
! 		let idxlinesBefore = Tex_CatFile(idxFileName)
! 
! 		" first run latex once.
! 		silent! call Tex_CompileLatex()
! 
! 		let idxlinesAfter = Tex_CatFile(idxFileName)
! 
! 		" If .idx file changed, then run makeindex to generate the new .ind
! 		" file and remember to rerun latex.
! 		if runCount == 0 && glob(idxFileName) != '' && idxlinesAfter != idxlinesAfter
! 			echomsg "running makeindex..."
! 			let temp_mp = &mp | let &mp='makeindex $*.idx'
! 			exec 'silent! make '.mainFileName_root
! 			let &mp = temp_mp
! 
! 			let needToRerun = 1
! 		endif
! 
! 		" The first time we see if we need to run bibtex
! 		if runCount == 0 && Tex_IsPresentInFile('\\bibdata', mainFileName_root.'.aux')
! 			let bibFileName = mainFileName_root . '.bbl'
! 
! 			let biblinesBefore = Tex_CatFile(bibFileName)
! 
! 			echomsg "running bibtex..."
! 			let temp_mp = &mp | let &mp='bibtex'
! 			exec 'silent! make '.mainFileName_root
! 			let &mp = temp_mp
! 
! 			let biblinesAfter = Tex_CatFile(bibFileName)
! 
! 			" If the .bbl file changed after running bibtex, we need to
! 			" latex again.
! 			if biblinesAfter != biblinesBefore
! 				echomsg 'need to rerun because bibliography file changed...'
! 				let needToRerun = 1
  			endif
! 		endif
  
! 		" check if latex asks us to rerun
! 		if Tex_IsPresentInFile('Rerun to get cross-references right', mainFileName_root.'.log')
! 			echomsg "need to rerun to get cross-references right..."
! 			let needToRerun = 1
  		endif
! 
! 		let runCount = runCount + 1
! 	endwhile
! 
! 	" finally set up the error window and the preview of the log
! 	silent! call Tex_SetupErrorWindow()
! endfunction " }}}
! 
! " Various helper functions used by Tex_CompileMultipleTimes(). These functions
! " use python where available (and allowed) otherwise do it in native vim at
! " the cost of some slowdown and some new temporary buffers being opened.
! " Tex_GotoTempFile: open a temp file. reuse from next time on {{{
! " Description: 
! function! Tex_GotoTempFile()
! 	if !exists('s:tempFileName')
! 		let s:tempFileName = tempname()
! 	endif
! 	exec 'silent! split '.s:tempFileName
! endfunction " }}}
! " Tex_IsPresentInFile: finds if a string str, is present in filename {{{
! " Description: 
! function! Tex_IsPresentInFile(regexp, filename)
! 	if has('python') && g:Tex_UsePython
! 		exec 'python isPresentInFile(r"'.a:regexp.'", r"'.a:filename.'")'
! 	else
  		call Tex_GotoTempFile()
  
***************
*** 45,60 ****
  
  		if search(a:regexp, 'w')
! 			let retVal = 1
  		else
! 			let retVal = 0
  		endif
- 
  		silent! bd
  
- 		return retVal
- 	endfunction " }}}
- 	" Tex_CatFile: returns the contents of the file in a string {{{
- 	" Description: 
- 	function! Tex_CatFile(filename)
  		call Tex_GotoTempFile()
  
--- 109,131 ----
  
  		if search(a:regexp, 'w')
! 			let retval = 1
  		else
! 			let retval = 0
  		endif
  		silent! bd
+ 	endif
+ 
+ 	return retval
+ endfunction " }}}
+ " Tex_CatFile: returns the contents of a file in a <NL> seperated string {{{
+ function! Tex_CatFile(filename)
+ 	if has('python') && g:Tex_UsePython
+ 		" catFile assigns a value to retval
+ 		exec 'python catFile("'.a:filename.'")'
+ 	else
+ 		if glob(a:filename) == ''
+ 			return ''
+ 		endif
  
  		call Tex_GotoTempFile()
  
***************
*** 69,73 ****
  		let _a = @a
  		silent! normal! ggVG"ay
! 		let retVal = @a
  		let @a = _a
  
--- 140,144 ----
  		let _a = @a
  		silent! normal! ggVG"ay
! 		let retval = @a
  		let @a = _a
  
***************
*** 75,157 ****
  		let &report = _report
  		let &sc = _sc
! 		return retVal
! 	endfunction " }}}
! 	" Tex_CompileMultipleTimes_Vim: vim implementaion of compileMultipleTimes() {{{
! 	" Description: compiles a file multiple times to get cross-references right.
! 	function! Tex_CompileMultipleTimes_Vim()
! 		let mainFileName_root = Tex_GetMainFileName(':p:t:r:r')
! 
! 		if mainFileName_root == ''
! 			let mainFileName_root = expand("%:p:t:r")
! 		endif
! 
! 		let runCount = 0
! 		let needToRerun = 1
! 		while needToRerun == 1 && runCount < 5
! 			" assume we need to run only once.
! 			let needToRerun = 0
! 
! 			" first run latex once.
! 			silent! call Tex_CompileLatex()
! 
! 			" The first time we see if we need to run bibtex
! 			if runCount == 0 && Tex_IsPresentInFile('\\bibdata', mainFileName_root.'.aux')
! 				let bibFileName = mainFileName_root . '.bbl'
! 
! 				let biblinesBefore = Tex_CatFile(bibFileName)
! 
! 				echomsg "running bibtex..."
! 				let temp_mp = &mp | let &mp='bibtex'
! 				exec 'silent! make '.mainFileName_root
! 				let &mp = temp_mp
! 
! 				let biblinesAfter = Tex_CatFile(bibFileName)
! 
! 				" If the .bbl file changed after running bibtex, we need to
! 				" latex again.
! 				if biblinesAfter != biblinesBefore
! 					echomsg 'need to rerun because bibliography file changed...'
! 					let needToRerun = 1
! 				endif
! 			endif
! 
! 			if runCount == 0 && filereadable(mainFileName_root.'.idx')
! 				let idxFileName = mainFileName_root.'.idx'
! 				let idxlinesBefore = Tex_CatFile(idxFileName)
! 
! 				echomsg "running makeindex..."
! 				let temp_mp = &mp | let &mp='makeindex $*.idx'
! 				exec 'silent! make '.mainFileName_root
! 				let &mp = temp_mp
! 
! 				let idxlinesAfter = Tex_CatFile(idxFileName)
! 
! 				" If the .idx file changed, then we need to rerun.
! 				if idxlinesBefore != idxlinesAfter
! 					echomsg 'need to rerun to get index right...'
! 					let needToRerun = 1
! 				endif
! 			endif
! 
! 			" check if latex asks us to rerun
! 			if Tex_IsPresentInFile('Rerun to get cross-references right', mainFileName_root.'.log')
! 				echomsg "need to rerun to get cross-references right..."
! 				let needToRerun = 1
! 			endif
! 
! 			let runCount = runCount + 1
! 		endwhile
! 
! 		" finally set up the error window and the preview of the log
! 		silent! call Tex_SetupErrorWindow()
! 	endfunction " }}}
  
  	finish
  endif
  
  python <<EOF
! import vim
! import re, os, string
  
  # isPresentInFile: check if regexp is present in the file {{{
  def isPresentInFile(regexp, filename):
--- 146,176 ----
  		let &report = _report
  		let &sc = _sc
! 	endif
! 	return retval
! endfunction
! " }}}
  
+ " Define the functions in python if available.
+ if !has('python') || !g:Tex_UsePython
  	finish
  endif
  
  python <<EOF
! import string, vim, re
! # catFile: assigns a local variable retval to the contents of a file {{{
! def catFile(filename):
! 	try:
! 		file = open(fname)
! 		lines = ''.join(file.readlines())
! 		file.close()
! 	except:
! 		lines = ''
! 
! 	# escape double quotes and backslashes before quoting the string so
! 	# everything passes throught.
! 	vim.command("""let retval = "%s" """ % re.sub(r'"|\\', r'\\\g<0>', lines))
! 	return lines
  
+ # }}}
  # isPresentInFile: check if regexp is present in the file {{{
  def isPresentInFile(regexp, filename):
***************
*** 161,245 ****
  		fp.close()
  		if re.search(regexp, fcontents):
  			return 1
  		else:
  			return None
  	except:
  		return None
  
- # }}}
- # catFile: return the contents of a file. {{{
- def catFile(fileName):
- 	try:
- 		file = open(fileName)
- 		lines = string.join(file.readlines(), '')
- 		file.close()
- 	except:
- 		lines = ''
- 	return lines
- 
- # }}}
- # compileMultipleTimes: compile the main file multiple times as needed. {{{
- def compileMultipleTimes():
- 	mainFileName_full = vim.eval("Tex_GetMainFileName(':p:r')")
- 	mainFileName_root = vim.eval("Tex_GetMainFileName(':p:r:r')")
- 
- 	if not mainFileName_root:
- 		mainFileName_full = vim.eval('expand("%:p")')
- 		mainFileName_root = vim.eval('expand("%:p:r")')
- 	
- 	runCount = 0
- 	needToRerun = 1
- 	while needToRerun == 1 and runCount < 5:
- 		needToRerun = 0
- 
- 		# first run latex once.
- 		vim.command('silent! call Tex_CompileLatex()')
- 
- 		if runCount == 0 and isPresentInFile(r'\\bibdata', mainFileName_root + '.aux'):
- 			bibFileName = mainFileName_root + '.bbl'
- 
- 			biblinesBefore = catFile(bibFileName)
- 
- 			vim.command('echomsg "running bibtex..."')
- 			vim.command('let temp_mp = &mp | let &mp=\'bibtex\'')
- 			vim.command('silent! make %s' % mainFileName_root)
- 			vim.command('let &mp = temp_mp')
- 
- 			biblinesAfter = catFile(bibFileName)
- 
- 			# if the .bbl file changed with this bibtex command, then we need
- 			# to rerun latex to refresh the bibliography
- 			if biblinesAfter != biblinesBefore:
- 				vim.command("echomsg 'need to rerun because bibliography file changed...'")
- 				needToRerun = 1
- 
- 		# The first time see if a .idx file has been created. If so we need to
- 		# run makeindex.
- 		if runCount == 0 and os.path.exists(mainFileName_root + '.idx'):
- 			idxFileName = mainFileName_root + '.idx'
- 			idxlinesBefore = catFile(idxFileName)
- 
- 			vim.command('echomsg "running makeindex..."')
- 			vim.command("""let temp_mp = &mp | let &mp='makeindex $*.idx'""")
- 			vim.command("""silent! make %s""" % mainFileName_root)
- 			vim.command("""let &mp = temp_mp""")
- 
- 			idxlinesAfter = Tex_CatFile(idxFileName)
- 
- 			# If the .idx file changed, then we need to rerun.
- 			if idxlinesBefore != idxlinesAfter:
- 				vim.command("echomsg 'need to rerun to get index right...'")
- 				needToRerun = 1
- 
- 		# check if latex asks us to rerun
- 		if isPresentInFile('Rerun to get cross-references right', mainFileName_root + '.log'):
- 			vim.command('echomsg "need to rerun to get cross-references right..."')
- 			needToRerun = 1
- 
- 		runCount = runCount + 1
- 
- 	# finally set up the error window and the preview of the log
- 	vim.command('echomsg "ran latex a total of %d times"' % runCount)
- 	vim.command('silent! call Tex_SetupErrorWindow()')
  # }}}
  EOF
--- 180,192 ----
  		fp.close()
  		if re.search(regexp, fcontents):
+ 			vim.command('let retval = 1')
  			return 1
  		else:
+ 			vim.command('let retval = 0')
  			return None
  	except:
+ 		vim.command('let retval = 0')
  		return None
  
  # }}}
  EOF

[Vim-latex-cvs] vimfiles/doc latex-suite.xml,1.13,1.14 latex-suite.txt,1.36,1.37

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

Update of /cvsroot/vim-latex/vimfiles/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv21102

Modified Files:
	latex-suite.xml latex-suite.txt 
Log Message:
added description of <F9> for commands such as \bibliographystyle


Index: latex-suite.xml
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** latex-suite.xml	28 Aug 2003 23:12:52 -0000	1.13
--- latex-suite.xml	29 Aug 2003 03:44:34 -0000	1.14
***************
*** 1641,1644 ****
--- 1641,1669 ----
     </informaltable>
    </section>
+   <section id="ls-completion-custom">
+    <title>Custom command completion</title>
+    <para>
+     &ls; also recognizes certain commonly used &latex; commands for the
+     <literal>&lt;F9&gt;</literal> key. At the moment, the
+     <literal>\bibliographystyle</literal>, <literal>\addtocontents</literal>
+     and the <literal>\addcontentsline</literal> commands are recognized,
+     although morre will be added in the future. When you press the
+     <literal>&lt;F9&gt;</literal> after such a command, &ls; will prompt
+     you with a list of arguments which make sense for the command.
+    </para>
+    <para>
+     This functionality is available for commands for which a global
+     variable of the form
+     <literal>g:Tex_completion_{&lt;command&gt;}</literal> is defined where
+     <literal>&lt;command&gt;</literal> is the command name. This variable
+     is a comma seperated list of values which this command takes. For
+     example, the argument to the <literal>\bibliographystyle</literal>
+     command is commonly one of <literal>abbr,alpha,plain,unsrt</literal>.
+     Therefore, &ls; defines
+     <programlisting>let g:Tex_completion_bibliographystyle = 'abbr,alpha,plain,unsrt'</programlisting>
+     You can define your own completion variables in a similar manner for
+     commands which you might use.
+    </para>
+   </section>
   </section>
   <section id="latex-compiling">
***************
*** 1742,1747 ****
  let g:Tex_CompileRule_dvi = 'latex --interaction=nonstopmode $*'
  let g:Tex_CompileRule_ps = 'dvips -Ppdf -o $*.ps $*.dvi'
! let g:Tex_CompileRule_pdf = 'ps2pdf $*.ps'
!     </programlisting>
     </para>
     <note>
--- 1767,1771 ----
  let g:Tex_CompileRule_dvi = 'latex --interaction=nonstopmode $*'
  let g:Tex_CompileRule_ps = 'dvips -Ppdf -o $*.ps $*.dvi'
! let g:Tex_CompileRule_pdf = 'ps2pdf $*.ps'</programlisting>
     </para>
     <note>

Index: latex-suite.txt
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.txt,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** latex-suite.txt	28 Aug 2003 23:12:52 -0000	1.36
--- latex-suite.txt	29 Aug 2003 03:44:34 -0000	1.37
***************
*** 12,16 ****
  macros to speed up editing LaTeX documents to functions for forward searching
  .dvi documents. Latex-suite has been possible because of the contributions of
! many people. Please see latex-suite-credits [|ls_a_ds|] for a list of people who
  have helped.
  
--- 12,16 ----
  macros to speed up editing LaTeX documents to functions for forward searching
  .dvi documents. Latex-suite has been possible because of the contributions of
! many people. Please see latex-suite-credits [|ls_a_dt|] for a list of people who
  have helped.
[...1762 lines suppressed...]
  
--- 2725,2729 ----
  
  ================================================================================
! Credits                                                        *ls_11* *ls_a_dt*
                                                             *latex-suite-credits*
  
***************
*** 2759,2763 ****
  out who has done what.
  
!                                               *latex-suite-maintainer* *ls_a_dW*
  The current maintainer(s) of latex-suite is(are)
  
--- 2779,2783 ----
  out who has done what.
  
!                                               *latex-suite-maintainer* *ls_a_dX*
  The current maintainer(s) of latex-suite is(are)
  

[Vim-latex-cvs] vimfiles/ftplugin/latex-suite texrc,1.33,1.34

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

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

Modified Files:
	texrc 
Log Message:
commit from the latex-multi-compile branch.


Index: texrc
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/texrc,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** texrc	26 Jul 2003 19:10:10 -0000	1.33
--- texrc	29 Aug 2003 02:55:48 -0000	1.34
***************
*** 25,28 ****
--- 25,29 ----
  "
  "        NOTE: This file is best viewed with Vim-6.0+ with folding turned on.
+ "         CVS: $Id$
  "=============================================================================
  
***************
*** 57,60 ****
--- 58,74 ----
  
  " ==============================================================================
+ " General settings {{{
+ 
+ TexLet g:Tex_UsePython = 1
+ 
+ " the system command which pulls in a file.
+ if &shell =~ 'sh'
+ 	TexLet g:Tex_CatCmd = 'cat'
+ else
+ 	TexLet g:Tex_CatCmd = 'type'
+ endif
+ 
+ " }}}
+ " ==============================================================================
  " Rules: specifications of programs for compiling and viewing {{{
  "
***************
*** 70,73 ****
--- 84,94 ----
  endif
  
+ " A comma seperated list of formats which need multiple compilations to be
+ " correctly compiled.
+ TexLet g:Tex_MultipleCompileFormats = 'dvi'
+ 
+ " Uncomment this line if you compile ps files via dvi files.
+ " TexLet g:Tex_FormatDependency_ps = 'dvi,ps'
+ 
  " ------------------------------------------------------------------------------
  " Compiler rules {{{
***************
*** 77,84 ****
  " but it is known that it can sometimes give different results in the output,
  " so use it with care.
! let s:CompileFlags = ''
  TexLet g:Tex_EscapeChars = '{}\'
- TexLet g:Tex_CompileRule_dvi = 'latex ' . s:CompileFlags .
-                         \ ' -interaction=nonstopmode $*'
  
  TexLet g:Tex_CompileRule_ps = 'dvips -Ppdf -o $*.ps $*.dvi'
--- 98,103 ----
  " but it is known that it can sometimes give different results in the output,
  " so use it with care.
! TexLet g:Tex_CompileRule_dvi = 'latex -interaction=nonstopmode $*'
  TexLet g:Tex_EscapeChars = '{}\'
  
  TexLet g:Tex_CompileRule_ps = 'dvips -Ppdf -o $*.ps $*.dvi'
***************
*** 94,97 ****
--- 113,118 ----
  
  TexLet g:Tex_CompileRule_html = 'latex2html $*.tex'
+ 
+ TexLet g:Tex_CompileRule_bib = 'bibtex $*'
  
  " }}}