Merge pull request #169 from dhruvasagar/dependabot/bundler/rake-12.3.3

Bump rake from 10.1.0 to 12.3.3

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: vim-table-mode
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.1.2
+  - 2.5.3
 script: rake ci

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## Version 4.6.4.1
+* Added a fix for markdown commentstring
+
+## Version 4.6.4
+* Added support for center aligning columns
+
 ## Version 4.6.3
 * Fixed tablemode#spreadsheet#LineNr()
 * Fixed tablemode#spreadsheet#cell#SetCell()

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-ruby '2.1.2'
+ruby '2.5.3'
 gem 'rake'
 gem 'vim-flavor', '~> 1.1'

Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     blankslate (2.1.2.4)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    rake (10.1.0)
+    rake (12.3.3)
     thor (0.18.1)
     vim-flavor (1.1.3)
       parslet (~> 1.0)
@@ -16,3 +16,9 @@ PLATFORMS
 DEPENDENCIES
   rake
   vim-flavor (~> 1.1)
+
+RUBY VERSION
+   ruby 2.5.3p105
+
+BUNDLED WITH
+   2.0.1

README.md

@@ -1,14 +1,10 @@
-# VIM Table Mode v4.6.3 [![Build Status](https://travis-ci.org/dhruvasagar/vim-table-mode.png?branch=master)](https://travis-ci.org/dhruvasagar/vim-table-mode)
+# VIM Table Mode v4.6.7 [![Build Status](https://travis-ci.org/dhruvasagar/vim-table-mode.png?branch=master)](https://travis-ci.org/dhruvasagar/vim-table-mode)
 
 An awesome automatic table creator & formatter allowing one to create neat
 tables as you type.
 
-## Change Log
-See <a
-href="https://github.com/dhruvasagar/vim-table-mode/blob/master/CHANGELOG.md">
-CHANGELOG.md </a>
-
 ## Getting Started 
+
 ### Installation
 
 There are several ways to do this
@@ -21,38 +17,114 @@ There are several ways to do this
    href="https://github.com/tpope/vim-pathogen">pathogen.vim</a>, then
    add a git submodule for your plugin:
 
-   ```sh
+```sh
 $ cd ~/.vim
 $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-mode
-   ```
+```
-3. Copy autoload/tablemode.vim, plugin/table-mode.vim, doc/table-mode.txt to
+
-   respective ~/.vim/autoload/, ~/.vim/plugin and ~/.vim/doc under UNIX or 
+3. Copy all files under autoload/, plugin/, doc/ to respective
+   ~/.vim/autoload/, ~/.vim/plugin and ~/.vim/doc under UNIX or
    vimfiles/autoload/, vimfiles/plugin/ and vimfiles/doc under WINDOWS and
    restart VIM
 
-### Usage
+### Creating table on-the-fly
 
