m-vim_plugins/vim-markdown
1
0
Fork 0
mirror of https://github.com/tpope/vim-markdown.git synced 2025-11-16 13:53:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: m-vim_plugins:fenced_highlighting
Branches Tags
m-vim_plugins:master m-vim_plugins:fenced_highlighting
m-vim_plugins:vim8.2 m-vim_plugins:vim7.4 m-vim_plugins:v1.0
..
compare: m-vim_plugins:vim7.4
Branches Tags
m-vim_plugins:master m-vim_plugins:fenced_highlighting
m-vim_plugins:vim8.2 m-vim_plugins:vim7.4 m-vim_plugins:v1.0

19 Commits
fenced_hig ... vim7.4

Author SHA1 Message Date
Drew Neil
a126974366 Add 'Last change: 2013 May 30' to headers 2013-11-16 16:48:16 +00:00
Tim Pope
451eefb9b2 Merge pull request #41 from cemerick/master 
Highlight italicized regions within bold regions
 2013-05-27 11:28:32 -07:00
Tim Pope
d9b041af65 Merge pull request #38 from hjdivad/dont-stomp-main-syntax 
Clear `main_syntax` if we set it.
 2013-05-23 21:11:11 -07:00
Chas Emerick
697edbe7ca Highlight italicized regions within bold regions 2013-05-14 07:50:17 -04:00
David J. Hamilton
de106cb725 Clear main_syntax if we set it. 
This prevents conflicts with other syntaxes that use `main_syntax`, like
vim-javascript.
 2013-05-02 12:08:46 -07:00
Tim Pope
ec0abb3064 Support blank lines in block quotes 2013-03-05 13:49:30 -05:00
Tim Pope
90fc7fc593 Fix highlighting HTML entities at start of line 2013-03-05 13:46:53 -05:00
Tim Pope
e8fa4faf82 Support indented fenced code blocks 2013-03-01 22:44:23 -05:00
Hinrik Örn Sigurðsson
5ed43c22bc Require space after ordered list marker 2013-01-27 15:22:31 -05:00
Hinrik Örn Sigurðsson
242dda3f01 Allow automatic links in headings 2013-01-25 19:12:36 -05:00
Bryan Richter
10cf9687d2 A more liberal markdownValid 2013-01-21 17:30:43 +00:00
Tim Pope
9407dae660 Really fix options after ```language 2012-10-12 18:20:48 -04:00
Tim Pope
ecafbe32a8 Fix ```language with more junk on the same line 2012-10-12 18:03:18 -04:00
Tim Pope
b2697b0adf Highlight GitHub style fenced code blocks 
One needs to opt-in to this by specifying which file types should be
highlighted:

    let g:markdown_github_languages = ['ruby', 'erb=eruby']

This may not work for all file types.

Closes #17.
 2012-10-12 17:58:09 -04:00
Tim Pope
dcdab0cd55 Strip r and o out of format options 
Closes #25.
 2012-08-06 22:45:15 -04:00
Tim Pope
7b747d0aa4 Improve tab handling 
Closes #18.
 2012-07-08 04:06:40 -04:00
