r1129 - in /trunk/packages/vim: debian/changelog patches/series patches/tex.vim-syntax_additions.diff patches/tex.vim-update.diff
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Fri Dec 14 21:20:16 UTC 2007
Author: jamessan
Date: Fri Dec 14 21:20:16 2007
New Revision: 1129
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1129
Log:
* Add tex.vim-update.diff, which syncs from upstream to fix some folding
issues. (Closes: #456166)
Added:
trunk/packages/vim/patches/tex.vim-update.diff
Modified:
trunk/packages/vim/debian/changelog
trunk/packages/vim/patches/series
trunk/packages/vim/patches/tex.vim-syntax_additions.diff
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1129&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Fri Dec 14 21:20:16 2007
@@ -5,8 +5,10 @@
domain name as specified in RFC 1738.
* debian/rules:
- Use bzip2 to compress the vim-runtime package.
-
- -- James Vega <jamessan at debian.org> Fri, 14 Dec 2007 15:36:05 -0500
+ * Add tex.vim-update.diff, which syncs from upstream to fix some folding
+ issues. (Closes: #456166)
+
+ -- James Vega <jamessan at debian.org> Fri, 14 Dec 2007 16:17:25 -0500
vim (1:7.1-175+1) unstable; urgency=low
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1129&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Fri Dec 14 21:20:16 2007
@@ -19,6 +19,7 @@
index.txt.diff -p0
de.po.diff -p0
samba.vim.diff -p0
+tex.vim-update.diff -p0
tex.vim-syntax_additions.diff -p0
sh.vim_syntax.diff -p0
gnuada.diff -p0
Modified: trunk/packages/vim/patches/tex.vim-syntax_additions.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/tex.vim-syntax_additions.diff?rev=1129&op=diff
==============================================================================
--- trunk/packages/vim/patches/tex.vim-syntax_additions.diff (original)
+++ trunk/packages/vim/patches/tex.vim-syntax_additions.diff Fri Dec 14 21:20:16 2007
@@ -13,8 +13,8 @@
endif
syn cluster texEnvGroup contains=texMatcher,texMathDelim,texSpecialChar,texStatement
-syn cluster texFoldGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texSectionMarker,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone, at texMathZones,texTitle,texAbstract
+-syn cluster texMatchGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption, at Spell
+syn cluster texFoldGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texSectionMarker,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone, at texMathZones,texTitle,texAbstract,texURLZone,texAcroZone
--syn cluster texMatchGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption, at Spell
+syn cluster texMatchGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texURLZone,texAcroZone, at Spell
syn cluster texRefGroup contains=texMatcher,texComment,texDelimiter
if !exists("tex_no_math")
@@ -28,7 +28,7 @@
" Try to flag {} and () mismatches: {{{1
if !exists("g:tex_no_error")
-@@ -416,8 +418,10 @@
+@@ -421,8 +423,10 @@
syn region texRefZone matchgroup=texStatement start="\\\(page\|eq\)ref{" end="}\|%stopzone\>" contains=@texRefGroup
syn region texRefZone matchgroup=texStatement start="\\v\=ref{" end="}\|%stopzone\>" contains=@texRefGroup
syn match texRefZone '\\cite\%([tp]\*\=\)\=' nextgroup=texRefOption,texCite
@@ -39,7 +39,7 @@
" Handle newcommand, newenvironment : {{{1
syn match texNewCmd "\\newcommand\>" nextgroup=texCmdName skipwhite skipnl
-@@ -441,6 +445,15 @@
+@@ -446,6 +450,15 @@
syn match texDefParms contained "#[^{]*" contains=texDefParm nextgroup=texCmdBody skipwhite skipnl
syn match texDefParm contained "#\d\+"
@@ -55,7 +55,7 @@
" TeX Lengths: {{{1
syn match texLength "\<\d\+\([.,]\d\+\)\=\s*\(true\)\=\s*\(bp\|cc\|cm\|dd\|em\|ex\|in\|mm\|pc\|pt\|sp\)\>"
-@@ -510,6 +523,7 @@
+@@ -515,6 +528,7 @@
HiLink texTypeStyle texType
" Basic TeX highlighting groups
@@ -63,7 +63,7 @@
HiLink texCmdArgs Number
HiLink texCmdName Statement
HiLink texComment Comment
-@@ -533,6 +547,7 @@
+@@ -538,6 +552,7 @@
HiLink texString String
HiLink texTodo Todo
HiLink texType Type
Added: trunk/packages/vim/patches/tex.vim-update.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/tex.vim-update.diff?rev=1129&op=file
==============================================================================
--- trunk/packages/vim/patches/tex.vim-update.diff (added)
+++ trunk/packages/vim/patches/tex.vim-update.diff Fri Dec 14 21:20:16 2007
@@ -1,0 +1,87 @@
+Index: vim/runtime/syntax/tex.vim
+===================================================================
+--- vim/runtime/syntax/tex.vim.orig
++++ vim/runtime/syntax/tex.vim
+@@ -1,8 +1,8 @@
+ " Vim syntax file
+ " Language: TeX
+ " Maintainer: Dr. Charles E. Campbell, Jr. <NdrchipO at ScampbellPfamily.AbizM>
+-" Last Change: Feb 27, 2007
+-" Version: 37
++" Last Change: Oct 10, 2007
++" Version: 39
+ " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+ "
+ " Notes: {{{1
+@@ -261,27 +261,27 @@
+
+ " Sections, subsections, etc: {{{1
+ if g:tex_fold_enabled && has("folding")
+- syn region texDocZone matchgroup=texSection start='\\begin\s*{\s*document\s*}' end='\\end\s*{\s*document\s*}' fold contains=@texFoldGroup, at texDocGroup, at Spell
+- syn region texPartZone matchgroup=texSection start='\\part\>' end='\n\ze\s*\\part\>' fold contains=@texFoldGroup, at texPartGroup, at Spell
+- syn region texChapterZone matchgroup=texSection start='\\chapter\>' end='\n\ze\s*\\chapter\>' fold contains=@texFoldGroup, at texChapterGroup, at Spell
+- syn region texSectionZone matchgroup=texSection start='\\section\>' end='\n\ze\s*\\section\>' fold contains=@texFoldGroup, at texSectionGroup, at Spell
+- syn region texSubSectionZone matchgroup=texSection start='\\subsection\>' end='\n\ze\s*\\subsection\>' fold contains=@texFoldGroup, at texSubSectionGroup, at Spell
+- syn region texSubSubSectionZone matchgroup=texSection start='\\subsubsection\>' end='\n\ze\s*\\subsubsection\>' fold contains=@texFoldGroup, at texSubSubSectionGroup, at Spell
+- syn region texParaZone matchgroup=texSection start='\\paragraph\>' end='\n\ze\s*\\paragraph\>' fold contains=@texFoldGroup, at texParaGroup, at Spell
+- syn region texSubParaZone matchgroup=texSection start='\\subparagraph\>' end='\n\ze\s*\\subparagraph\>' fold contains=@texFoldGroup, at Spell
+- syn region texTitle matchgroup=texSection start='\\\%(author\|title\)\>\s*{' end='}' fold contains=@texFoldGroup, at Spell
+- syn region texAbstract matchgroup=texSection start='\\begin\s*{\s*abstract\s*}' end='\\end\s*{\s*abstract\s*}' fold contains=@texFoldGroup, at Spell
++ syn region texDocZone matchgroup=texSection start='\\begin\s*{\s*document\s*}' end='\\end\s*{\s*document\s*}' fold contains=@texFoldGroup, at texDocGroup, at Spell
++ syn region texPartZone matchgroup=texSection start='\\part\>' end='\ze\n\s*\\part\>' fold contains=@texFoldGroup, at texPartGroup, at Spell
++ syn region texChapterZone matchgroup=texSection start='\\chapter\>' end='\ze\n\s*\\\%(chapter\|part\)\>' fold contains=@texFoldGroup, at texChapterGroup, at Spell
++ syn region texSectionZone matchgroup=texSection start='\\section\>' end='\ze\n\s*\\\%(section\>\|chapter\>\|part\>\|end{document}\)' fold contains=@texFoldGroup, at texSectionGroup, at Spell
++ syn region texSubSectionZone matchgroup=texSection start='\\subsection\>' end='\ze\n\s*\\\%(\%(sub\)\=section\>\|chapter\>\|part\>\|end{document}\)' fold contains=@texFoldGroup, at texSubSectionGroup, at Spell
++ syn region texSubSubSectionZone matchgroup=texSection start='\\subsubsection\>' end='\ze\n\s*\\\%(\%(sub\)\{,2}section\>\|chapter\>\|part\>\|end{document}\)' fold contains=@texFoldGroup, at texSubSubSectionGroup, at Spell
++ syn region texParaZone matchgroup=texSection start='\\paragraph\>' end='\ze\n\s*\\\%(paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end{document}\)' fold contains=@texFoldGroup, at texParaGroup, at Spell
++ syn region texSubParaZone matchgroup=texSection start='\\subparagraph\>' end='\ze\n\s*\\\%(\%(sub\)\=paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end{document}\)' fold contains=@texFoldGroup, at Spell
++ syn region texTitle matchgroup=texSection start='\\\%(author\|title\)\>\s*{' end='}' fold contains=@texFoldGroup, at Spell
++ syn region texAbstract matchgroup=texSection start='\\begin\s*{\s*abstract\s*}' end='\\end\s*{\s*abstract\s*}' fold contains=@texFoldGroup, at Spell
+ else
+- syn region texDocZone matchgroup=texSection start='\\begin\s*{\s*document\s*}' end='\\end\s*{\s*document\s*}' contains=@texFoldGroup, at texDocGroup, at Spell
+- syn region texPartZone matchgroup=texSection start='\\part\>' end='\n\ze\s*\\part\>' contains=@texFoldGroup, at texPartGroup, at Spell
+- syn region texChapterZone matchgroup=texSection start='\\chapter\>' end='\n\ze\s*\\chapter\>' contains=@texFoldGroup, at texChapterGroup, at Spell
+- syn region texSectionZone matchgroup=texSection start='\\section\>' end='\n\ze\s*\\section\>' contains=@texFoldGroup, at texSectionGroup, at Spell
+- syn region texSubSectionZone matchgroup=texSection start='\\subsection\>' end='\n\ze\s*\\subsection\>' contains=@texFoldGroup, at texSubSectionGroup, at Spell
+- syn region texSubSubSectionZone matchgroup=texSection start='\\subsubsection\>' end='\n\ze\s*\\subsubsection\>' contains=@texFoldGroup, at texSubSubSectionGroup, at Spell
+- syn region texParaZone matchgroup=texSection start='\\paragraph\>' end='\n\ze\s*\\paragraph\>' contains=@texFoldGroup, at texParaGroup, at Spell
+- syn region texSubParaZone matchgroup=texSection start='\\subparagraph\>' end='\n\ze\s*\\subparagraph\>' contains=@texFoldGroup, at Spell
+- syn region texTitle matchgroup=texSection start='\\\%(author\|title\)\>\s*{' end='}' contains=@texFoldGroup, at Spell
+- syn region texAbstract matchgroup=texSection start='\\begin\s*{\s*abstract\s*}' end='\\end\s*{\s*abstract\s*}' contains=@texFoldGroup, at Spell
++ syn region texDocZone matchgroup=texSection start='\\begin\s*{\s*document\s*}' end='\\end\s*{\s*document\s*}' contains=@texFoldGroup, at texDocGroup, at Spell
++ syn region texPartZone matchgroup=texSection start='\\part\>' end='\ze\n\s*\\part\>' contains=@texFoldGroup, at texPartGroup, at Spell
++ syn region texChapterZone matchgroup=texSection start='\\chapter\>' end='\ze\n\s*\\\%(chapter\|part\)\>' contains=@texFoldGroup, at texChapterGroup, at Spell
++ syn region texSectionZone matchgroup=texSection start='\\section\>' end='\ze\n\s*\\\%(section\>\|chapter\>\|part\>\|end{document}\)' contains=@texFoldGroup, at texSectionGroup, at Spell
++ syn region texSubSectionZone matchgroup=texSection start='\\subsection\>' end='\ze\n\s*\\\%(\%(sub\)\=section\>\|chapter\>\|part\>\|end{document}\)' contains=@texFoldGroup, at texSubSectionGroup, at Spell
++ syn region texSubSubSectionZone matchgroup=texSection start='\\subsubsection\>' end='\ze\n\s*\\\%(\%(sub\)\{,2}section\>\|chapter\>\|part\>\|end{document}\)' contains=@texFoldGroup, at texSubSubSectionGroup, at Spell
++ syn region texParaZone matchgroup=texSection start='\\paragraph\>' end='\ze\n\s*\\\%(paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end{document}\)' contains=@texFoldGroup, at texParaGroup, at Spell
++ syn region texSubParaZone matchgroup=texSection start='\\subparagraph\>' end='\ze\n\s*\\\%(\%(sub\)\=paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end{document}\)' contains=@texFoldGroup, at Spell
++ syn region texTitle matchgroup=texSection start='\\\%(author\|title\)\>\s*{' end='}' contains=@texFoldGroup, at Spell
++ syn region texAbstract matchgroup=texSection start='\\begin\s*{\s*abstract\s*}' end='\\end\s*{\s*abstract\s*}' contains=@texFoldGroup, at Spell
+ endif
+
+ " Bad Math (mismatched): {{{1
+@@ -300,8 +300,13 @@
+ fun! TexNewMathZone(sfx,mathzone,starform)
+ let grpname = "texMathZone".a:sfx
+ let syncname = "texSyncMathZone".a:sfx
++ if g:tex_fold_enabled
++ let foldcmd= " fold"
++ else
++ let foldcmd= ""
++ endif
+ exe "syn cluster texMathZones add=".grpname
+- exe 'syn region '.grpname.' start='."'".'\\begin\s*{\s*'.a:mathzone.'\s*}'."'".' end='."'".'\\end\s*{\s*'.a:mathzone.'\s*}'."'".' keepend contains=@texMathZoneGroup'
++ exe 'syn region '.grpname.' start='."'".'\\begin\s*{\s*'.a:mathzone.'\s*}'."'".' end='."'".'\\end\s*{\s*'.a:mathzone.'\s*}'."'".' keepend contains=@texMathZoneGroup'.foldcmd
+ exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
+ exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
+ exe 'HiLink '.grpname.' texMath'
+@@ -309,7 +314,7 @@
+ let grpname = "texMathZone".a:sfx.'S'
+ let syncname = "texSyncMathZone".a:sfx.'S'
+ exe "syn cluster texMathZones add=".grpname
+- exe 'syn region '.grpname.' start='."'".'\\begin\s*{\s*'.a:mathzone.'\*\s*}'."'".' end='."'".'\\end\s*{\s*'.a:mathzone.'\*\s*}'."'".' keepend contains=@texMathZoneGroup'
++ exe 'syn region '.grpname.' start='."'".'\\begin\s*{\s*'.a:mathzone.'\*\s*}'."'".' end='."'".'\\end\s*{\s*'.a:mathzone.'\*\s*}'."'".' keepend contains=@texMathZoneGroup'.foldcmd
+ exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
+ exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
+ exe 'HiLink '.grpname.' texMath'
More information about the pkg-vim-maintainers
mailing list