]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

PoC for single-line emphasis
authorAlexandre Constantino <dreaming.about.electric.sheep@gmail.com>
Wed, 3 Feb 2016 22:20:47 +0000 (22:20 +0000)
committerAlexandre Constantino <dreaming.about.electric.sheep@gmail.com>
Wed, 3 Feb 2016 22:20:47 +0000 (22:20 +0000)
PoC to have emphasis only apply when there is a closing token in the
same line as the opening one; ie emphasis will not work multi-line.

syntax/markdown.vim

index 6bf576fe84970e9f33690079275e4c4cab130044..8c3d75cfd181fa490e254f97272647fd869cb257 100644 (file)
@@ -42,12 +42,31 @@ if has('conceal')
 endif
 
 "additions to HTML groups
-syn region htmlItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]" end="[^\\\*\t ]\zs\*\ze\_W" keepend
-syn region htmlItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend
-syn region htmlBold start="\*\*\ze\S" end="\S\zs\*\*" keepend
-syn region htmlBold start="__\ze\S" end="\S\zs__" keepend
-syn region htmlBoldItalic start="\*\*\*\ze\S" end="\S\zs\*\*\*" keepend
-syn region htmlBoldItalic start="___\ze\S" end="\S\zs___" keepend
+"syn region htmlItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]" end="[^\\\*\t ]\zs\*\ze\_W" keepend
+"syn region htmlItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend
+"syn region htmlBold start="\*\*\ze\S" end="\S\zs\*\*" keepend
+"syn region htmlBold start="__\ze\S" end="\S\zs__" keepend
+"syn region htmlBoldItalic start="\*\*\*\ze\S" end="\S\zs\*\*\*" keepend
+"syn region htmlBoldItalic start="___\ze\S" end="\S\zs___" keepend
+
+" emphasis stops at newline (in case a closing token is not found before)
+"if get(g:, "vim_markdown_emphasis_stops_at_newline", 1)
+"    let esanl_pre = '\(\n\|'
+"    let esanl_suf = '\)'
+"else
+"    let esanl_pre = ''
+"    let esanl_suf = ''
+"endif
+"execute 'syn region htmlItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]" end="[^\\\*\t ]\zs' . esanl_pre . '\*' . esanl_suf . '\ze\_W" keepend'
+"execute 'syn region htmlItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs' . esanl_pre . '_' . esanl_suf . '\ze\_W" keepend'
+"execute 'syn region htmlBold start="\*\*\ze\S" end="\S\zs' . esanl_pre . '\*\*' . esanl_suf . '" keepend'
+"execute 'syn region htmlBold start="__\ze\S" end="\S\zs__" keepend
+"execute 'syn region htmlBoldItalic start="\*\*\*\ze\S" end="\S\zs\*\*\*" keepend
+"execute 'syn region htmlBoldItalic start="___\ze\S" end="\S\zs___" keepend
+
+" single-line emphasis (emphasis only works with matching token in the same line)
+syn region htmlItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]\([^\n]*[^\\\*\t ]\)\?\*" end="[^\\\*\t ]\zs\*\ze\_W" keepend
+
 
 " [link](URL) | [link][id] | [link][] | ![image](URL)
 syn region mkdFootnotes matchgroup=mkdDelimiter start="\[^"    end="\]"