From a7bebf2d9aea6c9b7f45f58a68c3812ec66980e9 Mon Sep 17 00:00:00 2001 From: yasuda Date: Tue, 24 May 2022 10:15:03 +0900 Subject: [PATCH 1/2] Apply **strong** / *emphasis* syntax for right after punctuations --- syntax/markdown.vim | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/syntax/markdown.vim b/syntax/markdown.vim index 0734c919..01677e7d 100644 --- a/syntax/markdown.vim +++ b/syntax/markdown.vim @@ -52,12 +52,12 @@ endif syntax region mkdItalic matchgroup=mkdItalic start="\%(\*\|_\)" end="\%(\*\|_\)" syntax region mkdBold matchgroup=mkdBold start="\%(\*\*\|__\)" end="\%(\*\*\|__\)" syntax region mkdBoldItalic matchgroup=mkdBoldItalic start="\%(\*\*\*\|___\)" end="\%(\*\*\*\|___\)" -execute 'syntax region htmlItalic matchgroup=mkdItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]\%(\%([^*]\|\\\*\|\n\)*[^\\\*\t ]\)\?\*\_W" end="[^\\\*\t ]\zs\*\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends -execute 'syntax region htmlItalic matchgroup=mkdItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends -execute 'syntax region htmlBold matchgroup=mkdBold start="\%(^\|\s\)\zs\*\*\ze\S" end="\S\zs\*\*" keepend contains=@Spell' . s:oneline . s:concealends -execute 'syntax region htmlBold matchgroup=mkdBold start="\%(^\|\s\)\zs__\ze\S" end="\S\zs__" keepend contains=@Spell' . s:oneline . s:concealends -execute 'syntax region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|\s\)\zs\*\*\*\ze\S" end="\S\zs\*\*\*" keepend contains=@Spell' . s:oneline . s:concealends -execute 'syntax region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|\s\)\zs___\ze\S" end="\S\zs___" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlItalic matchgroup=mkdItalic start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs\*\ze[^\\\*\t ]\%(\%([^*]\|\\\*\|\n\)*[^\\\*\t ]\)\?\*\_W" end="[^\\\*\t ]\zs\*\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlItalic matchgroup=mkdItalic start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlBold matchgroup=mkdBold start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs\*\*\ze\S" end="\S\zs\*\*" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlBold matchgroup=mkdBold start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs__\ze\S" end="\S\zs__" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs\*\*\*\ze\S" end="\S\zs\*\*\*" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs___\ze\S" end="\S\zs___" keepend contains=@Spell' . s:oneline . s:concealends " [link](URL) | [link][id] | [link][] | ![image](URL) syntax region mkdFootnotes matchgroup=mkdDelimiter start="\[^" end="\]" From 336a36cd9fda8ed77a1f26cacb4527dd05a2450b Mon Sep 17 00:00:00 2001 From: yasuda Date: Tue, 24 May 2022 15:32:23 +0900 Subject: [PATCH 2/2] Fix available non-wide punctuation list right before **strong** or *emphasis* --- syntax/markdown.vim | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/syntax/markdown.vim b/syntax/markdown.vim index 01677e7d..e95e54d9 100644 --- a/syntax/markdown.vim +++ b/syntax/markdown.vim @@ -52,12 +52,12 @@ endif syntax region mkdItalic matchgroup=mkdItalic start="\%(\*\|_\)" end="\%(\*\|_\)" syntax region mkdBold matchgroup=mkdBold start="\%(\*\*\|__\)" end="\%(\*\*\|__\)" syntax region mkdBoldItalic matchgroup=mkdBoldItalic start="\%(\*\*\*\|___\)" end="\%(\*\*\*\|___\)" -execute 'syntax region htmlItalic matchgroup=mkdItalic start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs\*\ze[^\\\*\t ]\%(\%([^*]\|\\\*\|\n\)*[^\\\*\t ]\)\?\*\_W" end="[^\\\*\t ]\zs\*\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends -execute 'syntax region htmlItalic matchgroup=mkdItalic start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends -execute 'syntax region htmlBold matchgroup=mkdBold start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs\*\*\ze\S" end="\S\zs\*\*" keepend contains=@Spell' . s:oneline . s:concealends -execute 'syntax region htmlBold matchgroup=mkdBold start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs__\ze\S" end="\S\zs__" keepend contains=@Spell' . s:oneline . s:concealends -execute 'syntax region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs\*\*\*\ze\S" end="\S\zs\*\*\*" keepend contains=@Spell' . s:oneline . s:concealends -execute 'syntax region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|[[:space:][:punct:]　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs___\ze\S" end="\S\zs___" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlItalic matchgroup=mkdItalic start="\%(^\|[[:space:],.!?"''''#$%&+\-/:;^|~<>=@()[\]{}　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs\*\ze[^\\\*\t ]\%(\%([^*]\|\\\*\|\n\)*[^\\\*\t ]\)\?\*\_W" end="[^\\\*\t ]\zs\*\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlItalic matchgroup=mkdItalic start="\%(^\|[[:space:],.!?"''''#$%&+\-/:;^|~<>=@()[\]{}　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlBold matchgroup=mkdBold start="\%(^\|[[:space:],.!?"''''#$%&+\-/:;^|~<>=@()[\]{}　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs\*\*\ze\S" end="\S\zs\*\*" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlBold matchgroup=mkdBold start="\%(^\|[[:space:],.!?"''''#$%&+\-/:;^|~<>=@()[\]{}　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs__\ze\S" end="\S\zs__" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|[[:space:],.!?"''''#$%&+\-/:;^|~<>=@()[\]{}　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs\*\*\*\ze\S" end="\S\zs\*\*\*" keepend contains=@Spell' . s:oneline . s:concealends +execute 'syntax region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|[[:space:],.!?"''''#$%&+\-/:;^|~<>=@()[\]{}　、。（）「」『』［］【】〚〛｛｝〈〉《》‹›«»〔〕〘〙‘’❛❜“”❝❞]\)\zs___\ze\S" end="\S\zs___" keepend contains=@Spell' . s:oneline . s:concealends " [link](URL) | [link][id] | [link][] | ![image](URL) syntax region mkdFootnotes matchgroup=mkdDelimiter start="\[^" end="\]"