Updated doc & README.md

- Moved some code around for better readability.
- Added new option g:table_mode_align for allowing the user to set the
  format option for aligning the text, this is passed directly to
  Tabular.
- Updated vim doc.
- Updated README.md

README.md

@@ -4,6 +4,9 @@ An awesome automatic table creator & formatter allowing one to create neat
 tables as you type.
 
 ## Change Log
+### Version 2.1.2 :
+* Bug Fixes #2, #3 & #4
+
 ### Version 2.1.1 :
 * Added option g:table_mode_align to allow setting Tabular format option for
   more control on how Tabular aligns text.

after/plugin/table-mode.vim

@@ -4,7 +4,7 @@
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       http://github.com/dhruvasagar/vim-table-mode
-" Version:       2.1.1
+" Version:       2.1.2
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope and
 "                uses a small amount of code from it.
@@ -45,7 +45,7 @@ call s:SetGlobalOptDefault('table_mode_border', 1)
 call s:SetGlobalOptDefault('table_mode_corner', '+')
 call s:SetGlobalOptDefault('table_mode_separator', '|')
 call s:SetGlobalOptDefault('table_mode_fillchar', '-')
-call s:SetGlobalOptDefault('table_mode_toggle_map', '<Leader>tm')
+call s:SetGlobalOptDefault('table_mode_toggle_map', '<LocalLeader>tm')
 call s:SetGlobalOptDefault('table_mode_always_active', 0)
 call s:SetGlobalOptDefault('table_mode_delimiter', ',')
 call s:SetGlobalOptDefault('table_mode_tableize_map', '<Leader>T')
@@ -59,12 +59,20 @@ if !g:table_mode_always_active
   command! -nargs=0 TableModeToggle call tablemode#TableModeToggle()
   command! -nargs=0 TableModeEnable call tablemode#TableModeEnable()
   command! -nargs=0 TableModeDisable call tablemode#TableModeDisable()
+else
+  let table_mode_separator_map = g:table_mode_separator
+  " '|' is a special character, we need to map <Bar> instead
+  if g:table_mode_separator ==# '|' | let table_mode_separator_map = '<Bar>' | endif
+
+  execute "inoremap <silent> " . table_mode_separator_map . ' ' .
+        \ table_mode_separator_map . "<Esc>:call tablemode#TableizeInsertMode()<CR>a"
+  unlet table_mode_separator_map
 endif
 
 command! -nargs=0 -range Tableize <line1>,<line2>call tablemode#TableizeRange()
-exec "xnoremap <silent> " . g:table_mode_tableize_map . " :Tableize<CR>"
-exec "nnoremap <silent> " . g:table_mode_tableize_map . " :Tableize<CR>"
+execute "xnoremap <silent> " . g:table_mode_tableize_map . " :Tableize<CR>"
+execute "nnoremap <silent> " . g:table_mode_tableize_map . " :Tableize<CR>"
 "}}}1
 
 " ModeLine {{{
-" vim:fdm=marker
+" vim:fdl=0 fdm=marker

autoload/tablemode.vim

@@ -4,7 +4,7 @@
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       http://github.com/dhruvasagar/vim-table-mode
-" Version:       2.1.1
+" Version:       2.1.2
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope and
 "                uses a small amount of code from it.
@@ -40,12 +40,6 @@ function! s:CountSeparator(line, separator) "{{{2
 endfunction
 " }}}2
 
-function! s:ConvertDelimiterToSeparator(line) "{{{2
-  execute 'silent! ' . a:line . 's/^\s*\zs\ze.\|' . g:table_mode_delimiter .
-        \ '\|$/' . g:table_mode_separator . '/g'
-endfunction
-" }}}2
-
 function! s:IsTableModeActive() "{{{2
   if g:table_mode_always_active | return 1 | endif
 
@@ -54,21 +48,16 @@ function! s:IsTableModeActive() "{{{2
 endfunction
 " }}}2
 
-function! s:TableModeSeparatorMap() "{{{2
-  if g:table_mode_separator ==# '|'
-    return '<Bar>'
-  else
-    return g:table_mode_separator
-  endif
-endfunction
-" }}}2
-
 function! s:ToggleMapping() "{{{2
   if exists('b:table_mode_active') && b:table_mode_active
