diff options
author | Bram Moolenaar <Bram@vim.org> | 2005-10-10 20:59:28 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2005-10-10 20:59:28 +0000 |
commit | d5cdbeb8dd859510c4674b17b67d613eff40a984 (patch) | |
tree | 7efb2d890b1eb727c0e15a2ade2613b606ad6c9b /runtime/syntax | |
parent | 196dfbcca1af4cf07f600e0186757d9adf097e7f (diff) | |
download | vim-git-d5cdbeb8dd859510c4674b17b67d613eff40a984.tar.gz |
updated for version 7.0155
Diffstat (limited to 'runtime/syntax')
-rw-r--r-- | runtime/syntax/perl.vim | 13 | ||||
-rw-r--r-- | runtime/syntax/ratpoison.vim | 73 | ||||
-rw-r--r-- | runtime/syntax/ruby.vim | 28 | ||||
-rw-r--r-- | runtime/syntax/tidy.vim | 21 |
4 files changed, 83 insertions, 52 deletions
diff --git a/runtime/syntax/perl.vim b/runtime/syntax/perl.vim index 327cc11fd..8cd40b493 100644 --- a/runtime/syntax/perl.vim +++ b/runtime/syntax/perl.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Perl " Maintainer: Nick Hibma <n_hibma@van-laarhoven.org> -" Last Change: 2004 Aug 29 +" Last Change: 2005 Oct 06 " Location: http://www.van-laarhoven.org/vim/syntax/perl.vim " " Please download most recent version first before mailing @@ -87,11 +87,10 @@ else endif syn keyword perlOperator defined undef and or not bless ref if exists("perl_fold") - " if BEGIN/END is a keyword the perlBEGINENDFold does not work - syn match perlControl "\<BEGIN\>" contained - syn match perlControl "\<END\>" contained + " if BEGIN/END would be a keyword the perlBEGINENDFold does not work + syn match perlControl "\<BEGIN\|CHECK\|INIT\|END\>" contained else - syn keyword perlControl BEGIN END + syn keyword perlControl BEGIN END CHECK INIT endif syn keyword perlStatementStorage my local our @@ -182,7 +181,7 @@ syn match perlFiledescStatement "\u\w*" contained " Special characters in strings and matches syn match perlSpecialString "\\\(\d\+\|[xX]\x\+\|c\u\|.\)" contained syn match perlSpecialStringU "\\['\\]" contained -syn match perlSpecialMatch "{\d\(,\d\)\=}" contained +syn match perlSpecialMatch "{\d\+\(,\(\d\+\)\=\)\=}" contained syn match perlSpecialMatch "\[\(\]\|-\)\=[^\[\]]*\(\[\|\-\)\=\]" contained syn match perlSpecialMatch "[+*()?.]" contained syn match perlSpecialMatch "(?[#:=!]" contained @@ -389,7 +388,7 @@ endif if exists("perl_fold") syn region perlPackageFold start="^package \S\+;$" end="^1;$" end="\n\+package"me=s-1 transparent fold keepend syn region perlSubFold start="^\z(\s*\)\<sub\>.*[^};]$" end="^\z1}\s*$" end="^\z1}\s*\#.*$" transparent fold keepend - syn region perlBEGINENDFold start="^\z(\s*\)\<\(BEGIN\|END\)\>.*[^};]$" end="^\z1}\s*$" transparent fold keepend + syn region perlBEGINENDFold start="^\z(\s*\)\<\(BEGIN\|END\|CHECK\|INIT\)\>.*[^};]$" end="^\z1}\s*$" transparent fold keepend if exists("perl_fold_blocks") syn region perlIfFold start="^\z(\s*\)\(if\|unless\|for\|while\|until\)\s*(.*)\s*{\s*$" start="^\z(\s*\)foreach\s*\(\(my\|our\)\=\s*\S\+\s*\)\=(.*)\s*{\s*$" end="^\z1}\s*;\=$" transparent fold keepend diff --git a/runtime/syntax/ratpoison.vim b/runtime/syntax/ratpoison.vim index 02a0a92f0..b1475600a 100644 --- a/runtime/syntax/ratpoison.vim +++ b/runtime/syntax/ratpoison.vim @@ -1,9 +1,8 @@ " Vim syntax file -" Filename: ratpoison.vim " Language: Ratpoison configuration/commands file ( /etc/ratpoisonrc ~/.ratpoisonrc ) " Maintainer: Doug Kearns <djkea2@gus.gscit.monash.edu.au> " URL: http://gus.gscit.monash.edu.au/~djkea2/vim/syntax/ratpoison.vim -" Last Change: 2004 Nov 27 +" Last Change: 2005 Oct 06 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -21,26 +20,27 @@ syn case ignore syn keyword ratpoisonBooleanArg on off contained syn case match -syn keyword ratpoisonCommandArg abort addhook alias banish bind contained -syn keyword ratpoisonCommandArg chdir clrunmanaged colon curframe defbarborder contained -syn keyword ratpoisonCommandArg defbargravity defbarpadding defbgcolor defborder deffgcolor contained -syn keyword ratpoisonCommandArg deffont defframesels definekey definputwidth defmaxsizegravity contained -syn keyword ratpoisonCommandArg defpadding defresizeunit deftransgravity defwaitcursor defwinfmt contained -syn keyword ratpoisonCommandArg defwingravity defwinliststyle defwinname delete delkmap contained -syn keyword ratpoisonCommandArg echo escape exec fdump focus contained -syn keyword ratpoisonCommandArg focusdown focuslast focusleft focusright focusup contained -syn keyword ratpoisonCommandArg frestore fselect gdelete getenv gmerge contained -syn keyword ratpoisonCommandArg gmove gnew gnewbg gnext gprev contained -syn keyword ratpoisonCommandArg gravity groups gselect help hsplit contained -syn keyword ratpoisonCommandArg info kill lastmsg license link contained -syn keyword ratpoisonCommandArg listhook meta msgwait newkmap newwm contained -syn keyword ratpoisonCommandArg next nextscreen number only other contained -syn keyword ratpoisonCommandArg prev prevscreen quit readkey redisplay contained -syn keyword ratpoisonCommandArg remhook remove resize restart rudeness contained -syn keyword ratpoisonCommandArg select setenv shrink source split contained -syn keyword ratpoisonCommandArg startup_message time title tmpwm unalias contained -syn keyword ratpoisonCommandArg unbind unmanage unsetenv verbexec version contained -syn keyword ratpoisonCommandArg vsplit warp windows syn case ignore contained +syn keyword ratpoisonCommandArg abort addhook alias banish chdir contained +syn keyword ratpoisonCommandArg clrunmanaged cnext colon compat cother contained +syn keyword ratpoisonCommandArg cprev curframe dedicate definekey delete contained +syn keyword ratpoisonCommandArg delkmap describekey echo escape exec contained +syn keyword ratpoisonCommandArg fdump focus focusdown focuslast focusleft contained +syn keyword ratpoisonCommandArg focusprev focusright focusup frestore fselect contained +syn keyword ratpoisonCommandArg gdelete getenv getsel gmerge gmove contained +syn keyword ratpoisonCommandArg gnew gnewbg gnext gprev gravity contained +syn keyword ratpoisonCommandArg groups gselect help hsplit inext contained +syn keyword ratpoisonCommandArg info iother iprev kill lastmsg contained +syn keyword ratpoisonCommandArg license link listhook meta msgwait contained +syn keyword ratpoisonCommandArg newkmap newwm next nextscreen number contained +syn keyword ratpoisonCommandArg only other prev prevscreen prompt contained +syn keyword ratpoisonCommandArg putsel quit ratclick rathold ratrelwarp contained +syn keyword ratpoisonCommandArg ratwarp readkey redisplay redo remhook contained +syn keyword ratpoisonCommandArg remove resize restart rudeness sdump contained +syn keyword ratpoisonCommandArg select set setenv sfdump shrink contained +syn keyword ratpoisonCommandArg source sselect startup_message time title contained +syn keyword ratpoisonCommandArg tmpwm unalias undefinekey undo unmanage contained +syn keyword ratpoisonCommandArg unsetenv verbexec version vsplit warp contained +syn keyword ratpoisonCommandArg windows contained syn match ratpoisonGravityArg "\<\(n\|north\)\>" contained syn match ratpoisonGravityArg "\<\(nw\|northwest\)\>" contained @@ -139,8 +139,10 @@ syn match ratpoisonStringCommand "^\s*\zsalias\ze\s*" syn match ratpoisonStringCommand "^\s*\zsbind\ze\s*" nextgroup=ratpoisonKeySeqArg syn match ratpoisonStringCommand "^\s*\zschdir\ze\s*" syn match ratpoisonStringCommand "^\s*\zscolon\ze\s*" nextgroup=ratpoisonCommandArg +syn match ratpoisonStringCommand "^\s*\zsdedicate\ze\s*" nextgroup=ratpoisonNumberArg syn match ratpoisonStringCommand "^\s*\zsdefinekey\ze\s*" syn match ratpoisonStringCommand "^\s*\zsdelkmap\ze\s*" +syn match ratpoisonStringCommand "^\s*\zsdescribekey\ze\s*" syn match ratpoisonStringCommand "^\s*\zsecho\ze\s*" syn match ratpoisonStringCommand "^\s*\zsescape\ze\s*" nextgroup=ratpoisonKeySeqArg syn match ratpoisonStringCommand "^\s*\zsexec\ze\s*" @@ -155,6 +157,11 @@ syn match ratpoisonStringCommand "^\s*\zslisthook\ze\s*" nextgroup=ratpoisonH syn match ratpoisonStringCommand "^\s*\zsnewkmap\ze\s*" syn match ratpoisonStringCommand "^\s*\zsnewwm\ze\s*" syn match ratpoisonStringCommand "^\s*\zsnumber\ze\s*" nextgroup=ratpoisonNumberArg +syn match ratpoisonStringCommand "^\s*\zsprompt\ze\s*" +syn match ratpoisonStringCommand "^\s*\zsratwarp\ze\s*" +syn match ratpoisonStringCommand "^\s*\zsratrelwarp\ze\s*" +syn match ratpoisonStringCommand "^\s*\zsratclick\ze\s*" +syn match ratpoisonStringCommand "^\s*\zsrathold\ze\s*" syn match ratpoisonStringCommand "^\s*\zsreadkey\ze\s*" syn match ratpoisonStringCommand "^\s*\zsremhook\ze\s*" nextgroup=ratpoisonHookArg syn match ratpoisonStringCommand "^\s*\zsresize\ze\s*" nextgroup=ratpoisonNumberArg @@ -162,11 +169,13 @@ syn match ratpoisonStringCommand "^\s*\zsrudeness\ze\s*" nextgroup=ratpoisonN syn match ratpoisonStringCommand "^\s*\zsselect\ze\s*" nextgroup=ratpoisonNumberArg syn match ratpoisonStringCommand "^\s*\zssetenv\ze\s*" syn match ratpoisonStringCommand "^\s*\zssource\ze\s*" +syn match ratpoisonStringCommand "^\s*\zssselect\ze\s*" syn match ratpoisonStringCommand "^\s*\zsstartup_message\ze\s*" nextgroup=ratpoisonBooleanArg syn match ratpoisonStringCommand "^\s*\zstitle\ze\s*" syn match ratpoisonStringCommand "^\s*\zstmpwm\ze\s*" syn match ratpoisonStringCommand "^\s*\zsunalias\ze\s*" syn match ratpoisonStringCommand "^\s*\zsunbind\ze\s*" nextgroup=ratpoisonKeySeqArg +syn match ratpoisonStringCommand "^\s*\zsundefinekey\ze\s*" syn match ratpoisonStringCommand "^\s*\zsunmanage\ze\s*" syn match ratpoisonStringCommand "^\s*\zsunsetenv\ze\s*" syn match ratpoisonStringCommand "^\s*\zsverbexec\ze\s*" @@ -175,15 +184,21 @@ syn match ratpoisonStringCommand "^\s*\zswarp\ze\s*" nextgroup=ratpoisonBoole syn match ratpoisonVoidCommand "^\s*\zsabort\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsbanish\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsclrunmanaged\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zscnext\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zscompat\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zscother\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zscprev\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zscurframe\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsdelete\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsfocusdown\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsfocuslast\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsfocusleft\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zsfocusprev\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsfocusright\ze\s*$" -syn match ratpoisonVoidCommand "^\s*\zsfocus\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsfocusup\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zsfocus\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsfselect\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zsgetsel\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsgmerge\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsgmove\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsgnewbg\ze\s*$" @@ -193,24 +208,32 @@ syn match ratpoisonVoidCommand "^\s*\zsgprev\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsgroups\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zshelp\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zshsplit\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zsinext\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsinfo\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zsiother\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zsiprev\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zskill\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zslastmsg\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zslicense\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsmeta\ze\s*$" -syn match ratpoisonVoidCommand "^\s*\zsnext\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsnextscreen\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zsnext\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsonly\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsother\ze\s*$" -syn match ratpoisonVoidCommand "^\s*\zsprev\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsprevscreen\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zsprev\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zsputsel\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsquit\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsredisplay\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zsredo\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsremove\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsrestart\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zssdump\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zssfdump\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsshrink\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zssplit\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zstime\ze\s*$" +syn match ratpoisonVoidCommand "^\s*\zsundo\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsversion\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zsvsplit\ze\s*$" syn match ratpoisonVoidCommand "^\s*\zswindows\ze\s*$" diff --git a/runtime/syntax/ruby.vim b/runtime/syntax/ruby.vim index aba869763..23079e962 100644 --- a/runtime/syntax/ruby.vim +++ b/runtime/syntax/ruby.vim @@ -91,13 +91,13 @@ syn match rubyPredefinedConstant "\%(\%(\.\@<!\.\)\@<!\|::\)\_s*\zs\%(RUBY_VERSI "syn match rubyPredefinedConstant "\%(::\)\=\zs\%(NotImplementError\)\>" " Normal Regular Expression -syn region rubyString matchgroup=rubyStringDelimiter start="\%(\%(^\|\<\%(and\|or\|while\|until\|unless\|if\|elsif\|when\|not\|then\)\|[\~=!|&(,[]\)\s*\)\@<=/" end="/[iomx]*" skip="\\\\\|\\/" contains=@rubyStringSpecial +syn region rubyString matchgroup=rubyStringDelimiter start="\%(\%(^\|\<\%(and\|or\|while\|until\|unless\|if\|elsif\|when\|not\|then\)\|[;\~=!|&(,[>]\)\s*\)\@<=/" end="/[iomx]*" skip="\\\\\|\\/" contains=@rubyStringSpecial syn region rubyString matchgroup=rubyStringDelimiter start="\%(\<\%(split\|scan\|gsub\|sub\)\s*\)\@<=/" end="/[iomx]*" skip="\\\\\|\\/" contains=@rubyStringSpecial " Normal String and Shell Command Output syn region rubyString matchgroup=rubyStringDelimiter start="\"" end="\"" skip="\\\\\|\\\"" contains=@rubyStringSpecial -syn region rubyString matchgroup=rubyStringDelimiter start="'" end="'" skip="\\\\\|\\'" -syn region rubyString matchgroup=rubyStringDelimiter start="`" end="`" skip="\\\\\|\\`" contains=@rubyStringSpecial +syn region rubyString matchgroup=rubyStringDelimiter start="'" end="'" skip="\\\\\|\\'" +syn region rubyString matchgroup=rubyStringDelimiter start="`" end="`" skip="\\\\\|\\`" contains=@rubyStringSpecial " Generalized Regular Expression syn region rubyString matchgroup=rubyStringDelimiter start="%r\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1[iomx]*" skip="\\\\\|\\\z1" contains=@rubyStringSpecial fold @@ -139,19 +139,19 @@ syn region rubyString start=+\%(\%(class\s*\|\%(\.\|::\)\)\_s*\)\@<!<<-'\z([^']* syn region rubyString start=+\%(\%(class\s*\|\%(\.\|::\)\)\_s*\)\@<!<<-`\z([^`]*\)`\ze+hs=s+3 matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart,@rubyStringSpecial nextgroup=rubyFunction fold keepend if exists('main_syntax') && main_syntax == 'eruby' - let ruby_no_expensive = 1 + let b:ruby_no_expensive = 1 end " Expensive Mode - colorize *end* according to opening statement -if !exists("ruby_no_expensive") - syn region rubyFunction matchgroup=rubyDefine start="\<def\s\+" end="\ze\%(\s\|(\|;\|$\)" oneline - syn region rubyClass matchgroup=rubyDefine start="\<class\s\+" end="\ze\%(\s\|<\|;\|$\)" oneline +if !exists("b:ruby_no_expensive") && !exists("ruby_no_expensive") + syn region rubyFunction matchgroup=rubyDefine start="\<def\s\+" end="\%(\s*\%(\s\|(\|;\|$\|#\)\)\@=" oneline + syn region rubyClass matchgroup=rubyDefine start="\<class\s\+" end="\%(\s*\%(\s\|<\|;\|$\|#\)\)\@=" oneline syn match rubyDefine "\<class\ze<<" - syn region rubyModule matchgroup=rubyDefine start="\<module\s\+" end="\ze\%(\s\|;\|$\)" oneline + syn region rubyModule matchgroup=rubyDefine start="\<module\s\+" end="\%(\s*\%(\s\|;\|$\|#\)\)\@=" oneline - syn region rubyBlock start="\<def\>" matchgroup=rubyDefine end="\<end\>" contains=ALLBUT,@rubyExtendedStringSpecial,rubyTodo nextgroup=rubyFunction fold - syn region rubyBlock start="\<class\>" matchgroup=rubyDefine end="\<end\>" contains=ALLBUT,@rubyExtendedStringSpecial,rubyTodo nextgroup=rubyClass fold - syn region rubyBlock start="\<module\>" matchgroup=rubyDefine end="\<end\>" contains=ALLBUT,@rubyExtendedStringSpecial,rubyTodo nextgroup=rubyModule fold + syn region rubyBlock start="\<def\>" matchgroup=rubyDefine end="\<end\>" contains=ALLBUT,@rubyExtendedStringSpecial,rubyTodo nextgroup=rubyFunction fold + syn region rubyBlock start="\<class\>" matchgroup=rubyDefine end="\<end\>" contains=ALLBUT,@rubyExtendedStringSpecial,rubyTodo nextgroup=rubyClass fold + syn region rubyBlock start="\<module\>" matchgroup=rubyDefine end="\<end\>" contains=ALLBUT,@rubyExtendedStringSpecial,rubyTodo nextgroup=rubyModule fold " modifiers syn match rubyControl "\<\%(if\|unless\|while\|until\)\>" display @@ -178,7 +178,7 @@ else syn region rubyFunction matchgroup=rubyControl start="\<def\s\+" end="\ze\%(\s\|(\|;\|$\)" oneline syn region rubyClass matchgroup=rubyControl start="\<class\s\+" end="\ze\%(\s\|<\|;\|$\)" oneline syn match rubyControl "\<class\ze<<" - syn region rubyModule matchgroup=rubyControl start="\<module\s\+" end="\ze\%(\s\|;\|$\)" oneline + syn region rubyModule matchgroup=rubyControl start="\<module\s\+" end="\ze\%(\s\|;\|$\)" oneline syn keyword rubyControl case begin do for if unless while until end endif @@ -197,7 +197,7 @@ if !exists("ruby_no_special_methods") syn keyword rubyAccess public protected private syn keyword rubyAttribute attr attr_accessor attr_reader attr_writer syn match rubyControl "\<\%(exit!\|\%(abort\|at_exit\|exit\|fork\|loop\|trap\)\>\)" - syn keyword rubyEval eval class_eval instance_eval module_eval + syn keyword rubyEval eval class_eval instance_eval module_eval syn keyword rubyException raise fail catch throw syn keyword rubyInclude autoload extend include load require syn keyword rubyKeyword callcc caller lambda proc @@ -205,7 +205,7 @@ endif " Comments and Documentation syn match rubySharpBang "\%^#!.*" display -syn keyword rubyTodo FIXME NOTE TODO XXX contained +syn keyword rubyTodo FIXME NOTE TODO XXX contained syn match rubyComment "#.*" contains=rubySharpBang,rubySpaceError,rubyTodo,@Spell syn region rubyDocumentation start="^=begin" end="^=end.*$" contains=rubySpaceError,rubyTodo,@Spell fold diff --git a/runtime/syntax/tidy.vim b/runtime/syntax/tidy.vim index bffb61702..b23dc3aeb 100644 --- a/runtime/syntax/tidy.vim +++ b/runtime/syntax/tidy.vim @@ -1,9 +1,8 @@ " Vim syntax file -" Filename: tidy.vim " Language: HMTL Tidy configuration file ( /etc/tidyrc ~/.tidyrc ) " Maintainer: Doug Kearns <djkea2@gus.gscit.monash.edu.au> " URL: http://gus.gscit.monash.edu.au/~djkea2/vim/syntax/tidy.vim -" Last Change: 2004 Nov 27 +" Last Change: 2005 Oct 06 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -33,14 +32,16 @@ syn match tidyNewTagValue "\<\w\+\>" contained syn case ignore syn keyword tidyBoolean t[rue] f[alse] y[es] n[o] contained syn case match -syn match tidyDoctype "\<omit\|auto\|strict\|loose\|transitional\>" contained -" NOTE: use match rather than keyword here so that tidyEncoding raw does not always have precedence over tidyOption raw -syn match tidyEncoding "\<\(ascii\|latin1\|raw\|utf8\|iso2022\|mac\|utf16le\|utf16be\|utf16\|win1252\|big5\|shiftjis\)\>" contained +syn match tidyDoctype "\<omit\|auto\|strict\|loose\|transitional\|user\>" contained +" NOTE: use match rather than keyword here so that tidyEncoding 'raw' does not +" always have precedence over tidyOption 'raw' +syn match tidyEncoding "\<\(ascii\|latin0\|latin1\|raw\|utf8\|iso2022\|mac\|utf16le\|utf16be\|utf16\|win1252\|ibm858\|big5\|shiftjis\)\>" contained +syn match tidyNewline "\<\(LF\|CRLF\|CR\)\>" syn match tidyNumber "\<\d\+\>" contained syn match tidyRepeat "\<keep-first\|keep-last\>" contained syn region tidyString start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline syn region tidyString start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline -syn cluster tidyValue contains=tidyBoolean,tidyDoctype,tidyEncoding,tidyNumber,tidyRepeat,tidyString +syn cluster tidyValue contains=tidyBoolean,tidyDoctype,tidyEncoding,tidyNewline,tidyNumber,tidyRepeat,tidyString syn match tidyOption "^accessibility-check" contained syn match tidyOption "^add-xml-decl" contained @@ -55,6 +56,7 @@ syn match tidyOption "^char-encoding" contained syn match tidyOption "^clean" contained syn match tidyOption "^css-prefix" contained syn match tidyOption "^doctype" contained +syn match tidyOption "^doctype-mode" contained syn match tidyOption "^drop-empty-paras" contained syn match tidyOption "^drop-font-tags" contained syn match tidyOption "^drop-proprietary-attributes" contained @@ -67,6 +69,7 @@ syn match tidyOption "^fix-bad-comments" contained syn match tidyOption "^fix-uri" contained syn match tidyOption "^force-output" contained syn match tidyOption "^gnu-emacs" contained +syn match tidyOption "^gnu-emacs-file" contained syn match tidyOption "^hide-comments" contained syn match tidyOption "^hide-endtags" contained syn match tidyOption "^indent" contained @@ -83,13 +86,17 @@ syn match tidyOption "^literal-attributes" contained syn match tidyOption "^logical-emphasis" contained syn match tidyOption "^lower-literals" contained syn match tidyOption "^markup" contained +syn match tidyOption "^merge-divs" contained syn match tidyOption "^ncr" contained +syn match tidyOption "^newline" contained syn match tidyOption "^numeric-entities" contained syn match tidyOption "^output-bom" contained syn match tidyOption "^output-encoding" contained +syn match tidyOption "^output-file" contained syn match tidyOption "^output-html" contained syn match tidyOption "^output-xhtml" contained syn match tidyOption "^output-xml" contained +syn match tidyOption "^punctuation-wrap" contained syn match tidyOption "^quiet" contained syn match tidyOption "^quote-ampersand" contained syn match tidyOption "^quote-marks" contained @@ -115,6 +122,7 @@ syn match tidyOption "^wrap-php" contained syn match tidyOption "^wrap-script-literals" contained syn match tidyOption "^wrap-sections" contained syn match tidyOption "^write-back" contained +syn match tidyOption "^vertical-space" contained syn match tidyNewTagOption "^new-blocklevel-tags" contained syn match tidyNewTagOption "^new-empty-tags" contained syn match tidyNewTagOption "^new-inline-tags" contained @@ -136,6 +144,7 @@ if version >= 508 || !exists("did_tidy_syn_inits") HiLink tidyDelimiter Special HiLink tidyDoctype Constant HiLink tidyEncoding Constant + HiLink tidyNewline Constant HiLink tidyNewTagDelimiter Special HiLink tidyNewTagOption Identifier HiLink tidyNewTagValue Constant |