[Vim-latex-cvs] vimfiles/ftplugin/latex-suite texmenuconf.vim,1.16,1.17 texrc,1.30,1.31

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

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

Modified Files:
	texmenuconf.vim texrc 
Log Message:
Change: Peter Heslin (maintaining the cream port of latex-suite says that
        the Windows menu from cream appears in the middle of the
        latex-suite menus). A new variable g:Tex_MainMenuLocation is used
        to find the location of the latex-suite menus.


Index: texmenuconf.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/texmenuconf.vim,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** texmenuconf.vim	30 May 2003 04:30:52 -0000	1.16
--- texmenuconf.vim	16 Jul 2003 05:17:04 -0000	1.17
***************
*** 3,6 ****
--- 3,7 ----
  "      Author: Srinath Avadhanula <sr...@fa...>
  " Description: 
+ "         CVS: $Id$
  " 
  "=============================================================================
***************
*** 12,74 ****
  let s:mapleader = exists('mapleader') ? mapleader : "\\"
  
  if g:Tex_NestPackagesMenu
! 	let g:Tex_PackagesMenuLocation = '81.10 '.s:mainmenuname.'&Packages.'
  else
! 	let g:Tex_PackagesMenuLocation = '81.10 '.g:Tex_MenuPrefix.'Packages.'
  endif
  
! let g:Tex_TemplatesMenuLocation = '80.20 '.s:mainmenuname.'&Templates.'
! let g:Tex_MacrosMenuLocation = '80.20 '.s:mainmenuname.'&Macros.'
! 
! let g:Tex_EnvMenuLocation = '82.20 '.g:Tex_MenuPrefix.'E&nvironments.'
  
  if g:Tex_NestElementMenus
! 	let g:Tex_ElementsMenuLocation = '83.20 '.g:Tex_MenuPrefix.'E&lements.'
  else
! 	let g:Tex_ElementsMenuLocation = '83.20 '.g:Tex_MenuPrefix
  endif
  
  " Set up the compiler/viewer menus. {{{
  "
  if has('gui_running') && g:Tex_Menus
! 	exec 'anoremenu 80.25 '. s:mainmenuname.'-sepsuite0-  :'
  
  	" menus for compiling / viewing etc.
! 	exec 'anoremenu 80.30 '.s:mainmenuname.'&Compile<tab>'.s:mapleader.'ll'.
  		\'   :silent! call RunLaTeX()<CR>'
! 	exec 'vnoremenu 80.35 '.s:mainmenuname.'Compile&Part<tab>'.s:mapleader.'lc'.
  		\'   :call Tex_PartCompilation("f","l","v")<CR>'
! 	exec 'anoremenu 80.40 '.s:mainmenuname.'&View<tab>'.s:mapleader.'lv'.
  		\'   :silent! call ViewLaTeX("all")<CR>'
! 	exec 'anoremenu 80.45 '.s:mainmenuname.'Vi&ewPart<tab>'.s:mapleader.'lp'.
  		\'   :silent! call ViewLaTeX("part")<CR>'
! 	exec 'anoremenu 80.50 '.s:mainmenuname.'&Search<tab>'.s:mapleader.'ls'.
  		\'   :silent! call ForwardSearchLaTeX()<CR>'
! 	exec 'anoremenu 80.60 '.s:mainmenuname.'&Target\ Format<tab>:TTarget'.
  		\'   :call SetTeXTarget()<CR>'
! 	exec 'anoremenu 80.70 '.s:mainmenuname.'&Compiler\ Target<tab>:TCTarget'.
  		\'   :call SetTeXCompilerTarget("Compile", "")<CR>'
! 	exec 'anoremenu 80.80 '.s:mainmenuname.'&Viewer\ Target<tab>:TVTarget'.
  		\'   :call SetTeXCompilerTarget("View", "")<CR>'
! 	exec 'anoremenu 80.90 '.s:mainmenuname.'Set\ &Ignore\ Level<tab>:TCLevel'.
  		\'   :TCLevel NONE<CR>'
! 	exec 'inoremenu 80.100 '.s:mainmenuname.'C&omplete\ Ref/Cite'.
  		\'   <Esc>:call Tex_viewer("default","text")<CR>'
  	" project
! 	exec 'anoremenu 80.105 '.s:mainmenuname.'Project.&Project<tab>:TProject'.
  		\'   :TProject<CR>'
! 	exec 'anoremenu 80.106 '.s:mainmenuname.'Project.Project&Edit<tab>:TProjectEdit'.
  		\'   :TProjectEdit<CR>'
