From: Hiroshi Shirosaki Date: Fri, 20 Jun 2014 11:45:09 +0000 (+0900) Subject: Merge pull request #95 from cassava/patch-1 X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/55698854abe296deb5b698e9d2d1c2a92549aa77?hp=071f06220f7e61a020de4895c1bf936ec99a12a8 Merge pull request #95 from cassava/patch-1 Changing Vundle "Bundle" references to "Plugin" --- diff --git a/README.md b/README.md index dd67309..20a74e3 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,24 @@ The following work on normal and visual modes: - `:Toct`: Same as `:Toc` but in a new tab. - `:Tocv`: Same as `:Toc` for symmetry with `:Toch` and `Tocv`. +- `:SetexToAtx`: + + Convert all Setex style headers in buffer to Atx. + + If a range is given, e.g. hit `:` from visual mode, only operate on the range. + +- `:HeaderDecrease`: + + Decrease level of all headers in buffer: `h2` to `h1`, `h3` to `h2`, etc. + + If range is given, only operate in the range. + + If an `h1` would be decreased, abort. + + For simplicity of implementation, Setex headers are converted to Atx. + +- `:HeaderIncrease`: Analogous to `:HeaderDecrease`, but increase levels instead. + ## Credits The main contributors of vim-markdown are: diff --git a/ftplugin/mkd.vim b/ftplugin/mkd.vim index ee861e7..2129203 100644 --- a/ftplugin/mkd.vim +++ b/ftplugin/mkd.vim @@ -358,6 +358,43 @@ function! s:MapNormVis(rhs,lhs) execute 'vn ' . a:rhs . ' :call VisMove(''' . a:lhs . ''')' endfunction +" Convert Setex headers in range `line1 .. line2` to Atx. +" Returns the number of conversions. +function! s:SetexToAtx(line1, line2) + let l:originalNumLines = line('$') + execute 'silent! ' . a:line1 . ',' . a:line2 . 'substitute/\v(.*\S.*)\n\=+$/# \1/' + execute 'silent! ' . a:line1 . ',' . a:line2 . 'substitute/\v(.*\S.*)\n-+$/## \1/' + return l:originalNumLines - line('$') +endfunction + +" If `a:1` is 0, decrease the level of all headers in range `line1 .. line2`. +" Otherwise, increase the level. `a:1` defaults to `0`. +function! s:HeaderDecrease(line1, line2, ...) + if a:0 > 0 + let l:increase = a:1 + else + let l:increase = 0 + endif + if l:increase + let l:forbiddenLevel = 6 + let l:replaceLevels = [5, 1] + let l:levelDelta = 1 + else + let l:forbiddenLevel = 1 + let l:replaceLevels = [2, 6] + let l:levelDelta = -1 + endif + for l:line in range(a:line1, a:line2) + if join(getline(l:line, l:line + 1), "\n") =~ s:levelRegexpDict[l:forbiddenLevel] + echomsg 'There is an h' . l:forbiddenLevel . ' at line ' . l:line . '. Aborting.' + return + endif + endfor + let l:numSubstitutions = s:SetexToAtx(a:line1, a:line2) + for l:level in range(replaceLevels[0], replaceLevels[1], -l:levelDelta) + execute 'silent! ' . a:line1 . ',' . (a:line2 - l:numSubstitutions) . 'substitute/' . s:levelRegexpDict[l:level] . '/' . repeat('#', l:level + l:levelDelta) . '\1/g' + endfor +endfunction call MapNormVis('(Markdown_MoveToNextHeader)', 'Markdown_MoveToNextHeader') call MapNormVis('(Markdown_MoveToPreviousHeader)', 'Markdown_MoveToPreviousHeader') @@ -388,3 +425,6 @@ command! -buffer Toc call s:Markdown_Toc() command! -buffer Toch call s:Markdown_Toc('horizontal') command! -buffer Tocv call s:Markdown_Toc('vertical') command! -buffer Toct call s:Markdown_Toc('tab') +command! -buffer -range=% SetexToAtx call s:SetexToAtx(, ) +command! -buffer -range=% HeaderDecrease call s:HeaderDecrease(, ) +command! -buffer -range=% HeaderIncrease call s:HeaderDecrease(, , 1)