diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-05-10 19:06:20 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-05-10 19:06:20 +0000 |
| commit | 25394022f2fda5c41dc88f5142f15cd3ef4107a4 (patch) | |
| tree | 63bb42311d52f627c941ad2352b2386c4b5e8687 /runtime/syntax | |
| parent | 3ad16f3fe668ce14f9b2382656f0f63a0d44d05b (diff) | |
updated for version 7.1b
Diffstat (limited to 'runtime/syntax')
| -rw-r--r-- | runtime/syntax/context.vim | 7 | ||||
| -rw-r--r-- | runtime/syntax/rst.vim | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/runtime/syntax/context.vim b/runtime/syntax/context.vim index 93b14b194f..225cc6efc2 100644 --- a/runtime/syntax/context.vim +++ b/runtime/syntax/context.vim @@ -1,13 +1,14 @@ " Vim syntax file " Language: ConTeXt typesetting engine " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2006-04-19 +" Latest Revision: 2006-08-10 if exists("b:current_syntax") finish endif runtime! syntax/plaintex.vim +unlet b:current_syntax let s:cpo_save = &cpo set cpo&vim @@ -16,6 +17,8 @@ if !exists('g:context_include') let g:context_include = ['mp', 'javascript', 'xml'] endif +syn spell toplevel + syn match contextBlockDelim display '\\\%(start\|stop\)\a\+' \ contains=@NoSpell @@ -27,7 +30,7 @@ syn region contextEscaped display matchgroup=contextPreProc \ start='\\type\=<<' end='>>' syn region contextEscaped matchgroup=contextPreProc \ start='\\start\z(\a*\%(typing\|typen\)\)' - \ end='\\stop\z1' + \ end='\\stop\z1' contains=plaintexComment keepend syn region contextEscaped display matchgroup=contextPreProc \ start='\\\h\+Type{' end='}' syn region contextEscaped display matchgroup=contextPreProc diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim index 6e24251ffe..d5a76a2b6a 100644 --- a/runtime/syntax/rst.vim +++ b/runtime/syntax/rst.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: reStructuredText documentation format " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2006-04-09 +" Latest Revision: 2006-07-04 if exists("b:current_syntax") finish @@ -50,7 +50,7 @@ syn match rstSimpleTableLines contained display syn cluster rstDirectives contains=rstFootnote,rstCitation, \ rstHyperlinkTarget,rstExDirective -syn match rstExplicitMarkup '^\.\.\s' +syn match rstExplicitMarkup '^\.\.\_s' \ nextgroup=@rstDirectives,rstComment,rstSubstitutionDefinition let s:ReferenceName = '[[:alnum:]]\+\%([_.-][[:alnum:]]\+\)*' @@ -91,7 +91,7 @@ execute 'syn match rstSubstitutionDefinition contained' . function! s:DefineOneInlineMarkup(name, start, middle, end, char_left, char_right) execute 'syn region rst' . a:name . \ ' start=+' . a:char_left . '\zs' . a:start . - \ '[^[:space:]' . a:char_right . a:start[strlen(a:start) - 1] . ']+' . + \ '\ze[^[:space:]' . a:char_right . a:start[strlen(a:start) - 1] . ']+' . \ a:middle . \ ' end=+\S' . a:end . '\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)+' endfunction @@ -130,10 +130,10 @@ execute 'syn match rstFootnoteReference contains=@NoSpell' . \ ' +\[\%(\d\+\|#\%(' . s:ReferenceName . '\)\=\|\*\)\]_+' execute 'syn match rstCitationReference contains=@NoSpell' . - \ ' +\[' . s:ReferenceName . '\]_+' + \ ' +\[' . s:ReferenceName . '\]_\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)+' execute 'syn match rstHyperlinkReference' . - \ ' /\<' . s:ReferenceName . '__\=/' + \ ' /\<' . s:ReferenceName . '__\=\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)/' syn match rstStandaloneHyperlink contains=@NoSpell \ "\<\%(\%(\%(https\=\|file\|ftp\|gopher\)://\|\%(mailto\|news\):\)[^[:space:]'\"<>]\+\|www[[:alnum:]_-]*\.[[:alnum:]_-]\+\.[^[:space:]'\"<>]\+\)[[:alnum:]/]" |