Compare commits

...

2 Commits

Author SHA1 Message Date
Dhruva Sagar
e997144d2f Releasing v2.1.3
- Fixed #1. Added new option `g:table_mode_no_border_padding` which if
  set to 1 (set to 0 by default) removes the padding around borders (and
  the text too), sets `g:table_mode_align` to `'c0'` for achieving the
  same.
2013-03-25 11:04:14 +05:30
Dhruva Sagar
554c57703f Minor refactoring 2013-03-23 12:40:48 +05:30
4 changed files with 41 additions and 19 deletions

View File

@@ -4,6 +4,10 @@ An awesome automatic table creator & formatter allowing one to create neat
tables as you type. tables as you type.
## Change Log ## Change Log
### Version 2.1.3 :
* Bug Fix #1, added new option `g:table_mode_no_border_padding` which removes
padding from the border.
### Version 2.1.2 : ### Version 2.1.2 :
* Bug Fixes #2, #3 & #4 * Bug Fixes #2, #3 & #4

View File

@@ -4,7 +4,7 @@
" Author: Dhruva Sagar <http://dhruvasagar.com/> " Author: Dhruva Sagar <http://dhruvasagar.com/>
" License: MIT (http://www.opensource.org/licenses/MIT) " License: MIT (http://www.opensource.org/licenses/MIT)
" Website: http://github.com/dhruvasagar/vim-table-mode " Website: http://github.com/dhruvasagar/vim-table-mode
" Version: 2.1.2 " Version: 2.1.3
" Note: This plugin was heavily inspired by the 'CucumberTables.vim' " Note: This plugin was heavily inspired by the 'CucumberTables.vim'
" (https://gist.github.com/tpope/287147) plugin by Tim Pope and " (https://gist.github.com/tpope/287147) plugin by Tim Pope and
" uses a small amount of code from it. " uses a small amount of code from it.
@@ -50,6 +50,7 @@ call s:SetGlobalOptDefault('table_mode_always_active', 0)
call s:SetGlobalOptDefault('table_mode_delimiter', ',') call s:SetGlobalOptDefault('table_mode_delimiter', ',')
call s:SetGlobalOptDefault('table_mode_tableize_map', '<Leader>T') call s:SetGlobalOptDefault('table_mode_tableize_map', '<Leader>T')
call s:SetGlobalOptDefault('table_mode_align', 'l1') call s:SetGlobalOptDefault('table_mode_align', 'l1')
call s:SetGlobalOptDefault('table_mode_no_border_padding', '0')
"}}}1 "}}}1
" Define Commands & Mappings {{{1 " Define Commands & Mappings {{{1

View File

@@ -4,7 +4,7 @@
" Author: Dhruva Sagar <http://dhruvasagar.com/> " Author: Dhruva Sagar <http://dhruvasagar.com/>
" License: MIT (http://www.opensource.org/licenses/MIT) " License: MIT (http://www.opensource.org/licenses/MIT)
" Website: http://github.com/dhruvasagar/vim-table-mode " Website: http://github.com/dhruvasagar/vim-table-mode
" Version: 2.1.2 " Version: 2.1.3
" Note: This plugin was heavily inspired by the 'CucumberTables.vim' " Note: This plugin was heavily inspired by the 'CucumberTables.vim'
" (https://gist.github.com/tpope/287147) plugin by Tim Pope and " (https://gist.github.com/tpope/287147) plugin by Tim Pope and
" uses a small amount of code from it. " uses a small amount of code from it.
@@ -77,7 +77,7 @@ function! s:UpdateLineBorder(line) "{{{2
if getline(cline-1) =~# hf if getline(cline-1) =~# hf
let prev_line_count = s:CountSeparator(cline-1, g:table_mode_corner) let prev_line_count = s:CountSeparator(cline-1, g:table_mode_corner)
if curr_line_count > prev_line_count if curr_line_count > prev_line_count
execute 'normal! kA' . repeat(g:table_mode_corner, curr_line_count - prev_line_count) . "\<Esc>j" silent! execute 'normal! kA' . repeat(g:table_mode_corner, curr_line_count - prev_line_count) . "\<Esc>j"
endif endif
else else
call append(cline-1, repeat(g:table_mode_corner, curr_line_count)) call append(cline-1, repeat(g:table_mode_corner, curr_line_count))
@@ -87,7 +87,7 @@ function! s:UpdateLineBorder(line) "{{{2
if getline(cline+1) =~# hf if getline(cline+1) =~# hf
let next_line_count = s:CountSeparator(cline+1, g:table_mode_corner) let next_line_count = s:CountSeparator(cline+1, g:table_mode_corner)
if curr_line_count > next_line_count if curr_line_count > next_line_count
execute 'normal! jA' . repeat(g:table_mode_corner, curr_line_count - next_line_count) . "\<Esc>k" silent! execute 'normal! jA' . repeat(g:table_mode_corner, curr_line_count - next_line_count) . "\<Esc>k"
end end
else else
call append(cline, repeat(g:table_mode_corner, curr_line_count)) call append(cline, repeat(g:table_mode_corner, curr_line_count))
@@ -96,17 +96,22 @@ endfunction
" }}}2 " }}}2
function! s:FillTableBorder() "{{{2 function! s:FillTableBorder() "{{{2
let current_col = col('.') let [ current_col, current_line ] = [ col('.'), line('.') ]
let current_line = line('.') if g:table_mode_no_border_padding
execute 'silent! %s/' . g:table_mode_corner . ' \zs\([' . silent! execute '%s/' . g:table_mode_corner . '\zs\([' .
\ g:table_mode_fillchar . ' ]*\)\ze ' . g:table_mode_corner . '/\=repeat("' . \ g:table_mode_fillchar . ' ]*\)\ze' . g:table_mode_corner .
\ g:table_mode_fillchar . '", s:Strlen(submatch(0)))/g' \ '/\=repeat("' . g:table_mode_fillchar . '", s:Strlen(submatch(0)))/g'
else
silent! execute '%s/' . g:table_mode_corner . ' \zs\([' .
\ g:table_mode_fillchar . ' ]*\)\ze ' . g:table_mode_corner .
\ '/\=repeat("' . g:table_mode_fillchar . '", s:Strlen(submatch(0)))/g'
endif
call cursor(current_line, current_col) call cursor(current_line, current_col)
endfunction endfunction
" }}}2 " }}}2
function! s:ConvertDelimiterToSeparator(line) "{{{2 function! s:ConvertDelimiterToSeparator(line) "{{{2
execute 'silent! ' . a:line . 's/^\s*\zs\ze.\|' . g:table_mode_delimiter . silent! execute a:line . 's/^\s*\zs\ze.\|' . g:table_mode_delimiter .
\ '\|$/' . g:table_mode_separator . '/g' \ '\|$/' . g:table_mode_separator . '/g'
endfunction endfunction
" }}}2 " }}}2
@@ -127,6 +132,7 @@ function! tablemode#TableizeInsertMode() "{{{2
let column = s:Strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g')) let column = s:Strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g'))
let position = s:Strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*')) let position = s:Strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*'))
if g:table_mode_border | call s:UpdateLineBorder(line('.')) | endif if g:table_mode_border | call s:UpdateLineBorder(line('.')) | endif
if g:table_mode_no_border_padding && g:table_mode_align !=# 'c0' | let g:table_mode_align = 'c0' | endif
execute 'Tabularize/[' . g:table_mode_separator . g:table_mode_corner . ']/' . g:table_mode_align execute 'Tabularize/[' . g:table_mode_separator . g:table_mode_corner . ']/' . g:table_mode_align
if g:table_mode_border | call s:FillTableBorder() | endif if g:table_mode_border | call s:FillTableBorder() | endif
normal! 0 normal! 0

