diff options
Diffstat (limited to 'runtime/syntax')
| -rw-r--r-- | runtime/syntax/cl.vim | 136 | ||||
| -rw-r--r-- | runtime/syntax/css.vim | 362 | ||||
| -rw-r--r-- | runtime/syntax/hgcommit.vim | 14 | ||||
| -rw-r--r-- | runtime/syntax/progress.vim | 116 |
4 files changed, 400 insertions, 228 deletions
diff --git a/runtime/syntax/cl.vim b/runtime/syntax/cl.vim index 343d2601d1..ccea2ee5ce 100644 --- a/runtime/syntax/cl.vim +++ b/runtime/syntax/cl.vim @@ -1,25 +1,25 @@ " Vim syntax file -" Language: CL -" (pronounced alphabetically, and NOT known as Clever) -" (CL was created by Multibase, http://www.mbase.com.au) +" Language: CL +" (pronounced alphabetically, and NOT known as Clever) +" (CL was created by Multibase, http://www.mbase.com.au) " Filename extensions: *.ent -" *.eni +" *.eni " Maintainer: Philip Uren <philuSPAX@ieee.org> Remove SPAX spam block -" Version: 4 -" Last Change: May 11 2012 +" Version: 5 +" Last Change: Aug 16 2012 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded if version < 600 - syntax clear + syntax clear elseif exists("b:current_syntax") - finish + finish endif if version >= 600 - setlocal iskeyword=@,48-57,_,-, + setlocal iskeyword=@,48-57,_,-, else - set iskeyword=@,48-57,_,-, + set iskeyword=@,48-57,_,-, endif syn case ignore @@ -27,87 +27,87 @@ syn case ignore syn sync lines=300 "If/else/elsif/endif and while/wend mismatch errors -syn match clifError "\<wend\>" -syn match clifError "\<elsif\>" -syn match clifError "\<else\>" -syn match clifError "\<endif\>" +syn match clifError "\<wend\>" +syn match clifError "\<elsif\>" +syn match clifError "\<else\>" +syn match clifError "\<endif\>" -syn match clSpaceError "\s\+$" +syn match clSpaceError "\s\+$" " If and while regions -syn region clLoop transparent matchgroup=clWhile start="\<while\>" matchgroup=clWhile end="\<wend\>" contains=ALLBUT,clBreak,clProcedure -syn region clIf transparent matchgroup=clConditional start="\<if\>" matchgroup=clConditional end="\<endif\>" contains=ALLBUT,clBreak,clProcedure +syn region clLoop transparent matchgroup=clWhile start="\<while\>" matchgroup=clWhile end="\<wend\>" contains=ALLBUT,clBreak,clProcedure +syn region clIf transparent matchgroup=clConditional start="\<if\>" matchgroup=clConditional end="\<endif\>" contains=ALLBUT,clBreak,clProcedure " Make those TODO notes and debugging stand out! -syn keyword clTodo contained TODO BUG DEBUG FIX -syn match clNeedsWork contained "NEED[S]*\s\s*WORK" -syn keyword clDebug contained debug +syn keyword clTodo contained TODO BUG DEBUG FIX +syn match clNeedsWork contained "NEED[S]*\s\s*WORK" +syn keyword clDebug contained debug -syn match clComment "#.*$" contains=clTodo,clNeedsWork -syn region clProcedure oneline start="^\s*[{}]" end="$" -syn match clInclude "^\s*include\s.*" +syn match clComment "#.*$" contains=clTodo,clNeedsWork,@Spell +syn region clProcedure oneline start="^\s*[{}]" end="$" +syn match clInclude "^\s*include\s.*" " We don't put "debug" in the clSetOptions; " we contain it in clSet so we can make it stand out. -syn keyword clSetOptions transparent aauto abort align convert E fill fnum goback hangup justify null_exit output rauto rawprint rawdisplay repeat skip tab trim -syn match clSet "^\s*set\s.*" contains=clSetOptions,clDebug +syn keyword clSetOptions transparent aauto abort align convert E fill fnum goback hangup justify null_exit output rauto rawprint rawdisplay repeat skip tab trim +syn match clSet "^\s*set\s.*" contains=clSetOptions,clDebug -syn match clPreProc "^\s*#P.*" +syn match clPreProc "^\s*#P.*" -syn keyword clConditional else elsif -syn keyword clWhile continue endloop +syn keyword clConditional else elsif +syn keyword clWhile continue endloop " 'break' needs to be a region so we can sync on it above. -syn region clBreak oneline start="^\s*break" end="$" +syn region clBreak oneline start="^\s*break" end="$" -syn match clOperator "[!;|)(:.><+*=-]" +syn match clOperator "[!;|)(:.><+*=-]" -syn match clNumber "\<\d\+\(u\=l\=\|lu\|f\)\>" +syn match clNumber "\<\d\+\(u\=l\=\|lu\|f\)\>" -syn region clString matchgroup=clQuote start=+"+ end=+"+ skip=+\\"+ -syn region clString matchgroup=clQuote start=+'+ end=+'+ skip=+\\'+ +syn region clString matchgroup=clQuote start=+"+ end=+"+ skip=+\\"+ contains=@Spell +syn region clString matchgroup=clQuote start=+'+ end=+'+ skip=+\\'+ contains=@Spell -syn keyword clReserved ERROR EXIT INTERRUPT LOCKED LREPLY MODE MCOL MLINE MREPLY NULL REPLY V1 V2 V3 V4 V5 V6 V7 V8 V9 ZERO BYPASS GOING_BACK AAUTO ABORT ABORT ALIGN BIGE CONVERT FNUM GOBACK HANGUP JUSTIFY NEXIT OUTPUT RAUTO RAWDISPLAY RAWPRINT REPEAT SKIP TAB TRIM LCOUNT PCOUNT PLINES SLINES SCOLS MATCH LMATCH +syn keyword clReserved ERROR EXIT INTERRUPT LOCKED LREPLY MODE MCOL MLINE MREPLY NULL REPLY V1 V2 V3 V4 V5 V6 V7 V8 V9 ZERO BYPASS GOING_BACK AAUTO ABORT ABORT ALIGN BIGE CONVERT FNUM GOBACK HANGUP JUSTIFY NEXIT OUTPUT RAUTO RAWDISPLAY RAWPRINT REPEAT SKIP TAB TRIM LCOUNT PCOUNT PLINES SLINES SCOLS MATCH LMATCH -syn keyword clFunction asc asize chr name random slen srandom day getarg getcgi getenv lcase scat sconv sdel skey smult srep substr sword trim ucase match +syn keyword clFunction asc asize chr name random slen srandom day getarg getcgi getenv lcase scat sconv sdel skey smult srep substr sword trim ucase match -syn keyword clStatement clear clear_eol clear_eos close copy create unique with where empty define define ldefine delay_form delete escape exit_block exit_do exit_process field fork format get getfile getnext getprev goto head join maintain message no_join on_eop on_key on_exit on_delete openin openout openapp pause popenin popenout popenio print put range read redisplay refresh restart_block screen select sleep text unlock write and not or do +syn keyword clStatement clear clear_eol clear_eos close copy create unique with where empty define define ldefine delay_form delete escape exit_block exit_do exit_process field fork format get getfile getnext getprev goto head join maintain message no_join on_eop on_key on_exit on_delete openin openout openapp pause popenin popenout popenio print put range read redisplay refresh restart_block screen select sleep text unlock write and not or do " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_cl_syntax_inits") - if version < 508 - let did_cl_syntax_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - - HiLink clifError Error - HiLink clSpaceError Error - HiLink clWhile Repeat - HiLink clConditional Conditional - HiLink clDebug Debug - HiLink clNeedsWork Todo - HiLink clTodo Todo - HiLink clComment Comment - HiLink clProcedure Procedure - HiLink clBreak Procedure - HiLink clInclude Include - HiLink clSetOption Statement - HiLink clSet Identifier - HiLink clPreProc PreProc - HiLink clOperator Operator - HiLink clNumber Number - HiLink clString String - HiLink clQuote Delimiter - HiLink clReserved Identifier - HiLink clFunction Function - HiLink clStatement Statement - - delcommand HiLink +if version >= 508 || !exists("did_cl_syntax_inits") + if version < 508 + let did_cl_syntax_inits = 1 + command -nargs=+ HiLink hi link <args> + else + command -nargs=+ HiLink hi def link <args> + endif + + HiLink clifError Error + HiLink clSpaceError Error + HiLink clWhile Repeat + HiLink clConditional Conditional + HiLink clDebug Debug + HiLink clNeedsWork Todo + HiLink clTodo Todo + HiLink clComment Comment + HiLink clProcedure Procedure + HiLink clBreak Procedure + HiLink clInclude Include + HiLink clSetOption Statement + HiLink clSet Identifier + HiLink clPreProc PreProc + HiLink clOperator Operator + HiLink clNumber Number + HiLink clString String + HiLink clQuote Delimiter + HiLink clReserved Identifier + HiLink clFunction Function + HiLink clStatement Statement + + delcommand HiLink endif let b:current_syntax = "cl" -" vim: ts=8 sw=4 +" vim: ts=8 sw=8 diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim index c2c83570ab..324dce3cc8 100644 --- a/runtime/syntax/css.vim +++ b/runtime/syntax/css.vim @@ -1,10 +1,11 @@ " Vim syntax file -" Language: Cascading Style Sheets -" Maintainer: Claudio Fleiner <claudio@fleiner.com> -" URL: http://www.fleiner.com/vim/syntax/css.vim -" Last Change: 2011 Dec 14 -" CSS2 by Nikolai Weibull -" Full CSS2, HTML4 support by Yeti +" Language: Cascading Style Sheets +" Previous Contributor List: +" Claudio Fleiner <claudio@fleiner.com> (Maintainer) +" Yeti (Add full CSS2, HTML4 support) +" Nikolai Weibull (Add CSS2 support) +" Maintainer: Jules Wang <w.jq0722@gmail.com> +" Last Change: 2012 Aug 21 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -19,6 +20,7 @@ endif syn case ignore +" All HTML4 tags syn keyword cssTagName abbr acronym address applet area a b base syn keyword cssTagName basefont bdo big blockquote body br button syn keyword cssTagName caption center cite code col colgroup dd del @@ -27,32 +29,51 @@ syn keyword cssTagName frameset h1 h2 h3 h4 h5 h6 head hr html img i syn keyword cssTagName iframe img input ins isindex kbd label legend li syn keyword cssTagName link map menu meta noframes noscript ol optgroup syn keyword cssTagName option p param pre q s samp script select small -syn keyword cssTagName span strike strong style sub sup tbody td +syn keyword cssTagName span strike strong style sub sup table tbody td syn keyword cssTagName textarea tfoot th thead title tr tt ul u var -syn match cssTagName "\<table\>" -syn match cssTagName "\*" +syn keyword cssTagName object -syn match cssTagName "@page\>" nextgroup=cssDefinition +" HTML5 new tags 5*6=30 +syn keyword cssTagName article aside audio bdi canvas command +syn keyword cssTagName datalist details embed figcaption figure footer +syn keyword cssTagName header hgroup keygen mark meter nav +syn keyword cssTagName output progress rt rp ruby section +syn keyword cssTagName source summary time track video wbr + +" Tags not supported in HTML5 +syn keyword cssDeprecated acronym applet basefont big center dir +syn keyword cssDeprecated font frame frameset noframes strike tt -syn match cssSelectorOp "[+>.]" -syn match cssSelectorOp2 "[~|]\?=" contained +"syn match cssTagName "\<table\>" +syn match cssTagName "\*" + +" selectors +syn match cssSelectorOp "[,>+]" +syn match cssSelectorOp2 "[~|^$*]\?=" contained +" FIXME: add HTML5 attribute syn region cssAttributeSelector matchgroup=cssSelectorOp start="\[" end="]" transparent contains=cssUnicodeEscape,cssSelectorOp2,cssStringQ,cssStringQQ +" .class and #id +syn match cssClassName "\.[A-Za-z][A-Za-z0-9_-]\+" + try syn match cssIdentifier "#[A-Za-zĄ-’_@][A-Za-zĄ-’0-9_@-]*" catch /^.*/ syn match cssIdentifier "#[A-Za-z_@][A-Za-z0-9_@-]*" endtry +syn match cssTagName "@page\>" nextgroup=cssDefinition +" FIXME: use cssVendor here +syn match cssTagName "@\(-\(webkit\|moz\|o\|ms\)-\)\=keyframes\>" nextgroup=cssDefinition syn match cssMedia "@media\>" nextgroup=cssMediaType skipwhite skipnl syn keyword cssMediaType contained screen print aural braile embosed handheld projection ty tv all nextgroup=cssMediaComma,cssMediaBlock skipwhite skipnl -syn match cssMediaComma "," nextgroup=cssMediaType skipwhite skipnl +"syn match cssMediaComma "," nextgroup=cssMediaType skipwhite skipnl syn region cssMediaBlock transparent matchgroup=cssBraces start='{' end='}' contains=cssTagName,cssError,cssComment,cssDefinition,cssURL,cssUnicodeEscape,cssIdentifier syn match cssValueInteger contained "[-+]\=\d\+" syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\=" -syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\)" +syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\)" syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)" syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)" syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)" @@ -73,20 +94,78 @@ syn keyword cssColor contained aqua black blue fuchsia gray green lime maroon na syn case match syn keyword cssColor contained ActiveBorder ActiveCaption AppWorkspace ButtonFace ButtonHighlight ButtonShadow ButtonText CaptionText GrayText Highlight HighlightText InactiveBorder InactiveCaption InactiveCaptionText InfoBackground InfoText Menu MenuText Scrollbar ThreeDDarkShadow ThreeDFace ThreeDHighlight ThreeDLightShadow ThreeDShadow Window WindowFrame WindowText Background syn case ignore + +syn match cssImportant contained "!\s*important\>" + syn match cssColor contained "\<transparent\>" syn match cssColor contained "\<white\>" syn match cssColor contained "#[0-9A-Fa-f]\{3\}\>" syn match cssColor contained "#[0-9A-Fa-f]\{6\}\>" -"syn match cssColor contained "\<rgb\s*(\s*\d\+\(\.\d*\)\=%\=\s*,\s*\d\+\(\.\d*\)\=%\=\s*,\s*\d\+\(\.\d*\)\=%\=\s*)" -syn region cssURL contained matchgroup=cssFunctionName start="\<url\s*(" end=")" oneline keepend -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgb\|clip\|attr\|counter\|rect\)\s*(" end=")" oneline keepend -syn match cssImportant contained "!\s*important\>" - -syn keyword cssCommonAttr contained auto none inherit +syn region cssURL contained matchgroup=cssFunctionName start="\<url\s*(" end=")" oneline keepend +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgb\|clip\|attr\|counter\|rect\|cubic-bezier\)\s*(" end=")" oneline keepend +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgba\|hsl\|hsla\)\s*(" end=")" oneline keepend +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(linear\|radial\)-gradient\s*(" end=")" oneline keepend +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(matrix\(3d\)\=\|scale\(3d\|X\|Y|\Z\)\=\|translate\(3d\|X\|Y|\Z\)\=\|skew\(X\|Y\)\=\|rotate\(3d\|X\|Y|\Z\)\=\|perspective\)\s*(" end=")" oneline keepend + +" Prop and Attr +" Reference: http://www.w3schools.com/cssref/default.asp +syn keyword cssCommonAttr contained auto none inherit all syn keyword cssCommonAttr contained top bottom syn keyword cssCommonAttr contained medium normal + +syn match cssAnimationProp contained "\<animation\(-\(name\|duration\|timing-function\|delay\|iteration-cout\|play-state\)\)\=\>" + + +syn keyword cssAnimationAttr contained infinite alternate paused running +" bugfix: escape linear-gradient +syn match cssAnimationAttr contained "\<linear\(-gradient\)\@!\>" +syn match cssAnimationAttr contained "\<ease\(-\(in-out\|out\|in\)\)\=\>" + +syn match cssBackgroundProp contained "\<background\(-\(color\|image\|attachment\|position\|clip\|origin\|size\)\)\=\>" +syn keyword cssBackgroundAttr contained center fixed over contain +syn match cssBackgroundAttr contained "\<no-repeat\>" +syn match cssBackgroundAttr contained "\<repeat\(-[xy]\)\=\>" +syn match cssBackgroundAttr contained "\<\(border\|content\|padding\)-box\>" + + +syn match cssBorderOutlineProp contained "\<border\(-\(top\|right\|bottom\|left\)\)\=\(-\(width\|color\|style\)\)\=\>" +syn match cssBorderOutlineProp contained "\<outline\(-\(width\|style\|color\)\)\=\>" +syn match cssBorderOutlineProp contained "\<border-\(top\|bottom\)-\(left\|right\)\(-radius\)\=\>" +syn match cssBorderOutlineProp contained "\<border-image\(-\(outset\|repeat\|slice\|source\|width\)\)\=\>" +syn match cssBorderOutlineProp contained "\<border-radius\>" +syn keyword cssBorderOutlineAttr contained thin thick medium +syn keyword cssBorderOutlineAttr contained dotted dashed solid double groove ridge inset outset +syn keyword cssBorderOutlineAttr contained hidden visible scroll collapse +syn keyword cssBorderOutlineAttr contained stretch round + + +syn match cssBoxProp contained "\<overflow\(-\(x\|y\|style\)\)\=\>" +syn match cssBoxProp contained "\<rotation\(-point\)=\>" +syn keyword cssBoxAttr contained visible hidden scroll auto +syn match cssBoxAttr contained "\<no-\(display\|content\)\>" + +syn keyword cssColorProp contained opacity +syn match cssColorProp contained "\<color-profile\>" +syn match cssColorProp contained "\<rendering-intent\>" + + +syn match cssDimensionProp contained "\<\(min\|max\)-\(width\|height\)\>" +syn keyword cssDimensionProp contained height +syn keyword cssDimensionProp contained width + +" shadow and sizing are in other property groups +syn match cssFlexibleBoxProp contained "\<box-\(align\|direction\|flex\|ordinal-group\|orient\|pack\|shadow\|sizing\)\>" +syn keyword cssFlexibleBoxAttr contained start end center baseline stretch +syn keyword cssFlexibleBoxAttr contained normal reverse +syn keyword cssFlexibleBoxAttr contained single mulitple +syn keyword cssFlexibleBoxAttr contained horizontal +" bugfix: escape vertial-align +syn match cssFlexibleBoxAttr contained "\<vertical\(-align\)\@!\>" +syn match cssFlexibleBoxAttr contained "\<\(inline\|block\)-axis\>" + + syn match cssFontProp contained "\<font\(-\(family\|style\|variant\|weight\|size\(-adjust\)\=\|stretch\)\)\=\>" syn match cssFontAttr contained "\<\(sans-\)\=\<serif\>" syn match cssFontAttr contained "\<small\(-\(caps\|caption\)\)\=\>" @@ -95,67 +174,92 @@ syn match cssFontAttr contained "\<message-box\>" syn match cssFontAttr contained "\<status-bar\>" syn match cssFontAttr contained "\<\(\(ultra\|extra\|semi\|status-bar\)-\)\=\(condensed\|expanded\)\>" syn keyword cssFontAttr contained cursive fantasy monospace italic oblique -syn keyword cssFontAttr contained bold bolder lighter larger smaller -syn keyword cssFontAttr contained icon menu -syn match cssFontAttr contained "\<caption\>" -syn keyword cssFontAttr contained large smaller larger -syn keyword cssFontAttr contained narrower wider - -syn keyword cssColorProp contained color -syn match cssColorProp contained "\<background\(-\(color\|image\|attachment\|position\)\)\=\>" -syn keyword cssColorAttr contained center scroll fixed -syn match cssColorAttr contained "\<repeat\(-[xy]\)\=\>" -syn match cssColorAttr contained "\<no-repeat\>" +syn keyword cssFontAttr contained bold bolder light lighter larger smaller +syn keyword cssFontAttr contained icon menu caption +syn keyword cssFontAttr contained large smaller larger narrower wider +syn keyword cssFontAttr contained Courier Arial Georgia Times -syn match cssTextProp "\<\(\(word\|letter\)-spacing\|text\(-\(decoration\|transform\|align\|index\|shadow\)\)\=\|vertical-align\|unicode-bidi\|line-height\)\>" -syn match cssTextAttr contained "\<line-through\>" -syn match cssTextAttr contained "\<text-indent\>" -syn match cssTextAttr contained "\<\(text-\)\=\(top\|bottom\)\>" -syn keyword cssTextAttr contained underline overline blink sub super middle -syn keyword cssTextAttr contained capitalize uppercase lowercase center justify baseline sub super - -syn match cssBoxProp contained "\<\(margin\|padding\|border\)\(-\(top\|right\|bottom\|left\)\)\=\>" -syn match cssBoxProp contained "\<border-\(\(\(top\|right\|bottom\|left\)-\)\=\(width\|color\|style\)\)\=\>" -syn match cssBoxProp contained "\<\(width\|z-index\)\>" -syn match cssBoxProp contained "\<\(min\|max\)-\(width\|height\)\>" -syn keyword cssBoxProp contained width height float clear overflow clip visibility -syn keyword cssBoxAttr contained thin thick both -syn keyword cssBoxAttr contained dotted dashed solid double groove ridge inset outset -syn keyword cssBoxAttr contained hidden visible scroll collapse - -syn keyword cssGeneratedContentProp contained content quotes + +syn keyword cssGeneratedContentProp contained content quotes crop syn match cssGeneratedContentProp contained "\<counter-\(reset\|increment\)\>" -syn match cssGeneratedContentProp contained "\<list-style\(-\(type\|position\|image\)\)\=\>" +syn match cssGeneratedContentProp contained "\<move-to\>" +syn match cssGeneratedContentProp contained "\<page-policy\>" syn match cssGeneratedContentAttr contained "\<\(no-\)\=\(open\|close\)-quote\>" -syn match cssAuralAttr contained "\<lower\>" -syn match cssGeneratedContentAttr contained "\<\(lower\|upper\)-\(roman\|alpha\|greek\|latin\)\>" -syn match cssGeneratedContentAttr contained "\<\(hiragana\|katakana\)\(-iroha\)\=\>" -syn match cssGeneratedContentAttr contained "\<\(decimal\(-leading-zero\)\=\|cjk-ideographic\)\>" -syn keyword cssGeneratedContentAttr contained disc circle square hebrew armenian georgian -syn keyword cssGeneratedContentAttr contained inside outside -syn match cssPagingProp contained "\<page\(-break-\(before\|after\|inside\)\)\=\>" -syn keyword cssPagingProp contained size marks inside orphans widows -syn keyword cssPagingAttr contained landscape portrait crop cross always avoid -syn keyword cssUIProp contained cursor -syn match cssUIProp contained "\<outline\(-\(width\|style\|color\)\)\=\>" -syn match cssUIAttr contained "\<[ns]\=[ew]\=-resize\>" -syn keyword cssUIAttr contained default crosshair pointer move wait help -syn keyword cssUIAttr contained thin thick -syn keyword cssUIAttr contained dotted dashed solid double groove ridge inset outset -syn keyword cssUIAttr contained invert - -syn match cssRenderAttr contained "\<marker\>" -syn match cssRenderProp contained "\<\(display\|marker-offset\|unicode-bidi\|white-space\|list-item\|run-in\|inline-table\)\>" -syn keyword cssRenderProp contained position top bottom direction -syn match cssRenderProp contained "\<\(left\|right\)\>" -syn keyword cssRenderAttr contained block inline compact -syn match cssRenderAttr contained "\<table\(-\(row-gorup\|\(header\|footer\)-group\|row\|column\(-group\)\=\|cell\|caption\)\)\=\>" -syn keyword cssRenderAttr contained static relative absolute fixed -syn keyword cssRenderAttr contained ltr rtl embed bidi-override pre nowrap -syn match cssRenderAttr contained "\<bidi-override\>" +syn match cssGridProp contained "\<grid-\(columns\|rows\)\>" + +syn match cssHyerlinkProp contained "\<target\(-\(name\|new\|position\)\)\=\>" + +syn match cssListProp contained "\<list-style\(-\(type\|position\|image\)\)\=\>" +syn match cssListAttr contained "\<\(lower\|upper\)-\(roman\|alpha\|greek\|latin\)\>" +syn match cssListAttr contained "\<\(hiragana\|katakana\)\(-iroha\)\=\>" +syn match cssListAttr contained "\<\(decimal\(-leading-zero\)\=\|cjk-ideographic\)\>" +syn keyword cssListAttr contained disc circle square hebrew armenian georgian +syn keyword cssListAttr contained inside outside + + +syn match cssMarginProp contained "\<margin\(-\(top\|right\|bottom\|left\)\)\=\>" + +syn match cssMultiColumnProp contained "\<column\(-\(\break-\(after\|before\)\|count\|gap\|rule\(-\(color\|style\|width\)\)\=\)\|span\|width\)\=\>" + +syn match cssPaddingProp contained "\<padding\(-\(top\|right\|bottom\|left\)\)\=\>" + +syn keyword cssPositioningProp contained bottom clear clip display float left +syn keyword cssPositioningProp contained position right top visibility +syn match cssPositioningProp contained "\<z-index\>" +syn keyword cssPositioningAttr contained block inline compact +syn match cssPositioningAttr contained "\<table\(-\(row-gorup\|\(header\|footer\)-group\|row\|column\(-group\)\=\|cell\|caption\)\)\=\>" +syn keyword cssPositioningAttr contained left right both +syn match cssPositioningAttr contained "\<list-item\>" +syn match cssPositioningAttr contained "\<inline-\(block\|table\)\>" +syn keyword cssPositioningAttr contained static relative absolute fixed + +syn match cssPrintProp contained "\<page\(-break-\(before\|after\|inside\)\)\=\>" +syn keyword cssPrintProp contained orphans widows +syn keyword cssPrintAttr contained landscape portrait crop cross always avoid + +syn match cssTableProp contained "\<\(caption-side\|table-layout\|border-collapse\|border-spacing\|empty-cells\)\>" +syn keyword cssTableAttr contained fixed collapse separate show hide once always + + +syn keyword cssTextProp contained color direction +syn match cssTextProp "\<\(\(word\|letter\)-spacing\|text\(-\(decoration\|transform\|align\|index\|shadow\)\)\=\|vertical-align\|unicode-bidi\|line-height\)\>" +syn match cssTextProp contained "\<text-\(justify\|\outline\|overflow\|warp\|align-last\)\>" +syn match cssTextProp contained "\<word-\(break\|\wrap\)\>" +syn match cssTextProp contained "\<white-space\>" +syn match cssTextProp contained "\<hanging-punctuation\>" +syn match cssTextProp contained "\<punctuation-trim\>" +syn match cssTextAttr contained "\<line-through\>" +syn match cssTextAttr contained "\<text-indent\>" +syn match cssTextAttr contained "\<\(text-\)\=\(top\|bottom\)\>" +syn keyword cssTextAttr contained ltr rtl embed nowrap +syn keyword cssTextAttr contained underline overline blink sub super middle +syn keyword cssTextAttr contained capitalize uppercase lowercase +syn keyword cssTextAttr contained center justify baseline sub super +syn match cssTextAttr contained "\<pre\(-\(line\|wrap\)\)\=\>" +syn match cssTextAttr contained "\<\(allow\|force\)-end\>" +syn keyword cssTextAttr contained start end adjacent +syn match cssTextAttr contained "\<inter-\(word\|ideographic\|cluster\)\>" +syn keyword cssTextAttr contained distribute kashida first last +syn keyword cssTextAttr contained clip ellipsis unrestricted suppress +syn match cssTextAttr contained "\<break-all\>" +syn match cssTextAttr contained "\<break-word\>" +syn keyword cssTextAttr contained hyphenate + + +syn match cssTransformProp contained "\<transform\(-\(origin\|style\)\)\=\>" +syn match cssTransformProp contained "\<perspective\(-origin\)\=\>" +syn match cssTransformProp contained "\<backface-visibility\>" + +syn match cssTransitionProp contained "\<transition\(-\(delay\|duration\|property\|timing-function\)\)\=\>" + +syn match cssUIProp contained "\<nav-\(down\|index\|left\|right\|up\)\=\>" +syn match cssUIProp contained "\<outline-offset\>" +syn match cssUIProp contained "\<box-sizing\>" +syn keyword cssUIProp contained appearance icon resize +syn keyword cssUIAttr contained window button menu field syn match cssAuralProp contained "\<\(pause\|cue\)\(-\(before\|after\)\)\=\>" syn match cssAuralProp contained "\<\(play-during\|speech-rate\|voice-family\|pitch\(-range\)\=\|speak\(-\(punctuation\|numerals\)\)\=\)\>" @@ -171,30 +275,54 @@ syn keyword cssAuralAttr contained below level above higher syn match cssAuralAttr contained "\<\(x-\)\=\(slow\|fast\)\>" syn keyword cssAuralAttr contained faster slower syn keyword cssAuralAttr contained male female child code digits continuous +syn match cssAuralAttr contained "\<lower\>" + +" cursor +syn keyword cssUIProp contained cursor +syn match cssUIAttr contained "\<[ns]\=[ew]\=-resize\>" +syn keyword cssUIAttr contained crosshair default help move pointer +syn keyword cssUIAttr contained progress wait + +" FIXME: I could not find them in reference +syn keyword cssUIAttr contained invert maker size zoom +syn match cssRenderAttr contained "\<run-in\>" +syn match cssRenderAttr contained "\<text-rendering\>" +syn match cssRenderAttr contained "\<font-smoothing\>" +syn match cssRenderProp contained "\<marker-offset\>" +syn match cssRenderAttr contained "\<bidi-override\>" -syn match cssTableProp contained "\<\(caption-side\|table-layout\|border-collapse\|border-spacing\|empty-cells\|speak-header\)\>" -syn keyword cssTableAttr contained fixed collapse separate show hide once always " FIXME: This allows cssMediaBlock before the semicolon, which is wrong. syn region cssInclude start="@import" end=";" contains=cssComment,cssURL,cssUnicodeEscape,cssMediaType syn match cssBraces contained "[{}]" syn match cssError contained "{@<>" -syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape +syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition syn match cssBraceError "}" +" Pseudo class syn match cssPseudoClass ":[A-Za-z0-9_-]*" contains=cssPseudoClassId,cssUnicodeEscape -syn keyword cssPseudoClassId contained link visited active hover focus before after left right +syn keyword cssPseudoClassId link visited active hover focus before after left right lang syn match cssPseudoClassId contained "\<first\(-\(line\|letter\|child\)\)\=\>" -syn region cssPseudoClassLang matchgroup=cssPseudoClassId start=":lang(" end=")" oneline - +" FIXME: handle functions. +"syn region cssPseudoClassLang matchgroup=cssPseudoClassId start="lang(" end=")" +syn match cssPseudoClassId contained "\<\(last\|only\|nth\|nth-last\)-child\>" +syn match cssPseudoClassId contained "\<\(first\|last\|only\|nth\|nth-last\)-of-type\>" +syn keyword cssPseudoClassId root empty target enable disabled checked not invalid +syn match cssPseudoClassId contained "::\(-moz-\)\=selection" + +" Comment syn region cssComment start="/\*" end="\*/" contains=@Spell +syn region cssComment start="//" skip="\\$" end="$" keepend contains=@Spell syn match cssUnicodeEscape "\\\x\{1,6}\s\?" syn match cssSpecialCharQQ +\\"+ contained syn match cssSpecialCharQ +\\'+ contained syn region cssStringQQ start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=cssUnicodeEscape,cssSpecialCharQQ syn region cssStringQ start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=cssUnicodeEscape,cssSpecialCharQ -syn match cssClassName "\.[A-Za-z][A-Za-z0-9_-]\+" + +" Vendor Prefix +syn match cssVendor contained "\(-\(webkit\|moz\|o\|ms\)-\)" + if main_syntax == "css" syn sync minlines=10 @@ -212,31 +340,75 @@ if version >= 508 || !exists("did_css_syn_inits") endif HiLink cssComment Comment + HiLink cssVendor Comment HiLink cssTagName Statement + HiLink cssDeprecated Error HiLink cssSelectorOp Special HiLink cssSelectorOp2 Special - HiLink cssFontProp StorageClass - HiLink cssColorProp StorageClass - HiLink cssTextProp StorageClass + + HiLink cssAnimationProp StorageClass + HiLink cssBackgroundProp StorageClass + HiLink cssBorderOutlineProp StorageClass HiLink cssBoxProp StorageClass - HiLink cssRenderProp StorageClass - HiLink cssAuralProp StorageClass - HiLink cssRenderProp StorageClass + HiLink cssColorProp StorageClass + HiLink cssContentForPagedMediaProp StorageClass + HiLink cssDimensionProp StorageClass + HiLink cssFlexibleBoxProp StorageClass + HiLink cssFontProp StorageClass HiLink cssGeneratedContentProp StorageClass - HiLink cssPagingProp StorageClass + HiLink cssGridProp StorageClass + HiLink cssHyerlinkProp StorageClass + HiLink cssLineboxProp StorageClass + HiLink cssListProp StorageClass + HiLink cssMarginProp StorageClass + HiLink cssMarqueeProp StorageClass + HiLink cssMultiColumnProp StorageClass + HiLink cssPaddingProp StorageClass + HiLink cssPagedMediaProp StorageClass + HiLink cssPositioningProp StorageClass + HiLink cssPrintProp StorageClass + HiLink cssRubyProp StorageClass + HiLink cssSpeechProp StorageClass HiLink cssTableProp StorageClass + HiLink cssTextProp StorageClass + HiLink cssTransformProp StorageClass + HiLink cssTransitionProp StorageClass HiLink cssUIProp StorageClass - HiLink cssFontAttr Type - HiLink cssColorAttr Type - HiLink cssTextAttr Type + HiLink cssAuralProp StorageClass + HiLink cssRenderProp StorageClass + + HiLink cssAnimationAttr Type + HiLink cssBackgroundAttr Type + HiLink cssBorderOutlineAttr Type HiLink cssBoxAttr Type - HiLink cssRenderAttr Type - HiLink cssAuralAttr Type + HiLink cssColorAttr Type + HiLink cssContentForPagedMediaAttr Type + HiLink cssDimensionAttr Type + HiLink cssFlexibleBoxAttr Type + HiLink cssFontAttr Type HiLink cssGeneratedContentAttr Type - HiLink cssPagingAttr Type + HiLink cssGridAttr Type + HiLink cssHyerlinkAttr Type + HiLink cssLineboxAttr Type + HiLink cssListAttr Type + HiLink cssMarginAttr Type + HiLink cssMarqueeAttr Type + HiLink cssMultiColumnAttr Type + HiLink cssPaddingAttr Type + HiLink cssPagedMediaAttr Type + HiLink cssPositioningAttr Type + HiLink cssPrintAttr Type + HiLink cssRubyAttr Type + HiLink cssSpeechAttr Type HiLink cssTableAttr Type + HiLink cssTextAttr Type + HiLink cssTransformAttr Type + HiLink cssTransitionAttr Type HiLink cssUIAttr Type + HiLink cssAuralAttr Type + HiLink cssRenderAttr Type HiLink cssCommonAttr Type + HiLink cssPseudoClassId PreProc HiLink cssPseudoClassLang Constant HiLink cssValueLength Number diff --git a/runtime/syntax/hgcommit.vim b/runtime/syntax/hgcommit.vim index e4c8b6ed44..37fe9db8bf 100644 --- a/runtime/syntax/hgcommit.vim +++ b/runtime/syntax/hgcommit.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: hg (Mercurial) commit file " Maintainer: Ken Takata <kentkt at csc dot jp> -" Last Change: 2012 Aug 2 +" Last Change: 2012 Aug 23 " Filenames: hg-editor-*.txt " License: VIM License " URL: https://github.com/k-takata/hg-vim @@ -10,12 +10,12 @@ if exists("b:current_syntax") finish endif -syn match hgcommitComment "^HG:.*$" -syn match hgcommitUser "^HG: user: \zs.*$" contained containedin=hgcommitComment -syn match hgcommitBranch "^HG: branch \zs.*$" contained containedin=hgcommitComment -syn match hgcommitAdded "^HG: \zsadded .*$" contained containedin=hgcommitComment -syn match hgcommitChanged "^HG: \zschanged .*$" contained containedin=hgcommitComment -syn match hgcommitRemoved "^HG: \zsremoved .*$" contained containedin=hgcommitComment +syn match hgcommitComment "^HG:.*$" contains=@NoSpell +syn match hgcommitUser "^HG: user: \zs.*$" contains=@NoSpell contained containedin=hgcommitComment +syn match hgcommitBranch "^HG: branch \zs.*$" contains=@NoSpell contained containedin=hgcommitComment +syn match hgcommitAdded "^HG: \zsadded .*$" contains=@NoSpell contained containedin=hgcommitComment +syn match hgcommitChanged "^HG: \zschanged .*$" contains=@NoSpell contained containedin=hgcommitComment +syn match hgcommitRemoved "^HG: \zsremoved .*$" contains=@NoSpell contained containedin=hgcommitComment hi def link hgcommitComment Comment hi def link hgcommitUser String diff --git a/runtime/syntax/progress.vim b/runtime/syntax/progress.vim index 3ff7723453..190a0f381b 100644 --- a/runtime/syntax/progress.vim +++ b/runtime/syntax/progress.vim @@ -3,20 +3,20 @@ " Filename extensions: *.p (collides with Pascal), " *.i (collides with assembler) " *.w (collides with cweb) -" Maintainer: Philip Uren <philuSPAX@ieee.org> Remove SPAX spam block -" Contributors: Chris Ruprecht <chris@ruprecht.org> -" Philip Uren <philu@computer.org> -" Mikhail Kuperblum <mikhail@whasup.com> -" John Florian <jflorian@voyager.net> -" Version: 11 -" Last Change: May 11 2012 +" Maintainer: Philip Uren <philuSPAX@ieee.org> Remove SPAX spam block +" Contributors: Chris Ruprecht <chris@ruprecht.org> +" Philip Uren <philu@computer.org> +" Mikhail Kuperblum <mikhail@whasup.com> +" John Florian <jflorian@voyager.net> +" Version: 12 +" Last Change: Aug 16 2012 " For version 5.x: Clear all syntax item " For version 6.x: Quit when a syntax file was already loaded if version < 600 - syntax clear + syntax clear elseif exists("b:current_syntax") - finish + finish endif let s:cpo_save = &cpo @@ -34,7 +34,7 @@ set expandtab syn case ignore " Progress Blocks of code and mismatched "end." errors. -syn match ProgressEndError "\<end\>" +syn match ProgressEndError "\<end\>" syn region ProgressDoBlock transparent matchgroup=ProgressDo start="\<do\>" matchgroup=ProgressDo end="\<end\>" contains=ALLBUT,ProgressProcedure,ProgressFunction syn region ProgressForBlock transparent matchgroup=ProgressFor start="\<for\>" matchgroup=ProgressFor end="\<end\>" contains=ALLBUT,ProgressProcedure,ProgressFunction syn region ProgressRepeatBlock transparent matchgroup=ProgressRepeat start="\<repeat\>" matchgroup=ProgressRepeat end="\<end\>" contains=ALLBUT,ProgressProcedure,ProgressFunction @@ -44,20 +44,20 @@ syn region ProgressCaseBlock transparent matchgroup=ProgressCase start="\<case\> " and they could go in ProgressReserved, " but I found it more helpful to highlight them in a different color. syn keyword ProgressConditional if else then when otherwise -syn keyword ProgressFor each where +syn keyword ProgressFor each where " Make those TODO and debugging notes stand out! -syn keyword ProgressTodo contained TODO BUG FIX -syn keyword ProgressDebug contained DEBUG +syn keyword ProgressTodo contained TODO BUG FIX +syn keyword ProgressDebug contained DEBUG syn keyword ProgressDebug debugger " If you like to highlight the whole line of " the start and end of procedures " to make the whole block of code stand out: -syn match ProgressProcedure "^\s*procedure.*" -syn match ProgressProcedure "^\s*end\s\s*procedure.*" -syn match ProgressFunction "^\s*function.*" -syn match ProgressFunction "^\s*end\s\s*function.*" +syn match ProgressProcedure "^\s*procedure.*" +syn match ProgressProcedure "^\s*end\s\s*procedure.*" +syn match ProgressFunction "^\s*function.*" +syn match ProgressFunction "^\s*end\s\s*function.*" " ... otherwise use this: " syn keyword ProgressFunction procedure function @@ -99,14 +99,14 @@ syn keyword ProgressReserved window-maxim[ized] window-minim[ized] window-normal " Strings. Handles embedded quotes. " Note that, for some reason, Progress doesn't use the backslash, "\" " as the escape character; it uses tilde, "~". -syn region ProgressString matchgroup=ProgressQuote start=+"+ end=+"+ skip=+\~'\|\~\~+ -syn region ProgressString matchgroup=ProgressQuote start=+'+ end=+'+ skip=+\~'\|\~\~+ +syn region ProgressString matchgroup=ProgressQuote start=+"+ end=+"+ skip=+\~'\|\~\~+ contains=@Spell +syn region ProgressString matchgroup=ProgressQuote start=+'+ end=+'+ skip=+\~'\|\~\~+ contains=@Spell syn match ProgressIdentifier "\<[a-zA-Z_][a-zA-Z0-9_]*\>()" " syn match ProgressDelimiter "()" -syn match ProgressMatrixDelimiter "[][]" +syn match ProgressMatrixDelimiter "[][]" " If you prefer you can highlight the range: "syn match ProgressMatrixDelimiter "[\d\+\.\.\d\+]" @@ -114,7 +114,7 @@ syn match ProgressNumber "\<\-\=\d\+\(u\=l\=\|lu\|f\)\>" syn match ProgressByte "\$[0-9a-fA-F]\+" " More values: Logicals, and Progress's unknown value, ?. -syn match ProgressNumber "?" +syn match ProgressNumber "?" syn keyword ProgressNumber true false yes no " If you don't like tabs: @@ -123,9 +123,9 @@ syn match ProgressShowTab "\t" " If you don't like white space on the end of lines, uncomment this: " syn match ProgressSpaceError "\s\+$" -syn region ProgressComment start="/\*" end="\*/" contains=ProgressComment,ProgressTodo,ProgressDebug -syn region ProgressInclude start="^[ ]*[{]" end="[}]" contains=ProgressPreProc,ProgressOperator,ProgressString,ProgressComment -syn region ProgressPreProc start="&" end="\>" contained +syn region ProgressComment start="/\*" end="\*/" contains=ProgressComment,ProgressTodo,ProgressDebug,@Spell +syn region ProgressInclude start="^[ ]*[{]" end="[}]" contains=ProgressPreProc,ProgressOperator,ProgressString,ProgressComment +syn region ProgressPreProc start="&" end="\>" contained " This next line works reasonably well. " syn match ProgressOperator "[!;|)(:.><+*=-]" @@ -277,7 +277,7 @@ syn keyword ProgressOperator write-fragment write-message write-processing-instr syn keyword ProgressOperator xml-data-type xml-node-name xml-node-type xml-schema-pat[h] xml-suppress-namespace-processing y y-of year year-offset yes-no syn keyword ProgressOperator yes-no-cancel -syn |