! 	exec 'anoremenu 80.107 '.s:mainmenuname.'Project.Project&Write<tab>:TProjectWrite'.
  		\'   :TProjectWrite<CR>'
! 	exec 'anoremenu 80.110 '.s:mainmenuname.'-sepsuite1- :'
  	" refreshing folds
  	if g:Tex_Folding
! 		exec 'anoremenu 80.120 '.s:mainmenuname.'&Refresh\ Folds<tab>'.s:mapleader.'rf'.
  			\'   :call MakeTexFolds(1)<CR>'
! 		exec 'anoremenu 80.130 '.s:mainmenuname.'-sepsuite2- :'
  	endif
  	" editing private texrc
! 	exec 'anoremenu 80.140 '.s:mainmenuname.'Edit\ &texrc<tab>:Ttexrc'.
  			\' :Ttexrc<CR>'
  
--- 13,93 ----
  let s:mapleader = exists('mapleader') ? mapleader : "\\"
  
+ " This glboal variable is incremented each time a top-level latex-suite menu
+ " is created. We should always use this variable for setting the locations of
+ " newly created top-level menus.
+ let g:Tex_NextMenuLocation = g:Tex_MainMenuLocation
+ 
+ " The templates and macros menus are always nested within the main latex-suit
+ " menu.
+ let g:Tex_TemplatesMenuLocation = g:Tex_MainMenuLocation.'.20 '.s:mainmenuname.'&Templates.'
+ let g:Tex_MacrosMenuLocation = g:Tex_MainMenuLocation.'.20 '.s:mainmenuname.'&Macros.'
+ 
+ " The packages menu can either be a child of the main menu or be a top-level
+ " menu by itself.
  if g:Tex_NestPackagesMenu
! 	let g:Tex_PackagesMenuLocation = (g:Tex_MainMenuLocation).'.10 '.s:mainmenuname.'&Packages.'
  else
! 	let g:Tex_PackagesMenuLocation = (g:Tex_NextMenuLocation).'.10 '.g:Tex_MenuPrefix.'Packages.'
! 	let g:Tex_NextMenuLocation = g:Tex_NextMenuLocation + 1
  endif
  
! " Environments are always a top-level menu.
! let g:Tex_EnvMenuLocation = (g:Tex_NextMenuLocation).'.20 '.g:Tex_MenuPrefix.'E&nvironments.'
! let g:Tex_NextMenuLocation = g:Tex_NextMenuLocation + 1
  
+ " Elements are always a top-level menu. 
+ " If we choose to nest elements, then the top-level &TeX-Elements menu
+ " contains <Fonts / Counters / Dimensions>
+ " otherwise, the Fonts, Counters and Dimensions menus become top-level menus.
  if g:Tex_NestElementMenus
! 	let g:Tex_ElementsMenuLocation = (g:Tex_NextMenuLocation).'.20 '.g:Tex_MenuPrefix.'E&lements.'
  else
! 	let g:Tex_ElementsMenuLocation = (g:Tex_NextMenuLocation).'.20 '.g:Tex_MenuPrefix
  endif
+ let g:Tex_NextMenuLocation = g:Tex_NextMenuLocation + 1
+ 
  
  " Set up the compiler/viewer menus. {{{
  "
  if has('gui_running') && g:Tex_Menus
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.25 '. s:mainmenuname.'-sepsuite0-  :'
  
  	" menus for compiling / viewing etc.
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.30 '.s:mainmenuname.'&Compile<tab>'.s:mapleader.'ll'.
  		\'   :silent! call RunLaTeX()<CR>'
! 	exec 'vnoremenu '.g:Tex_MainMenuLocation.'.35 '.s:mainmenuname.'Compile&Part<tab>'.s:mapleader.'lc'.
  		\'   :call Tex_PartCompilation("f","l","v")<CR>'
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.40 '.s:mainmenuname.'&View<tab>'.s:mapleader.'lv'.
  		\'   :silent! call ViewLaTeX("all")<CR>'
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.45 '.s:mainmenuname.'Vi&ewPart<tab>'.s:mapleader.'lp'.
  		\'   :silent! call ViewLaTeX("part")<CR>'
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.50 '.s:mainmenuname.'&Search<tab>'.s:mapleader.'ls'.
  		\'   :silent! call ForwardSearchLaTeX()<CR>'
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.60 '.s:mainmenuname.'&Target\ Format<tab>:TTarget'.
  		\'   :call SetTeXTarget()<CR>'
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.70 '.s:mainmenuname.'&Compiler\ Target<tab>:TCTarget'.
  		\'   :call SetTeXCompilerTarget("Compile", "")<CR>'
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.80 '.s:mainmenuname.'&Viewer\ Target<tab>:TVTarget'.
  		\'   :call SetTeXCompilerTarget("View", "")<CR>'
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.90 '.s:mainmenuname.'Set\ &Ignore\ Level<tab>:TCLevel'.
  		\'   :TCLevel NONE<CR>'
