X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/e3bbd8b78aa50235dbb87a515f0fb0384621447d..3b7499f4cf49a9009d70ab6fac447d258f0097ec:/syntax/mkd.vim diff --git a/syntax/mkd.vim b/syntax/mkd.vim index 7b9e61f..d6233d2 100644 --- a/syntax/mkd.vim +++ b/syntax/mkd.vim @@ -15,7 +15,10 @@ if version < 600 so :p:h/html.vim else runtime! syntax/html.vim - unlet b:current_syntax + + if exists('b:current_syntax') + unlet b:current_syntax + endif endif if version < 600 @@ -36,18 +39,18 @@ syn case ignore syn sync linebreaks=1 "additions to HTML groups -syn region htmlItalic start="\(^\|\s\)\@<=\*" end="\*\($\|\s\)\@=" keepend -syn region htmlItalic start="\(^\|\s\)\@<=_" end="_\($\|\s\)\@=" keepend -syn region htmlBold start="\(^\|\s\)\@<=\*\*" end="\*\*\($\|\s\)\@=" keepend -syn region htmlBold start="\(^\|\s\)\@<=__" end="__\($\|\s\)\@=" keepend -syn region htmlBoldItalic start="\(^\|\s\)\@<=\*\*\*" end="\*\*\*\($\|\s\)\@=" keepend -syn region htmlBoldItalic start="\(^\|\s\)\@<=___" end="___\($\|\s\)\@=" keepend +syn region htmlItalic start="\\\@/ end=/$/ contains=mkdLineBreak,mkdLineContinue,@Spell syn region mkdCode start=/\(\([^\\]\|^\)\\\)\@]*>" end="" syn region mkdCode start="]*>" end="" -syn match mkdCode /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/ +syn region mkdFootnote start="\[^" end="\]" +syn match mkdCode /^\s*\n\(\(\s\{8,}[^ ]\|\t\t\+[^\t]\).*\n\)\+/ +syn match mkdIndentCode /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/ contained syn match mkdListItem "^\s*[-*+]\s\+" syn match mkdListItem "^\s*\d\+\.\s\+" +syn region mkdNonListItemBlock start="\n\(\_^\_$\|\s\{4,}[^ ]\|\t+[^\t]\)\@!" end="^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@=" contains=@mkdNonListItem,@Spell syn match mkdRule /^\s*\*\s\{0,1}\*\s\{0,1}\*$/ syn match mkdRule /^\s*-\s\{0,1}-\s\{0,1}-$/ -syn match mkdRule /^\s+_\s\{0,1}_\s\{0,1}_$/ +syn match mkdRule /^\s*_\s\{0,1}_\s\{0,1}_$/ syn match mkdRule /^\s*-\{3,}$/ syn match mkdRule /^\s*\*\{3,5}$/ @@ -88,9 +94,13 @@ syn region htmlH6 start="^\s*######" end="\($\|#\+\)" contain syn match htmlH1 /^.\+\n=\+$/ contains=@Spell syn match htmlH2 /^.\+\n-\+$/ contains=@Spell +syn cluster mkdNonListItem contains=htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdID,mkdURL,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdIndentCode,mkdListItem,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6 + "highlighting for Markdown groups HtmlHiLink mkdString String HtmlHiLink mkdCode String +HtmlHiLink mkdIndentCode String +HtmlHiLink mkdFootnote Comment HtmlHiLink mkdBlockquote Comment HtmlHiLink mkdLineContinue Comment HtmlHiLink mkdListItem Identifier @@ -107,6 +117,11 @@ HtmlHiLink mkdLinkTitle htmlString HtmlHiLink mkdDelimiter Delimiter +" Automatically insert bullets +setlocal formatoptions+=r +" Accept various markers as bullets +setlocal comments=b:*,b:+,b:- + let b:current_syntax = "mkd" delcommand HtmlHiLink