From 3337484df5043b85b57c32855679198b9d5c78b5 Mon Sep 17 00:00:00 2001 From: Daniel Ashbrook Date: Thu, 11 Nov 2021 22:11:24 +0100 Subject: [PATCH 1/2] Simplify & improve bold+italic Works for *bold _italic_ more bold* etc --- syntax/wiki.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/syntax/wiki.vim b/syntax/wiki.vim index 8a814a8..1f2f399 100644 --- a/syntax/wiki.vim +++ b/syntax/wiki.vim @@ -244,11 +244,11 @@ execute 'syntax match wikiItalicT' syntax match wikiConcealItalic /_/ contained conceal execute 'syntax match wikiBoldItalic' - \ '/' . wiki#rx#bolditalic . '/' - \ 'contains=wikiConcealBold,wikiConcealItalic,@Spell' + \ '/' . wiki#rx#italic . '/' + \ 'contains=wikiConcealBold,wikiConcealItalic,@Spell contained' execute 'syntax match wikiItalicBold' - \ '/' . wiki#rx#italicbold . '/' - \ 'contains=wikiConcealBold,wikiConcealItalic,@Spell' + \ '/' . wiki#rx#bold . '/' + \ 'contains=wikiConcealBold,wikiConcealItalic,@Spell contained' highlight default wikiBold cterm=bold gui=bold highlight default wikiItalic cterm=italic gui=italic From a0a4360337c977195e27517f1adf48a089311886 Mon Sep 17 00:00:00 2001 From: Daniel Ashbrook Date: Thu, 11 Nov 2021 22:47:32 +0100 Subject: [PATCH 2/2] Add missing contains= --- syntax/wiki.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntax/wiki.vim b/syntax/wiki.vim index 1f2f399..90f6232 100644 --- a/syntax/wiki.vim +++ b/syntax/wiki.vim @@ -229,7 +229,7 @@ highlight wikiListTodoPartial cterm=none gui=none execute 'syntax match wikiBold' \ '/' . wiki#rx#bold . '/' - \ 'contains=wikiConcealBold,@Spell' + \ 'contains=wikiBoldItalic,wikiConcealBold,@Spell' execute 'syntax match wikiBoldT' \ '/' . wiki#rx#bold . '/' \ 'contained contains=@Spell' @@ -237,7 +237,7 @@ syntax match wikiConcealBold /*/ contained conceal execute 'syntax match wikiItalic' \ '/' . wiki#rx#italic . '/' - \ 'contains=wikiConcealItalic,@Spell' + \ 'contains=wikiItalicBold,wikiConcealItalic,@Spell' execute 'syntax match wikiItalicT' \ '/' . wiki#rx#italic . '/' \ 'contained contains=@Spell'