! 	exec 'inoremenu '.g:Tex_MainMenuLocation.'.100 '.s:mainmenuname.'C&omplete\ Ref/Cite'.
  		\'   <Esc>:call Tex_viewer("default","text")<CR>'
  	" project
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.105 '.s:mainmenuname.'Project.&Project<tab>:TProject'.
  		\'   :TProject<CR>'
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.106 '.s:mainmenuname.'Project.Project&Edit<tab>:TProjectEdit'.
  		\'   :TProjectEdit<CR>'
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.107 '.s:mainmenuname.'Project.Project&Write<tab>:TProjectWrite'.
  		\'   :TProjectWrite<CR>'
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.110 '.s:mainmenuname.'-sepsuite1- :'
  	" refreshing folds
  	if g:Tex_Folding
! 		exec 'anoremenu '.g:Tex_MainMenuLocation.'.120 '.s:mainmenuname.'&Refresh\ Folds<tab>'.s:mapleader.'rf'.
  			\'   :call MakeTexFolds(1)<CR>'
! 		exec 'anoremenu '.g:Tex_MainMenuLocation.'.130 '.s:mainmenuname.'-sepsuite2- :'
  	endif
  	" editing private texrc
! 	exec 'anoremenu '.g:Tex_MainMenuLocation.'.140 '.s:mainmenuname.'Edit\ &texrc<tab>:Ttexrc'.
  			\' :Ttexrc<CR>'
  
***************
*** 131,139 ****
  " configuration menu.
  if g:Tex_Menus
! 	exe 'amenu 80.900 '.s:mainmenuname.'Configure\ Menu.Add\ Math\ Menu         :call Tex_MenuConfigure("math", 1)<cr>'
! 	exe 'amenu 80.900 '.s:mainmenuname.'Configure\ Menu.Remove\ Math\ Menu      :call Tex_MenuConfigure("math", 0)<cr>'
! 	exe 'amenu 80.900 '.s:mainmenuname.'Configure\ Menu.Expand\ Elements        :call Tex_MenuConfigure("elements", "expand")<cr>'
! 	exe 'amenu 80.900 '.s:mainmenuname.'Configure\ Menu.Compress\ Elements      :call Tex_MenuConfigure("elements", "nest")<cr>'
! 	exe 'amenu 80.900 '.s:mainmenuname.'Configure\ Menu.Load\ Packages\ Menu    :call Tex_MenuConfigure("packages", 1)<cr>'
  endif
  
--- 150,158 ----
  " configuration menu.
  if g:Tex_Menus
! 	exe 'amenu '.g:Tex_MainMenuLocation.'.900 '.s:mainmenuname.'Configure\ Menu.Add\ Math\ Menu         :call Tex_MenuConfigure("math", 1)<cr>'
! 	exe 'amenu '.g:Tex_MainMenuLocation.'.900 '.s:mainmenuname.'Configure\ Menu.Remove\ Math\ Menu      :call Tex_MenuConfigure("math", 0)<cr>'
! 	exe 'amenu '.g:Tex_MainMenuLocation.'.900 '.s:mainmenuname.'Configure\ Menu.Expand\ Elements        :call Tex_MenuConfigure("elements", "expand")<cr>'
! 	exe 'amenu '.g:Tex_MainMenuLocation.'.900 '.s:mainmenuname.'Configure\ Menu.Compress\ Elements      :call Tex_MenuConfigure("elements", "nest")<cr>'
! 	exe 'amenu '.g:Tex_MainMenuLocation.'.900 '.s:mainmenuname.'Configure\ Menu.Load\ Packages\ Menu    :call Tex_MenuConfigure("packages", 1)<cr>'
  endif
  

Index: texrc
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/texrc,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** texrc	30 Jun 2003 01:28:39 -0000	1.30
--- texrc	16 Jul 2003 05:17:05 -0000	1.31
***************
*** 451,454 ****
--- 451,457 ----
  TexLet g:Tex_Menus = 1
  
+ " The location of the main menu
+ TexLet g:Tex_MainMenuLocation = 80
+ 
  " Math contains a large number of tex math elemets such as arrows,
  " mathematical fonts (\mathrm), mathematical diacritics (\dot), binary