-    execute "inoremap <silent> " . s:TableModeSeparatorMap() . ' ' .
-          \ s:TableModeSeparatorMap() . "<Esc>:call <SID>Tableize()<CR>a"
+    call s:SetBufferOptDefault('table_mode_separator_map', g:table_mode_separator)
+    " '|' is a special character, we need to map <Bar> instead
+    if g:table_mode_separator ==# '|' | let b:table_mode_separator_map = '<Bar>' | endif
+
+    execute "inoremap <silent> <buffer> " . b:table_mode_separator_map . ' ' .
+          \ b:table_mode_separator_map . "<Esc>:call tablemode#TableizeInsertMode()<CR>a"
   else
-    execute "iunmap <silent> " . s:TableModeSeparatorMap()
+    execute "iunmap <silent> <buffer> " . b:table_mode_separator_map
   endif
 endfunction
 " }}}2
@@ -92,7 +81,7 @@ function! s:UpdateLineBorder(line) "{{{2
     endif
   else
     call append(cline-1, repeat(g:table_mode_corner, curr_line_count))
-    let cline = a:line + 1
+    let cline = a:line + 1 " because of the append, the current line moved down
   endif
 
   if getline(cline+1) =~# hf
@@ -116,7 +105,24 @@ function! s:FillTableBorder() "{{{2
 endfunction
 " }}}2
 
-function! s:Tableize() "{{{2
+function! s:ConvertDelimiterToSeparator(line) "{{{2
+  execute 'silent! ' . a:line . 's/^\s*\zs\ze.\|' . g:table_mode_delimiter .
+        \ '\|$/' . g:table_mode_separator . '/g'
+endfunction
+" }}}2
+
+function! s:Tableizeline(line) "{{{2
+  call s:ConvertDelimiterToSeparator(a:line)
+  if g:table_mode_border | call s:UpdateLineBorder(a:line) | endif
+  execute 'Tabularize/[' . g:table_mode_separator . g:table_mode_corner . ']/' . g:table_mode_align
+endfunction
+" }}}2
+
+" }}}1
+
+" Public API {{{1
+
+function! tablemode#TableizeInsertMode() "{{{2
   if s:IsTableModeActive() && getline('.') =~# ('^\s*' . g:table_mode_separator)
     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.*'))
@@ -129,17 +135,6 @@ function! s:Tableize() "{{{2
 endfunction
 " }}}2
 
-function! s:Tableizeline(line) "{{{2
-  call s:ConvertDelimiterToSeparator(a:line)
-  call s:UpdateLineBorder(a:line)
-  execute 'Tabularize/[' . g:table_mode_separator . g:table_mode_corner . ']/' . g:table_mode_align
-endfunction
-" }}}2
-
-" }}}1
-
-" Public API {{{1
-
 function! tablemode#TableModeEnable() "{{{2
   call s:SetActive(1)
 endfunction
@@ -161,17 +156,19 @@ endfunction
 " }}}2
 
 function! tablemode#TableizeRange() range "{{{2
+  let shift = 1
+  if g:table_mode_border | let shift = shift + 1 | endif
   call s:Tableizeline(a:firstline)
   undojoin
   " The first one causes 2 extra lines for top & bottom border while the
   " following lines cause only 1 for the bottom border.
-  let lnum = a:firstline+3
-  while lnum <= (a:firstline + (a:lastline - a:firstline+1)*2)
+  let lnum = a:firstline + shift + (g:table_mode_border > 0)
+  while lnum < (a:firstline + (a:lastline - a:firstline + 1)*shift)
     call s:Tableizeline(lnum)
     undojoin
-    let lnum = lnum + 2
+    let lnum = lnum + shift
   endwhile
-  call s:FillTableBorder()
+  if g:table_mode_border | call s:FillTableBorder() | endif
 endfunction
 " }}}2
 

doc/table-mode.txt

@@ -1,7 +1,7 @@
-*table-mode.txt*			Table Mode for easy table formatting. v2.1
+*table-mode.txt*			Table Mode for easy table formatting. v2.1.2
 ===============================================================================
 	Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
-				 VERSION 2.1
+				 VERSION 2.1.2
 
 		Author: Dhruva Sagar <http://dhruvasagar.com/>
 		License: MIT <http://opensource.org/licenses/MIT/>