-- **On the fly table creation** :
+To start using the plugin in the on-the-fly mode use `:TableModeToggle` mapped to <kbd>\<Leader\>tm</kbd> by default (which means <kbd>\\</kbd> <kbd>t</kbd> <kbd>m</kbd> if you didn't override the <Leader> by `:let mapleader = ','` to have <kbd>,</kbd> <kbd>t</kbd> <kbd>m</kbd>).
 
-   By default the table column separator is <kbd>|</kbd> defined by the
+> Tip :
-   `g:table_mode_separator` option. As soon as you type it on a new line (ignores
+> You can use the following to quickly enable / disable table mode in insert
-   indentation) the script gets to work on creating a table around it. As you
+> mode by using `||` or `__` :
-   type and define more columns, the table is completed, formatted and aligned
+> ```vim
-   automatically on the fly.
+> function! s:isAtStartOfLine(mapping)
+>   let text_before_cursor = getline('.')[0 : col('.')-1]
+>   let mapping_pattern = '\V' . escape(a:mapping, '\')
+>   let comment_pattern = '\V' . escape(substitute(&l:commentstring, '%s.*$', '', ''), '\')
+>   return (text_before_cursor =~? '^' . ('\v(' . comment_pattern . '\v)?') . '\s*\v' . mapping_pattern . '\v$')
+> endfunction
+> 
+> inoreabbrev <expr> <bar><bar>
+>           \ <SID>isAtStartOfLine('\|\|') ?
+>           \ '<c-o>:TableModeEnable<cr><bar><space><bar><left><left>' : '<bar><bar>'
+> inoreabbrev <expr> __
+>           \ <SID>isAtStartOfLine('__') ?
+>           \ '<c-o>:silent! TableModeDisable<cr>' : '__'
+> ```
 
-   Since this could lead to unwanted behavior I have disabled table mode by
+Enter the first line, delimiting columns by the `|` symbol. The plugin reacts by inserting spaces between the text and the separator if you omit them:
-   default. You have to use `:TableModeToggle` command or the table mode
+
-   toggle mapping, which is <kbd>\<Leader\>tm</kbd> defined by `g:table_mode_toggle_map`
+    | name | address | phone |
-   option to toggle the table mode or you can directly use `:TableModeEnable`
+
-   and `:TableModeDisable` to enable or disable the table mode. This is on a
+In the second line (without leaving Insert mode), enter `|` twice. The plugin will write a properly formatted horizontal line:
-   per buffer basis and so it does not cause any unusual behavior unless it is
+
-   enabled explicitly. Please read `:h table-mode` for further information.
+    | name | address | phone |
+    |------+---------+-------|
+
+When you enter the subsequent lines, the plugin will automatically adjust the formatting to match the text you’re entering every time you press `|`:
+
+    | name       | address | phone |
+    |------------+---------+-------|
+    | John Adams |
+
+Go on until the table is ready:
+
+    | name            | address                  | phone      |
+    |-----------------+--------------------------+------------|
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    |-----------------+--------------------------+------------|
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    |-----------------+--------------------------+------------|
+
+Then you can return to the first line and above it enter `||`:
+
+    |-----------------+--------------------------+------------|
+    | name            | address                  | phone      |
+    |-----------------+--------------------------+------------|
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    |-----------------+--------------------------+------------|
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    |-----------------+--------------------------+------------|
+
+Corner separators are adjustable:
+
+For Markdown-compatible tables use
+
+    let g:table_mode_corner='|'
+
+
+    |-----------------|--------------------------|------------|
+    | name            | address                  | phone      |
+    |-----------------|--------------------------|------------|
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    |-----------------|--------------------------|------------|
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    |-----------------|--------------------------|------------|
+
+To get ReST-compatible tables use
+
+    let g:table_mode_corner_corner='+'
+    let g:table_mode_header_fillchar='='
+
+
+    +-----------------+--------------------------+------------+
+    | name            | address                  | phone      |
+    +=================+==========================+============+
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    +-----------------+--------------------------+------------+
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    +-----------------+--------------------------+------------+
+
+Markdown and ReST filetypes have automatically configured corners.
 
    You can also define in a table header border how it's content should be
-   aligned, whether right or left by using a `:` character defined by
+   aligned, whether center, right or left by using a `:` character defined by
    `g:table_mode_align_char` option.
 
-- **Format existing content into a table** :
+If you manipulate the table when table mode is disabled or copy paste a table
+from clipboard from outside and it ends up being misaligned, you can realign
+it using `:TableModeRealign` or using the default mapping
+<kbd>\<Leader\>tr</kbd> defined by `g:table_mode_relign_map` option.
+
+### Formatting existing content into a table
 
    Table Mode wouldn't justify it's name if it didn't allow formatting
    existing content into a table. And it does as promised. Like table creation
@@ -74,7 +146,7 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
    You can use the mapping <kbd>\<Leader\>T</kbd> with a `[count]` to apply it to the
    next `[count]` lines in standard vim style.
 
-- **Move between cells** :
+### Moving around 
 
    Now you can move between cells using table mode motions <kbd>[|</kbd>,
    <kbd>]|</kbd>, <kbd>{|</kbd> & <kbd>}|</kbd> to move left | right | up |
@@ -82,7 +154,7 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
    and move to the next | previous row after the last | first cell in the
    current row if one exists. 
 
-- **Manipulating Table** :
+### Manipulating Table
 
   - **Cell Text Object** :
 
@@ -105,7 +177,9 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
       (provided you are within a table row), this can also be preceeded with a
       [count] to delete multiple columns.
 
-- **Table Formulas** :
+## Advanced Usage: Spreadsheet Capabilities
+
+### Table Formulas
 
   Table Mode now has support for formulas like a spreadsheet. There are 2 ways
   of defining formulas :
@@ -129,7 +203,7 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
 
   NOTE: You can now use the mapping <kbd>\<Leader\>t?</kbd>
 
-- **Formula Expressions** :
+### Formula Expressions
 
   Expressions are of the format `$target = formula`.
 
@@ -170,10 +244,15 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
       - `$5,3 = Sum(1,2:5,2)/$5,1`
       - `$5,3 = Average(1,2:5,2)/$5,1`
 
-### Demo
+## Demo
 
-<a href="http://www.youtube.com/watch?v=sK2IH1hiDkw"><img
+<a href="http://www.youtube.com/watch?v=9lVQ0VJY3ps"><img
-src="https://raw.github.com/dhruvasagar/vim-table-mode/master/youtube.png"/></a>
+src="https://raw.github.com/axil/vim-table-mode/master/youtube.png"/></a>
+
+## Change Log
+See <a
+href="https://github.com/dhruvasagar/vim-table-mode/blob/master/CHANGELOG.md">
+CHANGELOG.md </a>
 
 ## Contributing
 
@@ -193,3 +272,33 @@ named <a href="https://gist.github.com/tpope/287147">cucumbertables.vim</a>.
 
 Also a shout out to godlygeek who developed the incredible <a
 href="http://github.com/godlygeek/tabular">Tabular</a> plugin.
+
+## Contributors
+
+### Code Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="https://github.com/dhruvasagar/vim-table-mode/graphs/contributors"><img src="https://opencollective.com/vim-table-mode/contributors.svg?width=890&button=false" /></a>
+
+### Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/vim-table-mode/contribute)]
+
+#### Individuals
+
+<a href="https://opencollective.com/vim-table-mode"><img src="https://opencollective.com/vim-table-mode/individuals.svg?width=890"></a>
+
+#### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/vim-table-mode/contribute)]
+
+<a href="https://opencollective.com/vim-table-mode/organization/0/website"><img src="https://opencollective.com/vim-table-mode/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/1/website"><img src="https://opencollective.com/vim-table-mode/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/2/website"><img src="https://opencollective.com/vim-table-mode/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/3/website"><img src="https://opencollective.com/vim-table-mode/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/4/website"><img src="https://opencollective.com/vim-table-mode/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/5/website"><img src="https://opencollective.com/vim-table-mode/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/6/website"><img src="https://opencollective.com/vim-table-mode/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/7/website"><img src="https://opencollective.com/vim-table-mode/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/8/website"><img src="https://opencollective.com/vim-table-mode/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/9/website"><img src="https://opencollective.com/vim-table-mode/organization/9/avatar.svg"></a>

autoload/tablemode.vim

@@ -65,22 +65,20 @@ function! s:ToggleMapping() "{{{2
   endif
 endfunction
 
-function! tablemode#SyntaxEnable()
+function! s:ToggleSyntax() "{{{2
-  exec 'syntax match Table'
+  if !g:table_mode_syntax | return | endif
-        \ '/' . tablemode#table#StartExpr() . '\zs|.\+|\ze' . tablemode#table#EndExpr() . '/'
-        \ 'contains=TableBorder,TableSeparator,TableColumnAlign containedin=ALL'
-  syntax match TableSeparator /|/ contained
-  syntax match TableColumnAlign /:/ contained
-  syntax match TableBorder /[\-+]\+/ contained
 
-  hi! link TableBorder Delimiter
-  hi! link TableSeparator Delimiter
-  hi! link TableColumnAlign Type
-endfunction
-
-function! s:ToggleSyntax()
   if tablemode#IsActive()
-    call tablemode#SyntaxEnable()
+    exec 'syntax match Table'
+          \ '/' . tablemode#table#StartExpr() . '\zs|.\+|\ze' . tablemode#table#EndExpr() . '/'
+          \ 'contains=TableBorder,TableSeparator,TableColumnAlign containedin=ALL'
+    syntax match TableSeparator /|/ contained
+    syntax match TableColumnAlign /:/ contained
+    syntax match TableBorder /[\-+]\+/ contained
+
+    hi! link TableBorder Delimiter
+    hi! link TableSeparator Delimiter
+    hi! link TableColumnAlign Type
   else
     syntax clear Table
     syntax clear TableBorder
@@ -93,10 +91,36 @@ function! s:ToggleSyntax()
   endif
 endfunction
 
+function! s:ToggleAutoAlign() "{{{2
+  if !g:table_mode_auto_align | return | endif
+
+  if tablemode#IsActive()
+    augroup TableModeAutoAlign
+      au!
+
+      autocmd CursorHold <buffer> nested silent! if &modified | call tablemode#table#Realign('.') | endif
+      " autocmd InsertLeave <buffer> nested silent! if &modified | call tablemode#table#Realign('.') | endif
+    augroup END
+  else
+    autocmd! TableModeAutoAlign
+  endif
+endfunction
+
+function! s:ToggleOptions() "{{{2
+  if tablemode#IsActive()
+    let b:old_update_time = &updatetime
+    exec 'set updatetime='.g:table_mode_update_time
+  else
+    exec 'set updatetime='.get(b:, 'old_update_time', 4000)
+  endif
+endfunction
+
 function! s:SetActive(bool) "{{{2
   let b:table_mode_active = a:bool
   call s:ToggleSyntax()
   call s:ToggleMapping()
+  call s:ToggleAutoAlign()
+  call s:ToggleOptions()
   if tablemode#IsActive()
     doautocmd User TableModeEnabled
   else
@@ -145,15 +169,17 @@ function! tablemode#IsActive() "{{{2
 endfunction
 
 function! tablemode#TableizeInsertMode() "{{{2
-  if tablemode#IsActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator)
+  if tablemode#IsActive()
-    call tablemode#table#AddBorder('.')
+    if getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator . tablemode#table#EndExpr()) 
-    normal! A
+      call tablemode#table#AddBorder('.')
-  elseif tablemode#IsActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
+      normal! A
-    let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g'))
+    elseif getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
-    let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*'))
+      let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g'))
-    call tablemode#table#Realign('.')
+      let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*'))
-    normal! 0
+      call tablemode#table#Realign('.')
-    call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
+      normal! 0
+      call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
+    endif
   endif
 endfunction
 

autoload/tablemode/align.vim

@@ -13,7 +13,7 @@ function! s:Padding(string, length, where) "{{{3
   elseif a:where =~# 'r'
     return repeat(" ", gap_length) . a:string
   elseif a:where =~# 'c'
-    let right = spaces / 2
+    let right = gap_length / 2
     let left = right + (right * 2 != gap_length)
     return repeat(" ", left) . a:string . repeat(" ", right)
   endif
@@ -64,14 +64,21 @@ function! tablemode#align#Split(string, delim)
 endfunction
 
 function! tablemode#align#alignments(lnum, ncols) "{{{2
+  let achr = g:table_mode_align_char
   let alignments = []
   if tablemode#table#IsBorder(a:lnum+1)
-    let hcols = tablemode#align#Split(getline(a:lnum+1), '[' . g:table_mode_corner . g:table_mode_corner_corner . ']')
+    let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
+    let corner_corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner_corner')
+    let hcols = tablemode#align#Split(getline(a:lnum+1), '[' . corner . corner_corner . ']')
     for idx in range(len(hcols))
       " Right align if header
       call add(alignments, 'l')
-      if hcols[idx] =~# g:table_mode_align_char . '$' | let alignments[idx] = 'r' | endif
+      if hcols[idx] =~# achr . '[^'.achr.']\+' . achr
-      if hcols[idx] !~# '[^0-9\.]' | let alignments[idx] = 'r' | endif
+        let alignments[idx] = 'c'
+      elseif hcols[idx] =~# achr . '$'
+        let alignments[idx] = 'r'
+      endif
+      " if hcols[idx] !~# '[^0-9\.]' | let alignments[idx] = 'r' | endif
     endfor
   end
   return alignments
@@ -79,7 +86,7 @@ endfunction
 
 function! tablemode#align#Align(lines) "{{{2
   if empty(a:lines) | return [] | endif
-  let lines = map(a:lines, 'map(v:val, "v:key =~# \"text\" ? tablemode#align#Split(v:val, g:table_mode_separator) : v:val")')
+  let lines = map(a:lines, 'map(v:val, "v:key =~# \"text\" ? tablemode#align#Split(v:val, g:table_mode_escaped_separator_regex) : v:val")')
 
   for line in lines
     let stext = line.text

autoload/tablemode/logger.vim

@@ -1,5 +1,5 @@
 function! tablemode#logger#log(message)
   if g:table_mode_verbose
-    echom message
+    echom a:message
   endif
 endfunction

autoload/tablemode/spreadsheet.vim

@@ -41,7 +41,7 @@ function! tablemode#spreadsheet#GetLastRow(line) "{{{2
   if tablemode#table#IsRow(a:line)
     let line = tablemode#utils#line(a:line)
 
-    while tablemode#table#IsRow(line + 1) || tablemode#table#IsBorder(line + 1)
+    while tablemode#table#IsTable(line + 1)
       let line += 1
     endwhile
     if tablemode#table#IsBorder(line) | let line -= 1 | endif
@@ -61,7 +61,7 @@ function! tablemode#spreadsheet#LineNr(line, row) "{{{2
     let line = tablemode#spreadsheet#GetFirstRow(a:line)
     let row_nr = 0
 
-    while tablemode#table#IsRow(line + 1) || tablemode#table#IsBorder(line + 1)
+    while tablemode#table#IsTable(line + 1)
       if tablemode#table#IsRow(line)
         let row_nr += 1
         if a:row ==# row_nr | break | endif
@@ -77,7 +77,7 @@ function! tablemode#spreadsheet#RowNr(line) "{{{2
   let line = tablemode#utils#line(a:line)
 
   let rowNr = 0
-  while !tablemode#table#IsHeader(line) && (tablemode#table#IsRow(line) || tablemode#table#IsBorder(line))
+  while !tablemode#table#IsHeader(line) && tablemode#table#IsTable(line)
     if tablemode#table#IsRow(line) | let rowNr += 1 | endif
     let line -= 1
   endwhile
@@ -89,13 +89,13 @@ function! tablemode#spreadsheet#RowCount(line) "{{{2
   let line = tablemode#utils#line(a:line)
 
   let [tline, totalRowCount] = [line, 0]
-  while !tablemode#table#IsHeader(tline) && (tablemode#table#IsRow(tline) || tablemode#table#IsBorder(tline))
+  while !tablemode#table#IsHeader(tline) && tablemode#table#IsTable(tline)
     if tablemode#table#IsRow(tline) | let totalRowCount += 1 | endif
     let tline -= 1
   endwhile
 
   let tline = line + 1
-  while !tablemode#table#IsHeader(tline) && (tablemode#table#IsRow(tline) || tablemode#table#IsBorder(tline))
+  while !tablemode#table#IsHeader(tline) && tablemode#table#IsTable(tline)
     if tablemode#table#IsRow(tline) | let totalRowCount += 1 | endif
     let tline += 1
   endwhile
@@ -180,10 +180,19 @@ function! tablemode#spreadsheet#Average(range, ...) abort "{{{2
   return s:Average(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 
-function! tablemode#spreadsheet#Sort(bang, ...) "{{{2
+function! tablemode#spreadsheet#Sort(bang, ...) range "{{{2
+  if exists('*getcurpos')
+    let col = getcurpos()[4] " curswant
+  else
+    let col = col('.')
+  endif
   let opts = a:0 ? a:1 : ''
   let bang = a:bang ? '!' : ''
-  let [firstRow, lastRow] = [tablemode#spreadsheet#GetFirstRow('.'), tablemode#spreadsheet#GetLastRow('.')]
+  if a:firstline == a:lastline
+    let [firstRow, lastRow] = [tablemode#spreadsheet#GetFirstRow('.'), tablemode#spreadsheet#GetLastRow('.')]
+  else
+    let [firstRow, lastRow] = [a:firstline, a:lastline]
+  endif
   call tablemode#spreadsheet#MoveToStartOfCell()
-  exec ':'.firstRow.','.lastRow . 'sort'.bang opts '/.*\%'.col('.').'v/'
+  exec ':undojoin | '.firstRow.','.lastRow . 'sort'.bang opts '/.*\%'.col.'v/'
 endfunction

autoload/tablemode/spreadsheet/cell.vim

@@ -58,7 +58,7 @@ function! tablemode#spreadsheet#cell#GetCells(line, ...) abort
     if row == 0
       let values = []
       let line = first_row
-      while tablemode#table#IsRow(line) || tablemode#table#IsBorder(line)
+      while tablemode#table#IsTable(line)
         if tablemode#table#IsRow(line)
           let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
           call add(values, tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, '')))
@@ -70,7 +70,7 @@ function! tablemode#spreadsheet#cell#GetCells(line, ...) abort
       let row_nr = 0
       let row_diff = row > 0 ? 1 : -1
       let line = row > 0 ? first_row : last_row
-      while tablemode#table#IsRow(line) || tablemode#table#IsBorder(line)
+      while tablemode#table#IsTable(line)
         if tablemode#table#IsRow(line)
           let row_nr += row_diff
           if row ==# row_nr | break | endif

autoload/tablemode/spreadsheet/formula.vim

@@ -1,4 +1,7 @@
 " Private Functions {{{1
+function! s:IsFormulaLine(line) "{{{2
+  return getline(a:line) =~# 'tmf: '
+endfunction
 
 " Public Functions {{{1
 function! tablemode#spreadsheet#formula#Add(...) "{{{2
@@ -16,7 +19,10 @@ function! tablemode#spreadsheet#formula#Add(...) "{{{2
     if getline(fline) =~# 'tmf: '
       " Comment line correctly
       let line_val = getline(fline)
-      let line_expr = line_val[match(line_val, tablemode#table#StartCommentExpr()):match(line_val, tablemode#table#EndCommentExpr())]
+      let start_pos = match(line_val, tablemode#table#StartCommentExpr())
+      let end_pos = match(line_val, tablemode#table#EndCommentExpr())
+      if empty(end_pos) | let end_pos = len(line_val) | endif
+      let line_expr = strpart(line_val, start_pos, end_pos)
       let sce = matchstr(line_val, tablemode#table#StartCommentExpr() . '\zs')
       let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
       call setline(fline, sce . line_expr . '; ' . fr . ece)
@@ -57,8 +63,8 @@ function! tablemode#spreadsheet#formula#EvaluateExpr(expr, line) abort "{{{2
     let expr = substitute(expr, 'Average(\([^)]*\))', 'tablemode#spreadsheet#Average("\1",'.line.','.colm.')', 'g')
   endif
 
-  if expr =~# '\$\d\+,\d\+'
+  if expr =~# '\$\-\?\d\+,\-\?\d\+'
-    let expr = substitute(expr, '\$\(\d\+\),\(\d\+\)',
+    let expr = substitute(expr, '\$\(\-\?\d\+\),\(\-\?\d\+\)',
           \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, submatch(1), submatch(2)))', 'g')
   endif
 
@@ -102,14 +108,21 @@ function! tablemode#spreadsheet#formula#EvaluateFormulaLine() abort "{{{2
     let line = tablemode#spreadsheet#GetLastRow('.')
     let fline = line + 1
     if tablemode#table#IsBorder(fline) | let fline += 1 | endif
-    if getline(fline) =~# 'tmf: '
+    while s:IsFormulaLine(fline)
-      let exprs = split(matchstr(getline(fline), matchexpr), ';')
+      let exprs += split(matchstr(getline(fline), matchexpr), ';')
-    endif
+      let fline += 1
-  elseif getline('.') =~# 'tmf: ' " We're on the formula line
+    endwhile
+  elseif s:IsFormulaLine('.')
+    let fline = line('.')
     let line = line('.') - 1
+    while s:IsFormulaLine(line) | let fline = line | let line -= 1 | endwhile
     if tablemode#table#IsBorder(line) | let line -= 1 | endif
     if tablemode#table#IsRow(line)
-      let exprs = split(matchstr(getline('.'), matchexpr), ';')
+      " let exprs = split(matchstr(getline('.'), matchexpr), ';')
+      while s:IsFormulaLine(fline)
+        let exprs += split(matchstr(getline(fline), matchexpr), ';')
+        let fline += 1
+      endwhile
     endif
   endif
 

autoload/tablemode/table.vim

@@ -1,15 +1,24 @@
 " Private Functions {{{1
+function! s:blank(string) "{{{2
+  return a:string =~# '^\s*$'
+endfunction
+
 function! s:BorderExpr() "{{{2
+  let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
+  let corner_corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner_corner')
+  let header_fillchar = tablemode#utils#get_buffer_or_global_option('table_mode_header_fillchar')
   return tablemode#table#StartExpr() .
-        \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
+        \ '[' . corner . corner_corner . ']' .
-        \ '[' . escape(g:table_mode_fillchar . g:table_mode_header_fillchar . g:table_mode_corner . g:table_mode_align_char, '-') . ']\+' .
+        \ '[' . escape(g:table_mode_fillchar . header_fillchar . corner . g:table_mode_align_char, '-') . ']\+' .
-        \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
+        \ '[' . corner . corner_corner . ']' .
         \ tablemode#table#EndExpr()
 endfunction
 
 function! s:DefaultBorder() "{{{2
   if tablemode#IsActive()
-    return g:table_mode_corner_corner . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_fillchar . g:table_mode_corner_corner
+    let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
+    let corner_corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner_corner')
+    return corner_corner . g:table_mode_fillchar . corner . g:table_mode_fillchar . corner_corner
   else
     return ''
   endif
@@ -27,25 +36,33 @@ function! s:GenerateHeaderBorder(line) "{{{2
     endif
     if tablemode#utils#strlen(line_val) <= 1 | return s:DefaultBorder() | endif
 
-    let border = substitute(line_val[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator, g:table_mode_corner, 'g')
+    let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
-    " To accurately deal with unicode double width characters
+    let corner_corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner_corner')
-    if tablemode#table#IsHeader(line - 1)
+    let header_fillchar = tablemode#utils#get_buffer_or_global_option('table_mode_header_fillchar')
-      let fill_columns = map(split(border, g:table_mode_corner),  'repeat(g:table_mode_header_fillchar, tablemode#utils#StrDisplayWidth(v:val))')
+
-    else
+    let tline = line_val[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)]
-      let fill_columns = map(split(border, g:table_mode_corner),  'repeat(g:table_mode_fillchar, tablemode#utils#StrDisplayWidth(v:val))')
+    let fillchar = tablemode#table#IsHeader(line - 1) ? header_fillchar : g:table_mode_fillchar
-    endif
+
-    let border = g:table_mode_corner . join(fill_columns, g:table_mode_corner) . g:table_mode_corner
+    let special_replacement = '___'
-    let border = substitute(border, '^' . g:table_mode_corner . '\(.*\)' . g:table_mode_corner . '$', g:table_mode_corner_corner . '\1' . g:table_mode_corner_corner, '')
+    let border = substitute(tline, g:table_mode_escaped_separator_regex, special_replacement, 'g')
+    let seperator_match_regex = special_replacement . '\zs\(.\{-}\)\ze' . special_replacement
+    let border = substitute(border, seperator_match_regex, '\=repeat(fillchar, tablemode#utils#StrDisplayWidth(submatch(0)))', 'g')
+    let border = substitute(border, special_replacement, g:table_mode_separator, 'g')
+    let border = substitute(border, g:table_mode_separator, corner, 'g')
+    let border = substitute(border, '^' . corner . '\(.*\)' . corner . '$', corner_corner . '\1' . corner_corner, '')
 
     " Incorporate header alignment chars
     if getline(line) =~# g:table_mode_align_char
-      let pat = '[' . g:table_mode_corner_corner . g:table_mode_corner . ']'
+      let pat = '[' . corner_corner . corner . ']'
       let hcols = tablemode#align#Split(getline(line), pat)
       let gcols = tablemode#align#Split(border, pat)
 
       for idx in range(len(hcols))
         if hcols[idx] =~# g:table_mode_align_char
-          if hcols[idx] =~# g:table_mode_align_char . '$'
+          " center align
+          if hcols[idx] =~# g:table_mode_align_char . '[^'.g:table_mode_align_char.']\+' . g:table_mode_align_char
+            let gcols[idx] = g:table_mode_align_char . gcols[idx][1:-2] . g:table_mode_align_char
+          elseif hcols[idx] =~# g:table_mode_align_char . '$'
             let gcols[idx] = gcols[idx][:-2] . g:table_mode_align_char
           else
             let gcols[idx] = g:table_mode_align_char . gcols[idx][1:]
@@ -75,7 +92,7 @@ endfunction
 function! tablemode#table#GetCommentStart() "{{{2
   let cstring = &commentstring
   if tablemode#utils#strlen(cstring) > 0
-    return substitute(split(cstring, '%s')[0], '.', '\\\0', 'g')
+    return substitute(split(cstring, '%s')[0], '[^(%)]', '\\\0', 'g')
   else
     return ''
   endif
@@ -95,7 +112,7 @@ function! tablemode#table#GetCommentEnd() "{{{2
   if tablemode#utils#strlen(cstring) > 0
     let cst = split(cstring, '%s')
     if len(cst) == 2
-      return substitute(cst[1], '.', '\\\0', 'g')
+      return substitute(cst[1], '[^()]', '\\\0', 'g')
     else
       return ''
     endif
@@ -132,7 +149,7 @@ function! tablemode#table#EndExpr() "{{{2
 endfunction
 
 function! tablemode#table#IsBorder(line) "{{{2
-  return !empty(getline(a:line)) && getline(a:line) =~# s:BorderExpr()
+  return !s:blank(getline(a:line)) && getline(a:line) =~# s:BorderExpr()
 endfunction
 
 function! tablemode#table#IsHeader(line) "{{{2
@@ -146,7 +163,11 @@ function! tablemode#table#IsHeader(line) "{{{2
 endfunction
 
 function! tablemode#table#IsRow(line) "{{{2
-  return !tablemode#table#IsBorder(a:line) && getline(a:line) =~# (tablemode#table#StartExpr() . g:table_mode_separator)
+  return !tablemode#table#IsBorder(a:line) && getline(a:line) =~# (tablemode#table#StartExpr() . g:table_mode_separator) . '[^' . g:table_mode_separator . ']\+'
+endfunction
+
+function! tablemode#table#IsTable(line) "{{{2
+  return tablemode#table#IsRow(a:line) || tablemode#table#IsBorder(a:line)
 endfunction
 
 function! tablemode#table#AddBorder(line) "{{{2
@@ -154,11 +175,14 @@ function! tablemode#table#AddBorder(line) "{{{2
 endfunction
 
 function! tablemode#table#Realign(line) "{{{2
+  let current_fm = &foldmethod " save foldmethod to be restored
+  setlocal foldmethod=manual " manual foldmethod while table is being aligned
+
   let line = tablemode#utils#line(a:line)
 
   let lines = []
   let [lnum, blines] = [line, []]
-  while tablemode#table#IsRow(lnum) || tablemode#table#IsBorder(lnum)
+  while tablemode#table#IsTable(lnum)
     if tablemode#table#IsBorder(lnum)
       call insert(blines, lnum)
       let lnum -= 1
@@ -169,7 +193,7 @@ function! tablemode#table#Realign(line) "{{{2
   endwhile
 
   let lnum = line + 1
-  while tablemode#table#IsRow(lnum) || tablemode#table#IsBorder(lnum)
+  while tablemode#table#IsTable(lnum)
     if tablemode#table#IsBorder(lnum)
       call add(blines, lnum)
       let lnum += 1
@@ -188,4 +212,7 @@ function! tablemode#table#Realign(line) "{{{2
   for bline in blines
     call tablemode#table#AddBorder(bline)
   endfor
+
+  " restore foldmethod
+  execute "setlocal foldmethod=" . current_fm
 endfunction

autoload/tablemode/utils.vim

@@ -47,3 +47,7 @@ function! tablemode#utils#StrDisplayWidth(string) "{{{2
     return rv
   endif
 endfunction
+
+function! tablemode#utils#get_buffer_or_global_option(table_option) "{{{2
+  return get(b:, a:table_option, get(g:, a:table_option))
+endf

doc/table-mode.txt

@@ -1,7 +1,7 @@
 *table-mode.txt*			Table Mode for easy table formatting
 ===============================================================================
 	Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
-				 VERSION 4.6.3
+                               VERSION 4.6.7
 
 		Author: Dhruva Sagar <http://dhruvasagar.com/>
 		License: MIT <http://opensource.org/licenses/MIT/>
@@ -86,7 +86,7 @@ Table Formulas:
 		input formula will be appended to the formula line if one
 		exists or a new one will be created with the input formula
 		taking the current cell as the target cell. The formula line
-		is evaluated immidiately to reflect the results.
+		is evaluated immediately to reflect the results.
 
 		You can directly also add / manipulate formula expressions in
 		the formula line. The formula line is a commented line right
@@ -138,6 +138,7 @@ OPTIONS							*table-mode-options*
 
 Overview:
 	|table-mode-loaded| ............. Disable the plugin.
+	|table-mode-verbose| ............ Notify when Enabled/Disabled.
 	|table-mode-corner| ............. Set corner character.
 	|table-mode-separator| .......... Set separator character.
 	|table-mode-fillchar| ........... Set table fillchar character.
@@ -168,14 +169,24 @@ Overview:
         |table-mode-eval-formula-map| ... Set the eval formula mapping
         |table-mode-echo-cell-map| ...... Set the echo cell mapping
         |table-mode-sort-map| ........... Set the table sort mapping
+        |table-mode-syntax| ............. Control table mode syntax
+        |table-mode-auto-align| ......... Set if the table mode should auto
+                                        align as you type
 
 g:loaded_table_mode					*table-mode-loaded*
 	Use this option to disable the plugin: >
 		let g:loaded_table_mode = 1
 <
+g:table_mode_verbose					*table-mode-verbose*
+	Use this option to disable notifications: >
+		let g:table_mode_verbose = 0
+<
 g:table_mode_corner					*table-mode-corner*
 	Use this option to define the table corner character: >
 		let g:table_mode_corner = '+'
+<
+        Or only in the current buffer: >
+		let b:table_mode_corner = '+'
 <
 g:table_mode_separator					*table-mode-separator*
 	Use this option to define the table column separator character: >
@@ -224,6 +235,9 @@ g:table_mode_corner_corner                           *table-mode-corner-corner*
         Use this option to define the character to be used for the extreme
         corners of the table border. >
                 let g:table_mode_corner_corner = '|'
+<
+        Or only in the current buffer: >
+		let b:table_mode_corner_corner = '|'
 <
 g:table_mode_align_char                                  *table-mode-align-char*
         Use this option to define the character to be used for defining
@@ -291,6 +305,32 @@ g:table_mode_sort_map                                      *table-mode-sort-map*
         current column. >
                 let g:table_mode_sort_map = '<Leader>ts'
 >
+g:table_mode_tableize_map                              *table-mode-tableize-map*
+        Set this to configure the mapping for converting the visual selection
+        to a table. >
+                let g:table_mode_tableize_map = '<Leader>tt'
+>
+g:table_mode_tableize_d_map                          *table-mode-tableize-d-map*
+        Set this to configure the mapping for converting the visual selection
+        to a table, asking the user for a delimiter. >
+                let g:table_mode_tableize_d_map = '<Leader>T'
+>
+g:table_mode_syntax                                          *table-mode-syntax*
+        Control whether table mode should define table syntax definitions or
+        not. >
+                let g:table_mode_syntax = 1
+<
+g:table_mode_auto_align                                *table-mode-auto-align*
+        Set if the table mode should auto align as you type when table mode is
+        active. >
+                let g:table_mode_auto_align = 1
+<
+
+g:table_mode_update_time                              *table-mode-update-time*
+        Set the value of updatetime to be used when table mode is active,
+        used in combination with |table-mode-auto-align|. >
+                let g:table_mode_update_time = 500
+<
 
 ===============================================================================
 MAPPINGS						*table-mode-mappings*
@@ -349,9 +389,13 @@ MAPPINGS						*table-mode-mappings*
 		would evaluate the formula line and update the table
 		accordingly. This invokes the |TableEvalFormulaLine| command.
 
+
+                                               *table-mode-mappings-sort-column*
+<Leader>ts      Sort a column under the cursor. This invokes |TableSort|
+
 ||              Expands to a header border. You can change this by changing
                 |table-mode-separator| option. You can change the character to
-                be used for te extreme corners of the border by changing
+                be used for the extreme corners of the border by changing
                 |table-mode-corner-corner| option.
 
 ===============================================================================
@@ -416,17 +460,25 @@ COMMANDS						*table-mode-commands*
 	This command when invoked from anywhere within the table or directly
 	on the formula line evaluates it and updates the table accordingly.
 
+                                                                  *:TableSort*
+                                                       *table-mode-:TableSort*
+:TableSort[!] [i][u][r][n][x][o]
+        This command sorts column under the cursor and inherits the same flags
+        as the |:sort| command.
+
+        With [!] the order is reversed.
+
 ===============================================================================
 CONTRIBUTING						*table-mode-contributing*
 
 If you want to take a stab at it, by all means, send me a pull request on
-Github (http://github.com/dhruvasagar/table-mode) or get in touch with me
+Github (http://github.com/dhruvasagar/vim-table-mode) or get in touch with me
 directly via e-mail at dhruva 'dot' sagar 'at' gmail.com.
 
 ===============================================================================
 REPORT ISSUES					      *table-mode-report-issues*
 
 If you discover any issues, please report them at
-http://github.com/dhruvasagar/table-mode/issues.
+http://github.com/dhruvasagar/vim-table-mode/issues.
 
  vim:tw=78:ts=8:ft=help:norl:ai:et

ftplugin/markdown_tablemode.vim

@@ -0,0 +1 @@
+let b:table_mode_corner = '|'

ftplugin/rst_tablemode.vim

@@ -0,0 +1,2 @@
+let b:table_mode_corner_corner = '+'
+let b:table_mode_header_fillchar = '='

plugin/table-mode.vim

@@ -16,8 +16,9 @@ endfunction
 
 " Set Global Defaults {{{1
 call s:SetGlobalOptDefault('table_mode_corner', '+')
-call s:SetGlobalOptDefault('table_mode_verbose', 0)
+call s:SetGlobalOptDefault('table_mode_verbose', 1)
 call s:SetGlobalOptDefault('table_mode_separator', '|')
+call s:SetGlobalOptDefault('table_mode_escaped_separator_regex', '\(\\\)\@<!' . g:table_mode_separator)
 call s:SetGlobalOptDefault('table_mode_fillchar', '-')
 call s:SetGlobalOptDefault('table_mode_header_fillchar', '-')
 call s:SetGlobalOptDefault('table_mode_map_prefix', '<Leader>t')
@@ -36,13 +37,19 @@ call s:SetGlobalOptDefault('table_mode_motion_right_map', ']<Bar>')
 call s:SetGlobalOptDefault('table_mode_cell_text_object_a_map', 'a<Bar>')
 call s:SetGlobalOptDefault('table_mode_cell_text_object_i_map', 'i<Bar>')
 
-call s:SetGlobalOptDefault('table_mode_realign_map', '<Leader>tr')
+call s:SetGlobalOptDefault('table_mode_realign_map', g:table_mode_map_prefix.'r')
-call s:SetGlobalOptDefault('table_mode_delete_row_map', '<Leader>tdd')
+call s:SetGlobalOptDefault('table_mode_delete_row_map', g:table_mode_map_prefix.'dd')
-call s:SetGlobalOptDefault('table_mode_delete_column_map', '<Leader>tdc')
+call s:SetGlobalOptDefault('table_mode_delete_column_map', g:table_mode_map_prefix.'dc')
-call s:SetGlobalOptDefault('table_mode_add_formula_map', '<Leader>tfa')
+call s:SetGlobalOptDefault('table_mode_add_formula_map', g:table_mode_map_prefix.'fa')
-call s:SetGlobalOptDefault('table_mode_eval_formula_map', '<Leader>tfe')
+call s:SetGlobalOptDefault('table_mode_eval_formula_map', g:table_mode_map_prefix.'fe')
-call s:SetGlobalOptDefault('table_mode_echo_cell_map', '<Leader>t?')
+call s:SetGlobalOptDefault('table_mode_echo_cell_map', g:table_mode_map_prefix.'?')
-call s:SetGlobalOptDefault('table_mode_sort_map', '<Leader>ts')
+call s:SetGlobalOptDefault('table_mode_sort_map', g:table_mode_map_prefix.'s')
+call s:SetGlobalOptDefault('table_mode_tableize_map', g:table_mode_map_prefix.'t')
+call s:SetGlobalOptDefault('table_mode_tableize_d_map', '<Leader>T')
+
+call s:SetGlobalOptDefault('table_mode_syntax', 1)
+call s:SetGlobalOptDefault('table_mode_auto_align', 1)
+call s:SetGlobalOptDefault('table_mode_update_time', 500)
 
 function! s:TableEchoCell() "{{{1
   if tablemode#table#IsRow('.')
@@ -50,16 +57,9 @@ function! s:TableEchoCell() "{{{1
   endif
 endfunction
 
-augroup TableMode
-  au!
-
-  autocmd Syntax * if tablemode#IsActive() | call tablemode#SyntaxEnable() | endif
-augroup END
-
 " Define Commands & Mappings {{{1
 if !g:table_mode_always_active "{{{2
-  exec "nnoremap <silent> " . g:table_mode_map_prefix . g:table_mode_toggle_map .
+  exec "nnoremap <silent>" g:table_mode_map_prefix . g:table_mode_toggle_map ":<C-U>call tablemode#Toggle()<CR>"
-       \ " <Esc>:call tablemode#Toggle()<CR>"
   command! -nargs=0 TableModeToggle call tablemode#Toggle()
   command! -nargs=0 TableModeEnable call tablemode#Enable()
   command! -nargs=0 TableModeDisable call tablemode#Disable()
@@ -75,7 +75,7 @@ endif
 " }}}2
 
 command! -nargs=? -range Tableize <line1>,<line2>call tablemode#TableizeRange(<q-args>)
-command! -nargs=? -bang TableSort call tablemode#spreadsheet#Sort(<bang>0, <q-args>)
+command! -nargs=? -bang -range TableSort <line1>,<line2>call tablemode#spreadsheet#Sort(<bang>0, <q-args>)
 command! TableAddFormula call tablemode#spreadsheet#formula#Add()
 command! TableModeRealign call tablemode#table#Realign('.')
 command! TableEvalFormulaLine call tablemode#spreadsheet#formula#EvaluateFormulaLine()
@@ -100,23 +100,23 @@ onoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spr
 xnoremap <silent> <Plug>(table-mode-cell-text-object-a) :<C-U>call tablemode#spreadsheet#cell#TextObject(0)<CR>
 xnoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spreadsheet#cell#TextObject(1)<CR>
 
-nnoremap <silent> <Plug>(table-mode-delete-row) :call tablemode#spreadsheet#DeleteRow()<CR>
+nnoremap <silent> <Plug>(table-mode-delete-row) :<C-U>call tablemode#spreadsheet#DeleteRow()<CR>
-nnoremap <silent> <Plug>(table-mode-delete-column) :call tablemode#spreadsheet#DeleteColumn()<CR>
+nnoremap <silent> <Plug>(table-mode-delete-column) :<C-U>call tablemode#spreadsheet#DeleteColumn()<CR>
 
 nnoremap <silent> <Plug>(table-mode-add-formula) :call tablemode#spreadsheet#formula#Add()<CR>
 nnoremap <silent> <Plug>(table-mode-eval-formula) :call tablemode#spreadsheet#formula#EvaluateFormulaLine()<CR>
 
 nnoremap <silent> <Plug>(table-mode-echo-cell) :call <SID>TableEchoCell()<CR>
 
-nnoremap <silent> <Plug>(table-mode-sort) :call tablemode#spreadsheet#Sort()<CR>
+nnoremap <silent> <Plug>(table-mode-sort) :call tablemode#spreadsheet#Sort('')<CR>
 
 if !hasmapto('<Plug>(table-mode-tableize)')
-  exec "nmap " . g:table_mode_map_prefix . "t <Plug>(table-mode-tableize)"
+  exec "nmap" g:table_mode_tableize_map "<Plug>(table-mode-tableize)"
-  exec "xmap " . g:table_mode_map_prefix . "t <Plug>(table-mode-tableize)"
+  exec "xmap" g:table_mode_tableize_map "<Plug>(table-mode-tableize)"
 endif
 
 if !hasmapto('<Plug>(table-mode-tableize-delimiter)')
-  xmap <Leader>T <Plug>(table-mode-tableize-delimiter)
+  exec "xmap" g:table_mode_tableize_d_map "<Plug>(table-mode-tableize-delimiter)"
 endif
 
 augroup TableMode "{{{1

t/config/options.vim

@@ -1,5 +1,6 @@
 let g:table_mode_corner = '+'
 let g:table_mode_separator = '|'
+let g:table_mode_escaped_separator_regex = '\(\\\)\@<!|'
 let g:table_mode_fillchar = '-'
 let g:table_mode_header_fillchar = '-'
 let g:table_mode_map_prefix = '<Leader>t'
@@ -25,3 +26,9 @@ let g:table_mode_add_formula_map = '<Leader>tfa'
 let g:table_mode_eval_formula_map = '<Leader>tfe'
 let g:table_mode_echo_cell_map = '<Leader>t?'
 let g:table_mode_sort_map = '<Leader>ts'
+let g:table_mode_tableize_map = '<Leader>tt'
+let g:table_mode_tableize_d_map = '<Leader>T'
+
+let g:table_mode_syntax = 1
+let g:table_mode_auto_align = 1
+let g:table_mode_update_time = 500

t/fixtures/align/unicode_before.txt

@@ -1,2 +1,2 @@
-| This | is 測試 | table |
+|This|is 測試|table|
-| This | is also | a table |
+|This|is also|a table|

t/fixtures/big_sample.txt

@@ -0,0 +1,7 @@
+|---+---+---+---|
+| 1 | 9 | a | z |
+| 2 | 8 | b | y |
+| 3 | 7 | c | x |
+| 4 | 6 | d | w |
+| 5 | 5 | e | v |
+|---+---+---+---|

t/fixtures/table/sample_header_realign_after.txt

@@ -1,4 +1,4 @@
-| Title | Message |
+| S. No | Title | Message |
-|------:+--------:|
+|-------+:------+:-------:|
-|    t1 |    msg1 |
+| 1     | t1    |   msg1  |
-|    t2 |    msg2 |
+| 2     | t2    |   msg2  |

t/fixtures/table/sample_header_realign_before.txt

@@ -1,4 +1,4 @@
-| Title | Message |
+|S. No|Title|Message|
-|------:+--------:|
+|-----+:----+:-----:|
-| t1    | msg1    |
+|1|t1|msg1|
-| t2    | msg2    |
+|2|t2|msg2|

t/fixtures/table/sample_header_realign_unicode_after.txt

@@ -1,8 +1,8 @@
 |--------------+------------------+------------|
-| 测试测试     | 测试长度         |     长测试 |
+| 测试测试     |     测试长度     |     长测试 |
-|--------------+------------------+-----------:|
+|--------------+:----------------:+-----------:|
-| abc          | 测试长度         |     长测试 |
+| abc          |     测试长度     |     长测试 |
 | 长           | 测试测试测试测试 |   测试测试 |
-| 测试测试     | 测试             | 测试测测试 |
+| 测试测试     |       测试       | 测试测测试 |
-| 测试测试测试 | 测试测试         |       测试 |
+| 测试测试测试 |     测试测试     |       测试 |
 |--------------+------------------+------------|

t/fixtures/table/sample_header_realign_unicode_before.txt

@@ -1,6 +1,6 @@
 |--------+--------+------|
 |测试测试|测试长度|长测试|
-|--------+--------+-----:|
+|--------+:------:+-----:|
 |abc|测试长度|长测试|
 |长|测试测试测试测试|测试测试|
 |测试测试|测试|测试测测试|

t/formula.vim

@@ -19,7 +19,7 @@ describe 'Formulas'
       call tablemode#spreadsheet#formula#Add("Sum(1:-1)")
       Expect tablemode#spreadsheet#cell#GetCell() == '250.0'
       call cursor(8, 15)
-      Expect getline('.') == '/* tmf: $4,2=Sum(1:3) ; $5,2=Sum(1:-1) */'
+      Expect getline('.') == '/* tmf: $4,2=Sum(1:3); $5,2=Sum(1:-1) */'
     end
   end
 

t/spreadsheet.vim

@@ -102,4 +102,25 @@ describe 'spreadsheet'
       Expect tablemode#spreadsheet#ColumnCount('.') == 1
     end
   end
+  
+  describe 'Repeated Manipulations'
+    before
+      new
+      normal! ggdG
+      read t/fixtures/big_sample.txt
+      call cursor(2, 3)
+    end
+
+    it 'should delete multiple rows correctly'
+      Expect tablemode#spreadsheet#RowCount('.') == 5
+      .,.+1 call tablemode#spreadsheet#DeleteRow()
+      Expect tablemode#spreadsheet#RowCount('.') == 3
+    end
+
+    it 'should delete multiple columns correctly'
+      Expect tablemode#spreadsheet#ColumnCount('.') == 4
+      .,.+1 call tablemode#spreadsheet#DeleteColumn()
+      Expect tablemode#spreadsheet#ColumnCount('.') == 2
+    end
+  end
 end

t/table.vim

@@ -40,6 +40,29 @@ describe 'table'
     end
   end
 
+  describe 'IsTable'
+    before
+      new normal! ggdG
+      read t/fixtures/table/sample_with_header.txt
+    end
+
+    it 'should be true on a table row'
+      Expect tablemode#table#IsTable(2) to_be_true
+      Expect tablemode#table#IsTable(4) to_be_true
+      Expect tablemode#table#IsTable(5) to_be_true
+    end
+
+    it 'should be true when on a table border'
+      Expect tablemode#table#IsTable(1) to_be_true
+      Expect tablemode#table#IsTable(3) to_be_true
+      Expect tablemode#table#IsTable(6) to_be_true
+    end
+
+    it 'should not be true when not on a table'
+      Expect tablemode#table#IsTable(7) to_be_false
+    end
+  end
+
   describe 'IsHeader'
     before
       new