Fix ellipsis, start fix for en and em-dash

vim-pandoc · Feb 14, 2020 · ee59c57 · ee59c57
1 parent efe6a9a
commit ee59c57
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/syntax/pandoc.vim b/syntax/pandoc.vim
@@ -501,19 +501,19 @@ endif
 
 " Emdashes: {{{3
 if &encoding ==# 'utf-8'
-  call s:WithConceal('emdashes', 'syn match pandocEllipses /\([^-]\)\@<=---\([^-]\)\@=/ display', 'conceal cchar=—')
+  call s:WithConceal('emdashes', 'syn match pandocEmdashes /---/ containedin=pandocSetexHeader,pandocEmphasis,pandocStrong,pandocListItem,pandocListItemContinuation,pandocUListItem display', 'conceal cchar=—')
 endif
 " }}}3
 
 " Endashes: {{{3
 if &encoding ==# 'utf-8'
-  call s:WithConceal('endashes', 'syn match pandocEllipses /\([^-]\)\@<=--\([^-]\)\@=/ display', 'conceal cchar=–')
+  call s:WithConceal('endashes', 'syn match pandocEndashes /\([^-]\)\@<=--\([^-]\)\@=/ display', 'conceal cchar=–')
 endif
 " }}}3
 
 " Ellipses: {{{3
 if &encoding ==# 'utf-8'
-    call s:WithConceal('ellipses', 'syn match pandocEllipses /\.\.\./ display', 'conceal cchar=…')
+    call s:WithConceal('ellipses', 'syn match pandocEllipses /\.\.\./ containedin=pandocEmphasis,pandocStrong,pandocListItem,pandocListItemContinuation,pandocUListItem  display', 'conceal cchar=…')
 endif
 " }}}3
 

diff --git a/tests/smart.pdc b/tests/smart.pdc
@@ -1,4 +1,4 @@
-# smart punctuation
+# Smart Punctuation
 
 # Ellipses ...
 
@@ -15,6 +15,38 @@ Blah ... blah.
 ... and yet.
 ...and yet.
 
+* I'm in a bullet...
+
+Endash --
+----------
+
+Endash --
+==========
+
+And then there was --
+
+Blah--blah.
+Blah -- blah.
+
+-- and yet.
+--and yet.
+
+* I'm in a bullet...
+
+Emdash ---
+---------
+
+Emdash ---
+==========
+
+And then there was ---
+
+Blah---blah.
+Blah --- blah.
+
+--- and yet.
+---and yet.
+
 # "Foo" is a thing
 
 A "Foo" is a thing