View File

@@ -48,15 +48,17 @@ The table mode is disabled by default and you can enter table mode using
OPTIONS *table-mode-options* OPTIONS *table-mode-options*
Overview: Overview:
|table-mode-options-loaded| .......... Disable the plugin |table-mode-options-loaded| ............. Disable the plugin
|table-mode-options-border| .......... Enable border |table-mode-options-border| ............. Enable border
|table-mode-options-corner| .......... Set corner character |table-mode-options-corner| ............. Set corner character
|table-mode-options-separator| ....... Set separator character |table-mode-options-separator| .......... Set separator character
|table-mode-options-fillchar| ........ Set table fillchar character |table-mode-options-fillchar| ........... Set table fillchar character
|table-mode-options-toggle-map| ...... Set table mode toggle mapping |table-mode-options-toggle-map| ......... Set table mode toggle mapping
|table-mode-options-always-active| ... Set table mode to always enabled |table-mode-options-always-active| ...... Set table mode to always enabled
|table-mode-options-delimiter| ....... Set the delimiter for Tableize |table-mode-options-delimiter| .......... Set the delimiter for Tableize
|table-mode-options-align| ........... Set the text alignment for Tableize |table-mode-options-align| .............. Set the text alignment for
Tableize
|table-mode-options-no-border-padding| .. Set for no border padding.
g:table_mode_loaded *table-mode-options-loaded* g:table_mode_loaded *table-mode-options-loaded*
Use this option to disable the plugin: > Use this option to disable the plugin: >
@@ -110,6 +112,15 @@ g:table_mode_align *table-mode-options-align*
the tables. Go through |tabular-walkthrough| for details on how to set the tables. Go through |tabular-walkthrough| for details on how to set
the format options for alignment. > the format options for alignment. >
let g:table_mode_align = 'l1' let g:table_mode_align = 'l1'
<
g:table_mode_no_border_padding *table-mode-options-no-border-padding*
Use this option to remove the border padding (extra spaces around the
|table-mode-options-fillchar|). >
let g:table_mode_no_border_padding = 0
<
NOTE this option changes |table-mode-options-align| to 'c0', so that
there is no extra padding around the contents.
=============================================================================== ===============================================================================
MAPPINGS *table-mode-mappings* MAPPINGS *table-mode-mappings*