Tim Pope
9a21f7a6bc Ignore options after ```filetype 
Closes #22.
 2012-06-28 23:31:35 -04:00
Tim Pope
3a99157473 Flag internal underscores in headings 2012-04-01 22:55:05 -04:00
Tim Pope
fdc0f091c7 Work around users overriding ftplugin/html.vim 2011-12-21 22:45:33 -05:00
2 changed files with 30 additions and 21 deletions
Expand all files Collapse all files

9
ftplugin/markdown.vim
View File

@@ -1,6 +1,7 @@
" Vim filetype plugin
" Language: Markdown
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
" Last Change: 2013 May 30
if exists("b:did_ftplugin")
finish
@@ -9,9 +10,13 @@ endif
runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s
setlocal formatoptions+=tcqln
setlocal formatoptions+=tcqln formatoptions-=r formatoptions-=o
setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^[-*+]\\s\\+
let b:undo_ftplugin .= "|setl cms< com< fo<"
if exists('b:undo_ftplugin')
let b:undo_ftplugin .= "|setl cms< com< fo< flp<"
else
let b:undo_ftplugin = "setl cms< com< fo< flp<"
endif
" vim:set sw=2:

42
syntax/markdown.vim
View File

@@ -2,6 +2,7 @@
" Language: Markdown
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
" Filenames: *.markdown
" Last Change: 2013 May 30
if exists("b:current_syntax")
finish
@@ -29,38 +30,38 @@ unlet! s:type
syn sync minlines=10
syn case ignore
syn match markdownValid '[<>]\S\@!'
syn match markdownValid '[<>]\c[a-z/$!]\@!'
syn match markdownValid '&\%(#\=\w*;\)\@!'
syn match markdownLineStart "^[<@]\@!" nextgroup=@markdownBlock
syn match markdownLineStart "^[<@]\@!" nextgroup=@markdownBlock,htmlSpecialChar
syn cluster markdownBlock contains=markdownH1,markdownH2,markdownH3,markdownH4,markdownH5,markdownH6,markdownBlockquote,markdownListMarker,markdownOrderedListMarker,markdownCodeBlock,markdownRule
syn cluster markdownInline contains=markdownLineBreak,markdownLinkText,markdownItalic,markdownBold,markdownCode,markdownEscape,@htmlTop
syn cluster markdownInline contains=markdownLineBreak,markdownLinkText,markdownItalic,markdownBold,markdownCode,markdownEscape,@htmlTop,markdownError
syn match markdownH1 "^.\+\n=\+$" contained contains=@markdownInline,markdownHeadingRule
syn match markdownH2 "^.\+\n-\+$" contained contains=@markdownInline,markdownHeadingRule
syn match markdownH1 "^.\+\n=\+$" contained contains=@markdownInline,markdownHeadingRule,markdownAutomaticLink
syn match markdownH2 "^.\+\n-\+$" contained contains=@markdownInline,markdownHeadingRule,markdownAutomaticLink
syn match markdownHeadingRule "^[=-]\+$" contained
syn region markdownH1 matchgroup=markdownHeadingDelimiter start="##\@!" end="#*\s*$" keepend oneline contains=@markdownInline contained
syn region markdownH2 matchgroup=markdownHeadingDelimiter start="###\@!" end="#*\s*$" keepend oneline contains=@markdownInline contained
syn region markdownH3 matchgroup=markdownHeadingDelimiter start="####\@!" end="#*\s*$" keepend oneline contains=@markdownInline contained
syn region markdownH4 matchgroup=markdownHeadingDelimiter start="#####\@!" end="#*\s*$" keepend oneline contains=@markdownInline contained
syn region markdownH5 matchgroup=markdownHeadingDelimiter start="######\@!" end="#*\s*$" keepend oneline contains=@markdownInline contained
syn region markdownH6 matchgroup=markdownHeadingDelimiter start="#######\@!" end="#*\s*$" keepend oneline contains=@markdownInline contained
syn region markdownH1 matchgroup=markdownHeadingDelimiter start="##\@!" end="#*\s*$" keepend oneline contains=@markdownInline,markdownAutomaticLink contained
syn region markdownH2 matchgroup=markdownHeadingDelimiter start="###\@!" end="#*\s*$" keepend oneline contains=@markdownInline,markdownAutomaticLink contained
syn region markdownH3 matchgroup=markdownHeadingDelimiter start="####\@!" end="#*\s*$" keepend oneline contains=@markdownInline,markdownAutomaticLink contained
syn region markdownH4 matchgroup=markdownHeadingDelimiter start="#####\@!" end="#*\s*$" keepend oneline contains=@markdownInline,markdownAutomaticLink contained
syn region markdownH5 matchgroup=markdownHeadingDelimiter start="######\@!" end="#*\s*$" keepend oneline contains=@markdownInline,markdownAutomaticLink contained
syn region markdownH6 matchgroup=markdownHeadingDelimiter start="#######\@!" end="#*\s*$" keepend oneline contains=@markdownInline,markdownAutomaticLink contained
syn match markdownBlockquote ">\s" contained nextgroup=@markdownBlock
syn match markdownBlockquote ">\%(\s\|$\)" contained nextgroup=@markdownBlock
syn region markdownCodeBlock start=" \|\t" end="$" contained
" TODO: real nesting
syn match markdownListMarker " \{0,4\}[-*+]\%(\s\+\S\)\@=" contained
syn match markdownOrderedListMarker " \{0,4}\<\d\+\.\%(\s*\S\)\@=" contained
syn match markdownListMarker "\%(\t\| \{0,4\}\)[-*+]\%(\s\+\S\)\@=" contained
syn match markdownOrderedListMarker "\%(\t\| \{0,4}\)\<\d\+\.\%(\s\+\S\)\@=" contained
syn match markdownRule "\* *\* *\*[ *]*$" contained
syn match markdownRule "- *- *-[ -]*$" contained
syn match markdownLineBreak "\s\{2,\}$"
syn match markdownLineBreak " \{2,\}$"
syn region markdownIdDeclaration matchgroup=markdownLinkDelimiter start="^ \{0,3\}!\=\[" end="\]:" oneline keepend nextgroup=markdownUrl skipwhite
syn match markdownUrl "\S\+" nextgroup=markdownUrlTitle skipwhite contained
@@ -76,17 +77,17 @@ syn region markdownAutomaticLink matchgroup=markdownUrlDelimiter start="<\%(\w\+
syn region markdownItalic start="\S\@<=\*\|\*\S\@=" end="\S\@<=\*\|\*\S\@=" keepend contains=markdownLineStart
syn region markdownItalic start="\S\@<=_\|_\S\@=" end="\S\@<=_\|_\S\@=" keepend contains=markdownLineStart
syn region markdownBold start="\S\@<=\*\*\|\*\*\S\@=" end="\S\@<=\*\*\|\*\*\S\@=" keepend contains=markdownLineStart
syn region markdownBold start="\S\@<=__\|__\S\@=" end="\S\@<=__\|__\S\@=" keepend contains=markdownLineStart
syn region markdownBold start="\S\@<=\*\*\|\*\*\S\@=" end="\S\@<=\*\*\|\*\*\S\@=" keepend contains=markdownLineStart,markdownItalic
syn region markdownBold start="\S\@<=__\|__\S\@=" end="\S\@<=__\|__\S\@=" keepend contains=markdownLineStart,markdownItalic
syn region markdownBoldItalic start="\S\@<=\*\*\*\|\*\*\*\S\@=" end="\S\@<=\*\*\*\|\*\*\*\S\@=" keepend contains=markdownLineStart
syn region markdownBoldItalic start="\S\@<=___\|___\S\@=" end="\S\@<=___\|___\S\@=" keepend contains=markdownLineStart
syn region markdownCode matchgroup=markdownCodeDelimiter start="`" end="`" keepend contains=markdownLineStart
syn region markdownCode matchgroup=markdownCodeDelimiter start="`` \=" end=" \=``" keepend contains=markdownLineStart
syn region markdownCode matchgroup=markdownCodeDelimiter start="^\s*\zs```\s*\w*\ze\s*$" end="^```\ze\s*$" keepend
syn region markdownCode matchgroup=markdownCodeDelimiter start="^\s*```.*$" end="^\s*```\ze\s*$" keepend
if main_syntax ==# 'markdown'
for s:type in g:markdown_fenced_languages
exe 'syn region markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' matchgroup=markdownCodeDelimiter start="^\s*\zs```'.matchstr(s:type,'[^=]*').'$" end="^```\ze\s*$" keepend contains=@markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g')
exe 'syn region markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' matchgroup=markdownCodeDelimiter start="^\s*```'.matchstr(s:type,'[^=]*').'\>.*$" end="^\s*```\ze\s*$" keepend contains=@markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g')
endfor
unlet! s:type
endif
@@ -126,5 +127,8 @@ hi def link markdownEscape Special
hi def link markdownError Error
let b:current_syntax = "markdown"
if main_syntax ==# 'markdown'
unlet main_syntax
endif
" vim:set sw=2: