diff options
Diffstat (limited to '')
| -rw-r--r-- | syntax/html.vim | 22 | ||||
| -rw-r--r-- | syntax/html/aria.vim | 25 | ||||
| -rw-r--r-- | syntax/html/electron.vim | 19 |
3 files changed, 54 insertions, 12 deletions
diff --git a/syntax/html.vim b/syntax/html.vim index da9117dc..3f58cf02 100644 --- a/syntax/html.vim +++ b/syntax/html.vim @@ -2,8 +2,9 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1 " Vim syntax file " Language: HTML (version 5.1) -" SVG (SVG 1.1 (Second Edition) ) -" Last Change: 2016 Jan 20 +" SVG (SVG 1.1 Second Edition) +" MathML (MathML 3.0 Second Edition) +" Last Change: 2017 Mar 07 " License: Public domain " (but let me know if you like :) ) " @@ -18,6 +19,15 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1 " Modified: htdebeer <H.T.de.Beer@gmail.com> " Changes: add common SVG elements and attributes for inline SVG +" Patch 7.4.1142 +if has("patch-7.4-1142") + if has("win32") + syn iskeyword @,48-57,_,128-167,224-235,- + else + syn iskeyword @,48-57,_,192-255,- + endif +endif + " HTML 5 tags syn keyword htmlTagName contained article aside audio canvas command syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer @@ -90,7 +100,7 @@ syn keyword htmlArg contained xml:lang xml:space xml:base xmlns syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload " <video>, <audio>, <source>, <track> -syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track +syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline " <form>, <input>, <button> syn keyword htmlArg contained form autocomplete autofocus list min max step syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate @@ -102,7 +112,7 @@ syn keyword htmlArg contained async " <content> syn keyword htmlArg contained select " <iframe> -syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen +syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest " <picture> syn keyword htmlArg contained srcset sizes " <a> @@ -117,11 +127,11 @@ syn keyword htmlArg contained integrity crossorigin " Custom Data Attributes " http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes -syn match htmlArg "\<\(data\-\([a-z_][a-z0-9_.\-]*\)\+\)\{1,}\>" contained +syn match htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained " Vendor Extension Attributes " http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility -syn match htmlArg "\<\(x\-\([a-z_][a-z0-9_.\-]*\)\+\)\{2,}\>" contained +syn match htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained " Microdata " http://dev.w3.org/html5/md/ diff --git a/syntax/html/aria.vim b/syntax/html/aria.vim index 28cf34c0..3bb377ea 100644 --- a/syntax/html/aria.vim +++ b/syntax/html/aria.vim @@ -1,16 +1,15 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1 " Vim syntax file -" Language: WAI-ARIA +" Language: WAI-ARIA " Maintainer: othree <othree@gmail.com> -" URL: http://github.com/othree/html5-syntax.vim -" Last Change: 2014-05-02 +" URL: https://github.com/othree/html5.vim +" Last Change: 2017-03-07 " License: MIT -" Changes: Add match rules -" update to Draft 16 September 2010 +" Changes: update to Candidate Recommendation 27 October 2016 " WAI-ARIA States and Properties -" http://www.w3.org/TR/wai-aria/states_and_properties +" https://www.w3.org/TR/wai-aria-1.1/#states_and_properties syn keyword htmlArg contained role " Global States and Properties @@ -18,6 +17,8 @@ syn keyword htmlArg contained aria-atomic aria-busy aria-controls aria-describe syn keyword htmlArg contained aria-disabled aria-dropeffect aria-flowto aria-grabbed syn keyword htmlArg contained aria-haspopup aria-hidden aria-invalid aria-label syn keyword htmlArg contained aria-labelledby aria-live aria-owns aria-relevant +" 1.1 +syn keyword htmlArg contained aria-current aria-details aria-keyshortcuts aria-roledescription " Widget Attributes syn keyword htmlArg contained aria-autocomplete aria-checked aria-disabled aria-expanded @@ -25,6 +26,8 @@ syn keyword htmlArg contained aria-haspopup aria-hidden aria-invalid aria-label syn keyword htmlArg contained aria-level aria-multiline aria-multiselectable aria-orientation syn keyword htmlArg contained aria-pressed aria-readonly aria-required aria-selected syn keyword htmlArg contained aria-sort aria-valuemax aria-valuemin aria-valuenow aria-valuetext +" 1.1 +syn keyword htmlArg contained aria-errormessage aria-hasgroup aria-modal aria-placeholder " Live Region Attributes syn keyword htmlArg contained aria-atomic aria-busy aria-live aria-relevant @@ -35,6 +38,9 @@ syn keyword htmlArg contained aria-dropeffect aria-grabbed " Relationship Attributes syn keyword htmlArg contained aria-activedescendant aria-controls aria-describedby aria-flowto syn keyword htmlArg contained aria-labelledby aria-owns aria-posinset aria-setsize +" 1.1 +syn keyword htmlArg contained aria-colcount aria-colindex aria-colspan +syn keyword htmlArg contained aria-rowcount aria-rowindex aria-rowspan " Use match: https://github.com/othree/html5.vim/issues/39 @@ -44,6 +50,8 @@ syn match htmlArg contained "\<aria-\%(\|atomic\|busy\|controls\|describedby\ syn match htmlArg contained "\<aria-\%(\|disabled\|dropeffect\|flowto\|grabbed\)\>" syn match htmlArg contained "\<aria-\%(\|haspopup\|hidden\|invalid\|label\)\>" syn match htmlArg contained "\<aria-\%(\|labelledby\|live\|owns\|relevant\)\>" +" 1.1 +syn match htmlArg contained "\<aria-\%(\|current\|details\|keyshortcuts\|roledescription\)\>" " Widget Attributes syn match htmlArg contained "\<aria-\%(\|autocomplete\|checked\|disabled\|expanded\)\>" @@ -51,6 +59,8 @@ syn match htmlArg contained "\<aria-\%(\|haspopup\|hidden\|invalid\|label\)\> syn match htmlArg contained "\<aria-\%(\|level\|multiline\|multiselectable\|orientation\)\>" syn match htmlArg contained "\<aria-\%(\|pressed\|readonly\|required\|selected\)\>" syn match htmlArg contained "\<aria-\%(\|sort\|valuemax\|valuemin\|valuenow\|valuetext\)\>" +" 1.1 +syn match htmlArg contained "\<aria-\%(\|errormessage\|hasgroup\|modal\|placeholder\)\>" " Live Region Attributes syn match htmlArg contained "\<aria-\%(\|atomic\|busy\|live\|relevant\)\>" @@ -61,6 +71,9 @@ syn match htmlArg contained "\<aria-\%(\|dropeffect\|grabbed\)\>" " Relationship Attributes syn match htmlArg contained "\<aria-\%(\|activedescendant\|controls\|describedby\|flowto\)\>" syn match htmlArg contained "\<aria-\%(\|labelledby\|owns\|posinset\|setsize\)\>" +" 1.1 +syn match htmlArg contained "\<aria-\%(\|colcount\|colindex\|colspan\)\>" +syn match htmlArg contained "\<aria-\%(\|rowcount\|rowindex\|rowspan\)\>" endif diff --git a/syntax/html/electron.vim b/syntax/html/electron.vim new file mode 100644 index 00000000..35e60dd4 --- /dev/null +++ b/syntax/html/electron.vim @@ -0,0 +1,19 @@ +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1 + +" Vim syntax file +" Language: Electron +" Maintainer: othree <othree@gmail.com> +" URL: https://github.com/othree/html5.vim +" Last Change: 2017-03-15 +" License: MIT + +" <webview> https://electron.atom.io/docs/api/webview-tag/ +syn keyword htmlTagName contained webview + +syn keyword htmlArg contained autosize nodeintegration plugins preload httpreferrer +syn keyword htmlArg contained useragent disablewebsecurity partition allowpopups +syn keyword htmlArg contained webpreferences blinkfeatures disableblinkfeatures +syn keyword htmlArg contained guestinstance disableguestresize + + +endif |