From: Hiroshi Shirosaki Date: Fri, 15 Dec 2017 04:31:17 +0000 (+0900) Subject: Merge pull request #312 from memeplex/namedanchor X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/a4c57c4b032a660fed80f72a8106dab145a3b0f3?hp=46f2a724aee3b81b2c8463f4e3b08e5b8055bfb5 Merge pull request #312 from memeplex/namedanchor Follow named anchors with ge --- diff --git a/README.md b/README.md index e01ccc32..ca7eef2b 100644 --- a/README.md +++ b/README.md @@ -150,6 +150,13 @@ To disable conceal regardless of `conceallevel` setting, add the following to yo let g:vim_markdown_conceal = 0 ``` +To disable math conceal with LaTeX math syntax enabled, add the following to your `.vimrc`: + +```vim +let g:tex_conceal = "" +let g:vim_markdown_math = 1 +``` + ### Fenced code block languages You can use filetype name as fenced code block languages for syntax highlighting. @@ -261,7 +268,7 @@ let g:vim_markdown_new_list_item_indent = 2 ### Do not require .md extensions for Markdown links -If you want to have a link like this `[link text](link-url)` and follow it for editing in vim using the "ge" command, but have it open the file "link-url.md" instead of the file "link-url", then use this option: +If you want to have a link like this `[link text](link-url)` and follow it for editing in vim using the `ge` command, but have it open the file "link-url.md" instead of the file "link-url", then use this option: ```vim let g:vim_markdown_no_extensions_in_markdown = 1 @@ -272,7 +279,7 @@ Normal behaviour would be that vim-markup required you to do this `[link text](l ### Auto-write when following link -If you follow a link like this `[link text](link-url)` using the "ge" shortcut, this option will automatically save any edits you made before moving you: +If you follow a link like this `[link text](link-url)` using the `ge` shortcut, this option will automatically save any edits you made before moving you: ```vim let g:vim_markdown_autowrite = 1 diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim index cdf0a265..9ee01006 100644 --- a/after/ftplugin/markdown.vim +++ b/after/ftplugin/markdown.vim @@ -125,7 +125,11 @@ else if l1 =~ '^#' && !s:is_mkdCode(a:lnum) " fold level according to option if s:vim_markdown_folding_level == 1 || matchend(l1, '^#\+') > s:vim_markdown_folding_level - return -1 + if a:lnum == line('$') + return matchend(l1, '^#\+') - 1 + else + return -1 + endif else " headers are not folded return 0 @@ -133,7 +137,7 @@ else endif if l0 =~ '^#' && !s:is_mkdCode(a:lnum-1) - " current line starts with hashes + " previous line starts with hashes return '>'.matchend(l0, '^#\+') else " keep previous foldlevel diff --git a/doc/vim-markdown.txt b/doc/vim-markdown.txt index 3ee30e63..c6d579e7 100644 --- a/doc/vim-markdown.txt +++ b/doc/vim-markdown.txt @@ -21,6 +21,10 @@ Contents ~ 3. TOML Front Matter |vim-markdown-toml-front-matter| 4. JSON Front Matter |vim-markdown-json-front-matter| 10. Adjust new list item indent |vim-markdown-adjust-new-list-item-indent| + 11. Do not require .md extensions for Markdown links + |vim-markdown-do-not-require-.md-extensions-for-markdown-links| + 12. Auto-write when following link + |vim-markdown-auto-write-when-following-link| 4. Mappings |vim-markdown-mappings| 5. Commands |vim-markdown-commands| 6. Credits |vim-markdown-credits| @@ -96,10 +100,10 @@ To fold in a style like python-mode [6], add the following to your '.vimrc': Level 1 heading which is served as a document title is not folded. 'g:vim_markdown_folding_level' setting is not active with this fold style. -To prevent foldtext from being overridden, add the following to your '.vimrc': - +To prevent foldtext from being set add the following to your '.vimrc': +> let g:vim_markdown_override_foldtext = 0 - +< ------------------------------------------------------------------------------- *vim-markdown-set-header-folding-level* Set header folding level ~ @@ -149,10 +153,10 @@ Syntax Concealing ~ Concealing is set for some syntax. -For example, conceal '[link text](link url)' as just 'link text'. -Also, '_italic_' and '*italic*' will conceal to just 'italic'. -Similarly '__bold__', '**bold**', '___italic bold___', and '***italic bold***' -will conceal to 'bold', 'bold', 'italic bold', and 'italic bold' respectively. +For example, conceal '[link text](link url)' as just 'link text'. Also, +'_italic_' and '*italic*' will conceal to just _italic_. Similarly '__bold__', +'**bold**', '___italic bold___', and '***italic bold***' will conceal to just +**bold**, **bold**, **_italic bold_**, and **_italic bold_** respectively. To enable conceal use Vim's standard conceal configuration. > @@ -163,6 +167,12 @@ your '.vimrc': > let g:vim_markdown_conceal = 0 < +To disable math conceal with LaTeX math syntax enabled, add the following to +your '.vimrc': +> + let g:tex_conceal = "" + let g:vim_markdown_math = 1 +< ------------------------------------------------------------------------------- *vim-markdown-fenced-code-block-languages* Fenced code block languages ~ @@ -244,6 +254,31 @@ of indent is 4. If you'd like to change the number as 2, just write: > let g:vim_markdown_new_list_item_indent = 2 < +------------------------------------------------------------------------------- + *vim-markdown-do-not-require-.md-extensions-for-markdown-links* +Do not require .md extensions for Markdown links ~ + +If you want to have a link like this '[link text](link-url)' and follow it for +editing in vim using the 'ge' command, but have it open the file "link-url.md" +instead of the file "link-url", then use this option: +> + let g:vim_markdown_no_extensions_in_markdown = 1 +< +This is super useful for GitLab and GitHub wiki repositories. + +Normal behaviour would be that vim-markup required you to do this '[link text +](link-url.md)', but this is not how the Gitlab and GitHub wiki repositories +work. So this option adds some consistency between the two. + +------------------------------------------------------------------------------- + *vim-markdown-auto-write-when-following-link* +Auto-write when following link ~ + +If you follow a link like this '[link text](link-url)' using the 'ge' shortcut, +this option will automatically save any edits you made before moving you: +> + let g:vim_markdown_autowrite = 1 +< =============================================================================== *vim-markdown-mappings* Mappings ~ diff --git a/syntax/markdown.vim b/syntax/markdown.vim index 4602d66e..43cb8988 100644 --- a/syntax/markdown.vim +++ b/syntax/markdown.vim @@ -61,7 +61,7 @@ execute 'syn region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|\s\)\zs syn region mkdFootnotes matchgroup=mkdDelimiter start="\[^" end="\]" execute 'syn region mkdID matchgroup=mkdDelimiter start="\[" end="\]" contained oneline' . s:conceal execute 'syn region mkdURL matchgroup=mkdDelimiter start="(" end=")" contained oneline' . s:conceal -execute 'syn region mkdLink matchgroup=mkdDelimiter start="\\\@ ]*>" end=">" " Link definitions: [id]: URL (Optional Title) -syn region mkdLinkDef matchgroup=mkdDelimiter start="^ \{,3}\zs\[" end="]:" oneline nextgroup=mkdLinkDefTarget skipwhite +syn region mkdLinkDef matchgroup=mkdDelimiter start="^ \{,3}\zs\[\^\@!" end="]:" oneline nextgroup=mkdLinkDefTarget skipwhite syn region mkdLinkDefTarget start="<\?\zs\S" excludenl end="\ze[>[:space:]\n]" contained nextgroup=mkdLinkTitle,mkdLinkDef skipwhite skipnl oneline syn region mkdLinkTitle matchgroup=mkdDelimiter start=+"+ end=+"+ contained syn region mkdLinkTitle matchgroup=mkdDelimiter start=+'+ end=+'+ contained @@ -143,8 +143,8 @@ endif if get(g:, 'vim_markdown_math', 0) syn include @tex syntax/tex.vim - syn region mkdMath start="\\\@