Switch to strong and em implementation based on Tim Pope's.

Seems to fix some problems with mine. Changed so *'s and _'s inside words don't
start emphasis, which is not canonical but everyone seems to like better.

diff --git a/syntax/mkd.vim b/syntax/mkd.vim
index 29261940f45d3ba5460754f08b8c679d41a8c016..7b9e61fa644cd809fa770819b7996d5073a59faa 100644 (file)
--- a/syntax/mkd.vim
+++ b/syntax/mkd.vim
@@ -36,10 +36,12 @@ syn case ignore
 syn sync linebreaks=1
 
 "additions to HTML groups
-syn region htmlBold     start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\*\@!/     end=/\\\@<!\*\@<!\*\*\*\@!\($\|\A\)\@=/   contains=@Spell,htmlItalic
-syn region htmlItalic   start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\@!/       end=/\\\@<!\*\@<!\*\*\@!\($\|\A\)\@=/      contains=htmlBold,@Spell
-syn region htmlBold     start=/\\\@<!\(^\|\A\)\@=_\@<!___\@!/         end=/\\\@<!_\@<!___\@!\($\|\A\)\@=/       contains=htmlItalic,@Spell
-syn region htmlItalic   start=/\\\@<!\(^\|\A\)\@=_\@<!__\@!/          end=/\\\@<!_\@<!__\@!\($\|\A\)\@=/        contains=htmlBold,@Spell
+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
 
 " [link](URL) | [link][id] | [link][]
 syn region mkdFootnotes matchgroup=mkdDelimiter start="\[^"    end="\]"