From e26d9fdb8efb2b6d345595981972809ffd1f3b3c Mon Sep 17 00:00:00 2001
From: Rane <rane.brown@gmail.com>
Date: Thu, 14 Mar 2019 14:03:42 -0600
Subject: [PATCH 1/3] Fix bold and italic markdown syntax

---
 syntax/vimwiki_markdown.vim | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/syntax/vimwiki_markdown.vim b/syntax/vimwiki_markdown.vim
index 5962699..0740712 100644
--- a/syntax/vimwiki_markdown.vim
+++ b/syntax/vimwiki_markdown.vim
@@ -13,23 +13,21 @@ let s:markdown_syntax = g:vimwiki_syntax_variables['markdown']
 let s:markdown_syntax.rxEqIn = '\$[^$`]\+\$'
 let s:markdown_syntax.char_eqin = '\$'
 
-" text: *strong*
-" let s:markdown_syntax.rxBold = '\*[^*]\+\*'
+" text: **strong** or __strong__
 let s:markdown_syntax.rxBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
-      \'\*'.
-      \'\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)'.
-      \'\*'.
+      \'\(\*\|_\)\{2\}'.
+      \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`[:space:]]\)'.
+      \'\1\{2\}'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let s:markdown_syntax.char_bold = '*'
+let s:markdown_syntax.char_bold = '\*\*\|__'
 
-" text: _emphasis_
-" let s:markdown_syntax.rxItalic = '_[^_]\+_'
+" text: _emphasis_ or *emphasis*
 let s:markdown_syntax.rxItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
-      \'_'.
-      \'\%([^_`[:space:]][^_`]*[^_`[:space:]]\|[^_`[:space:]]\)'.
-      \'_'.
+      \'\(\*\|_\)'.
+      \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`[:space:]]\)'.
+      \'\1'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let s:markdown_syntax.char_italic = '_'
+let s:markdown_syntax.char_italic = '\*\|_'
 
 " text: *_bold italic_* or _*italic bold*_
 let s:markdown_syntax.rxBoldItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.

From 6b29b6604c0a82e3078e17ac08a669c957a0126d Mon Sep 17 00:00:00 2001
From: Rane <rane.brown@gmail.com>
Date: Thu, 14 Mar 2019 15:21:04 -0600
Subject: [PATCH 2/3] Fix bold_italic and italic_bold markdown syntax.

---
 syntax/vimwiki.vim          |  2 +-
 syntax/vimwiki_markdown.vim | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 512aad9..6a2f9cf 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -383,7 +383,7 @@ hi def link VimwikiBoldT VimwikiBold
 hi def VimwikiItalic term=italic cterm=italic gui=italic
 hi def link VimwikiItalicT VimwikiItalic
 
-hi def VimwikiBoldItalic term=bold cterm=bold gui=bold,italic
+hi def VimwikiBoldItalic term=bold,italic cterm=bold,italic gui=bold,italic
 hi def link VimwikiItalicBold VimwikiBoldItalic
 hi def link VimwikiBoldItalicT VimwikiBoldItalic
 hi def link VimwikiItalicBoldT VimwikiBoldItalic
diff --git a/syntax/vimwiki_markdown.vim b/syntax/vimwiki_markdown.vim
index 0740712..05e1f34 100644
--- a/syntax/vimwiki_markdown.vim
+++ b/syntax/vimwiki_markdown.vim
@@ -31,18 +31,18 @@ let s:markdown_syntax.char_italic = '\*\|_'
 
 " text: *_bold italic_* or _*italic bold*_
 let s:markdown_syntax.rxBoldItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
-      \'\*_'.
-      \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`[:space:]]\)'.
-      \'_\*'.
+      \'\(\*\)\{3\}'.
+      \'\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)'.
+      \'\1\{3\}'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let s:markdown_syntax.char_bolditalic = '\*_'
+let s:markdown_syntax.char_bolditalic = '\*\*\*'
 
 let s:markdown_syntax.rxItalicBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
-      \'_\*'.
-      \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`[:space:]]\)'.
-      \'\*_'.
+      \'\(_\)\{3\}'.
+      \'\%([^_`[:space:]][^_`]*[^_`[:space:]]\|[^_`[:space:]]\)'.
+      \'\1\{3\}'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let s:markdown_syntax.char_italicbold = '_\*'
+let s:markdown_syntax.char_italicbold = '___'
 
 " text: `code`
 let s:markdown_syntax.rxCode = '`[^`]\+`'

From 1f1966a4f643897668c4b797a8f2af6811db25eb Mon Sep 17 00:00:00 2001
From: Rane <rane.brown@gmail.com>
Date: Fri, 15 Mar 2019 06:12:35 -0600
Subject: [PATCH 3/3] Add description of markdown specific text decorators

---
 doc/vimwiki.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 4f935e5..908c9b3 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -877,6 +877,12 @@ is decorated: >
   super^script^
   sub,,script,,
 
+For Markdown syntax these variations are used: >
+
+  **bold text** or __bold text__
+  *italic text* or _italic text_
+  ***bold_italic text*** or ___italic_bold text___
+
 Furthermore, there are a number of words which are highlighted extra flashy:
 TODO, DONE, STARTED, FIXME, FIXED, XXX.