vim-latex-cvs Mailing List for Vim-Latex (Page 30)
Brought to you by:
srinathava,
tmaas
You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(82) |
Dec
(124) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(104) |
Feb
(3) |
Mar
(6) |
Apr
(48) |
May
(34) |
Jun
(62) |
Jul
(33) |
Aug
(24) |
Sep
(32) |
Oct
(16) |
Nov
(36) |
Dec
(39) |
2004 |
Jan
|
Feb
(3) |
Mar
(8) |
Apr
|
May
(29) |
Jun
(13) |
Jul
(4) |
Aug
(6) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
(6) |
Dec
(9) |
2006 |
Jan
(9) |
Feb
(2) |
Mar
(16) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(22) |
Jun
(1) |
Jul
|
Aug
(6) |
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
(1) |
Feb
|
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(17) |
Sep
(3) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
2010 |
Jan
(25) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(8) |
Nov
|
Dec
|
2011 |
Jan
|
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(10) |
Oct
(1) |
Nov
|
Dec
(1) |
2012 |
Jan
(5) |
Feb
(1) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
(4) |
Nov
(1) |
Dec
|
2013 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(15) |
Dec
|
2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
From: <sri...@us...> - 2002-12-30 11:12:05
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite In directory sc8-pr-cvs1:/tmp/cvs-serv9478 Modified Files: envmacros.vim Log Message: Bug: Pressing <F5> and then pressing <enter> without choosing anything inserts 0 (zero) Cause: Tex_DoEnvironment() doesn't account for the fact that the user does not choose anything. Therefore, vim by default returns zero. Solution: Make Tex_DoEnvironment return '' if the user hasn't chosen anything. Index: envmacros.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/envmacros.vim,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** envmacros.vim 30 Dec 2002 08:59:30 -0000 1.15 --- envmacros.vim 30 Dec 2002 11:12:02 -0000 1.16 *************** *** 3,7 **** " Author: Mikolaj Machowski " Created: Tue Apr 23 08:00 PM 2002 PST ! " Last Change: Mon Dec 30 12:00 AM 2002 PST " " Description: mappings/menus for environments. --- 3,7 ---- " Author: Mikolaj Machowski " Created: Tue Apr 23 08:00 PM 2002 PST ! " Last Change: Mon Dec 30 03:00 AM 2002 PST " " Description: mappings/menus for environments. *************** *** 555,558 **** --- 555,560 ---- if env != '' return Tex_PutEnvironment(env) + else + return '' endif else |
From: Srinath A. <sr...@fa...> - 2002-12-30 11:03:58
|
I just noticed another problem with the long marker string. We are triggering line breaks unecessarily. Just doing $$ 10 spaces away from EOL causes the $$ to slip into the next line. This will have to be fixed too... Maybe Benji's original idea of using phs.phs instead of the marker string... (maybe check to see if phs != phe before this...) Srinath On Mon, 30 Dec 2002 sri...@us... wrote: > Update of /cvsroot/vim-latex/vimfiles/plugin > In directory sc8-pr-cvs1:/tmp/cvs-serv405 > > Modified Files: > imaps.vim > Log Message: > Bug: When we trigger a mapping near the end of the line, things go bad. > Cause: The "marker" or the "very improbable string" which is used by > IMAP_PutTextWithMovement() to mark the beginning of the left-hand side > contains spaces! This causes expansions near the end of a line to > trigger line breaks (if 'fo' contains t, which is default and tw != 0), > so that the marker text is broken across lines... Havoc ensues. > Solution: remove spaces from marker text. > |
From: <sri...@us...> - 2002-12-30 10:54:52
|
Update of /cvsroot/vim-latex/vimfiles/plugin In directory sc8-pr-cvs1:/tmp/cvs-serv405 Modified Files: imaps.vim Log Message: Bug: When we trigger a mapping near the end of the line, things go bad. Cause: The "marker" or the "very improbable string" which is used by IMAP_PutTextWithMovement() to mark the beginning of the left-hand side contains spaces! This causes expansions near the end of a line to trigger line breaks (if 'fo' contains t, which is default and tw != 0), so that the marker text is broken across lines... Havoc ensues. Solution: remove spaces from marker text. Index: imaps.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/plugin/imaps.vim,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** imaps.vim 24 Dec 2002 12:51:06 -0000 1.14 --- imaps.vim 30 Dec 2002 10:54:49 -0000 1.15 *************** *** 8,12 **** " while preserving filetype indentation. " ! " Last Change: Tue Dec 24 04:00 AM 2002 PST " " Documentation: {{{ --- 8,12 ---- " while preserving filetype indentation. " ! " Last Change: Mon Dec 30 02:00 AM 2002 PST " " Documentation: {{{ *************** *** 269,273 **** " A very rare string: Do not use any special characters here. This is used " for moving to the beginning of the inserted text. ! let marker = '<!--- @#% Start Here @#% ----!>' let markerLength = strlen(marker) --- 269,273 ---- " A very rare string: Do not use any special characters here. This is used " for moving to the beginning of the inserted text. ! let marker = '<!---@#%_Start_Here_@#%----!>' let markerLength = strlen(marker) |
From: <sri...@us...> - 2002-12-30 09:04:43
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite In directory sc8-pr-cvs1:/tmp/cvs-serv8256 Modified Files: folding.vim Log Message: Bug: folds for section, subsection etc eat up an \end{document}. Solution: include '^\s*\end{document' in the endfoldpattern of the relevant things. Index: folding.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/folding.vim,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** folding.vim 20 Nov 2002 07:35:28 -0000 1.7 --- folding.vim 30 Dec 2002 09:04:39 -0000 1.8 *************** *** 4,8 **** " Version: 1.0 " Created: Tue Apr 23 05:00 PM 2002 PST ! " Last Change: Tue Nov 19 11:00 PM 2002 PST " " Description: functions to interact with Syntaxfolds.vim --- 4,8 ---- " Version: 1.0 " Created: Tue Apr 23 05:00 PM 2002 PST ! " Last Change: Mon Dec 30 01:00 AM 2002 PST " " Description: functions to interact with Syntaxfolds.vim *************** *** 163,167 **** call AddSyntaxFoldItem ( \ '^\s*\\subsubsection\W', ! \ '^\s*\\appendix\W\|^\s*\\subsubsection\W\|^\s*\\subsection\W\|^\s*\\section\W\|^\s*%%fakesection\|^\s*\\chapter\W\|^\s*\\begin{slide', \ 0, \ -1, --- 163,167 ---- call AddSyntaxFoldItem ( \ '^\s*\\subsubsection\W', ! \ '^\s*\\appendix\W\|^\s*\\subsubsection\W\|^\s*\\subsection\W\|^\s*\\section\W\|^\s*%%fakesection\|^\s*\\chapter\W\|^\s*\\begin{slide\|^\s*\\end{document', \ 0, \ -1, *************** *** 171,175 **** call AddSyntaxFoldItem ( \ '^\s*\\subsection\W', ! \ '^\s*\\appendix\W\|^\s*\\subsection\W\|^\s*\\section\W\|^\s*%%fakesection\|^\s*\\chapter\W\|^\s*\\begin{slide', \ 0, \ -1, --- 171,175 ---- call AddSyntaxFoldItem ( \ '^\s*\\subsection\W', ! \ '^\s*\\appendix\W\|^\s*\\subsection\W\|^\s*\\section\W\|^\s*%%fakesection\|^\s*\\chapter\W\|^\s*\\begin{slide\|^\s*\\end{document', \ 0, \ -1, *************** *** 179,183 **** call AddSyntaxFoldItem ( \ '^\s*\\section\W', ! \ '^\s*\\appendix\W\|^\s*\\section\W\|^\s*%%fakesection\|^\s*\\chapter\W\|^\s*\\begin{slide', \ 0, \ -1, --- 179,183 ---- call AddSyntaxFoldItem ( \ '^\s*\\section\W', ! \ '^\s*\\appendix\W\|^\s*\\section\W\|^\s*%%fakesection\|^\s*\\chapter\W\|^\s*\\begin{slide\|^\s*\\end{document', \ 0, \ -1, *************** *** 187,191 **** call AddSyntaxFoldItem ( \ '^\s*%%fakesection', ! \ '^\s*\\appendix\W\|^\s\\section\W\|^\s*%%fakesection\|^\s*\\chapter\W\|^\s*\\begin{slide', \ 0, \ -1, --- 187,191 ---- call AddSyntaxFoldItem ( \ '^\s*%%fakesection', ! \ '^\s*\\appendix\W\|^\s\\section\W\|^\s*%%fakesection\|^\s*\\chapter\W\|^\s*\\begin{slide\|^\s*\\end{document', \ 0, \ -1, *************** *** 195,199 **** call AddSyntaxFoldItem( \ '^\s*\\chapter\W', ! \ '^\s*\\appendix\W\|^\s*\\chapter\W\|^\s*\\begin{slide', \ 0, \ -1 --- 195,199 ---- call AddSyntaxFoldItem( \ '^\s*\\chapter\W', ! \ '^\s*\\appendix\W\|^\s*\\chapter\W\|^\s*\\begin{slide\|^\s*\\end{document', \ 0, \ -1 *************** *** 203,207 **** call AddSyntaxFoldItem ( \ '^\s*\\begin{slide', ! \ '^\s*\\appendix\W\|^\s*\\chapter\W\|^\s*\\begin{slide', \ 0, \ 0 --- 203,207 ---- call AddSyntaxFoldItem ( \ '^\s*\\begin{slide', ! \ '^\s*\\appendix\W\|^\s*\\chapter\W\|^\s*\\begin{slide\|^\s*\\end{document', \ 0, \ 0 |
From: <sri...@us...> - 2002-12-30 08:59:33
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite In directory sc8-pr-cvs1:/tmp/cvs-serv7011 Modified Files: envmacros.vim Log Message: Bug: <S-F5> always says that we are not in an environment. Cause: used double quotes instead of single quotes in a search pattern. Solution: well, duh! Index: envmacros.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/envmacros.vim,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** envmacros.vim 27 Dec 2002 23:01:24 -0000 1.14 --- envmacros.vim 30 Dec 2002 08:59:30 -0000 1.15 *************** *** 3,7 **** " Author: Mikolaj Machowski " Created: Tue Apr 23 08:00 PM 2002 PST ! " Last Change: Tue Dec 24 02:00 AM 2002 PST " " Description: mappings/menus for environments. --- 3,7 ---- " Author: Mikolaj Machowski " Created: Tue Apr 23 08:00 PM 2002 PST ! " Last Change: Mon Dec 30 12:00 AM 2002 PST " " Description: mappings/menus for environments. *************** *** 677,681 **** function! Tex_ChangeEnvironments() ! let env_line = searchpair("$$\|\\[\|begin{", '', "$$\|\\]\|end{", "bn") if env_line != 0 --- 677,681 ---- function! Tex_ChangeEnvironments() ! let env_line = searchpair('$$\|\\[\|begin{', '', '$$\|\\]\|end{', "bn") if env_line != 0 |
From: <sri...@us...> - 2002-12-30 00:48:46
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages In directory sc8-pr-cvs1:/tmp/cvs-serv13470 Modified Files: amsmath Log Message: \numberwithin takes 2 arguments, the environment whose numbering to affect and the parent environment to number within. Index: amsmath =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages/amsmath,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** amsmath 27 Dec 2002 22:59:25 -0000 1.4 --- amsmath 30 Dec 2002 00:48:43 -0000 1.5 *************** *** 90,94 **** \.'noo:allowdisplaybreaks,' \.'nor:nobreakdash,' ! \.'brs:numberwithin,' \.'bra:leftroot,' \.'bra:uproot,' --- 90,94 ---- \.'noo:allowdisplaybreaks,' \.'nor:nobreakdash,' ! \.'brs:numberwithin{<+env+>}{<+parent+>},' \.'bra:leftroot,' \.'bra:uproot,' |
From: Srinath A. <sr...@fa...> - 2002-12-30 00:34:16
|
On Sun, 29 Dec 2002, Benji Fisher wrote: > sri...@us... wrote: > > Update of /cvsroot/vim-latex/vimfiles/plugin > > In directory sc8-pr-cvs1:/tmp/cvs-serv20120 > > > > Modified Files: > > Tag: b-newpackages > > imaps.vim > > Log Message: > > . making IMAP() create global map, not buffer local. This commit might also > > cause a conflict... > > It looks as though this only changes the time stamp. Didn't you > want to remove the "(a:ft == '' ? '' : '<buffer>')"? > There was a problem with imaps.vim. The time-stamp got changed in the b-newpackges branch but no other changes were made. This caused 2 "empty" commits to be made... I have since 'outdated' both these revisions. As of now, 1.11.2.1 doesn't exist. I also mention another rev which I outdated in a previous email... Take a look at: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/vim-latex/vimfiles/plugin/imaps.vim Srinath |
From: <sri...@us...> - 2002-12-30 00:23:57
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite In directory sc8-pr-cvs1:/tmp/cvs-serv7627 Modified Files: custommacros.vim Log Message: . repairing the TMacro command. NOTE: There is still a bug in that the user is not left in insert mode... This seems to be a vim bug (?) . made the NewMacro() function script local, as demanded by the TMacroNew command. Index: custommacros.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/custommacros.vim,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** custommacros.vim 27 Dec 2002 01:49:58 -0000 1.10 --- custommacros.vim 30 Dec 2002 00:23:53 -0000 1.11 *************** *** 4,8 **** " Version: 1.0 " Created: Tue Apr 23 05:00 PM 2002 PST ! " Last Change: Thu Dec 26 05:00 PM 2002 PST " " Description: functions for processing custom macros in the --- 4,8 ---- " Version: 1.0 " Created: Tue Apr 23 05:00 PM 2002 PST ! " Last Change: Sun Dec 29 04:00 PM 2002 PST " " Description: functions for processing custom macros in the *************** *** 39,43 **** " }}} " NewMacro: opens new file in macros directory {{{ ! function! NewMacro() exe "cd ".s:path."/macros" new --- 39,43 ---- " }}} " NewMacro: opens new file in macros directory {{{ ! function! <SID>NewMacro() exe "cd ".s:path."/macros" new *************** *** 130,134 **** " }}} " commands for macros {{{ ! com! -nargs=? TMacro :call <SID>ReadMacro(<f-args>) com! -nargs=0 TMacroNew :call <SID>NewMacro() com! -nargs=? TMacroEdit :call <SID>EditMacro(<f-args>) --- 130,134 ---- " }}} " commands for macros {{{ ! com! -nargs=? TMacro :let s:retVal = <SID>ReadMacro(<f-args>) <bar> normal! i<C-r>=s:retVal<CR> com! -nargs=0 TMacroNew :call <SID>NewMacro() com! -nargs=? TMacroEdit :call <SID>EditMacro(<f-args>) |
From: <sri...@us...> - 2002-12-30 00:16:55
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite In directory sc8-pr-cvs1:/tmp/cvs-serv6236 Modified Files: packages.vim Log Message: Bug: When the command TPackage was used without arguments, then the user couldn't choose a package file. The list would scroll by quickly without waiting for user input and no package would be chosen. Cause: Using a command com! Foo normal! i<C-r>=Foo()<CR> where Foo() asks for user input doesn't seem to work in vim. Solution: Benji suggested that we use something like: com! let ret = Foo() <bar> normal! i<C-r>=ret<CR> This causes the normal! command to not have to get any user input. TODO: There is still a bug in that the command doesn't take the user to insert mode... i.e, the following doesn't work: com! Foo normal! i This command does not take the user to insert mode. However, com! Foo normal! 0v$<C-g> does take the user to select mode... Index: packages.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages.vim,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** packages.vim 27 Dec 2002 22:41:11 -0000 1.17 --- packages.vim 30 Dec 2002 00:16:51 -0000 1.18 *************** *** 3,7 **** " Author: Mikolaj Machowski " Created: Tue Apr 23 06:00 PM 2002 PST ! " Last Change: Fri Dec 27 02:00 PM 2002 PST " " Description: handling packages from within vim --- 3,7 ---- " Author: Mikolaj Machowski " Created: Tue Apr 23 06:00 PM 2002 PST ! " Last Change: Sun Dec 29 04:00 PM 2002 PST " " Description: handling packages from within vim *************** *** 18,22 **** let s:menu_div = 20 ! com! -nargs=* TPackage :normal! i<C-r>=Tex_pack_one(<f-args>)<CR> com! -nargs=0 TPackageUpdate :silent! call Tex_pack_updateall() com! -nargs=0 TPackageUpdateAll :silent! call Tex_pack_updateall() --- 18,22 ---- let s:menu_div = 20 ! com! -nargs=* TPackage let s:retVal = Tex_pack_one(<f-args>) <bar> normal! i<C-r>=s:retVal<CR> com! -nargs=0 TPackageUpdate :silent! call Tex_pack_updateall() com! -nargs=0 TPackageUpdateAll :silent! call Tex_pack_updateall() |
From: <sri...@us...> - 2002-12-29 23:51:33
|
Update of /cvsroot/vim-latex/vimfiles/doc In directory sc8-pr-cvs1:/tmp/cvs-serv1241 Modified Files: latex-suite.txt Log Message: Typo in docs. Visual macros for sections start with comma (,) not backtick (`). Index: latex-suite.txt =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/doc/latex-suite.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** latex-suite.txt 22 Dec 2002 03:00:35 -0000 1.10 --- latex-suite.txt 29 Dec 2002 23:51:30 -0000 1.11 *************** *** 1,5 **** *latex-suite* Tools for an enhanced LaTeX environment in Vim For Vim version 6.0 and above. ! Last Change: Sat Dec 14 02:00 AM 2002 PST By Srinath Avadhanula <sr...@fa...>, --- 1,5 ---- *latex-suite* Tools for an enhanced LaTeX environment in Vim For Vim version 6.0 and above. ! Last Change: Sat Dec 28 09:00 PM 2002 PST By Srinath Avadhanula <sr...@fa...>, *************** *** 299,303 **** SSE in insert mode inserts > \section{<++>}<++> ! < If you select a word or line and press `se, then you get > \section{section name} < The menu item in Tex-Environments.Sections have a sub-menu called --- 299,303 ---- SSE in insert mode inserts > \section{<++>}<++> ! < If you select a word or line and press ,se, then you get > \section{section name} < The menu item in Tex-Environments.Sections have a sub-menu called |
From: <sri...@us...> - 2002-12-29 23:42:46
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite In directory sc8-pr-cvs1:/tmp/cvs-serv31792 Modified Files: texrc Log Message: Disabling diacritics by default. It looks like most people who need accented characters are able to type them directly, and for those who can't, these maps only save one keystroke, while causing a _lot_ of headaches for people who do not use diacritics. Index: texrc =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/texrc,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** texrc 22 Dec 2002 03:00:50 -0000 1.16 --- texrc 29 Dec 2002 23:42:43 -0000 1.17 *************** *** 4,8 **** " Author: Srinath Avadhanula " Created: Mon Apr 01 11:00 AM 2002 PST ! " Last Change: Sat Dec 21 06:00 PM 2002 PST " " Description: This file contains resource configuration information for the --- 4,8 ---- " Author: Srinath Avadhanula " Created: Mon Apr 01 11:00 AM 2002 PST ! " Last Change: Sat Dec 28 09:00 PM 2002 PST " " Description: This file contains resource configuration information for the *************** *** 229,233 **** " +} = \"a " :o = \^o ! TexLet g:Tex_Diacritics = 1 " }}} --- 229,233 ---- " +} = \"a " :o = \^o ! TexLet g:Tex_Diacritics = 0 " }}} |
From: Benji F. <be...@me...> - 2002-12-29 20:57:50
|
sri...@us... wrote: > Update of /cvsroot/vim-latex/vimfiles/plugin > In directory sc8-pr-cvs1:/tmp/cvs-serv20120 > > Modified Files: > Tag: b-newpackages > imaps.vim > Log Message: > . making IMAP() create global map, not buffer local. This commit might also > cause a conflict... It looks as though this only changes the time stamp. Didn't you want to remove the "(a:ft == '' ? '' : '<buffer>')"? --Benji > Index: imaps.vim > =================================================================== > RCS file: /cvsroot/vim-latex/vimfiles/plugin/imaps.vim,v > retrieving revision 1.11 > retrieving revision 1.11.2.1 > diff -C2 -d -r1.11 -r1.11.2.1 > *** imaps.vim 22 Dec 2002 03:39:06 -0000 1.11 > --- imaps.vim 27 Dec 2002 21:57:36 -0000 1.11.2.1 > *************** > *** 8,12 **** > " while preserving filetype indentation. > " > ! " Last Change: Sat Dec 21 10:00 PM 2002 EST > " > " Documentation: {{{ > --- 8,12 ---- > " while preserving filetype indentation. > " > ! " Last Change: Tue Dec 24 04:00 AM 2002 PST > " > " Documentation: {{{ > *************** > *** 179,183 **** > let lastLHSChar = '<space>' > end > ! exe 'inoremap <silent>' (a:ft== '' ? '' : '<buffer>') > \ escape(lastLHSChar, '|') > \ '<C-r>=<SID>LookupCharacter("' . > --- 179,183 ---- > let lastLHSChar = '<space>' > end > ! exe 'inoremap <silent>' (a:ft == '' ? '' : '<buffer>') > \ escape(lastLHSChar, '|') > \ '<C-r>=<SID>LookupCharacter("' . |
From: Srinath A. <sr...@fa...> - 2002-12-28 06:15:13
|
Version 1.9 of templates.vim was also a faulty commit. It has been 'outdated'. PS: Really sorry about these flurry of emails... I shall try not to repeat my mistakes... Srinath On Fri, 27 Dec 2002 sri...@us... wrote: > Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite > In directory sc8-pr-cvs1:/tmp/cvs-serv2611 > > Modified Files: > templates.vim > Log Message: > . Merging changes from the b-newpackages directory. I think we should let > cvs handle the last-changed line. This line is causing havoc in merging. > For example, this file was never changed in the b-newpackages directory > except sometime by mistake the Last Change: line got modified because of > somet update... > |
From: Srinath A. <sr...@fa...> - 2002-12-28 00:22:26
|
I apologize for these really screwed up commits. But fear not, I have repaired the cvs repository itself... version 1.15 of imaps.vim no longer exists. On Fri, 27 Dec 2002 sri...@us... wrote: > Update of /cvsroot/vim-latex/vimfiles/plugin > In directory sc8-pr-cvs1:/tmp/cvs-serv887 > > Modified Files: > imaps.vim > Log Message: > . changes from the b-newpackages branch... > > > Index: imaps.vim > =================================================================== > RCS file: /cvsroot/vim-latex/vimfiles/plugin/imaps.vim,v > retrieving revision 1.14 > retrieving revision 1.15 > diff -C2 -d -r1.14 -r1.15 > *** imaps.vim 24 Dec 2002 12:51:06 -0000 1.14 > --- imaps.vim 27 Dec 2002 22:42:50 -0000 1.15 > *************** > *** 8,12 **** > " while preserving filetype indentation. > " > ! " Last Change: Tue Dec 24 04:00 AM 2002 PST > " > " Documentation: {{{ > --- 8,12 ---- > " while preserving filetype indentation. > " > ! " Last Change: Fri Dec 27 02:00 PM 2002 PST > " > " Documentation: {{{ > > > > > ------------------------------------------------------- > This sf.net email is sponsored by:ThinkGeek > Welcome to geek heaven. > http://thinkgeek.com/sf > _______________________________________________ > Vim-latex-cvs mailing list > Vim...@li... > https://lists.sourceforge.net/lists/listinfo/vim-latex-cvs > > |
From: Srinath A. <sr...@fa...> - 2002-12-28 00:21:05
|
This latest merge from the b-newpackages branch was more painful than it should have been, and its mostly due to some mistakes on my part.. Therefore, so as not to repeat my mistakes in the future, I am preparing a 'cheat-sheet' for branching/merging. These are compiled from: http://www.cvshome.org/docs/manual/cvs.html http://cvsbook.red-bean.com/cvsbook.html NOTE: Not all these steps are mandatory. They are just a good thing to do. Creating a branch: ================== $ cd /path/to/trunk (This is where you have checked out the main trunk. Note, if you want to create branches off branches (not recommended), then you'll want to cd to where you have checked out the branch). $ cvs update (If this shows some errors for non-mergeable files, then you'll need to resolve the conflicts manually). $ cvs diff (If this shows some diffs , then $ cvs commit (If this shows more errors for non-mergeable files, you'll also need to check for conflicts etc). ) $ cvs tag -b b-<branchname> (This is the branch name chosen) Checking out a branch ===================== $ cvs co -r b-<branchname> -d /path/to/branch <modulename> (Note, you can use -z9 before 'co' if you are on a slow connection) (Also, the argument to -d can be relative to the current directory). Preparing a branch for merging into trunk ========================================= $ cd /path/to/branch (This is where you have checked out a copy of the branch). $ cvs update (If this step shows conflicts, then resolve and commit). $ cvs diff (If this part shows some diffs, then $ cvs commit (Again, if this shows conflicts, resolve and commit). ) $ cvs tag b-<branchname>-<authorname>-merge-<mergenumber> (where <mergenumber> is the number of times you have merged from this branch to the trunk <authorname> is your name). The final Merging Step ====================== $ # now for the main trunk $ cd /path/to/main/trunk (This is where you have checked out a copy of the main trunk) $ cvs diff (again, if there are locally modified copies $ cvs commit ) # If this is the first time a merge is being done from this branch onto # the main trunk $ cvs update -d -j b-<branchname> ( Here b-<branchname> is the branch name, not a revision name. This is the name with which the branch was created) # If this is not the first merge from branch to main trunk $ cvs update -d -j b-<branchname>-<author>-merge-<mergenumber> -j b-<branchname> (Note: the first tag refers to a revision tag name, whereas the the second revision is the branch tag). |
From: <sri...@us...> - 2002-12-27 23:01:32
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite In directory sc8-pr-cvs1:/tmp/cvs-serv6341 Modified Files: envmacros.vim Log Message: . changes from the b-newpackages branch Index: envmacros.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/envmacros.vim,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** envmacros.vim 22 Dec 2002 03:00:43 -0000 1.13 --- envmacros.vim 27 Dec 2002 23:01:24 -0000 1.14 *************** *** 3,7 **** " Author: Mikolaj Machowski " Created: Tue Apr 23 08:00 PM 2002 PST ! " Last Change: Thu Dec 19 03:00 AM 2002 PST " " Description: mappings/menus for environments. --- 3,7 ---- " Author: Mikolaj Machowski " Created: Tue Apr 23 08:00 PM 2002 PST ! " Last Change: Tue Dec 24 02:00 AM 2002 PST " " Description: mappings/menus for environments. *************** *** 665,678 **** let l = getline(".") let pack = matchstr(l, '^\s*\zs.*') ! if pack == '' ! let pack = input('Package? ') ! if pack != '' ! return Tex_PutPackage(pack) ! endif ! return 0 ! else ! normal 0D ! return Tex_PutPackage(pack) ! endif endfunction " }}} " Tex_ChangeEnvironments: calls Change() to change the environment {{{ --- 665,670 ---- let l = getline(".") let pack = matchstr(l, '^\s*\zs.*') ! normal! 0"_D ! return Tex_pack_one(pack) endfunction " }}} " Tex_ChangeEnvironments: calls Change() to change the environment {{{ |
From: <sri...@us...> - 2002-12-27 22:59:28
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages In directory sc8-pr-cvs1:/tmp/cvs-serv5661 Modified Files: amsmath eqparbox ifthen Log Message: . changes from the b-newpackages branch. Index: amsmath =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages/amsmath,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** amsmath 22 Dec 2002 03:00:54 -0000 1.3 --- amsmath 27 Dec 2002 22:59:25 -0000 1.4 *************** *** 74,78 **** \.'brd:dbinom,' \.'brd:tbinom,' ! \.'brs:genfrac{<+ldelim+>}{<+rdelim+>}{<+thick+>}{<+style+>}{<+numer+>}{<+denom+>}<++>,' \.'sbr:Commands,' \.'nob:smash,' --- 74,78 ---- \.'brd:dbinom,' \.'brd:tbinom,' ! \.'brs:genfrac{<+ldelim+>}{<+rdelim+>}{<+thick+>}{<+style+>}{<+numer+>}{<+denom+>},' \.'sbr:Commands,' \.'nob:smash,' *************** *** 94,98 **** \.'bra:uproot,' \.'bra:boxed,' ! \.'brs:DeclareMathSymbol{<++>}{<++>}{<++>}{<++>}<++>,' \.'bra:eqref' " vim:ft=vim --- 94,98 ---- \.'bra:uproot,' \.'bra:boxed,' ! \.'brs:DeclareMathSymbol{<++>}{<++>}{<++>}{<++>},' \.'bra:eqref' " vim:ft=vim Index: eqparbox =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages/eqparbox,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** eqparbox 22 Dec 2002 03:00:57 -0000 1.2 --- eqparbox 27 Dec 2002 22:59:25 -0000 1.3 *************** *** 2,6 **** let g:TeX_package_eqparbox = ! \ 'brs:eqparbox[<+pos+>][<+height+>][<+inner-pos+>]{<+tag+>}{<+text+>}<++>,' \.'bra:eqboxwidth' --- 2,6 ---- let g:TeX_package_eqparbox = ! \ 'brs:eqparbox[<+pos+>][<+height+>][<+inner-pos+>]{<+tag+>}{<+text+>},' \.'bra:eqboxwidth' Index: ifthen =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages/ifthen,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ifthen 22 Dec 2002 03:01:02 -0000 1.2 --- ifthen 27 Dec 2002 22:59:25 -0000 1.3 *************** *** 1,5 **** let g:TeX_package_option_ifthen = '' ! let g:TeX_package_color = \ 'brs:ifthenelse{<++>}{<++>}{<++>},' \.'brd:equal,' --- 1,5 ---- let g:TeX_package_option_ifthen = '' ! let g:TeX_package_ifthen = \ 'brs:ifthenelse{<++>}{<++>}{<++>},' \.'brd:equal,' |
From: <sri...@us...> - 2002-12-27 22:55:47
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite In directory sc8-pr-cvs1:/tmp/cvs-serv3810 Modified Files: main.vim Log Message: . merging changes from the b-newpackages branch. Index: main.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/main.vim,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** main.vim 26 Dec 2002 23:51:25 -0000 1.21 --- main.vim 27 Dec 2002 22:55:44 -0000 1.22 *************** *** 4,8 **** " Email: sr...@fa... " URL: ! " Last Change: Thu Dec 26 03:00 PM 2002 PST " " Help: --- 4,8 ---- " Email: sr...@fa... " URL: ! " Last Change: Fri Dec 27 02:00 PM 2002 PST " " Help: *************** *** 358,367 **** " i.e if main.tex.latexmain exists, then returns: " d:/path/to/main ! function! Tex_GetMainFileName() let curd = getcwd() exe 'cd '.expand('%:p:h') let lheadfile = glob('*.latexmain') if lheadfile != '' ! let lheadfile = fnamemodify(lheadfile, ':p:r:r') endif exe 'cd '.curd --- 358,372 ---- " i.e if main.tex.latexmain exists, then returns: " d:/path/to/main ! function! Tex_GetMainFileName(...) ! if a:0 > 0 ! let modifier = a:1 ! else ! let modifier = ':p:r:r' ! endif let curd = getcwd() exe 'cd '.expand('%:p:h') let lheadfile = glob('*.latexmain') if lheadfile != '' ! let lheadfile = fnamemodify(lheadfile, modifier) endif exe 'cd '.curd |
From: <sri...@us...> - 2002-12-27 22:47:49
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite In directory sc8-pr-cvs1:/tmp/cvs-serv2611 Modified Files: templates.vim Log Message: . Merging changes from the b-newpackages directory. I think we should let cvs handle the last-changed line. This line is causing havoc in merging. For example, this file was never changed in the b-newpackages directory except sometime by mistake the Last Change: line got modified because of somet update... Index: templates.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/templates.vim,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** templates.vim 23 Dec 2002 01:59:18 -0000 1.8 --- templates.vim 27 Dec 2002 22:47:46 -0000 1.9 *************** *** 88,102 **** " A function only puts one item into the search history... ! call Tex_CleanSearchHistory() endif endfunction function! <SID>Exec(what) ! exec 'return '.a:what endfunction " Back-Door to trojans !!! function! <SID>Compute(what) ! exe a:what if exists('s:comTemp') return s:comTemp.s:comTemp --- 88,102 ---- " A function only puts one item into the search history... ! call Tex_CleanSearchHistory() endif endfunction function! <SID>Exec(what) ! exec 'return '.a:what endfunction " Back-Door to trojans !!! function! <SID>Compute(what) ! exe a:what if exists('s:comTemp') return s:comTemp.s:comTemp *************** *** 109,116 **** com! -nargs=? TTemplate :call <SID>ReadTemplate(<f-args>) ! \| :call <SID>ProcessTemplate() ! \| :0 ! \| :exec "normal! i\<C-r>=IMAP_Jumpfunc('', 1)\<CR>" ! \| :startinsert " vim:fdm=marker:ts=4:sw=4:noet --- 109,116 ---- com! -nargs=? TTemplate :call <SID>ReadTemplate(<f-args>) ! \| :call <SID>ProcessTemplate() ! \| :0 ! \| :exec "normal! i\<C-r>=IMAP_Jumpfunc('', 1)\<CR>" ! \| :startinsert " vim:fdm=marker:ts=4:sw=4:noet |
From: <sri...@us...> - 2002-12-27 22:42:52
|
Update of /cvsroot/vim-latex/vimfiles/plugin In directory sc8-pr-cvs1:/tmp/cvs-serv887 Modified Files: imaps.vim Log Message: . changes from the b-newpackages branch... Index: imaps.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/plugin/imaps.vim,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** imaps.vim 24 Dec 2002 12:51:06 -0000 1.14 --- imaps.vim 27 Dec 2002 22:42:50 -0000 1.15 *************** *** 8,12 **** " while preserving filetype indentation. " ! " Last Change: Tue Dec 24 04:00 AM 2002 PST " " Documentation: {{{ --- 8,12 ---- " while preserving filetype indentation. " ! " Last Change: Fri Dec 27 02:00 PM 2002 PST " " Documentation: {{{ |
From: <sri...@us...> - 2002-12-27 22:41:15
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite In directory sc8-pr-cvs1:/tmp/cvs-serv31444 Modified Files: packages.vim Log Message: . merging changes from the b-newpackages branch. This merge is proving to be a huge pain. Somehow all that concurrent developement on the main trunk and the branch is screwing things up... Dont know why cvs gives me a lot of 'nonmergable' file errors. Index: packages.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages.vim,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** packages.vim 22 Dec 2002 03:00:47 -0000 1.16 --- packages.vim 27 Dec 2002 22:41:11 -0000 1.17 *************** *** 3,7 **** " Author: Mikolaj Machowski " Created: Tue Apr 23 06:00 PM 2002 PST ! " Last Change: Thu Dec 19 03:00 AM 2002 PST " " Description: handling packages from within vim --- 3,7 ---- " Author: Mikolaj Machowski " Created: Tue Apr 23 06:00 PM 2002 PST ! " Last Change: Fri Dec 27 02:00 PM 2002 PST " " Description: handling packages from within vim *************** *** 14,27 **** let s:doneOnce = 1 - " Level of Packages menu: - let s:p_menu_lev = g:Tex_PackagesMenuLocation - let s:path = expand("<sfile>:p:h") let s:menu_div = 20 ! com! -nargs=* TPackage call Tex_pack_one(<f-args>) com! -nargs=0 TPackageUpdate :silent! call Tex_pack_updateall() com! -nargs=0 TPackageUpdateAll :silent! call Tex_pack_updateall() let g:Tex_package_supported = '' let g:Tex_package_detected = '' --- 14,28 ---- let s:doneOnce = 1 let s:path = expand("<sfile>:p:h") + let s:menu_div = 20 ! com! -nargs=* TPackage :normal! i<C-r>=Tex_pack_one(<f-args>)<CR> com! -nargs=0 TPackageUpdate :silent! call Tex_pack_updateall() com! -nargs=0 TPackageUpdateAll :silent! call Tex_pack_updateall() + imap <silent> <plug> <Nop> + nmap <silent> <plug> i + let g:Tex_package_supported = '' let g:Tex_package_detected = '' *************** *** 40,43 **** --- 41,45 ---- exe 'setlocal dict+='.s:path.'/dictionaries/'.a:package if !has("gui_running") && filereadable(s:path.'/dictionaries/'.a:package) + \ && g:Tex_package_supported !~ a:package let g:Tex_package_supported = g:Tex_package_supported.','.a:package endif *************** *** 50,54 **** function! Tex_pack_uncheck(package) if has("gui_running") && filereadable(s:path.'/packages/'.a:package) ! exe 'silent! aunmenu '.s:p_menu_lev.'&'.a:package endif if filereadable(s:path.'/dictionaries/'.a:package) --- 52,58 ---- function! Tex_pack_uncheck(package) if has("gui_running") && filereadable(s:path.'/packages/'.a:package) ! exe 'silent! aunmenu '.g:Tex_PackagesMenuLocation.'-sep'.a:package.'-' ! exe 'silent! aunmenu '.g:Tex_PackagesMenuLocation.a:package.'\ Options' ! exe 'silent! aunmenu '.g:Tex_PackagesMenuLocation.a:package.'\ Commands' endif if filereadable(s:path.'/dictionaries/'.a:package) *************** *** 58,62 **** " }}} ! " Tex_pack_updateall: {{{ function! Tex_pack_updateall() if exists('g:Tex_package_supported') --- 62,66 ---- " }}} ! " Tex_pack_updateall: updates the TeX-Packages menu {{{ function! Tex_pack_updateall() if exists('g:Tex_package_supported') *************** *** 79,112 **** " }}} ! " Tex_pack_one: {{{ ! " Reads command-line and adds appropriate \usepackage lines function! Tex_pack_one(...) ! if a:0 == 0 let pwd = getcwd() exe 'cd '.s:path.'/packages' let packname = Tex_ChooseFile('Choose a package: ') exe 'cd '.pwd ! call Tex_pack_check(packname) ! return Tex_pack_supp(packname) ! elseif a:0 == 1 ! if filereadable(s:path.'/packages/'.a:1) ! return Tex_pack_supp(a:1) endif else ! let i = a:0 let omega = 1 ! while omega <= i ! exe 'let packname = a:'.omega if filereadable(s:path.'/packages/'.packname) call Tex_pack_check(packname) ! exe 'normal ko\usepackage{'.packname."}\<Esc>" ! let omega = omega + 1 endif endwhile endif endfunction " }}} ! " Tex_pack_all: scans the current file for \\usepackage{ lines {{{ ! " and loads the corresponding package options as menus. function! Tex_pack_all() --- 83,128 ---- " }}} ! " Tex_pack_one: supports each package in the argument list.{{{ ! " Description: ! " If no arguments are supplied, then the user is asked to choose from the ! " packages found in the packages/ directory function! Tex_pack_one(...) ! if a:0 == 0 || (a:0 > 0 && a:1 == '') let pwd = getcwd() exe 'cd '.s:path.'/packages' let packname = Tex_ChooseFile('Choose a package: ') exe 'cd '.pwd ! if packname != '' ! return Tex_pack_one(packname) ! else ! return '' endif else ! " Support the packages supplied. This function can be called with ! " multiple arguments in which case, support each of them in turn. ! let retVal = '' let omega = 1 ! while omega <= a:0 ! let packname = a:{omega} if filereadable(s:path.'/packages/'.packname) call Tex_pack_check(packname) ! if exists('g:TeX_package_option_'.packname) ! \ && g:TeX_package_option_{packname} != '' ! let retVal = retVal.'\usepackage[<++>]{'.packname.'}<++>' ! else ! let retVal = retVal.'\usepackage{'.packname.'}'."\<CR>" ! endif ! else ! let retVal = retVal.'\usepackage{'.packname.'}'."\<CR>" endif + let omega = omega + 1 endwhile + return IMAP_PutTextWithMovement(substitute(retVal, "\<CR>$", '', ''), '<+', '+>') endif endfunction " }}} ! " Tex_pack_all: scans the current file for \usepackage{} lines {{{ ! " and if supported, loads the options and commands found in the ! " corresponding package file. function! Tex_pack_all() *************** *** 115,127 **** if Tex_GetMainFileName() != '' ! let cwd = getcwd() ! let fname = Tex_GetMainFileName() ! if glob(fname.'.tex') != '' ! let fname = fname.'.tex' ! elseif glob(fname) != '' ! let fname = '' ! else ! let fname = currfile ! endif else let fname = currfile --- 131,135 ---- if Tex_GetMainFileName() != '' ! let fname = Tex_GetMainFileName(':p:r') else let fname = currfile *************** *** 158,167 **** endif let g:Tex_package_detected = g:Tex_package_detected.' '.pname ! call Tex_pack_check(pname) let i = i + 1 endwhile elseif oldpack != packname let g:Tex_package_detected = g:Tex_package_detected.' '.packname ! call Tex_pack_check(packname) endif let oldpack = packname --- 166,175 ---- endif let g:Tex_package_detected = g:Tex_package_detected.' '.pname ! call Tex_pack_one(pname) let i = i + 1 endwhile elseif oldpack != packname let g:Tex_package_detected = g:Tex_package_detected.' '.packname ! call Tex_pack_one(packname) endif let oldpack = packname *************** *** 175,205 **** " }}} ! " Tex_pack_supp_menu: sets up a menu for packages found in packages/ {{{ ! " groups the packages thus found into groups of 20... function! Tex_pack_supp_menu() ! let g:suplist = glob(s:path."/packages/*") ! let g:suplist = substitute(g:suplist, "\n", ',', 'g') ! let nu_s_list = GetListCount(g:suplist) ! if nu_s_list <= s:menu_div ! let SupMenu = '' ! let NotSupMenu = 1 ! endif ! let basic_nu_s_list = 0 ! let OptMenu = '' ! while basic_nu_s_list < nu_s_list ! let s_item = GetListItem(g:suplist, basic_nu_s_list) ! let fptr = fnamemodify(s_item, ':p:t:r') ! let fpt = fnamemodify(s_item, ':p:t') ! if !exists('NotSupMenu') && basic_nu_s_list % s:menu_div == 0 ! let s_index = strpart(fptr, 0, 5) ! if strlen(s_item) > 5 ! let OptMenu = '.'.s_index.'\.\.\.\ -' ! else ! let OptMenu = '.'.s_index.'\ -' ! endif ! endif ! exe 'amenu '.s:p_menu_lev.'&Supported'.OptMenu.'.&'.fptr." :call Tex_pack_supp('".fpt."')<CR>" ! let basic_nu_s_list = basic_nu_s_list + 1 ! endwhile endfunction --- 183,200 ---- " }}} ! " Tex_pack_supp_menu: sets up a menu for package files {{{ ! " found in the packages directory groups the packages thus found into groups ! " of 20... function! Tex_pack_supp_menu() ! ! let pwd = getcwd() ! exec 'cd '.s:path.'/packages' ! let suplist = glob("*") ! exec 'cd '.pwd ! ! let suplist = substitute(suplist, "\n", ',', 'g').',' ! ! call Tex_MakeSubmenu(suplist, g:Tex_PackagesMenuLocation.'Supported.', ! \ '<plug><C-r>=Tex_pack_one("', '")<CR>') endfunction *************** *** 207,394 **** " Tex_pack: loads the options (and commands) for the given package {{{ function! Tex_pack(pack) ! let basic_nu_p_list = '' ! let nu_p_list = '' ! let g:p_file = s:path . '/packages/' . a:pack ! if filereadable(g:p_file) ! "exe 'source ' . g:p_file ! exe 'let g:p_list = g:TeX_package_' . a:pack ! exe 'let g:p_o_list = g:TeX_package_option_' . a:pack - " Creating package.Option menu {{{ - if exists('g:p_o_list') && g:p_o_list != '' - let nu_p_o_list = GetListCount(g:p_o_list) - if nu_p_o_list <= s:menu_div - let OptMenu = '' - let NotOptMenu = 1 - endif - if nu_p_o_list == 1 - let p_o_delimiter = '' - else - let p_o_delimiter = ',' - endif - let basic_nu_p_o_list = 0 - let o_loop_nu = 0 - while basic_nu_p_o_list < nu_p_o_list - let p_o_item = GetListItem(g:p_o_list, basic_nu_p_o_list) - let p_o_item_def = strpart(p_o_item, 0, 3) - let p_o_item_name = substitute(p_o_item, '^...:', '', '') - if !exists('NotOptMenu') && (o_loop_nu % s:menu_div == 0 || p_o_item_def == 'sbr') - if p_o_item_def == 'sbr' - let OptMenu = '.&'.p_o_item_name - let o_loop_nu = 1 - let basic_nu_p_o_list = basic_nu_p_o_list + 1 - let p_o_item = GetListItem(g:p_o_list, basic_nu_p_o_list) - else - let ost_index = strpart(p_o_item_name, 0, 4) - if strlen(p_o_item_name) > 5 - let OptMenu = '.'.ost_index.'\.\.\.\ -' - else - let OptMenu = '.'.ost_index.'\ -' - endif - endif - endif - let l_m_p_o_item = '&'.substitute(p_o_item, '<++>', '', '') - let p_o_end = p_o_item[strlen(p_o_item) - 1] - if p_o_end !~ "[a-zA-Z}]" - let r_m_p_o_item = "<plug><C-r>=IMAP_PutTextWithMovement('".p_o_item.'<++>'.p_o_delimiter."<++>')<cr>" - elseif p_o_end == '}' - let r_m_p_o_item = "<plug><C-r>=IMAP_PutTextWithMovement('".p_o_item.p_o_delimiter."<++>')<cr>" - else - let r_m_p_o_item = '<plug>'.p_o_item.p_o_delimiter - endif - exe 'amenu '.s:p_menu_lev.'&'.a:pack.'.&Options'.OptMenu.'.'.l_m_p_o_item.' '.r_m_p_o_item - let basic_nu_p_o_list = basic_nu_p_o_list + 1 - let o_loop_nu = o_loop_nu + 1 - endwhile - endif " }}} - " Creating package.Command menu {{{ - let nu_p_list = GetListCount(g:p_list) - if nu_p_list <= s:menu_div - let ComMenu = '' - let NotComMenu = 1 endif - let basic_nu_p_list = 0 - let loop_nu = 0 - while basic_nu_p_list < nu_p_list - let p_item = GetListItem(g:p_list, basic_nu_p_list) - let p_item_def = strpart(p_item, 0, 3) - let p_item_name = substitute(p_item, '^...:', '', '') - if !exists('NotComMenu') && p_item_def == 'sbr' - let ComMenu = '.&'.p_item_name - let loop_nu = 1 - let basic_nu_p_list = basic_nu_p_list + 1 - let p_item = GetListItem(g:p_list, basic_nu_p_list) - let p_item_def = strpart(p_item, 0, 3) - let p_item_name = substitute(p_item, '^...:', '', '') - endif - " testing command type {{{ - if p_item_def == 'bra' - let com_type = '{}' - let l_m_item = '\\&'.p_item_name.'{}' - let r_m_item = "<plug><C-r>=IMAP_PutTextWithMovement('\\".p_item_name."{<++>}<++>')<cr>" - elseif p_item_def == 'brs' - let com_type = '{}' - let l_m_item = '\\&'.substitute(p_item_name, "[<++><++>]", '', 'g') - let r_m_item = "<plug><C-r>=IMAP_PutTextWithMovement('\\".p_item_name."<++>')<cr>" - elseif p_item_def == 'brd' - let com_type = '{}{}' - let l_m_item = '\\&'.p_item_name.'{}{}' - let r_m_item = "<plug><C-r>=IMAP_PutTextWithMovement('\\".p_item_name."{<++>}{<++>}<++>')<cr>" - elseif p_item_def == 'sep' - let com_type = '' - let l_m_item = '-packsep'.basic_nu_p_list.'-' - let r_m_item = ':' - elseif p_item_def == 'env' - let com_type = '(E)' - let l_m_item = '&'.p_item_name.'(E)' - let r_m_item = '<plug>\begin{'.p_item_name.'}<cr> <cr>\end{'.p_item_name.'}<++><Up><Left>' - elseif p_item_def == 'ens' - let com_type = '(E)' - let p_env_spec = substitute(p_item_name, '.*:', '', '') - let p_env_name = matchstr(p_item_name, '^[^:]*') - let l_m_item = '&'.p_env_name.'(E)' - let r_m_item = '<plug>\begin{'.p_env_name.'}'.p_env_spec.'<cr><++><cr>\end{'.p_env_name.'}<++><Up><Up><C-j>' - elseif p_item_def == 'eno' - let com_type = '(E)' - let l_m_item = '&'.p_item_name.'(E)' - let r_m_item = '<plug>\begin[<++>]{'.p_item_name.'}<cr><++><cr>\end{'.p_item_name.'}<++><Up><Up><C-j>' - elseif p_item_def == 'nor' - let com_type = "\\\\'" - let l_m_item = '\\&'.p_item_name."'" - let r_m_item = "<plug>\\".p_item_name.' ' - elseif p_item_def == 'noo' - let com_type = '\\[]' - let l_m_item = '\\&'.p_item_name.'[]' - let r_m_item = "<plug><C-r>=IMAP_PutTextWithMovement('\\".p_item_name."[<++>]<++>')<cr>" - elseif p_item_def == 'nob' - let com_type = '[]{}' - let l_m_item = '\\&'.p_item_name.'[]{}' - let r_m_item = "<plug><C-r>=IMAP_PutTextWithMovement('\\".p_item_name."[<++>]{<++>}<++>')<cr>" - elseif p_item_def == 'pla' - let com_type = '(p)' - let l_m_item = '&'.p_item_name."'" - let r_m_item = '<plug>'.p_item_name.' ' - elseif p_item_def == 'spe' - let com_type = '(s)' - let l_m_item = '&'.p_item_name - let r_m_item = '<plug>'.p_item_name - else - let com_type = '\\' - let l_m_item = '\\&'.p_item_name - let r_m_item = "<plug>\\".p_item_name - endif " }}} - if !exists('NotComMenu') && loop_nu % s:menu_div == 0 - let st_index = strpart(p_item_name, 0, 4) - if strlen(p_item_name) > 4 - let ComMenu = '.'.com_type.'&'.st_index.'\.\.\.\ -' - else - let ComMenu = '.'.com_type.'&'.st_index.'\ -' - endif - endif - exe 'amenu '.s:p_menu_lev.'&'.a:pack.ComMenu.'.'.l_m_item.' '.r_m_item - let basic_nu_p_list = basic_nu_p_list + 1 - let loop_nu = loop_nu + 1 - endwhile " }}} endif endfunction " }}} ! " Tex_pack_supp: "supports" the package... {{{ ! function! Tex_pack_supp(supp_pack) ! call Tex_pack_check(a:supp_pack) ! exe 'let g:s_p_o = g:TeX_package_option_'.a:supp_pack ! if exists('g:s_p_o') && g:s_p_o != '' ! exe 'normal i\usepackage{'.a:supp_pack.'}<++>' ! exe 'normal F{i[]'."\<Right>" else ! exe 'normal i\usepackage{'.a:supp_pack."}\<cr>" endif ! if g:Tex_package_supported == '' ! let g:Tex_package_supported = a:supp_pack else ! let g:Tex_package_supported = g:Tex_package_supported.','.a:supp_pack endif - endfunction " }}} ! " Tex_PutPackage: inserts package from line {{{ ! " (see Tex_package_from_line in envmacros.vim) ! function! Tex_PutPackage(package) ! if filereadable(s:path.'/packages/'.a:package) ! call Tex_pack_supp(a:package) else ! exe 'normal i\usepackage{'.a:package."}\<Esc>$" endif - call Tex_pack_updateall() - endfunction " }}} ! if g:Tex_Menus ! exe 'amenu '.s:p_menu_lev.'&UpdatePackage :call Tex_pack(expand("<cword>"))<cr>' ! exe 'amenu '.s:p_menu_lev.'&UpdateAll :call Tex_pack_updateall()<cr>' ! call Tex_pack_supp_menu() ! call Tex_pack_all() endif --- 202,387 ---- " Tex_pack: loads the options (and commands) for the given package {{{ function! Tex_pack(pack) ! if exists('g:TeX_package_'.a:pack) ! ! exec 'amenu '.g:Tex_PackagesMenuLocation.'-sep'.a:pack.'- <Nop>' ! let optionList = g:TeX_package_option_{a:pack}.',' ! ! if optionList != '' ! ! let mainMenuName = g:Tex_PackagesMenuLocation.a:pack.'\ Options.' ! call s:GroupPackageMenuItems(optionList, mainMenuName, ! \ '<plug><C-r>=IMAP_PutTextWithMovement("', ',")<CR>') endif + let commandList = g:TeX_package_{a:pack} + if commandList != '' + + let mainMenuName = g:Tex_PackagesMenuLocation.a:pack.'\ Commands.' + call s:GroupPackageMenuItems(commandList, mainMenuName, + \ '<plug><C-r>=Tex_ProcessPackageCommand("', '")<CR>', + \ '<SID>FilterPackageMenuLHS') + endif endif endfunction " }}} ! ! " ============================================================================== ! " Menu Functions ! " Creating menu items for the all the package files found in the packages/ ! " directory as well as creating menus for each supported package found in the ! " preamble. ! " ============================================================================== ! " Tex_MakeSubmenu: makes a submenu given a list of items {{{ ! " Description: ! " This function takes a comma seperated list of menu items and creates a ! " 'grouped' menu. i.e, it groups the items into s:menu_div items each and ! " puts them in submenus of the given mainMenu. ! " Each menu item is linked to the HandlerFunc. ! " If an additional argument is supplied, then it is used to filter each of ! " the menu items to generate better names for the menu display. ! " ! function! Tex_MakeSubmenu(menuList, mainMenuName, ! \ handlerFuncLHS, handlerFuncRHS, ...) ! ! let extractFunction = (a:0 > 0 ? a:1 : '' ) ! let menuList = substitute(a:menuList, '[^,]$', ',', '') ! ! let doneMenuSubmenu = 0 ! ! while menuList != '' ! ! " Extract upto s:menu_div menus at once. ! let menuBunch = matchstr(menuList, '\v(.{-},){,'.s:menu_div.'}') ! ! " The remaining menus go into the list. ! let menuList = strpart(menuList, strlen(menuBunch)) ! ! let submenu = '' ! " If there is something remaining, then we got s:menu_div items. ! " therefore put these menu items into a submenu. ! if strlen(menuList) || doneMenuSubmenu ! exec 'let firstMenu = '.extractFunction."(matchstr(menuBunch, '\\v^.{-}\\ze,'))" ! exec 'let lastMenu = '.extractFunction."(matchstr(menuBunch, '\\v[^,]{-}\\ze,$'))" ! ! let submenu = firstMenu.'\ \-\ '.lastMenu.'.' ! ! let doneMenuSubmenu = 1 ! endif ! ! " Now for each menu create a menu under the submenu ! let i = 1 ! let menuName = Tex_Strntok(menuBunch, ',', i) ! while menuName != '' ! exec 'let menuItem = '.extractFunction.'(menuName)' ! execute 'amenu '.a:mainMenuName.submenu.menuItem ! \ ' '.a:handlerFuncLHS.menuName.a:handlerFuncRHS ! ! let i = i + 1 ! let menuName = Tex_Strntok(menuBunch, ',', i) ! endwhile ! endwhile ! endfunction ! ! " }}} ! " GroupPackageMenuItems: uses the sbr: to split menus into groups {{{ ! " Description: ! " This function first splits up the menuList into groups based on the ! " special sbr: tag and then calls Tex_MakeSubmenu ! " ! function! <SID>GroupPackageMenuItems(menuList, menuName, ! \ handlerFuncLHS, handlerFuncRHS,...) ! ! if a:0 > 0 ! let extractFunction = a:1 else ! let extractFunction = '' endif ! let menuList = a:menuList ! ! while matchstr(menuList, 'sbr:') != '' ! let groupName = matchstr(menuList, '\v^sbr:\zs.{-}\ze,') ! let menuList = strpart(menuList, strlen('sbr:'.groupName.',')) ! if matchstr(menuList, 'sbr:') != '' ! let menuGroup = matchstr(menuList, '\v^.{-},\zesbr:') ! else ! let menuGroup = menuList ! endif ! ! call Tex_MakeSubmenu(menuGroup, a:menuName.groupName.'.', ! \ a:handlerFuncLHS, a:handlerFuncRHS, extractFunction) ! ! let menuList = strpart(menuList, strlen(menuGroup)) ! endwhile ! ! call Tex_MakeSubmenu(menuList, a:menuName, ! \ a:handlerFuncLHS, a:handlerFuncRHS, extractFunction) ! ! endfunction " }}} ! " Definition of what to do for various package commands {{{ ! let s:CommandSpec_bra = '\<+replace+>{<++>}<++>' ! let s:CommandSpec_brs = '\<+replace+><++>' ! let s:CommandSpec_brd = '\<+replace+>{<++>}{<++>}<++>' ! let s:CommandSpec_env = '\begin{<+replace+>}'."\<CR><++>\<CR>".'\end{<+replace+>}<++>' ! let s:CommandSpec_ens = '\begin{<+replace+>}<+extra+>'."\<CR><++>\<CR>".'\end{<+replace+>}<++>' ! let s:CommandSpec_eno = '\begin[<++>]{<+replace+>}'."\<CR><++>\<CR>".'\end{<+replace+>}' ! let s:CommandSpec_nor = '\<+replace+>' ! let s:CommandSpec_noo = '\<+replace+>[<++>]' ! let s:CommandSpec_nob = '\<+replace+>[<++>]{<++>}{<++>}<++>' ! let s:CommandSpec_spe = '<+replace+>' ! let s:CommandSpec_ = '\<+replace+>' ! ! let s:MenuLHS_bra = '\\&<+replace+>{}' ! let s:MenuLHS_brs = '\\&<+replace+>{}' ! let s:MenuLHS_brd = '\\&<+replace+>{}{}' ! let s:MenuLHS_env = '&<+replace+>\ (E)' ! let s:MenuLHS_ens = '&<+replace+>\ (E)' ! let s:MenuLHS_eno = '&<+replace+>\ (E)' ! let s:MenuLHS_nor = '\\&<+replace+>' ! let s:MenuLHS_noo = '\\&<+replace+>[]' ! let s:MenuLHS_nob = '\\&<+replace+>[]{}{}' ! let s:MenuLHS_spe = '&<+replace+>' ! let s:MenuLHS_sep = '-sep<+replace+>-' ! let s:MenuLHS_ = '\\&<+replace+>' ! " }}} ! " Tex_ProcessPackageCommand: processes a command from the package menu {{{ ! " Description: ! function! Tex_ProcessPackageCommand(command) ! if a:command =~ ':' ! let commandType = matchstr(a:command, '^\w\+\ze:') ! let commandName = matchstr(a:command, '^\w\+:\zs[^:]\+\ze:\?') ! let extrapart = strpart(a:command, strlen(commandType.':'.commandName.':')) else ! let commandType = '' ! let commandName = a:command ! let extrapart = '' endif + let command = s:CommandSpec_{commandType} + let command = substitute(command, '<+replace+>', commandName, 'g') + let command = substitute(command, '<+extra+>', extrapart, 'g') + return IMAP_PutTextWithMovement(command) + endfunction " }}} ! " FilterPackageMenuLHS: filters the command description to provide a better menu item {{{ ! " Description: ! function! <SID>FilterPackageMenuLHS(command) ! let commandType = matchstr(a:command, '^\w\+\ze:') ! if commandType != '' ! let commandName = strpart(a:command, strlen(commandType.':')) else ! let commandName = a:command endif ! return substitute(s:MenuLHS_{commandType}, '<+replace+>', commandName, 'g') ! endfunction " }}} ! if g:Tex_Menus ! exe 'amenu '.g:Tex_PackagesMenuLocation.'&UpdatePackage :call Tex_pack(expand("<cword>"))<cr>' ! exe 'amenu '.g:Tex_PackagesMenuLocation.'&UpdateAll :call Tex_pack_updateall()<cr>' ! call Tex_pack_supp_menu() ! call Tex_pack_all() endif |
From: <sri...@us...> - 2002-12-27 21:57:39
|
Update of /cvsroot/vim-latex/vimfiles/plugin In directory sc8-pr-cvs1:/tmp/cvs-serv20120 Modified Files: Tag: b-newpackages imaps.vim Log Message: . making IMAP() create global map, not buffer local. This commit might also cause a conflict... Index: imaps.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/plugin/imaps.vim,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** imaps.vim 22 Dec 2002 03:39:06 -0000 1.11 --- imaps.vim 27 Dec 2002 21:57:36 -0000 1.11.2.1 *************** *** 8,12 **** " while preserving filetype indentation. " ! " Last Change: Sat Dec 21 10:00 PM 2002 EST " " Documentation: {{{ --- 8,12 ---- " while preserving filetype indentation. " ! " Last Change: Tue Dec 24 04:00 AM 2002 PST " " Documentation: {{{ *************** *** 179,183 **** let lastLHSChar = '<space>' end ! exe 'inoremap <silent>' (a:ft== '' ? '' : '<buffer>') \ escape(lastLHSChar, '|') \ '<C-r>=<SID>LookupCharacter("' . --- 179,183 ---- let lastLHSChar = '<space>' end ! exe 'inoremap <silent>' (a:ft == '' ? '' : '<buffer>') \ escape(lastLHSChar, '|') \ '<C-r>=<SID>LookupCharacter("' . |
From: <sri...@us...> - 2002-12-27 21:54:54
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages In directory sc8-pr-cvs1:/tmp/cvs-serv19514 Modified Files: Tag: b-newpackages amsmath Log Message: removing the trailing <++> from the brs: definition. Index: amsmath =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages/amsmath,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** amsmath 22 Dec 2002 03:00:54 -0000 1.3 --- amsmath 27 Dec 2002 21:54:51 -0000 1.3.2.1 *************** *** 74,78 **** \.'brd:dbinom,' \.'brd:tbinom,' ! \.'brs:genfrac{<+ldelim+>}{<+rdelim+>}{<+thick+>}{<+style+>}{<+numer+>}{<+denom+>}<++>,' \.'sbr:Commands,' \.'nob:smash,' --- 74,78 ---- \.'brd:dbinom,' \.'brd:tbinom,' ! \.'brs:genfrac{<+ldelim+>}{<+rdelim+>}{<+thick+>}{<+style+>}{<+numer+>}{<+denom+>},' \.'sbr:Commands,' \.'nob:smash,' *************** *** 94,98 **** \.'bra:uproot,' \.'bra:boxed,' ! \.'brs:DeclareMathSymbol{<++>}{<++>}{<++>}{<++>}<++>,' \.'bra:eqref' " vim:ft=vim --- 94,98 ---- \.'bra:uproot,' \.'bra:boxed,' ! \.'brs:DeclareMathSymbol{<++>}{<++>}{<++>}{<++>},' \.'bra:eqref' " vim:ft=vim |
From: <sri...@us...> - 2002-12-27 21:53:44
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages In directory sc8-pr-cvs1:/tmp/cvs-serv19215 Modified Files: Tag: b-newpackages eqparbox Log Message: removing the trailing <++> from a brs: definition. Index: eqparbox =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/packages/eqparbox,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** eqparbox 22 Dec 2002 03:00:57 -0000 1.2 --- eqparbox 27 Dec 2002 21:53:41 -0000 1.2.2.1 *************** *** 2,6 **** let g:TeX_package_eqparbox = ! \ 'brs:eqparbox[<+pos+>][<+height+>][<+inner-pos+>]{<+tag+>}{<+text+>}<++>,' \.'bra:eqboxwidth' --- 2,6 ---- let g:TeX_package_eqparbox = ! \ 'brs:eqparbox[<+pos+>][<+height+>][<+inner-pos+>]{<+tag+>}{<+text+>},' \.'bra:eqboxwidth' |
From: <sri...@us...> - 2002-12-27 21:27:03
|
Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite In directory sc8-pr-cvs1:/tmp/cvs-serv10353 Modified Files: Tag: b-newpackages templates.vim Log Message: . Using the new syntax for IMAP_Jumpfunc(). TODO: There still a bug in this... Doing a :startinsert is simply not sufficient. Sometimes we might want to be left in select mode. The latest version on the main branch should fix this. This commit might cause a conflict... Index: templates.vim =================================================================== RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/templates.vim,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** templates.vim 22 Dec 2002 03:00:49 -0000 1.7 --- templates.vim 27 Dec 2002 21:27:01 -0000 1.7.2.1 *************** *** 5,9 **** " Version: 1.0 " Created: Tue Apr 23 05:00 PM 2002 PST ! " Last Change: Thu Dec 19 03:00 AM 2002 PST " " Description: functions for handling templates in latex-suite/templates --- 5,9 ---- " Version: 1.0 " Created: Tue Apr 23 05:00 PM 2002 PST ! " Last Change: Sun Dec 22 03:00 PM 2002 PST " " Description: functions for handling templates in latex-suite/templates *************** *** 30,34 **** \":call <SID>ReadTemplate('".fnameshort."')<CR>". \":call <SID>ProcessTemplate()<CR>:0<CR>". ! \"i<C-r>=IMAP_Jumpfunc()<CR>" let i = i + 1 endwhile --- 30,34 ---- \":call <SID>ReadTemplate('".fnameshort."')<CR>". \":call <SID>ProcessTemplate()<CR>:0<CR>". ! \"i<C-r>=IMAP_Jumpfunc('', 1)<CR>" let i = i + 1 endwhile *************** *** 87,91 **** \| :call <SID>ProcessTemplate() \| :0 ! \| :exec "normal! i\<C-r>=IMAP_Jumpfunc()\<CR>" \| :startinsert --- 87,91 ---- \| :call <SID>ProcessTemplate() \| :0 ! \| :exec "normal! i\<C-r>=IMAP_Jumpfunc('', 1)\<CR>" \| :startinsert |