|
From: <sri...@us...> - 2006-03-20 09:53:06
|
Revision: 998 Author: srinathava Date: 2006-03-20 01:52:12 -0800 (Mon, 20 Mar 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=998&view=rev Log Message: ----------- New: Forgot to change the svn:eol-style properties on the packages/* files. Property Changed: ---------------- trunk/vimfiles/ftplugin/latex-suite/packages/SIunits trunk/vimfiles/ftplugin/latex-suite/packages/accents trunk/vimfiles/ftplugin/latex-suite/packages/acromake trunk/vimfiles/ftplugin/latex-suite/packages/afterpage trunk/vimfiles/ftplugin/latex-suite/packages/alltt trunk/vimfiles/ftplugin/latex-suite/packages/amsmath trunk/vimfiles/ftplugin/latex-suite/packages/amsthm trunk/vimfiles/ftplugin/latex-suite/packages/amsxtra trunk/vimfiles/ftplugin/latex-suite/packages/arabic trunk/vimfiles/ftplugin/latex-suite/packages/array trunk/vimfiles/ftplugin/latex-suite/packages/babel trunk/vimfiles/ftplugin/latex-suite/packages/bar trunk/vimfiles/ftplugin/latex-suite/packages/bm trunk/vimfiles/ftplugin/latex-suite/packages/bophook trunk/vimfiles/ftplugin/latex-suite/packages/boxedminipage trunk/vimfiles/ftplugin/latex-suite/packages/caption2 trunk/vimfiles/ftplugin/latex-suite/packages/cases trunk/vimfiles/ftplugin/latex-suite/packages/ccaption trunk/vimfiles/ftplugin/latex-suite/packages/changebar trunk/vimfiles/ftplugin/latex-suite/packages/chapterbib trunk/vimfiles/ftplugin/latex-suite/packages/cite trunk/vimfiles/ftplugin/latex-suite/packages/color trunk/vimfiles/ftplugin/latex-suite/packages/comma trunk/vimfiles/ftplugin/latex-suite/packages/deleq trunk/vimfiles/ftplugin/latex-suite/packages/drftcite trunk/vimfiles/ftplugin/latex-suite/packages/dropping trunk/vimfiles/ftplugin/latex-suite/packages/enumerate trunk/vimfiles/ftplugin/latex-suite/packages/eqlist trunk/vimfiles/ftplugin/latex-suite/packages/eqparbox trunk/vimfiles/ftplugin/latex-suite/packages/everyshi trunk/vimfiles/ftplugin/latex-suite/packages/exmpl trunk/vimfiles/ftplugin/latex-suite/packages/flafter trunk/vimfiles/ftplugin/latex-suite/packages/float trunk/vimfiles/ftplugin/latex-suite/packages/floatflt trunk/vimfiles/ftplugin/latex-suite/packages/fn2end trunk/vimfiles/ftplugin/latex-suite/packages/footmisc trunk/vimfiles/ftplugin/latex-suite/packages/geometry trunk/vimfiles/ftplugin/latex-suite/packages/german trunk/vimfiles/ftplugin/latex-suite/packages/graphicx trunk/vimfiles/ftplugin/latex-suite/packages/graphpap trunk/vimfiles/ftplugin/latex-suite/packages/harpoon trunk/vimfiles/ftplugin/latex-suite/packages/hhline trunk/vimfiles/ftplugin/latex-suite/packages/histogram trunk/vimfiles/ftplugin/latex-suite/packages/hyperref trunk/vimfiles/ftplugin/latex-suite/packages/ifthen trunk/vimfiles/ftplugin/latex-suite/packages/inputenc trunk/vimfiles/ftplugin/latex-suite/packages/letterspace trunk/vimfiles/ftplugin/latex-suite/packages/lineno trunk/vimfiles/ftplugin/latex-suite/packages/longtable trunk/vimfiles/ftplugin/latex-suite/packages/lscape trunk/vimfiles/ftplugin/latex-suite/packages/manyfoot trunk/vimfiles/ftplugin/latex-suite/packages/moreverb trunk/vimfiles/ftplugin/latex-suite/packages/multibox trunk/vimfiles/ftplugin/latex-suite/packages/multicol trunk/vimfiles/ftplugin/latex-suite/packages/newalg trunk/vimfiles/ftplugin/latex-suite/packages/ngerman trunk/vimfiles/ftplugin/latex-suite/packages/numprint trunk/vimfiles/ftplugin/latex-suite/packages/oldstyle trunk/vimfiles/ftplugin/latex-suite/packages/outliner trunk/vimfiles/ftplugin/latex-suite/packages/overcite trunk/vimfiles/ftplugin/latex-suite/packages/parallel trunk/vimfiles/ftplugin/latex-suite/packages/plain trunk/vimfiles/ftplugin/latex-suite/packages/plates trunk/vimfiles/ftplugin/latex-suite/packages/polski trunk/vimfiles/ftplugin/latex-suite/packages/psgo trunk/vimfiles/ftplugin/latex-suite/packages/schedule trunk/vimfiles/ftplugin/latex-suite/packages/textfit trunk/vimfiles/ftplugin/latex-suite/packages/times trunk/vimfiles/ftplugin/latex-suite/packages/tipa trunk/vimfiles/ftplugin/latex-suite/packages/ulem trunk/vimfiles/ftplugin/latex-suite/packages/url trunk/vimfiles/ftplugin/latex-suite/packages/verbatim trunk/vimfiles/ftplugin/latex-suite/packages/version trunk/vimfiles/ftplugin/latex-suite/texrc Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/SIunits ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/accents ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/acromake ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/afterpage ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/alltt ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/amsmath ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/amsthm ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/amsxtra ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/arabic ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/array ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/babel ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/bar ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/bm ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/bophook ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/boxedminipage ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/caption2 ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/cases ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/ccaption ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/changebar ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/chapterbib ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/cite ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/color ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/comma ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/deleq ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/drftcite ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/dropping ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/enumerate ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/eqlist ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/eqparbox ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/everyshi ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/exmpl ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/flafter ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/float ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/floatflt ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/fn2end ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/footmisc ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/geometry ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/german ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/graphicx ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/graphpap ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/harpoon ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/hhline ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/histogram ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/hyperref ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/ifthen ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/inputenc ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/letterspace ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/lineno ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/longtable ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/lscape ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/manyfoot ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/moreverb ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/multibox ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/multicol ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/newalg ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/ngerman ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/numprint ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/oldstyle ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/outliner ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/overcite ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/parallel ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/plain ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/plates ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/polski ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/psgo ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/schedule ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/textfit ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/times ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/tipa ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/ulem ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/url ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/verbatim ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/packages/version ___________________________________________________________________ Name: svn:eol-style - native + LF Property changes on: trunk/vimfiles/ftplugin/latex-suite/texrc ___________________________________________________________________ Name: svn:eol-style - native + LF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sri...@us...> - 2006-03-21 05:32:41
|
Revision: 999 Author: srinathava Date: 2006-03-20 21:32:37 -0800 (Mon, 20 Mar 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=999&view=rev Log Message: ----------- Bug: \cite completion does not work when the bib file is included as \bibliography{db.bib} instead of \bibliography{db} (Javier Rojas) Why: We used 'silent! find '.fname.'.bib' Fix: Add '.bib' to 'suffixesadd' and use 'silent! find '.fname instead Created a new function Tex_FindFile() to make such things easier in the future. Modified Paths: -------------- trunk/vimfiles/ftplugin/latex-suite/main.vim trunk/vimfiles/ftplugin/latex-suite/texviewer.vim trunk/vimfiles/ftplugin/latex-suite/version.vim Modified: trunk/vimfiles/ftplugin/latex-suite/main.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/main.vim 2006-03-20 09:52:12 UTC (rev 998) +++ trunk/vimfiles/ftplugin/latex-suite/main.vim 2006-03-21 05:32:37 UTC (rev 999) @@ -611,6 +611,34 @@ function! Tex_EscapeSpaces(path) return substitute(a:path, '[^\\]\(\\\\\)*\zs ', '\\ ', 'g') endfunction " }}} +" Tex_FindFile: finds a file in the vim's 'path' {{{ +" Description: finds a file in vim's 'path' +function! Tex_FindFile(fname, path, suffixesadd) + if exists('*findfile') + let _suffixesadd = &suffixesadd + let &suffixesadd = a:suffixesadd + let retval = findfile(a:fname, a:path) + let &suffixesadd = _suffixesadd + else + " split a new window so we do not screw with the current buffer. We + " want to use the same filename each time so that multiple scratch + " buffers are not created. + let retval = '' + silent! split __HOPEFULLY_THIS_FILE_DOES_NOT_EXIST__ + let _suffixesadd = &suffixesadd + let _path = &path + let &suffixesadd = a:suffixesadd + let &path = a:path + exec 'silent! find '.a:fname + if bufname('%') != '__HOPEFULLY_THIS_FILE_DOES_NOT_EXIST__' + let retval = expand('%:p') + end + silent! bdelete! + let &suffixesadd = _suffixesadd + let &path = _path + endif + return retval +endfunction " }}} " ============================================================================== " Smart key-mappings Modified: trunk/vimfiles/ftplugin/latex-suite/texviewer.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/texviewer.vim 2006-03-20 09:52:12 UTC (rev 998) +++ trunk/vimfiles/ftplugin/latex-suite/texviewer.vim 2006-03-21 05:32:37 UTC (rev 999) @@ -504,7 +504,7 @@ if mainfname == expand('%:p') split else - exec 'split '.mainfname + exec 'split '.Tex_EscapeSpaces(mainfname) endif let pos = line('.').'| normal! '.virtcol('.').'|' @@ -560,35 +560,32 @@ let &path = '.,'.g:Tex_BIBINPUTS let i = 1 - while Tex_Strntok(bibnames, ',', i) != '' + while 1 + let bibname = Tex_Strntok(bibnames, ',', i) + if bibname == '' + break + endif + " first try to find if a .bib file exists. If so do not search in " the corresponding .bbl file. (because the .bbl file will most " probly be generated automatically from the .bib file with " bibtex). - " split a new window so we do not screw with the current buffer. - split - let thisbufnum = bufnr('%') - call Tex_Debug('silent! find '.Tex_Strntok(bibnames, ',', i).'.bib', 'view') - exec 'silent! find '.Tex_Strntok(bibnames, ',', i).'.bib' - if bufnr('%') != thisbufnum + let fname = Tex_FindFile(bibname, '.,'.g:Tex_BIBINPUTS, '.bib') + if fname != '' call Tex_Debug('finding .bib file ['.bufname('%').']', 'view') - call Tex_Debug('using pattern '.Tex_EscapeForGrep('@.*{'.a:prefix), 'view') - lcd %:p:h - " use the appropriate syntax for the .bib file. + exec 'split '.Tex_EscapeSpaces(fname) call Tex_Grepadd('@.*{'.a:prefix, "%") + q else - let thisbufnum = bufnr('%') - exec 'silent! find '.Tex_Strntok(bibnames, ',', i).'.bbl' - call Tex_Debug('now in bufnum#'.bufnr('%'), 'view') - if bufnr('%') != thisbufnum + let fname = Tex_FindFile(bibname, '.,'.g:Tex_BIBINPUTS, '.bbl') + if fname != '' + exec 'split '.Tex_EscapeSpaces(fname) call Tex_Debug('finding .bbl file ['.bufname('.').']', 'view') - lcd %:p:h call Tex_Grepadd('\\bibitem{'.a:prefix, "%") + q endif endif - " close the newly opened window - q let i = i + 1 endwhile @@ -618,8 +615,6 @@ " If we have not found any \bibliography or \thebibliography environment " in this file, search for these environments in all the files which this " file includes. - let &path = '.,'.g:Tex_TEXINPUTS - let &suffixesadd = '.tex' exec 0 let wrap = 'w' @@ -628,16 +623,13 @@ let filename = matchstr(getline('.'), '\\\(input\|include\){\zs.\{-}\ze}') - split - let thisbufnum = bufnr('%') - - exec 'silent! find '.filename - if bufnr('%') != thisbufnum - " DANGER! recursive call. - call Tex_Debug('scanning recursively in ['.bufname('%').']', 'view') + let foundfile = Tex_FindFile(filename, '.,'.g:Tex_TEXINPUTS, '.tex') + if foundfile != '' + exec 'split '.Tex_EscapeSpaces(foundfile) + call Tex_Debug('scanning recursively in ['.foundfile.']', 'view') let foundCiteFile = Tex_ScanFileForCite(a:prefix) + q endif - q if foundCiteFile return 1 @@ -659,28 +651,21 @@ call Tex_Grepadd('\\label{'.a:prefix, "%") " Then recursively grep for all \include'd or \input'ed files. - let &suffixesadd = '.tex' - let &path = '.,'.g:Tex_TEXINPUTS exec 0 let wrap = 'w' while search('^\s*\\\(input\|include\)', wrap) let wrap = 'W' let filename = matchstr(getline('.'), '\\\(input\|include\){\zs.\{-}\ze}') - - let thisbufnum = bufnr('%') - - split - exec 'silent! find '.filename - - if bufnr('%') != thisbufnum - call Tex_Debug('Tex_ScanFileForLabels: scanning recursively in ['.bufname('%').']', 'view') + let foundfile = Tex_FindFile(filename, '.,'.Tex_TEXINPUTS, '.tex') + if foundfile != '' + exec 'split '.Tex_EscapeSpaces(foundfile) + call Tex_Debug('Tex_ScanFileForLabels: scanning recursively in ['.foundfile.']', 'view') call Tex_ScanFileForLabels(a:prefix) + q endif - - q - endwhile + endfunction " }}} " ============================================================================== @@ -840,7 +825,7 @@ let mainfname = Tex_GetMainFileName(':p') wincmd n - exec ':e '.mainfname + exec 'silent! e '.mainfname if search('\\\(no\)\?bibliography{', 'w') @@ -852,31 +837,21 @@ call Tex_Debug(':Tex_FindBibFiles: trying to search through ['.bibnames.']', 'view') - let _path = &path - let &path = '.,'.g:Tex_BIBINPUTS - let bibfiles = '' let i = 1 - while Tex_Strntok(bibnames, ',', i) != '' - " split a new window so we do not screw with the current buffer. - split - let thisbufnum = bufnr('%') - - call Tex_Debug(':Tex_FindBibFiles: silent! find '.Tex_Strntok(bibnames, ',', i).'.bib', 'view') - exec 'silent! find '.Tex_Strntok(bibnames, ',', i).'.bib' - if bufnr('%') != thisbufnum - call Tex_Debug(':Tex_FindBibFiles: finding .bib file ['.bufname('%').']', 'view') - " use the appropriate syntax for the .bib file. - let bibfiles = bibfiles.expand('%:p')."\n" + while 1 + let bibname = Tex_Strntok(bibnames, ',', i) + if bibname == '' + break endif - - q - + let fname = Tex_FindFile(bibname, '.,'.g:Tex_BIBINPUTS, '.bib') + if fname != '' + let bibfiles = bibfiles.fname."\n" + endif let i = i + 1 endwhile call Tex_Debug(":Tex_FindBibFiles: returning [".bibfiles."]", "view") - let &path = _path q return bibfiles Modified: trunk/vimfiles/ftplugin/latex-suite/version.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-20 09:52:12 UTC (rev 998) +++ trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-21 05:32:37 UTC (rev 999) @@ -24,7 +24,7 @@ " "stabilize" that version by releasing a few pre-releases and then " keep that as a stable point. function! Tex_Version() - return "Latex-Suite: version 1.8.07" + return "Latex-Suite: version 1.8.11" endfunction com! -nargs=0 TVersion echo Tex_Version() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sri...@us...> - 2006-03-25 08:40:18
|
Revision: 1004 Author: srinathava Date: 2006-03-25 00:40:15 -0800 (Sat, 25 Mar 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=1004&view=rev Log Message: ----------- Bug: After applying a filter to the bibtex results, pressing 'a' to get back the full list gives an error (Fabian Braennstroem) Why: Tex_HandleBibShortcuts() did not correctly create the prefix filter when it removed the rest of the filters. Fix: do ze right thing. New: Handle the case when a bibtex file is not found more elegantly. New: Catch a wrong specification of the filter more elegantly. Modified Paths: -------------- trunk/vimfiles/ftplugin/latex-suite/texviewer.vim trunk/vimfiles/ftplugin/latex-suite/version.vim Modified: trunk/vimfiles/ftplugin/latex-suite/texviewer.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/texviewer.vim 2006-03-25 05:41:09 UTC (rev 1003) +++ trunk/vimfiles/ftplugin/latex-suite/texviewer.vim 2006-03-25 08:40:15 UTC (rev 1004) @@ -872,8 +872,13 @@ endif function! Tex_StartCiteCompletion() - let mainfname = Tex_GetMainFileName(':p') let bibfiles = Tex_FindBibFiles() + if bibfiles !~ '\S' + echohl WarningMsg + echomsg 'No bibfiles found! Sorry' + echohl None + return + endif bot split __OUTLINE__ exec Tex_GetVarValue('Tex_OutlineWindowHeight', 15).' wincmd _' @@ -986,6 +991,12 @@ endif let inp = input('Enter '.a:command.' criterion [field<space>value]: ') + if inp !~ '\v^\S+\s+\S.*' + echohl WarningMsg + echomsg 'Invalid filter specification. Use "field<space>value"' + echohl None + return + endif if inp != '' " If the field is specified as a single character, then replace @@ -1005,13 +1016,13 @@ exec "python Tex_BibFile.addsortfield(\"".inp."\")" exec 'python Tex_BibFile.sort()' endif - call Tex_DisplayBibList() + silent! call Tex_DisplayBibList() endif elseif a:command == 'remove_filters' exec 'python Tex_BibFile.rmfilters()' - exec 'python Tex_BibFile.addfilter("key '.s:prefix.'")' + exec 'python Tex_BibFile.addfilter("key ^'.s:prefix.'")' call Tex_DisplayBibList() endif Modified: trunk/vimfiles/ftplugin/latex-suite/version.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-25 05:41:09 UTC (rev 1003) +++ trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-25 08:40:15 UTC (rev 1004) @@ -24,7 +24,7 @@ " "stabilize" that version by releasing a few pre-releases and then " keep that as a stable point. function! Tex_Version() - return "Latex-Suite: version 1.8.12" + return "Latex-Suite: version 1.8.13" endfunction com! -nargs=0 TVersion echo Tex_Version() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sri...@us...> - 2006-04-28 16:48:19
|
Revision: 1012 Author: srinathava Date: 2006-04-28 09:48:12 -0700 (Fri, 28 Apr 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=1012&view=rev Log Message: ----------- Bug: When a file is included as \input{file.tex} then there is an error in \ref completion (Matthias Rosenkranz) Why: outline.py always appends .tex to the filename so that we try to include file.tex.tex which does not exist. Fix: Try opening file and then file.tex and use the first one which is OK. This avoids problems with having to guess. (modified version of patch submitted by Franz Pletz) Modified Paths: -------------- trunk/vimfiles/ftplugin/latex-suite/outline.py trunk/vimfiles/ftplugin/latex-suite/version.vim Modified: trunk/vimfiles/ftplugin/latex-suite/outline.py =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/outline.py 2006-04-28 16:41:47 UTC (rev 1011) +++ trunk/vimfiles/ftplugin/latex-suite/outline.py 2006-04-28 16:48:12 UTC (rev 1012) @@ -12,19 +12,27 @@ import StringIO # getFileContents {{{ -def getFileContents(argin, ext=''): - if type(argin) is str: - fname = argin + ext - else: - fname = argin.group(3) + ext +def getFileContents(fname): + if type(fname) is not str: + fname = fname.group(3) - # This longish thing is to make sure that all files are converted into - # \n seperated lines. - contents = '\n'.join(open(fname).read().splitlines()) + # If neither the file or file.tex exists, then we just give up. + if not os.path.isfile(fname): + if os.path.isfile(fname + '.tex'): + fname += '.tex' + else: + return '' + try: + # This longish thing is to make sure that all files are converted into + # \n seperated lines. + contents = '\n'.join(open(fname).read().splitlines()) + except IOError: + return '' + # TODO what are all the ways in which a tex file can include another? pat = re.compile(r'^\\(@?)(include|input){(.*?)}', re.M) - contents = re.sub(pat, lambda input: getFileContents(input, ext), contents) + contents = re.sub(pat, getFileContents, contents) return ('%%==== FILENAME: %s' % fname) + '\n' + contents @@ -142,7 +150,7 @@ # section_text] rettext = getSectionLabels(sections[0], sectypes[1:], section_prefix, label_prefix) - + for i in range(1,len(sections),2): sec_num = (i+1)/2 section_name = re.search(r'\\%s{(.*?)}' % sectypes[0], sections[i]).group(1) @@ -166,8 +174,7 @@ if head: os.chdir(head) - [root, ext] = os.path.splitext(tail) - contents = getFileContents(root, ext) + contents = getFileContents(fname) nonempty = stripComments(contents) lineinfo = addFileNameAndNumber(nonempty) Modified: trunk/vimfiles/ftplugin/latex-suite/version.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-04-28 16:41:47 UTC (rev 1011) +++ trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-04-28 16:48:12 UTC (rev 1012) @@ -24,7 +24,7 @@ " "stabilize" that version by releasing a few pre-releases and then " keep that as a stable point. function! Tex_Version() - return "Latex-Suite: version 1.8.18" + return "Latex-Suite: version 1.8.19" endfunction com! -nargs=0 TVersion echo Tex_Version() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sri...@us...> - 2006-05-01 04:32:18
|
Revision: 1014 Author: srinathava Date: 2006-04-30 21:32:11 -0700 (Sun, 30 Apr 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=1014&view=rev Log Message: ----------- Bug: There is a complaint on mac when the view rule is not specified, although it should be allowed on the mac to not have any view rule specified. (Chen Long) Fix: Specifically check for has('macunix') when the view rule has to be set and relax in this case. Modified Paths: -------------- trunk/vimfiles/ftplugin/latex-suite/compiler.vim trunk/vimfiles/ftplugin/latex-suite/version.vim Modified: trunk/vimfiles/ftplugin/latex-suite/compiler.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/compiler.vim 2006-04-29 02:36:23 UTC (rev 1013) +++ trunk/vimfiles/ftplugin/latex-suite/compiler.vim 2006-05-01 04:32:11 UTC (rev 1014) @@ -34,6 +34,12 @@ elseif Tex_GetVarValue('Tex_'.a:type.'RuleComplete_'.target) != '' let s:target = target + elseif a:type == 'View' && has('macunix') + " On the mac, we can have empty view rules, so do not complain when + " both Tex_ViewRule_target and Tex_ViewRuleComplete_target are + " empty. On other platforms, we will complain... see below. + let s:target = target + else let curd = getcwd() exe 'cd '.expand('%:p:h') Modified: trunk/vimfiles/ftplugin/latex-suite/version.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-04-29 02:36:23 UTC (rev 1013) +++ trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-05-01 04:32:11 UTC (rev 1014) @@ -24,7 +24,7 @@ " "stabilize" that version by releasing a few pre-releases and then " keep that as a stable point. function! Tex_Version() - return "Latex-Suite: version 1.8.21" + return "Latex-Suite: version 1.8.22" endfunction com! -nargs=0 TVersion echo Tex_Version() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sri...@us...> - 2006-05-01 21:29:46
|
Revision: 1015 Author: srinathava Date: 2006-05-01 14:29:40 -0700 (Mon, 01 May 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=1015&view=rev Log Message: ----------- Bug: sloppybar should be sloppypar (Bernhard Walle) Fix: Change ESB->\begin{sloppybar} to ESP->\begin{sloppypar} It looks like lots of people might complain because of this because ESP is quite a common acronym... Modified Paths: -------------- trunk/vimfiles/ftplugin/latex-suite/envmacros.vim trunk/vimfiles/ftplugin/latex-suite/version.vim trunk/vimfiles/ftplugin/latex-suite/wizardfuncs.vim Modified: trunk/vimfiles/ftplugin/latex-suite/envmacros.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/envmacros.vim 2006-05-01 04:32:11 UTC (rev 1014) +++ trunk/vimfiles/ftplugin/latex-suite/envmacros.vim 2006-05-01 21:29:40 UTC (rev 1015) @@ -238,7 +238,7 @@ call s:Tex_EnvMacros('EFR', '&Structure.', 'flushright') call s:Tex_EnvMacros('EQN', '&Structure.', 'quotation') call s:Tex_EnvMacros('EQE', '&Structure.', 'quote') -call s:Tex_EnvMacros('ESB', '&Structure.', 'sloppybar') +call s:Tex_EnvMacros('ESP', '&Structure.', 'sloppypar') call s:Tex_EnvMacros('ETI', '&Structure.', 'theindex') call s:Tex_EnvMacros('ETP', '&Structure.', 'titlepage') call s:Tex_EnvMacros('EVM', '&Structure.', 'verbatim') Modified: trunk/vimfiles/ftplugin/latex-suite/version.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-05-01 04:32:11 UTC (rev 1014) +++ trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-05-01 21:29:40 UTC (rev 1015) @@ -24,7 +24,7 @@ " "stabilize" that version by releasing a few pre-releases and then " keep that as a stable point. function! Tex_Version() - return "Latex-Suite: version 1.8.22" + return "Latex-Suite: version 1.8.23" endfunction com! -nargs=0 TVersion echo Tex_Version() Modified: trunk/vimfiles/ftplugin/latex-suite/wizardfuncs.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/wizardfuncs.vim 2006-05-01 04:32:11 UTC (rev 1014) +++ trunk/vimfiles/ftplugin/latex-suite/wizardfuncs.vim 2006-05-01 21:29:40 UTC (rev 1015) @@ -287,7 +287,7 @@ \."\n <mapleader> is a value of g:Tex_Leader2" \."\n I v&V I v&V" \."\n ELI ".g:Tex_Leader2."li list EQN ".g:Tex_Leader2."qn quotation" -\."\n EDE ".g:Tex_Leader2."de description ESB ".g:Tex_Leader2."sb sloppybar" +\."\n EDE ".g:Tex_Leader2."de description ESP ".g:Tex_Leader2."sb sloppypar" \."\n EEN ".g:Tex_Leader2."en enumerate ETI ".g:Tex_Leader2."ti theindex" \."\n EIT ".g:Tex_Leader2."it itemize ETP ".g:Tex_Leader2."tp titlepage" \."\n ETI ".g:Tex_Leader2."ti theindex EVM ".g:Tex_Leader2."vm verbatim" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sri...@us...> - 2006-03-25 05:41:14
|
Revision: 1003 Author: srinathava Date: 2006-03-24 21:41:09 -0800 (Fri, 24 Mar 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=1003&view=rev Log Message: ----------- Bug: Parsing bib files fails in certain situations, for example with fields like "number = 3," (a single number) Why: too many assumptions about how the bibtex file is structured. Fix: Relax the parsing. Modified Paths: -------------- trunk/vimfiles/ftplugin/latex-suite/bibtools.py trunk/vimfiles/ftplugin/latex-suite/version.vim Modified: trunk/vimfiles/ftplugin/latex-suite/bibtools.py =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/bibtools.py 2006-03-23 04:02:21 UTC (rev 1002) +++ trunk/vimfiles/ftplugin/latex-suite/bibtools.py 2006-03-25 05:41:09 UTC (rev 1003) @@ -1,3 +1,7 @@ +# Author: Srinath Avadhanula +# This file is distributed as part of the vim-latex project +# http://vim-latex.sf.net + import re class Bibliography(dict): @@ -6,7 +10,6 @@ txt: a string which represents the entire bibtex entry. A typical entry is of the form: - @ARTICLE{ellington:84:part3, author = {Ellington, C P}, title = {The Aerodynamics of Hovering Insect Flight. III. Kinematics}, @@ -78,12 +81,11 @@ value = body[:(mn.start(0))] else: - mn = re.match(r'\d+', body) - if not mn: - raise "Only completely numeral fields can be left unquoted" + # $ always matches. So we do not need to do any + # error-checking. + mn = re.search(r',|$', body) + value = m.group(2) + body[:(mn.start(0))].rstrip() - value = m.group(2) + mn.group(0) - self[field] = re.sub(r'\s+', ' ', value) body = body[(mn.start(0)+1):] Modified: trunk/vimfiles/ftplugin/latex-suite/version.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-23 04:02:21 UTC (rev 1002) +++ trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-25 05:41:09 UTC (rev 1003) @@ -24,7 +24,7 @@ " "stabilize" that version by releasing a few pre-releases and then " keep that as a stable point. function! Tex_Version() - return "Latex-Suite: version 1.8.11" + return "Latex-Suite: version 1.8.12" endfunction com! -nargs=0 TVersion echo Tex_Version() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sri...@us...> - 2006-03-28 04:32:18
|
Revision: 1005 Author: srinathava Date: 2006-03-27 20:32:11 -0800 (Mon, 27 Mar 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=1005&view=rev Log Message: ----------- New: Latex-suite (once again) honors Tex_ImageDir. This setting is supposed to be the name of a _single_ directory. Its used when <F9> is pressed to complete an \includegraphics command. In this situation, the file browser is opened on the directory pointed to by Tex_ImageDir rather than the current directory. Modified Paths: -------------- trunk/vimfiles/ftplugin/latex-suite/texviewer.vim trunk/vimfiles/ftplugin/latex-suite/version.vim Modified: trunk/vimfiles/ftplugin/latex-suite/texviewer.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/texviewer.vim 2006-03-25 08:40:15 UTC (rev 1004) +++ trunk/vimfiles/ftplugin/latex-suite/texviewer.vim 2006-03-28 04:32:11 UTC (rev 1005) @@ -241,7 +241,7 @@ call FB_SetVar('FB_CallBackFunction', 'Tex_CompleteFileName') call FB_SetVar('FB_CallBackFunctionArgs', '"'.a:ext.'"') - call FB_OpenFileBrowser('.') + call FB_OpenFileBrowser(Tex_GetVarValue('Tex_ImageDir', '.')) endfunction " }}} " Tex_CompleteFileName: {{{ " Description: Modified: trunk/vimfiles/ftplugin/latex-suite/version.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-25 08:40:15 UTC (rev 1004) +++ trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-28 04:32:11 UTC (rev 1005) @@ -24,7 +24,7 @@ " "stabilize" that version by releasing a few pre-releases and then " keep that as a stable point. function! Tex_Version() - return "Latex-Suite: version 1.8.13" + return "Latex-Suite: version 1.8.14" endfunction com! -nargs=0 TVersion echo Tex_Version() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sri...@us...> - 2006-03-29 06:11:10
|
Revision: 1007 Author: srinathava Date: 2006-03-28 22:11:01 -0800 (Tue, 28 Mar 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=1007&view=rev Log Message: ----------- Bug: Using <S-F5> to change \begin{eqnarray} 2 = 3 \label{first} \\ 4 = 5 \end{eqnarray} to an \begin{align}...\end{align} inserts \nonumber's. Why: It was assumed that we will only change starred environments (i.e, ones which will not be numbered) into unstarred environments. Fix: Only insert \nonumber if the original environment was starred and the new environment is not. Ofcourse, its not obvious that this is the right thing to do. It feels that someone would convert a previously starred environment into a starred one precisely to give it a label or something similar. Why increase the work required by inserting \nonumber? More feedback needed. For now, I'm just fixing the obvious bug. Modified Paths: -------------- trunk/vimfiles/ftplugin/latex-suite/envmacros.vim trunk/vimfiles/ftplugin/latex-suite/version.vim Modified: trunk/vimfiles/ftplugin/latex-suite/envmacros.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/envmacros.vim 2006-03-28 19:15:18 UTC (rev 1006) +++ trunk/vimfiles/ftplugin/latex-suite/envmacros.vim 2006-03-29 06:11:01 UTC (rev 1007) @@ -730,11 +730,11 @@ let change_env = PromptForEnvironment('What do you want to change it to? ') if change_env == 'eqnarray' - call <SID>Change('eqnarray', 1, '', 1) + call <SID>Change('eqnarray', 1, '', env_name =~ '\*$') + elseif change_env == 'align' + call <SID>Change('align', 1, '', env_name =~ '\*$') elseif change_env == 'eqnarray*' call <SID>Change('eqnarray*', 0, '\\nonumber', 0) - elseif change_env == 'align' - call <SID>Change('align', 1, '', 1) elseif change_env == 'align*' call <SID>Change('align*', 0, '\\nonumber', 0) elseif change_env == 'equation*' Modified: trunk/vimfiles/ftplugin/latex-suite/version.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-28 19:15:18 UTC (rev 1006) +++ trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-29 06:11:01 UTC (rev 1007) @@ -24,7 +24,7 @@ " "stabilize" that version by releasing a few pre-releases and then " keep that as a stable point. function! Tex_Version() - return "Latex-Suite: version 1.8.15" + return "Latex-Suite: version 1.8.16" endfunction com! -nargs=0 TVersion echo Tex_Version() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sri...@us...> - 2006-03-29 06:15:12
|
Revision: 1008 Author: srinathava Date: 2006-03-28 22:15:08 -0800 (Tue, 28 Mar 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=1008&view=rev Log Message: ----------- New: Support the Tex_ImageDir setting more fully. Now when Tex_ImageDir is found, then pressing <F9> to complete \includegraphics will open up the file-browser on the directory pointed to by Tex_ImageDir. When a file is chosen, the filename is completed relative to Tex_ImageDir. Modified Paths: -------------- trunk/vimfiles/ftplugin/latex-suite/texviewer.vim trunk/vimfiles/ftplugin/latex-suite/version.vim Modified: trunk/vimfiles/ftplugin/latex-suite/texviewer.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/texviewer.vim 2006-03-29 06:11:01 UTC (rev 1007) +++ trunk/vimfiles/ftplugin/latex-suite/texviewer.vim 2006-03-29 06:15:08 UTC (rev 1008) @@ -147,25 +147,33 @@ call Tex_SetupFileCompletion( \ '', \ '^\.\\|\.tex$\\|\.bib$\\|\.bbl$\\|\.zip$\\|\.gz$', - \ 'noext') + \ 'noext', + \ Tex_GetVarValue('Tex_ImageDir', '.'), + \ Tex_GetVarValue('Tex_ImageDir', '')) elseif exists("s:type") && s:type == 'bibliography' call Tex_SetupFileCompletion( \ '\.b..$', \ '', - \ 'noext') + \ 'noext', + \ '.', + \ '') elseif exists("s:type") && s:type =~ 'include\(only\)\=' call Tex_SetupFileCompletion( \ '\.t..$', \ '', - \ 'noext') + \ 'noext', + \ '.', + \ '') elseif exists("s:type") && s:type == 'input' call Tex_SetupFileCompletion( \ '', \ '', - \ 'ext') + \ 'ext', + \ '.', + \ '') elseif exists('s:type') && exists("g:Tex_completion_".s:type) call <SID>Tex_CompleteRefCiteCustom('plugin_'.s:type) @@ -235,23 +243,25 @@ " ============================================================================== " Tex_SetupFileCompletion: {{{ " Description: -function! Tex_SetupFileCompletion(accept, reject, ext) +function! Tex_SetupFileCompletion(accept, reject, ext, dir, root) 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_SetVar('FB_CallBackFunctionArgs', '"'.a:ext.'", "'.a:root.'"') - call FB_OpenFileBrowser(Tex_GetVarValue('Tex_ImageDir', '.')) + call FB_OpenFileBrowser(a:dir) endfunction " }}} " Tex_CompleteFileName: {{{ " Description: -function! Tex_CompleteFileName(filename, ext) +function! Tex_CompleteFileName(filename, ext, root) + let root = (a:root == '' ? Tex_GetMainFileName(':p:h') : a:root) + call Tex_Debug('+Tex_CompleteFileName: getting filename '.a:filename, 'view') if a:ext == 'noext' let completeword = fnamemodify(a:filename, ':r') endif - let completeword = Tex_RelPath(completeword, Tex_GetMainFileName(':p:h')) + let completeword = Tex_RelPath(completeword, root) call Tex_Debug(":Tex_CompleteFileName: completing with ".completeword, "view") call Tex_CompleteWord(completeword) Modified: trunk/vimfiles/ftplugin/latex-suite/version.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-29 06:11:01 UTC (rev 1007) +++ trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-03-29 06:15:08 UTC (rev 1008) @@ -24,7 +24,7 @@ " "stabilize" that version by releasing a few pre-releases and then " keep that as a stable point. function! Tex_Version() - return "Latex-Suite: version 1.8.16" + return "Latex-Suite: version 1.8.17" endfunction com! -nargs=0 TVersion echo Tex_Version() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sri...@us...> - 2006-04-28 16:41:50
|
Revision: 1011 Author: srinathava Date: 2006-04-28 09:41:47 -0700 (Fri, 28 Apr 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=1011&view=rev Log Message: ----------- Bug: when 'filetype indent off' then pressing <M-i> at the beginning of a line inserts the \item one character to the right of the first character on the line. (Joachim Breitner) Why: We had mapped the insert item thing to <Esc>a... which doesn't get the cursor back to the same position at the beginning of a line. Fix: Just avoid going into normal mode in the first place (Franz Pletz) Modified Paths: -------------- trunk/vimfiles/ftplugin/latex-suite/envmacros.vim trunk/vimfiles/ftplugin/latex-suite/version.vim Modified: trunk/vimfiles/ftplugin/latex-suite/envmacros.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/envmacros.vim 2006-04-17 23:50:10 UTC (rev 1010) +++ trunk/vimfiles/ftplugin/latex-suite/envmacros.vim 2006-04-28 16:41:47 UTC (rev 1011) @@ -605,6 +605,7 @@ endif let i = i + 1 endwhile + endif endif " If nothing before us managed to create an environment, then just " create a bare-bones environment from the name. @@ -940,9 +941,8 @@ endfunction " }}} " Tex_SetItemMaps: sets the \item inserting maps for current buffer {{{ -" Description: -inoremap <script> <silent> <Plug>Tex_InsertItemOnThisLine <Esc>a<C-r>=Tex_InsertItem()<CR> +inoremap <script> <silent> <Plug>Tex_InsertItemOnThisLine <C-r>=Tex_InsertItem()<CR> inoremap <script> <silent> <Plug>Tex_InsertItemOnNextLine <ESC>o<C-R>=Tex_InsertItem()<CR> function! Tex_SetItemMaps() Modified: trunk/vimfiles/ftplugin/latex-suite/version.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-04-17 23:50:10 UTC (rev 1010) +++ trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-04-28 16:41:47 UTC (rev 1011) @@ -24,7 +24,7 @@ " "stabilize" that version by releasing a few pre-releases and then " keep that as a stable point. function! Tex_Version() - return "Latex-Suite: version 1.8.17" + return "Latex-Suite: version 1.8.18" endfunction com! -nargs=0 TVersion echo Tex_Version() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sri...@us...> - 2006-04-29 02:36:33
|
Revision: 1013 Author: srinathava Date: 2006-04-28 19:36:23 -0700 (Fri, 28 Apr 2006) ViewCVS: http://svn.sourceforge.net/vim-latex/?rev=1013&view=rev Log Message: ----------- Bug: In vim7, 'exe pos' doesn't seem to always work. Sometimes it leads to a spurious double-quote being inserted into the text. I have no idea why this happens. However, using vim's native setpos() when available seems to not have this problem. Fix: When setpos/getpos() are available use them instead. Two new utility functions Tex_(Set|Get)Pos() have been provided. Use these henceforth to record/restore cursor position. New: Expand ... to \dots also when the package ellipsis is detected. Modified Paths: -------------- trunk/vimfiles/ftplugin/latex-suite/compiler.vim trunk/vimfiles/ftplugin/latex-suite/custommacros.vim trunk/vimfiles/ftplugin/latex-suite/elementmacros.vim trunk/vimfiles/ftplugin/latex-suite/envmacros.vim trunk/vimfiles/ftplugin/latex-suite/main.vim trunk/vimfiles/ftplugin/latex-suite/packages.vim trunk/vimfiles/ftplugin/latex-suite/texviewer.vim trunk/vimfiles/ftplugin/latex-suite/version.vim trunk/vimfiles/ftplugin/latex-suite/wizardfuncs.vim Modified: trunk/vimfiles/ftplugin/latex-suite/compiler.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/compiler.vim 2006-04-28 16:48:12 UTC (rev 1012) +++ trunk/vimfiles/ftplugin/latex-suite/compiler.vim 2006-04-29 02:36:23 UTC (rev 1013) @@ -377,8 +377,6 @@ " compile it. function! Tex_PartCompile() range call Tex_Debug('+Tex_PartCompile', 'comp') - " Save position - let pos = line('.').' | normal! '.virtcol('.').'|' " Get a temporary file in the same directory as the file from which " fragment is being extracted. This is to enable the use of relative path Modified: trunk/vimfiles/ftplugin/latex-suite/custommacros.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/custommacros.vim 2006-04-28 16:48:12 UTC (rev 1012) +++ trunk/vimfiles/ftplugin/latex-suite/custommacros.vim 2006-04-29 02:36:23 UTC (rev 1013) @@ -196,7 +196,6 @@ let markerString = '<---- Latex Suite End Macro ---->' let _a = @a - let position = line('.').' | normal! '.virtcol('.').'|' silent! call append(line('.'), markerString) silent! exec "read ".fname silent! exec "normal! V/^".markerString."$/-1\<CR>\"ax" Modified: trunk/vimfiles/ftplugin/latex-suite/elementmacros.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/elementmacros.vim 2006-04-28 16:48:12 UTC (rev 1012) +++ trunk/vimfiles/ftplugin/latex-suite/elementmacros.vim 2006-04-29 02:36:23 UTC (rev 1013) @@ -35,17 +35,13 @@ let s:definedFuncs = 1 " Tex_RemoveElementMenus: remove the elements menu {{{ - " function! Tex_RemoveElementMenus() exe 'silent! aunmenu '.s:lastElementsLocation.'Font.' exe 'silent! aunmenu '.s:lastElementsLocation.'Dimension.' exe 'silent! aunmenu '.s:lastElementsLocation.'Counters.' exe 'silent! aunmenu '.s:lastElementsLocation.'Various.' - endfunction - - " }}} + endfunction " }}} " Tex_FontFamily: sets up font menus {{{ - " function! <SID>Tex_FontFamily(font,fam) let vislhs = matchstr(tolower(a:font), '^.\zs.*') @@ -65,11 +61,8 @@ \" \<C-\\>\<C-N>:call VEnclose('\\text".vislhs."{', '}', '{\\".vislhs.a:fam." ', '}')<CR>" endif - endfunction - - " }}} + endfunction " }}} " Tex_FontDiacritics: sets up menus for diacritics. {{{ - " function! <SID>Tex_FontDiacritics(name, rhs) let location = s:fontMenuLoc.'&Diacritics.'.a:name.'<tab>' exe 'amenu '.location. @@ -78,14 +71,12 @@ \" \<C-\\>\<C-n>:call VEnclose('\\".a:rhs."{', '}', '', '')<CR>" endfunction " }}} " Tex_FontSize: sets up size fonts {{{ - " function! <SID>Tex_FontSize(name) let location = s:fontMenuLoc.'&Size.'.a:name.'<tab>' exe 'amenu '.location." <plug>\\".a:name exe 'vunmenu '.location endfunction " }}} " Tex_Fontfont: sets up the 'font' part of font menus {{{ - " function! <SID>Tex_Fontfont(desc, lhs) let location = s:fontMenuLoc.'&font.'.a:desc.'<tab>' exe "amenu ".location." <plug><C-r>=IMAP_PutTextWithMovement('".a:lhs."')<CR>" @@ -109,6 +100,7 @@ exe "amenu ".location." <plug><C-r>=IMAP_PutTextWithMovement('".a:lhs."')<CR>" exe "vunmenu ".location endfunction " }}} + endif " }}} Modified: trunk/vimfiles/ftplugin/latex-suite/envmacros.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/envmacros.vim 2006-04-28 16:48:12 UTC (rev 1012) +++ trunk/vimfiles/ftplugin/latex-suite/envmacros.vim 2006-04-29 02:36:23 UTC (rev 1013) @@ -519,7 +519,7 @@ return Tex_ChooseFromPrompt( \ a:ask."\n" . \ Tex_CreatePrompt(g:Tex_PromptedEnvironments, 2, ",") . - \ "\nEnter nae or number of environment :", + \ "\nEnter name or number of environment :", \ g:Tex_PromptedEnvironments, ",") endfunction " }}} " Tex_DoEnvironment: fast insertion of environments {{{ @@ -642,7 +642,7 @@ function! Tex_FastEnvironmentInsert(isvisual) let start_line = line('.') - let pos = line('.').' | normal! '.virtcol('.').'|' + let pos = Tex_GetPos() let s:isvisual = a:isvisual " decide if we are in the preamble of the document. If we are then @@ -660,11 +660,11 @@ if start_line < begin_line " return to our original location and insert a package " statement. - exe pos + call Tex_SetPos(pos) return Tex_package_from_line() else " we are after the preamble. insert an environment. - exe pos + call Tex_SetPos(pos) return Tex_DoEnvironment() endif @@ -672,13 +672,13 @@ " if there is only a \documentclass but no \begin{document}, then " the entire file is a preamble. Put a package. - exe pos + call Tex_SetPos(pos) return Tex_package_from_line() else " no \documentclass, put an environment. - exe pos + call Tex_SetPos(pos) return Tex_DoEnvironment() endif @@ -889,13 +889,13 @@ " " Author: Alan Schmitt function! Tex_GetCurrentEnv() - let pos = line('.').' | normal! '.virtcol('.').'|' + let pos = Tex_GetPos() let i = 0 while 1 let env_line = search('^[^%]*\\\%(begin\|end\){', 'bW') if env_line == 0 " we reached the beginning of the file, so we return the empty string - exe pos + call Tex_SetPos(pos) return '' endif if match(getline(env_line), '^[^%]*\\begin{') == -1 @@ -906,7 +906,7 @@ " we found a \\begin which has not been \\end'ed. we are done. if i == 0 let env = matchstr(getline(env_line), '\\begin{\zs.\{-}\ze}') - exe pos + call Tex_SetPos(pos) return env else " this \\begin closes a \\end, continue searching. @@ -1071,7 +1071,7 @@ " function! Tex_ChangeCommand(isvisual) - let pos_com = line('.').' | normal! '.virtcol('.').'|' + let pos_com = Tex_GetPos() let com_line = searchpair('\\\k\{-}{', '', '}', 'b') @@ -1082,7 +1082,7 @@ if !exists('com_name') echomsg "You are not inside command" - exe pos_com + call Tex_SetPos(pos_com) return 0 endif @@ -1090,11 +1090,11 @@ let change_com = PromptForCommand('Do you want to change it to (number or name)? ') if change_com == '' - exe pos_com + call Tex_SetPos(pos_com) return 0 else call <SID>ChangeCommand(change_com) - exe pos_com + call Tex_SetPos(pos_com) return 0 endif Modified: trunk/vimfiles/ftplugin/latex-suite/main.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/main.vim 2006-04-28 16:48:12 UTC (rev 1012) +++ trunk/vimfiles/ftplugin/latex-suite/main.vim 2006-04-29 02:36:23 UTC (rev 1013) @@ -639,7 +639,24 @@ endif return retval endfunction " }}} +" Tex_GetPos: gets position of cursor {{{ +function! Tex_GetPos() + if exists('*getpos') + return getpos('.') + else + return line('.').' | normal! '.virtcol('.').'|' + endif +endfunction " }}} +" Tex_SetPos: sets position of cursor {{{ +function! Tex_SetPos(pos) + if exists('*setpos') + call setpos('.', a:pos) + else + exec a:pos + endif +endfunction " }}} + " ============================================================================== " Smart key-mappings " ============================================================================== @@ -772,7 +789,7 @@ function! <SID>SmartDots() if strpart(getline('.'), col('.')-3, 2) == '..' && - \ g:Tex_package_detected =~ '\<amsmath\>' + \ g:Tex_package_detected =~ '\<amsmath\|ellipsis\>' return "\<bs>\<bs>\\dots" elseif synIDattr(synID(line('.'),col('.')-1,0),"name") =~ '^texMath' \&& strpart(getline('.'), col('.')-3, 2) == '..' Modified: trunk/vimfiles/ftplugin/latex-suite/packages.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/packages.vim 2006-04-28 16:48:12 UTC (rev 1012) +++ trunk/vimfiles/ftplugin/latex-suite/packages.vim 2006-04-29 02:36:23 UTC (rev 1013) @@ -311,7 +311,7 @@ function! Tex_ScanForPackages(...) call Tex_Debug("+Tex_ScanForPackages", "pack") - let pos = line('.').' | normal! '.virtcol('.').'|' + let pos = Tex_GetPos() " For package files without \begin and \end{document}, we might be told to " search from beginning to end. @@ -448,7 +448,7 @@ endwhile - exe pos + call Tex_SetPos(pos) " first make a random search so that we push at least one item onto the " search history. Since vim puts only one item in the history per function " call, this way we make sure that one and only item is put into the Modified: trunk/vimfiles/ftplugin/latex-suite/texviewer.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/texviewer.vim 2006-04-28 16:48:12 UTC (rev 1012) +++ trunk/vimfiles/ftplugin/latex-suite/texviewer.vim 2006-04-29 02:36:23 UTC (rev 1013) @@ -47,7 +47,7 @@ let s:origdir = getcwd() cd %:p:h - let s:pos = line('.').' | normal! '.virtcol('.').'|' + let s:pos = Tex_GetPos() unlet! s:type unlet! s:typeoption @@ -220,7 +220,7 @@ " ``<enter>`` in one of the [Error List] windows which shows the list of " matches. completeword is the rest of the word which needs to be inserted. function! Tex_CompleteWord(completeword) - exe s:pos + call Tex_SetPos(s:pos) " Complete word, check if add closing } exe 'normal! a'.a:completeword."\<Esc>" @@ -476,7 +476,7 @@ exe s:winnum.' wincmd w' pclose! cclose - exe s:pos + call Tex_SetPos(s:pos) endfunction " }}} " Tex_GoToLocation: Go to chosen location {{{ " Description: Get number of current line and go to this number @@ -517,13 +517,13 @@ exec 'split '.Tex_EscapeSpaces(mainfname) endif - let pos = line('.').'| normal! '.virtcol('.').'|' + let pos = Tex_GetPos() if a:what =~ 'bib' call Tex_ScanFileForCite(a:prefix) else call Tex_ScanFileForLabels(a:prefix) endif - exec pos + call Tex_SetPos(pos) q let &path = _path Modified: trunk/vimfiles/ftplugin/latex-suite/version.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-04-28 16:48:12 UTC (rev 1012) +++ trunk/vimfiles/ftplugin/latex-suite/version.vim 2006-04-29 02:36:23 UTC (rev 1013) @@ -24,7 +24,7 @@ " "stabilize" that version by releasing a few pre-releases and then " keep that as a stable point. function! Tex_Version() - return "Latex-Suite: version 1.8.19" + return "Latex-Suite: version 1.8.21" endfunction com! -nargs=0 TVersion echo Tex_Version() Modified: trunk/vimfiles/ftplugin/latex-suite/wizardfuncs.vim =================================================================== --- trunk/vimfiles/ftplugin/latex-suite/wizardfuncs.vim 2006-04-28 16:48:12 UTC (rev 1012) +++ trunk/vimfiles/ftplugin/latex-suite/wizardfuncs.vim 2006-04-29 02:36:23 UTC (rev 1013) @@ -59,10 +59,9 @@ return sstructure.toc.shorttitle.ttitle endfunction - " }}} function! Tex_section(...) "{{{ - silent let pos = line('.').' | normal! '.virtcol('.').'|' + silent let pos = Tex_GetPos() silent let last_section_value = s:Tex_section_detection() if a:0 == 0 silent let last_section_name = s:Tex_section_name(last_section_value) @@ -79,10 +78,10 @@ silent let curr_section_name = s:Tex_section_name(curr_section_value) silent call s:Tex_section_call(curr_section_name) endif - silent exe pos + silent call Tex_SetPos(pos) endfunction "}}} function! Tex_section_adv(...) "{{{ - let pos = line('.').' | normal! '.virtcol('.').'|' + let pos = Tex_GetPos() silent let last_section_value = s:Tex_section_detection() if a:0 == 0 silent let last_section_name = s:Tex_section_name(last_section_value) @@ -99,12 +98,12 @@ let section = Tex_InsSecAdv(curr_section_name) endif exe "normal i".section - exe pos + call Tex_SetPos(pos) endfunction "}}} function! s:Tex_section_detection() "{{{ - let pos = line('.').' | normal! '.virtcol('.').'|' + let pos = Tex_GetPos() let last_section1 = search("\\\\\subparagraph\\|\\\\paragraph\\|\\\\subsubsection\\|\\\\subsection\\|\\\\section\\|\\\\chapter\\|\\\part\)", "b") - exe pos + call Tex_SetPos(pos) let last_section2 = search("\\\\\part\\|\\\\chapter\\|\\\\section\\|\\\\subsection\\|\\\\subsubsection\\|\\\\paragraph\\|\\\subparagraph\)", "b") if last_section1 > last_section2 let last_section = last_section1 @@ -132,7 +131,7 @@ else let last_section_value = 0 endif - exe pos + call Tex_SetPos(pos) return last_section_value endfunction "}}} function! s:Tex_section_curr_value(sec_arg) "{{{ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
