Fix for option g:table_mode_update_time

Add configuration option table_mode_update_time #73
This is for better experience with auto align, we override the updatetime with the value of the configuration g:table_mode_update_time. Once table mode is disabled prior defaults are restored.
2025-11-08 11:03:47 -05:00 · 2017-03-10 06:51:47 +05:30 · 2017-03-10 06:48:30 +05:30 · 2017-03-09 15:02:42 +05:30 · 2017-03-09 14:24:15 +05:30 · 2017-03-09 11:00:19 +05:30
40 changed files with 1644 additions and 997 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.3.0
 script: rake ci
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,56 @@
 # 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()
+
+## Version 4.6.2
+* Added custom User autocmd event for tablemode activation (enabled /
+  disabled)
+* Adding better header support for pandoc, headers can now have a different
+  fillchar configured with `g:table_mode_header_fillchar`
+
+## Version 4.6.1
+* Minor bug fixes
+
+## Version 4.6.0
+* Added better table header support. The first line of the table if separated
+  by a table border will be considered as the header. This also means that it
+  will not be considered / included when evaluating table formulas and that
+  the first line after the header would be considered the first line of the
+  table.
+
+## Version 4.5.0
+* Refactored toggled mappings
+* Table Syntax now gets toggled with Table Mode
+
+## Version 4.4.2
+* Updated mappings to be buffer local.
+* Updated mappings to toggle and function only when table mode is active.
+
+## Version 4.4.1
+* Added syntax for matching tables
+
+## Version 4.4.0
+* Minor bug fixes
+* Added feature to allow using negative indices within formulas to access rows,
+  columns relative to the last, -1 being the last.
+
+## Version 4.3.0
+* Refactored some more
+* Fixed issue #19, hiphens in the table broke alignment
+* Added feature #26, you can now define column alignments in the table header
+
+## Version 4.2.0
+* Refactored cells logic out to autoload/tablemode/spreadsheet/cell.vim
+* Refactored formula logic out to autoload/tablemode/spreadsheet/formula.vim
+
 ## Version 4.1.0
 * Fixed bad references within plugin
 * Added fixtures
@@ -7,7 +59,7 @@
 * Major refactoring of the codebase.
 * Improved modular tests.
 * Fixed long standing unicode character alignment issue.
-* Moved to providing <Plug> mappings rather than configuration based mappings
+* Moved to providing \<Plug\> mappings rather than configuration based mappings
  which can be more easily overriden by end user.

 ## Version 3.3.2
@@ -89,3 +141,7 @@

 ## Version 1.0 :
 * First stable release, create tables as you type.
+
+<!--
+  vim: ft=markdown
+-->
--- a/1
+++ b/1
@@ -1,4 +1,5 @@
 source 'https://rubygems.org'

+ruby '2.3.0'
 gem 'rake'
 gem 'vim-flavor', '~> 1.1'
--- a/README.md
+++ b/README.md
@@ -1,14 +1,10 @@
-# VIM Table Mode v4.1.0 [![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.6 [![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
@@ -25,30 +21,103 @@ There are several ways to do this
 $ cd ~/.vim
 $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-mode
   ```
-3. Copy autoload/todomode.vim, plugin/todo-mode.vim, doc/todo-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
-   `g:table_mode_separator` option. As soon as you type it on a new line (ignores
-   indentation) the script gets to work on creating a table around it. As you
-   type and define more columns, the table is completed, formatted and aligned
-   automatically on the fly.
+> Tip :
+> You can use the following to quickly enable / disable table mode in insert
+> mode by using `||` or `__` :
+> ```vim
+> 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
-   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`
-   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
-   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.
+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:

- **Format existing content into a table** :
+    | name | address | phone |
+
+In the second line (without leaving Insert mode), enter `|` twice. The plugin will write a properly formatted horizontal line:
+
+    | 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 |
+    +-----------------+--------------------------+------------+
+
+
+   You can also define in a table header border how it's content should be
+   aligned, whether center, right or left by using a `:` character defined by
+   `g:table_mode_align_char` 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
@@ -70,7 +139,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 |
@@ -78,7 +147,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** :

@@ -101,7 +170,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 :
@@ -125,7 +196,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`.

@@ -133,11 +204,13 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m

      - `$n`: This matches the table column number `n`. So the `formula` would
        be evaluated for each cell in that column and the result would be placed
-        in it.
+        in it. You can use negative indice to represent column relative to the
+        last, -1 being the last.

      - `$n,m`: This matches the table cell n,m (row, column). So in this case
        the formula would be evaluated and the result will be placed in this
-        cell.
+        cell. You can also use negative values to refer to cells relative to
+        the size, -1 being the last (row or column).

  - The `formula` can be a simple mathematical expression involving cells
    which are also defined by the same format as that of the target cell.  You
@@ -145,7 +218,7 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
    mode also provides 2 special functions `Sum` and `Average`. Both these
    functions take a range as input. A range can be of two forms :

-      - `r1,r2`: This represents cells in the current column from row `r1`
+      - `r1:r2`: This represents cells in the current column from row `r1`
        through `r2`. If `r2` is negative it represents `r2` rows above the
        current row (of the target cell).

@@ -164,10 +237,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
-src="https://raw.github.com/dhruvasagar/vim-table-mode/master/youtube.png"/></a>
+<a href="http://www.youtube.com/watch?v=9lVQ0VJY3ps"><img
+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

--- a/autoload/tablemode.vim
+++ b/autoload/tablemode.vim
@@ -1,71 +1,140 @@
-" ==============================  Header ======================================
-" File:          autoload/tablemode.vim
-" Description:   Table mode for vim for creating neat tables.
-" Author:        Dhruva Sagar <http://dhruvasagar.com/>
-" License:       MIT (http://www.opensource.org/licenses/MIT)
-" Website:       https://github.com/dhruvasagar/vim-table-mode
-" Version:       4.1.0
-" Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
-"                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
-"
-" Copyright Notice:
-"                Permission is hereby granted to use and distribute this code,
-"                with or without modifications, provided that this copyright
-"                notice is copied with it. Like anything else that's free,
-"                table-mode.vim is provided *as is* and comes with no warranty
-"                of any kind, either expressed or implied. In no event will
-"                the copyright holder be liable for any damamges resulting
-"                from the use of this software.
-" =============================================================================
-
 " Private Functions {{{1
-function! s:sub(str,pat,rep) abort "{{{2
-  return substitute(a:str,'\v\C'.a:pat,a:rep,'')
-endfunction
-
-function! s:gsub(str,pat,rep) abort "{{{2
-  return substitute(a:str,'\v\C'.a:pat,a:rep,'g')
-endfunction
-
 function! s:SetBufferOptDefault(opt, val) "{{{2
  if !exists('b:' . a:opt)
    let b:{a:opt} = a:val
  endif
 endfunction

-function! s:IsTableModeActive() "{{{2
-  if g:table_mode_always_active | return 1 | endif
+function! s:Map(map, to, mode) "{{{2
+  if !empty(a:to) && !hasmapto(a:map, a:mode)
+    for l:mode in split(a:mode, '.\zs')
+      execute l:mode . 'map <buffer>' a:to a:map
+    endfor
+  endif
+endfunction

-  call s:SetBufferOptDefault('table_mode_active', 0)
-  return b:table_mode_active
+function! s:UnMap(map, mode) "{{{2
+  if !empty(maparg(a:map, a:mode))
+    for mode in split(a:mode, '.\zs')
+      execute l:mode . 'unmap <buffer>' a:map
+    endfor
+  endif
 endfunction

 function! s:ToggleMapping() "{{{2
-  if exists('b:table_mode_active') && b:table_mode_active
-    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
+  let separator_map = g:table_mode_separator
+  " '|' is a special character, we need to map <Bar> instead
+  if g:table_mode_separator ==# '|' | let separator_map = '<Bar>' | endif

-    execute "inoremap <silent> <buffer> " . b:table_mode_separator_map . ' ' .
-          \ b:table_mode_separator_map . "<Esc>:call tablemode#TableizeInsertMode()<CR>a"
+  if !g:table_mode_disable_mappings
+    if tablemode#IsActive()
+      call s:Map('<Plug>(table-mode-tableize)', separator_map, 'i')
+      call s:Map('<Plug>(table-mode-motion-up)', g:table_mode_motion_up_map, 'n')
+      call s:Map('<Plug>(table-mode-motion-down)', g:table_mode_motion_down_map, 'n')
+      call s:Map('<Plug>(table-mode-motion-left)', g:table_mode_motion_left_map, 'n')
+      call s:Map('<Plug>(table-mode-motion-right)', g:table_mode_motion_right_map, 'n')
+
+      call s:Map('<Plug>(table-mode-cell-text-object-a)', g:table_mode_cell_text_object_a_map, 'ox')
+      call s:Map('<Plug>(table-mode-cell-text-object-i)', g:table_mode_cell_text_object_i_map, 'ox')
+
+      call s:Map('<Plug>(table-mode-realign)', g:table_mode_realign_map, 'n')
+      call s:Map('<Plug>(table-mode-delete-row)', g:table_mode_delete_row_map, 'n')
+      call s:Map('<Plug>(table-mode-delete-column)', g:table_mode_delete_column_map, 'n')
+      call s:Map('<Plug>(table-mode-add-formula)', g:table_mode_add_formula_map, 'n')
+      call s:Map('<Plug>(table-mode-eval-formula)', g:table_mode_eval_formula_map, 'n')
+      call s:Map('<Plug>(table-mode-echo-cell)', g:table_mode_echo_cell_map, 'n')
+      call s:Map('<Plug>(table-mode-sort)', g:table_mode_sort_map, 'n')
+    else
+      call s:UnMap(separator_map, 'i')
+      call s:UnMap(g:table_mode_motion_up_map, 'n')
+      call s:UnMap(g:table_mode_motion_down_map, 'n')
+      call s:UnMap(g:table_mode_motion_left_map, 'n')
+      call s:UnMap(g:table_mode_motion_right_map, 'n')
+
+      call s:UnMap(g:table_mode_cell_text_object_a_map, 'ox')
+      call s:UnMap(g:table_mode_cell_text_object_i_map, 'ox')
+
+      call s:UnMap(g:table_mode_realign_map, 'n')
+      call s:UnMap(g:table_mode_delete_row_map, 'n')
+      call s:UnMap(g:table_mode_delete_column_map, 'n')
+      call s:UnMap(g:table_mode_add_formula_map, 'n')
+      call s:UnMap(g:table_mode_eval_formula_map, 'n')
+      call s:UnMap(g:table_mode_echo_cell_map, 'n')
+      call s:UnMap(g:table_mode_sort_map, 'n')
+    endif
+  endif
+endfunction
+
+function! s:ToggleSyntax() "{{{2
+  if !g:table_mode_syntax | return | endif
+
+  if tablemode#IsActive()
+    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
-    silent! execute "iunmap <silent> <buffer> " . b:table_mode_separator_map
+    syntax clear Table
+    syntax clear TableBorder
+    syntax clear TableSeparator
+    syntax clear TableColumnAlign
+
+    hi! link TableBorder NONE
+    hi! link TableSeparator NONE
+    hi! link TableColumnAlign NONE
+  endif
+endfunction
+
+function! s:ToggleAutoAlign() "{{{2
+  if !g:table_mode_auto_align | return | endif
+
+  if tablemode#IsActive()
+    augroup TableModeAutoAlign
+      au!
+
+      autocmd CursorHold,CursorHoldI * nested silent! call tablemode#table#Realign('.')
+    augroup END
+  else
+    silent! augroup! 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
+    doautocmd User TableModeDisabled
+  endif
 endfunction

 function! s:ConvertDelimiterToSeparator(line, ...) "{{{2
-  let gflag = 'g'
-  if &gdefault | let gflag = 'gg' | endif
+  let old_gdefault = &gdefault
+  set nogdefault

  let delim = g:table_mode_delimiter
  if a:0 | let delim = a:1 | endif
  if delim ==# ','
-    silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs,\\ze[^\'\"]*[\'\"]/__COMMA__/" . gflag
+    silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs,\\ze[^\'\"]*[\'\"]/__COMMA__/g"
  endif

  let [cstart, cend] = [tablemode#table#GetCommentStart(), tablemode#table#GetCommentEnd()]
@@ -75,11 +144,13 @@ function! s:ConvertDelimiterToSeparator(line, ...) "{{{2

  silent! execute a:line . 's/' . tablemode#table#StartExpr() . '\zs\ze' . match_char_start .
        \ '\|' . delim .  '\|' . match_char_end . '\zs\ze' . tablemode#table#EndExpr() . '/' .
-        \ g:table_mode_separator . '/' . gflag
+        \ g:table_mode_separator . '/g'

  if delim ==# ','
-    silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs__COMMA__\\ze[^\'\"]*[\'\"]/,/" . gflag
+    silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs__COMMA__\\ze[^\'\"]*[\'\"]/,/g"
  endif
+
+  let &gdefault=old_gdefault
 endfunction

 function! s:Tableizeline(line, ...) "{{{2
@@ -89,37 +160,35 @@ function! s:Tableizeline(line, ...) "{{{2
 endfunction

 " Public API {{{1
-function! tablemode#sid() "{{{2
-  return maparg('<SID>', 'n')
-endfunction
-nnoremap <SID> <SID>
+function! tablemode#IsActive() "{{{2
+  if g:table_mode_always_active | return 1 | endif

-function! tablemode#scope() "{{{2
-  return s:
+  call s:SetBufferOptDefault('table_mode_active', 0)
+  return b:table_mode_active
 endfunction

 function! tablemode#TableizeInsertMode() "{{{2
-  if s:IsTableModeActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator)
-    call tablemode#table#AddHeaderBorder('.')
+  if tablemode#IsActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator)
+    call tablemode#table#AddBorder('.')
    normal! A
-  elseif s:IsTableModeActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
+  elseif tablemode#IsActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
    let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g'))
    let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*'))
-    call tablemode#table#TableRealign('.')
+    call tablemode#table#Realign('.')
    normal! 0
    call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
  endif
 endfunction

-function! tablemode#TableModeEnable() "{{{2
+function! tablemode#Enable() "{{{2
  call s:SetActive(1)
 endfunction

-function! tablemode#TableModeDisable() "{{{2
+function! tablemode#Disable() "{{{2
  call s:SetActive(0)
 endfunction

-function! tablemode#TableModeToggle() "{{{2
+function! tablemode#Toggle() "{{{2
  if g:table_mode_always_active
    return 1
  endif
@@ -136,7 +205,7 @@ function! tablemode#TableizeRange(...) range "{{{2
    let lnum += 1
  endwhile

-  call tablemode#table#TableRealign(lnum - 1)
+  call tablemode#table#Realign(lnum - 1)
 endfunction

 function! tablemode#TableizeByDelimiter() "{{{2
--- a/autoload/tablemode/align.vim
+++ b/autoload/tablemode/align.vim
@@ -1,51 +1,5 @@
-" ==============================  Header ======================================
-" File:          autoload/tablemode/align.vim
-" Description:   Table mode for vim for creating neat tables.
-" Author:        Dhruva Sagar <http://dhruvasagar.com/>
-" License:       MIT (http://www.opensource.org/licenses/MIT)
-" Website:       https://github.com/dhruvasagar/vim-table-mode
-" Version:       4.1.0
-" Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
-"                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
-"
-" Copyright Notice:
-"                Permission is hereby granted to use and distribute this code,
-"                with or without modifications, provided that this copyright
-"                notice is copied with it. Like anything else that's free,
-"                table-mode.vim is provided *as is* and comes with no warranty
-"                of any kind, either expressed or implied. In no event will
-"                the copyright holder be liable for any damamges resulting
-"                from the use of this software.
-" =============================================================================
-
 " Borrowed from Tabular
 " Private Functions {{{1
-" Return the number of bytes in a string after expanding tabs to spaces.  {{{2
-" This expansion is done based on the current value of 'tabstop'
-if exists('*strdisplaywidth')
-  " Needs vim 7.3
-  let s:Strlen = function("strdisplaywidth")
-else
-  function! s:Strlen(string)
-    " Implement the tab handling part of strdisplaywidth for vim 7.2 and
-    " earlier - not much that can be done about handling doublewidth
-    " characters.
-    let rv = 0
-    let i = 0
-
-    for char in split(a:string, '\zs')
-      if char == "\t"
-        let rv += &ts - i
-        let i = 0
-      else
-        let rv += 1
-        let i = (i + 1) % &ts
-      endif
-    endfor
-
-    return rv
-  endfunction
-endif
 " function! s:StripTrailingSpaces(string) - Remove all trailing spaces {{{2
 " from a string.
 function! s:StripTrailingSpaces(string)
@@ -53,23 +7,24 @@ function! s:StripTrailingSpaces(string)
 endfunction

 function! s:Padding(string, length, where) "{{{3
-  let gap_length = a:length - s:Strlen(a:string)
+  let gap_length = a:length - tablemode#utils#StrDisplayWidth(a:string)
  if a:where =~# 'l'
    return a:string . repeat(" ", gap_length)
  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
 endfunction

-" function! s:Split() - Split a string into fields and delimiters {{{2
+" Public Functions {{{1
+" function! tablemode#align#Split() - Split a string into fields and delimiters {{{2
 " Like split(), but include the delimiters as elements
 " All odd numbered elements are delimiters
 " All even numbered elements are non-delimiters (including zero)
-function! s:Split(string, delim)
+function! tablemode#align#Split(string, delim)
  let rv = []
  let beg = 0

@@ -108,59 +63,71 @@ function! s:Split(string, delim)
  return rv
 endfunction

-" Public Functions {{{1
-function! tablemode#align#sid() "{{{2
-  return maparg('<sid>', 'n')
-endfunction
-nnoremap <sid> <sid>
-
-function! tablemode#align#scope() "{{{2
-  return s:
+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 . ']')
+    for idx in range(len(hcols))
+      " Right align if header
+      call add(alignments, 'l')
+      if hcols[idx] =~# achr . '[^'.achr.']\+' . achr
+        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
 endfunction

 function! tablemode#align#Align(lines) "{{{2
-  let lines = map(a:lines, 's:Split(v:val, g:table_mode_separator)')
+  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")')

  for line in lines
-    if len(line) <= 1 | continue | endif
+    let stext = line.text
+    if len(stext) <= 1 | continue | endif

-    if line[0] !~ tablemode#table#StartExpr()
-      let line[0] = s:StripTrailingSpaces(line[0])
+    if stext[0] !~ tablemode#table#StartExpr()
+      let stext[0] = s:StripTrailingSpaces(stext[0])
    endif
-    if len(line) >= 2
-      for i in range(1, len(line)-1)
-        let line[i] = tablemode#utils#strip(line[i])
+    if len(stext) >= 2
+      for i in range(1, len(stext)-1)
+        let stext[i] = tablemode#utils#strip(stext[i])
      endfor
    endif
  endfor

  let maxes = []
  for line in lines
-    if len(line) <= 1 | continue | endif
-    for i in range(len(line))
+    let stext = line.text
+    if len(stext) <= 1 | continue | endif
+    for i in range(len(stext))
      if i == len(maxes)
-        let maxes += [ s:Strlen(line[i]) ]
+        let maxes += [ tablemode#utils#StrDisplayWidth(stext[i]) ]
      else
-        let maxes[i] = max([ maxes[i], s:Strlen(line[i]) ])
+        let maxes[i] = max([ maxes[i], tablemode#utils#StrDisplayWidth(stext[i]) ])
      endif
    endfor
  endfor

+  let alignments = tablemode#align#alignments(lines[0].lnum, len(lines[0].text))
+
  for idx in range(len(lines))
-    let line = lines[idx]
+    let tlnum = lines[idx].lnum
+    let tline = lines[idx].text

-    if len(line) <= 1 | continue | endif
-    for i in range(len(line))
-      if line[i] !~# '[^0-9\.]'
-        let field = s:Padding(line[i], maxes[i], 'r')
-      else
-        let field = s:Padding(line[i], maxes[i], 'l')
-      endif
-
-      let line[i] = field . (i == 0 || i == len(line) ? '' : ' ')
+    if len(tline) <= 1 | continue | endif
+    for jdx in range(len(tline))
+      " Dealing with the header being the first line
+      if jdx >= len(alignments) | call add(alignments, 'l') | endif
+      let field = s:Padding(tline[jdx], maxes[jdx], alignments[jdx])
+      let tline[jdx] = field . (jdx == 0 || jdx == len(tline) ? '' : ' ')
    endfor

-    let lines[idx] = s:StripTrailingSpaces(join(line, ''))
+    let lines[idx].text = s:StripTrailingSpaces(join(tline, ''))
  endfor

  return lines
--- a/autoload/tablemode/logger.vim
+++ b/autoload/tablemode/logger.vim
@@ -0,0 +1,5 @@
+function! tablemode#logger#log(message)
+  if g:table_mode_verbose
+    echom a:message
+  endif
+endfunction
--- a/autoload/tablemode/spreadsheet.vim
+++ b/autoload/tablemode/spreadsheet.vim
@@ -1,23 +1,3 @@
-" ==============================  Header ======================================
-" File:          autoload/tablemode/spreadsheet.vim
-" Description:   Table mode for vim for creating neat tables.
-" Author:        Dhruva Sagar <http://dhruvasagar.com/>
-" License:       MIT (http://www.opensource.org/licenses/MIT)
-" Website:       https://github.com/dhruvasagar/vim-table-mode
-" Version:       4.1.0
-" Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
-"                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
-"
-" Copyright Notice:
-"                Permission is hereby granted to use and distribute this code,
-"                with or without modifications, provided that this copyright
-"                notice is copied with it. Like anything else that's free,
-"                table-mode.vim is provided *as is* and comes with no warranty
-"                of any kind, either expressed or implied. In no event will
-"                the copyright holder be liable for any damamges resulting
-"                from the use of this software.
-" =============================================================================
-
 " Private Functions {{{1
 function! s:Sum(list) "{{{2
  let result = 0.0
@@ -37,99 +17,54 @@ function! s:Average(list) "{{{2
  return s:Sum(a:list)/len(a:list)
 endfunction

-" function! s:ParseRange(range, ...) {{{2
-" range: A string representing range of cells.
-"        - Can be row1:row2 for values in the current columns in those rows.
-"        - Can be row1,col1:row2,col2 for range between row1,col1 till
-"          row2,col2.
-function! s:ParseRange(range, ...)
-  if a:0 < 1
-    let default_col = tablemode#spreadsheet#ColumnNr('.')
-  elseif a:0 < 2
-    let default_col = a:1
-  endif
-
-  if type(a:range) != type('')
-    let range = string(a:range)
-  else
-    let range = a:range
-  endif
-
-  let [rowcol1, rowcol2] = split(range, ':')
-  let [rcs1, rcs2] = [map(split(rowcol1, ','), 'str2nr(v:val)'), map(split(rowcol2, ','), 'str2nr(v:val)')]
-
-  if len(rcs1) == 2
-    let [row1, col1] = rcs1
-  else
-    let [row1, col1] = [rcs1[0], default_col]
-  endif
-
-  if len(rcs2) == 2
-    let [row2, col2] = rcs2
-  else
-    let [row2, col2] = [rcs2[0], default_col]
-  endif
-
-  return [row1, col1, row2, col2]
-endfunction
-
 " Public Functions {{{1
-function! tablemode#spreadsheet#sid() "{{{2
-  return maparg('<sid>', 'n')
-endfunction
-nnoremap <sid> <sid>
-
-function! tablemode#spreadsheet#scope() "{{{2
-  return s:
-endfunction
-
 function! tablemode#spreadsheet#GetFirstRow(line) "{{{2
-  if tablemode#table#IsATableRow(a:line)
+  if tablemode#table#IsRow(a:line)
    let line = tablemode#utils#line(a:line)

-    while tablemode#table#IsATableRow(line - 1) || tablemode#table#IsATableHeader(line - 1)
+    while !tablemode#table#IsHeader(line - 1) && (tablemode#table#IsRow(line - 1) || tablemode#table#IsBorder(line - 1))
      let line -= 1
    endwhile
-    if tablemode#table#IsATableHeader(line) | let line += 1 | endif
+    if tablemode#table#IsBorder(line) | let line += 1 | endif

    return line
  endif
 endfunction

 function! tablemode#spreadsheet#MoveToFirstRow() "{{{2
-  if tablemode#table#IsATableRow('.')
+  if tablemode#table#IsRow('.')
    call cursor(tablemode#spreadsheet#GetFirstRow('.'), col('.'))
  endif
 endfunction

 function! tablemode#spreadsheet#GetLastRow(line) "{{{2
-  if tablemode#table#IsATableRow(a:line)
+  if tablemode#table#IsRow(a:line)
    let line = tablemode#utils#line(a:line)

-    while tablemode#table#IsATableRow(line + 1) || tablemode#table#IsATableHeader(line + 1)
+    while tablemode#table#IsTable(line + 1)
      let line += 1
    endwhile
-    if tablemode#table#IsATableHeader(line) | let line -= 1 | endif
+    if tablemode#table#IsBorder(line) | let line -= 1 | endif

    return line
  endif
 endfunction

 function! tablemode#spreadsheet#MoveToLastRow() "{{{2
-  if tablemode#table#IsATableRow('.')
+  if tablemode#table#IsRow('.')
    call cursor(tablemode#spreadsheet#GetLastRow('.'), col('.'))
  endif
 endfunction

-function! tablemode#spreadsheet#LineNr(row) "{{{2
-  if tablemode#table#IsATableRow('.')
-    let line = tablemode#spreadsheet#GetFirstRow('.')
+function! tablemode#spreadsheet#LineNr(line, row) "{{{2
+  if tablemode#table#IsRow(a:line)
+    let line = tablemode#spreadsheet#GetFirstRow(a:line)
    let row_nr = 0

-    while tablemode#table#IsATableRow(line + 1) || tablemode#table#IsATableHeader(line + 1)
-      if tablemode#table#IsATableRow(line)
+    while tablemode#table#IsTable(line + 1)
+      if tablemode#table#IsRow(line)
        let row_nr += 1
-        if row ==# row_nr | break | endif
+        if a:row ==# row_nr | break | endif
      endif
      let line += 1
    endwhile
@@ -142,8 +77,8 @@ function! tablemode#spreadsheet#RowNr(line) "{{{2
  let line = tablemode#utils#line(a:line)

  let rowNr = 0
-  while tablemode#table#IsATableRow(line) || tablemode#table#IsATableHeader(line)
-    if tablemode#table#IsATableRow(line) | let rowNr += 1 | endif
+  while !tablemode#table#IsHeader(line) && tablemode#table#IsTable(line)
+    if tablemode#table#IsRow(line) | let rowNr += 1 | endif
    let line -= 1
  endwhile

@@ -154,14 +89,14 @@ function! tablemode#spreadsheet#RowCount(line) "{{{2
  let line = tablemode#utils#line(a:line)

  let [tline, totalRowCount] = [line, 0]
-  while tablemode#table#IsATableRow(tline) || tablemode#table#IsATableHeader(tline)
-    if tablemode#table#IsATableRow(tline) | let totalRowCount += 1 | endif
+  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#IsATableRow(tline) || tablemode#table#IsATableHeader(tline)
-    if tablemode#table#IsATableRow(tline) | let totalRowCount += 1 | endif
+  while !tablemode#table#IsHeader(tline) && tablemode#table#IsTable(tline)
+    if tablemode#table#IsRow(tline) | let totalRowCount += 1 | endif
    let tline += 1
  endwhile

@@ -203,143 +138,8 @@ function! tablemode#spreadsheet#MoveToStartOfCell() "{{{2
  endif
 endfunction

-function! tablemode#spreadsheet#GetLastRow(line) "{{{2
-  if tablemode#table#IsATableRow(a:line)
-    let line = tablemode#utils#line(a:line)
-
-    while tablemode#table#IsATableRow(line + 1) || tablemode#table#IsATableHeader(line + 1)
-      let line += 1
-    endwhile
-    if tablemode#table#IsATableHeader(line) | let line -= 1 | endif
-
-    return line
-  endif
-endfunction
-
-function! tablemode#spreadsheet#GetFirstRow(line) "{{{2
-  if tablemode#table#IsATableRow(a:line)
-    let line = tablemode#utils#line(a:line)
-
-    while tablemode#table#IsATableRow(line - 1) || tablemode#table#IsATableHeader(line - 1)
-      let line -= 1
-    endwhile
-    if tablemode#table#IsATableHeader(line) | let line += 1 | endif
-
-    return line
-  endif
-endfunction
-
-" function! tablemode#spreadsheet#GetCells() - Function to get values of cells in a table {{{2
-" tablemode#spreadsheet#GetCells(row) - Get values of all cells in a row as a List.
-" tablemode#spreadsheet#GetCells(0, col) - Get values of all cells in a column as a List.
-" tablemode#spreadsheet#GetCells(row, col) - Get the value of table cell by given row, col.
-function! tablemode#spreadsheet#GetCells(line, ...) abort "{{{2
-  let line = tablemode#utils#line(a:line)
-
-  if tablemode#table#IsATableRow(line)
-    if a:0 < 1
-      let [row, colm] = [line, 0]
-    elseif a:0 < 2
-      let [row, colm] = [a:1, 0]
-    elseif a:0 < 3
-      let [row, colm] = a:000
-    endif
-
-    let first_row = tablemode#spreadsheet#GetFirstRow(line)
-    if row == 0
-      let values = []
-      let line = first_row
-      while tablemode#table#IsATableRow(line) || tablemode#table#IsATableHeader(line)
-        if tablemode#table#IsATableRow(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, '')))
-        endif
-        let line += 1
-      endwhile
-      return values
-    else
-      let row_nr = 0
-      let line = first_row
-      while tablemode#table#IsATableRow(line) || tablemode#table#IsATableHeader(line)
-        if tablemode#table#IsATableRow(line)
-          let row_nr += 1
-          if row ==# row_nr | break | endif
-        endif
-        let line += 1
-      endwhile
-
-      let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
-      if colm == 0
-        return map(split(row_line, g:table_mode_separator), 'tablemode#utils#strip(v:val)')
-      else
-        let split_line = split(row_line, g:table_mode_separator)
-        return tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, ''))
-      endif
-    endif
-  endif
-endfunction
-
-function! tablemode#spreadsheet#GetCell(...) "{{{2
-  if a:0 == 0
-    let [row, colm] = [tablemode#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
-  elseif a:0 == 2
-    let [row, colm] = [a:1, a:2]
-  endif
-
-  return tablemode#spreadsheet#GetCells('.', row, col)
-endfunction
-
-function! tablemode#spreadsheet#GetRow(row, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
-  return tablemode#spreadsheet#GetCells(line, a:row)
-endfunction
-
-function! tablemode#spreadsheet#GetRowColumn(col, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
-  let row = tablemode#RowNr('.')
-  return tablemode#spreadsheet#GetCells(line, row, a:col)
-endfunction
-
-function! tablemode#spreadsheet#GetColumn(col, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
-  return tablemode#spreadsheet#GetCells(line, 0, a:col)
-endfunction
-
-function! tablemode#spreadsheet#GetColumnRow(row, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
-  let col = tablemode#spreadsheet#ColumnNr('.')
-  return tablemode#spreadsheet#GetCells(line, a:row, col)
-endfunction
-
-function! tablemode#spreadsheet#SetCell(val, ...) "{{{2
-  if a:0 == 0
-    let [line, row, colm] = ['.', tablemode#spreadsheet#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
-  elseif a:0 == 2
-    let [line, row, colm] = ['.', a:1, a:2]
-  elseif a:0 == 3
-    let [line, row, colm] = a:000
-  endif
-
-  if tablemode#table#IsATableRow(line)
-    let line = tablemode#utils#line(line) + (row - tablemode#spreadsheet#RowNr(line)) * 1
-    let line_val = getline(line)
-    let cstartexpr = tablemode#table#StartCommentExpr()
-    let values = split(getline(line)[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator)
-    if len(values) < colm | return | endif
-    let values[colm-1] = a:val
-    let line_value = g:table_mode_separator . join(values, g:table_mode_separator) . g:table_mode_separator
-    if tablemode#utils#strlen(cstartexpr) > 0 && line_val =~# cstartexpr
-      let sce = matchstr(line_val, tablemode#table#StartCommentExpr())
-      let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
-      let line_value = sce . line_value . ece
-    endif
-    call setline(line, line_value)
-    call tablemode#table#TableRealign(line)
-  endif
-endfunction
-
 function! tablemode#spreadsheet#DeleteColumn() "{{{2
-  if tablemode#table#IsATableRow('.')
+  if tablemode#table#IsRow('.')
    for i in range(v:count1)
      call tablemode#spreadsheet#MoveToStartOfCell()
      call tablemode#spreadsheet#MoveToFirstRow()
@@ -348,201 +148,42 @@ function! tablemode#spreadsheet#DeleteColumn() "{{{2
      normal! d
    endfor

-    call tablemode#table#TableRealign('.')
+    call tablemode#table#Realign('.')
  endif
 endfunction

 function! tablemode#spreadsheet#DeleteRow() "{{{2
-  if tablemode#table#IsATableRow('.')
+  if tablemode#table#IsRow('.')
    for i in range(v:count1)
-      if tablemode#table#IsATableRow('.')
+      if tablemode#table#IsRow('.')
        normal! dd
      endif

-      if !tablemode#table#IsATableRow('.')
+      if !tablemode#table#IsRow('.')
        normal! k
      endif
    endfor

-    call tablemode#table#TableRealign('.')
+    call tablemode#table#Realign('.')
  endif
 endfunction

-function! tablemode#spreadsheet#GetCellRange(range, ...) abort "{{{2
-  if a:0 < 1
-    let [line, colm] = ['.', tablemode#spreadsheet#ColumnNr('.')]
-  elseif a:0 < 2
-    let [line, colm] = [a:1, tablemode#spreadsheet#ColumnNr('.')]
-  elseif a:0 < 3
-    let [line, colm] = [a:1, a:2]
-  else
-    call tablemode#utils#throw('Invalid Range')
-  endif
-
-  let values = []
-
-  if tablemode#table#IsATableRow(line)
-    let [row1, col1, row2, col2] = s:ParseRange(a:range, colm)
-
-    if row1 == row2
-      if col1 == col2
-        call add(values, tablemode#spreadsheet#GetCells(line, row1, col1))
-      else
-        let values = tablemode#spreadsheet#GetRow(row1, line)[(col1-1):(col2-1)]
-      endif
-    else
-      if col1 == col2
-        let values = tablemode#spreadsheet#GetColumn(col1, line)[(row1-1):(row2-1)]
-      else
-        let tcol = col1
-        while tcol <= col2
-          call add(values, tablemode#spreadsheet#GetColumn(tcol, line)[(row1-1):(row2-1)])
-          let tcol += 1
-        endwhile
-      endif
-    endif
-  endif
-
-  return values
-endfunction
-
 function! tablemode#spreadsheet#Sum(range, ...) abort "{{{2
  let args = copy(a:000)
  call insert(args, a:range)
-  return s:Sum(call('tablemode#spreadsheet#GetCellRange', args))
+  return s:Sum(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction

 function! tablemode#spreadsheet#Average(range, ...) abort "{{{2
  let args = copy(a:000)
  call insert(args, a:range)
-  return s:Average(call('tablemode#spreadsheet#GetCellRange', args))
+  return s:Average(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction

-function! tablemode#spreadsheet#AddFormula() "{{{2
-  let fr = input('f=')
-  let row = tablemode#spreadsheet#RowNr('.')
-  let colm = tablemode#spreadsheet#ColumnNr('.')
-  let indent = indent('.')
-  let indent_str = repeat(' ', indent)
-
-  if fr !=# ''
-    let fr = '$' . row . ',' . colm . '=' . fr
-    let fline = tablemode#spreadsheet#GetLastRow('.') + 1
-    if tablemode#table#IsATableHeader(fline) | let fline += 1 | endif
-    let cursor_pos = [line('.'), col('.')]
-    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 sce = matchstr(line_val, tablemode#table#StartCommentExpr() . '\zs')
-      let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
-      call setline(fline, sce . line_expr . '; ' . fr . ece)
-    else
-      let cstring = &commentstring
-      let [cmss, cmse] = ['', '']
-      if len(cstring) > 0
-        let cms = split(cstring, '%s')
-        if len(cms) == 2
-          let [cmss, cmse] = cms
-        else
-          let [cmss, cmse] = [cms[0], '']
-        endif
-      endif
-      let fr = indent_str . cmss . ' tmf: ' . fr . ' ' . cmse
-      call append(fline-1, fr)
-      call cursor(cursor_pos)
-    endif
-    call tablemode#spreadsheet#EvaluateFormulaLine()
-  endif
-endfunction
-
-function! tablemode#spreadsheet#EvaluateExpr(expr, line) abort "{{{2
-  let line = tablemode#utils#line(a:line)
-  let [target, expr] = map(split(a:expr, '='), 'tablemode#utils#strip(v:val)')
-  let cell = substitute(target, '\$', '', '')
-  if cell =~# ','
-    let [row, colm] = map(split(cell, ','), 'str2nr(v:val)')
-  else
-    let [row, colm] = [0, str2nr(cell)]
-  endif
-
-  if expr =~# 'Sum(.*)'
-    let expr = substitute(expr, 'Sum(\([^)]*\))', 'tablemode#spreadsheet#Sum("\1",'.line.','.colm.')', 'g')
-  endif
-
-  if expr =~# 'Average(.*)'
-    let expr = substitute(expr, 'Average(\([^)]*\))', 'tablemode#spreadsheet#Average("\1",'.line.','.colm.')', 'g')
-  endif
-
-  if expr =~# '\$\d\+,\d\+'
-    let expr = substitute(expr, '\$\(\d\+\),\(\d\+\)',
-          \ '\=str2float(tablemode#spreadsheet#GetCells(line, submatch(1), submatch(2)))', 'g')
-  endif
-
-  if cell =~# ','
-    if expr =~# '\$'
-      let expr = substitute(expr, '\$\(\d\+\)',
-          \ '\=str2float(tablemode#spreadsheet#GetCells(line, row, submatch(1)))', 'g')
-    endif
-    call tablemode#spreadsheet#SetCell(eval(expr), line, row, colm)
-  else
-    let [row, line] = [1, tablemode#spreadsheet#GetFirstRow(line)]
-    while tablemode#table#IsATableRow(line)
-      let texpr = expr
-      if expr =~# '\$'
-        let texpr = substitute(texpr, '\$\(\d\+\)',
-              \ '\=str2float(tablemode#spreadsheet#GetCells(line, row, submatch(1)))', 'g')
-      endif
-
-      call tablemode#spreadsheet#SetCell(eval(texpr), line, row, colm)
-      let row += 1
-      let line += 1
-    endwhile
-  endif
-endfunction
-
-function! tablemode#spreadsheet#EvaluateFormulaLine() abort "{{{2
-  let exprs = []
-  let cstring = &commentstring
-  let matchexpr = ''
-  if len(cstring) > 0
-    let cms = split(cstring, '%s')
-    if len(cms) == 2
-      let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*\ze' . escape(cms[1], '/*') . '\s*$'
-    else
-      let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*$'
-    endif
-  else
-    let matchexpr = '^\s* tmf: \zs.*$'
-  endif
-  if tablemode#table#IsATableRow('.') " We're inside the table
-    let line = tablemode#spreadsheet#GetLastRow('.')
-    let fline = line + 1
-    if tablemode#table#IsATableHeader(fline) | let fline += 1 | endif
-    if getline(fline) =~# 'tmf: '
-      let exprs = split(matchstr(getline(fline), matchexpr), ';')
-    endif
-  elseif getline('.') =~# 'tmf: ' " We're on the formula line
-    let line = line('.') - 1
-    if tablemode#table#IsATableHeader(line) | let line -= 1 | endif
-    if tablemode#table#IsATableRow(line)
-      let exprs = split(matchstr(getline('.'), matchexpr), ';')
-    endif
-  endif
-
-  for expr in exprs
-    call tablemode#spreadsheet#EvaluateExpr(expr, line)
-  endfor
-endfunction
-
-function! tablemode#spreadsheet#CellTextObject(inner) "{{{2
-  if tablemode#table#IsATableRow('.')
-    call tablemode#spreadsheet#MoveToStartOfCell()
-    if a:inner
-      normal! v
-      call search('[^' . g:table_mode_separator . ']\ze\s*' . g:table_mode_separator)
-    else
-      execute 'normal! vf' . g:table_mode_separator . 'l'
-    endif
-  endif
+function! tablemode#spreadsheet#Sort(bang, ...) "{{{2
+  let opts = a:0 ? a:1 : ''
+  let bang = a:bang ? '!' : ''
+  let [firstRow, lastRow] = [tablemode#spreadsheet#GetFirstRow('.'), tablemode#spreadsheet#GetLastRow('.')]
+  call tablemode#spreadsheet#MoveToStartOfCell()
+  exec ':'.firstRow.','.lastRow . 'sort'.bang opts '/.*\%'.col('.').'v/'
 endfunction
--- a/autoload/tablemode/spreadsheet/cell.vim
+++ b/autoload/tablemode/spreadsheet/cell.vim
@@ -0,0 +1,258 @@
+" Private Functions {{{1
+" function! s:ParseRange(range, ...) {{{2
+" range: A string representing range of cells.
+"        - Can be row1:row2 for values in the current columns in those rows.
+"        - Can be row1,col1:row2,col2 for range between row1,col1 till
+"          row2,col2.
+function! s:ParseRange(range, ...)
+  if a:0 < 1
+    let default_col = tablemode#spreadsheet#ColumnNr('.')
+  elseif a:0 < 2
+    let default_col = a:1
+  endif
+
+  if type(a:range) != type('')
+    let range = string(a:range)
+  else
+    let range = a:range
+  endif
+
+  let [rowcol1, rowcol2] = split(range, ':')
+  let [rcs1, rcs2] = [map(split(rowcol1, ','), 'str2nr(v:val)'), map(split(rowcol2, ','), 'str2nr(v:val)')]
+
+  if len(rcs1) == 2
+    let [row1, col1] = rcs1
+  else
+    let [row1, col1] = [rcs1[0], default_col]
+  endif
+
+  if len(rcs2) == 2
+    let [row2, col2] = rcs2
+  else
+    let [row2, col2] = [rcs2[0], default_col]
+  endif
+
+  return [row1, col1, row2, col2]
+endfunction
+
+
+" Public Functions {{{1
+" function! tablemode#spreadsheet#cell#GetCells() - Function to get values of cells in a table {{{2
+" tablemode#spreadsheet#GetCells(row) - Get values of all cells in a row as a List.
+" tablemode#spreadsheet#GetCells(0, col) - Get values of all cells in a column as a List.
+" tablemode#spreadsheet#GetCells(row, col) - Get the value of table cell by given row, col.
+function! tablemode#spreadsheet#cell#GetCells(line, ...) abort
+  let line = tablemode#utils#line(a:line)
+
+  if tablemode#table#IsRow(line)
+    if a:0 < 1
+      let [row, colm] = [line, 0]
+    elseif a:0 < 2
+      let [row, colm] = [a:1, 0]
+    elseif a:0 < 3
+      let [row, colm] = a:000
+    endif
+
+    let first_row = tablemode#spreadsheet#GetFirstRow(line)
+    let last_row = tablemode#spreadsheet#GetLastRow(line)
+    if row == 0
+      let values = []
+      let line = first_row
+      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, '')))
+        endif
+        let line += 1
+      endwhile
+      return values
+    else
+      let row_nr = 0
+      let row_diff = row > 0 ? 1 : -1
+      let line = row > 0 ? first_row : last_row
+      while tablemode#table#IsTable(line)
+        if tablemode#table#IsRow(line)
+          let row_nr += row_diff
+          if row ==# row_nr | break | endif
+        endif
+        let line += row_diff
+      endwhile
+
+      let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
+      if colm == 0
+        return map(split(row_line, g:table_mode_separator), 'tablemode#utils#strip(v:val)')
+      else
+        let split_line = split(row_line, g:table_mode_separator)
+        return tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, ''))
+      endif
+    endif
+  endif
+endfunction
+
+function! tablemode#spreadsheet#cell#GetCell(...) "{{{2
+  if a:0 == 0
+    let [row, colm] = [tablemode#spreadsheet#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
+  elseif a:0 == 2
+    let [row, colm] = [a:1, a:2]
+  endif
+
+  return tablemode#spreadsheet#cell#GetCells('.', row, colm)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetRow(row, ...) abort "{{{2
+  let line = a:0 ? a:1 : '.'
+  return tablemode#spreadsheet#cell#GetCells(line, a:row)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetRowColumn(col, ...) abort "{{{2
+  let line = a:0 ? a:1 : '.'
+  let row = tablemode#spreadsheet#RowNr('.')
+  return tablemode#spreadsheet#cell#GetCells(line, row, a:col)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetColumn(col, ...) abort "{{{2
+  let line = a:0 ? a:1 : '.'
+  return tablemode#spreadsheet#cell#GetCells(line, 0, a:col)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetColumnRow(row, ...) abort "{{{2
+  let line = a:0 ? a:1 : '.'
+  let col = tablemode#spreadsheet#ColumnNr('.')
+  return tablemode#spreadsheet#cell#GetCells(line, a:row, col)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetCellRange(range, ...) abort "{{{2
+  if a:0 < 1
+    let [line, colm] = ['.', tablemode#spreadsheet#ColumnNr('.')]
+  elseif a:0 < 2
+    let [line, colm] = [a:1, tablemode#spreadsheet#ColumnNr('.')]
+  elseif a:0 < 3
+    let [line, colm] = [a:1, a:2]
+  else
+    call tablemode#utils#throw('Invalid Range')
+  endif
+
+  let values = []
+
+  if tablemode#table#IsRow(line)
+    let [row1, col1, row2, col2] = s:ParseRange(a:range, colm)
+
+    if row1 == row2
+      if col1 == col2
+        call add(values, tablemode#spreadsheet#cell#GetCells(line, row1, col1))
+      else
+        let values = tablemode#spreadsheet#cell#GetRow(row1, line)[(col1-1):(col2-1)]
+      endif
+    else
+      if col1 == col2
+        let values = tablemode#spreadsheet#cell#GetColumn(col1, line)[(row1-1):(row2-1)]
+      else
+        let tcol = col1
+        while tcol <= col2
+          call add(values, tablemode#spreadsheet#cell#GetColumn(tcol, line)[(row1-1):(row2-1)])
+          let tcol += 1
+        endwhile
+      endif
+    endif
+  endif
+
+  return values
+endfunction
+
+function! tablemode#spreadsheet#cell#SetCell(val, ...) "{{{2
+  if a:0 == 0
+    let [line, row, colm] = ['.', tablemode#spreadsheet#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
+  elseif a:0 == 2
+    let [line, row, colm] = ['.', a:1, a:2]
+  elseif a:0 == 3
+    let [line, row, colm] = a:000
+  endif
+
+  " Account for negative values to reference from relatively from the last
+  if row < 0 | let row = tablemode#spreadsheet#RowCount(line) + row + 1 | endif
+  if colm < 0 | let colm = tablemode#spreadsheet#ColumnCount(line) + colm + 1 | endif
+
+  if tablemode#table#IsRow(line)
+    let line = tablemode#spreadsheet#LineNr(line, row)
+    let line_val = getline(line)
+    let cstartexpr = tablemode#table#StartCommentExpr()
+    let values = split(getline(line)[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator)
+    if len(values) < colm | return | endif
+    let values[colm-1] = a:val
+    let line_value = g:table_mode_separator . join(values, g:table_mode_separator) . g:table_mode_separator
+    if tablemode#utils#strlen(cstartexpr) > 0 && line_val =~# cstartexpr
+      let sce = matchstr(line_val, tablemode#table#StartCommentExpr())
+      let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
+      let line_value = sce . line_value . ece
+    endif
+    call setline(line, line_value)
+    call tablemode#table#Realign(line)
+  endif
+endfunction
+function! tablemode#spreadsheet#cell#TextObject(inner) "{{{2
+  if tablemode#table#IsRow('.')
+    call tablemode#spreadsheet#MoveToStartOfCell()
+    if a:inner
+      normal! v
+      call search('[^' . g:table_mode_separator . ']\ze\s*' . g:table_mode_separator)
+    else
+      execute 'normal! vf' . g:table_mode_separator . 'l'
+    endif
+  endif
+endfunction
+function! tablemode#spreadsheet#cell#Motion(direction, ...) "{{{2
+  let l:count = a:0 ? a:1 : v:count1
+  if tablemode#table#IsRow('.')
+    for ii in range(l:count)
+      if a:direction ==# 'l'
+        if tablemode#spreadsheet#IsLastCell()
+          if !tablemode#table#IsRow(line('.') + 1) && (tablemode#table#IsBorder(line('.') + 1) && !tablemode#table#IsRow(line('.') + 2))
+            return
+          endif
+          call tablemode#spreadsheet#cell#Motion('j', 1)
+          normal! 0
+        endif
+
+        " If line starts with g:table_mode_separator
+        if getline('.')[col('.')-1] ==# g:table_mode_separator
+          normal! 2l
+        else
+          execute 'normal! f' . g:table_mode_separator . '2l'
+        endif
+      elseif a:direction ==# 'h'
+        if tablemode#spreadsheet#IsFirstCell()
+          if !tablemode#table#IsRow(line('.') - 1) && (tablemode#table#IsBorder(line('.') - 1) && !tablemode#table#IsRow(line('.') - 2))
+            return
+          endif
+          call tablemode#spreadsheet#cell#Motion('k', 1)
+          normal! $
+        endif
+
+        " If line ends with g:table_mode_separator
+        if getline('.')[col('.')-1] ==# g:table_mode_separator
+          execute 'normal! F' . g:table_mode_separator . '2l'
+        else
+          execute 'normal! 2F' . g:table_mode_separator . '2l'
+        endif
+      elseif a:direction ==# 'j'
+        if tablemode#table#IsRow(line('.') + 1)
+          " execute 'normal! ' . 1 . 'j'
+          normal! j
+        elseif tablemode#table#IsBorder(line('.') + 1) && tablemode#table#IsRow(line('.') + 2)
+          " execute 'normal! ' . 2 . 'j'
+          normal! 2j
+        endif
+      elseif a:direction ==# 'k'
+        if tablemode#table#IsRow(line('.') - 1)
+          " execute 'normal! ' . 1 . 'k'
+          normal! k
+        elseif tablemode#table#IsBorder(line('.') - 1) && tablemode#table#IsRow(line('.') - 2)
+          " execute 'normal! ' . (1 + 1) . 'k'
+          normal! 2k
+        endif
+      endif
+    endfor
+  endif
+endfunction
+
+" vim: sw=2 sts=2 fdl=0 fdm=marker
--- a/autoload/tablemode/spreadsheet/formula.vim
+++ b/autoload/tablemode/spreadsheet/formula.vim
@@ -0,0 +1,132 @@
+" Private Functions {{{1
+function! s:IsFormulaLine(line) "{{{2
+  return getline(a:line) =~# 'tmf: '
+endfunction
+
+" Public Functions {{{1
+function! tablemode#spreadsheet#formula#Add(...) "{{{2
+  let fr = a:0 ? a:1 : input('f=')
+  let row = tablemode#spreadsheet#RowNr('.')
+  let colm = tablemode#spreadsheet#ColumnNr('.')
+  let indent = indent('.')
+  let indent_str = repeat(' ', indent)
+
+  if fr !=# ''
+    let fr = '$' . row . ',' . colm . '=' . fr
+    let fline = tablemode#spreadsheet#GetLastRow('.') + 1
+    if tablemode#table#IsBorder(fline) | let fline += 1 | endif
+    let cursor_pos = [line('.'), col('.')]
+    if getline(fline) =~# 'tmf: '
+      " Comment line correctly
+      let line_val = getline(fline)
+      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)
+    else
+      let cstring = &commentstring
+      let [cmss, cmse] = ['', '']
+      if len(cstring) > 0
+        let cms = split(cstring, '%s')
+        if len(cms) == 2
+          let [cmss, cmse] = cms
+        else
+          let [cmss, cmse] = [cms[0], '']
+        endif
+      endif
+      let fr = indent_str . cmss . ' tmf: ' . fr . ' ' . cmse
+      call append(fline-1, fr)
+      call cursor(cursor_pos)
+    endif
+    call tablemode#spreadsheet#formula#EvaluateFormulaLine()
+  endif
+endfunction
+
+function! tablemode#spreadsheet#formula#EvaluateExpr(expr, line) abort "{{{2
+  let line = tablemode#utils#line(a:line)
+  let [target, expr] = map(split(a:expr, '='), 'tablemode#utils#strip(v:val)')
+  let cell = substitute(target, '\$', '', '')
+  if cell =~# ','
+    let [row, colm] = map(split(cell, ','), 'str2nr(v:val)')
+  else
+    let [row, colm] = [0, str2nr(cell)]
+  endif
+
+  if expr =~# 'Sum(.*)'
+    let expr = substitute(expr, 'Sum(\([^)]*\))', 'tablemode#spreadsheet#Sum("\1",'.line.','.colm.')', 'g')
+  endif
+
+  if expr =~# 'Average(.*)'
+    let expr = substitute(expr, 'Average(\([^)]*\))', 'tablemode#spreadsheet#Average("\1",'.line.','.colm.')', 'g')
+  endif
+
+  if expr =~# '\$\d\+,\d\+'
+    let expr = substitute(expr, '\$\(\d\+\),\(\d\+\)',
+          \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, submatch(1), submatch(2)))', 'g')
+  endif
+
+  if cell =~# ','
+    if expr =~# '\$'
+      let expr = substitute(expr, '\$\(\d\+\)',
+          \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, row, submatch(1)))', 'g')
+    endif
+    call tablemode#spreadsheet#cell#SetCell(eval(expr), line, row, colm)
+  else
+    let [row, line] = [1, tablemode#spreadsheet#GetFirstRow(line)]
+    while tablemode#table#IsRow(line)
+      let texpr = expr
+      if expr =~# '\$'
+        let texpr = substitute(texpr, '\$\(\d\+\)',
+              \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, row, submatch(1)))', 'g')
+      endif
+
+      call tablemode#spreadsheet#cell#SetCell(eval(texpr), line, row, colm)
+      let row += 1
+      let line += 1
+    endwhile
+  endif
+endfunction
+
+function! tablemode#spreadsheet#formula#EvaluateFormulaLine() abort "{{{2
+  let exprs = []
+  let cstring = &commentstring
+  let matchexpr = ''
+  if len(cstring) > 0
+    let cms = split(cstring, '%s')
+    if len(cms) == 2
+      let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*\ze' . escape(cms[1], '/*') . '\s*$'
+    else
+      let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*$'
+    endif
+  else
+    let matchexpr = '^\s* tmf: \zs.*$'
+  endif
+  if tablemode#table#IsRow('.') " We're inside the table
+    let line = tablemode#spreadsheet#GetLastRow('.')
+    let fline = line + 1
+    if tablemode#table#IsBorder(fline) | let fline += 1 | endif
+    while s:IsFormulaLine(fline)
+      let exprs += split(matchstr(getline(fline), matchexpr), ';')
+      let fline += 1
+    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), ';')
+      while s:IsFormulaLine(fline)
+        let exprs += split(matchstr(getline(fline), matchexpr), ';')
+        let fline += 1
+      endwhile
+    endif
+  endif
+
+  for expr in exprs
+    call tablemode#spreadsheet#formula#EvaluateExpr(expr, line)
+  endfor
+endfunction
--- a/autoload/tablemode/table.vim
+++ b/autoload/tablemode/table.vim
@@ -1,34 +1,18 @@
-" ==============================  Header ======================================
-" File:          autoload/tablemode/table.vim
-" Description:   Table mode for vim for creating neat tables.
-" Author:        Dhruva Sagar <http://dhruvasagar.com/>
-" License:       MIT (http://www.opensource.org/licenses/MIT)
-" Website:       https://github.com/dhruvasagar/vim-table-mode
-" Version:       4.1.0
-" Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
-"                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
-"
-" Copyright Notice:
-"                Permission is hereby granted to use and distribute this code,
-"                with or without modifications, provided that this copyright
-"                notice is copied with it. Like anything else that's free,
-"                table-mode.vim is provided *as is* and comes with no warranty
-"                of any kind, either expressed or implied. In no event will
-"                the copyright holder be liable for any damamges resulting
-"                from the use of this software.
-" =============================================================================
-
 " Private Functions {{{1
-function! s:HeaderBorderExpr() "{{{2
+function! s:blank(string) "{{{2
+  return a:string =~# '^\s*$'
+endfunction
+
+function! s:BorderExpr() "{{{2
  return tablemode#table#StartExpr() .
        \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
-        \ '[' . g:table_mode_fillchar . g:table_mode_corner . ']*' .
+        \ '[' . escape(g:table_mode_fillchar . g:table_mode_header_fillchar . g:table_mode_corner . g:table_mode_align_char, '-') . ']\+' .
        \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
        \ tablemode#table#EndExpr()
 endfunction

-function! s:DefaultHeaderBorder() "{{{2
-  if s:IsTableModeActive()
+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
  else
    return ''
@@ -37,19 +21,44 @@ endfunction

 function! s:GenerateHeaderBorder(line) "{{{2
  let line = tablemode#utils#line(a:line)
-  if tablemode#table#IsATableRow(line - 1) || tablemode#table#IsATableRow(line + 1)
+  if tablemode#table#IsRow(line - 1) || tablemode#table#IsRow(line + 1)
    let line_val = ''
-    if tablemode#table#IsATableRow(line + 1)
+    if tablemode#table#IsRow(line + 1)
      let line_val = getline(line + 1)
    endif
-    if tablemode#table#IsATableRow(line - 1) && tablemode#utils#strlen(line_val) < tablemode#utils#strlen(getline(line - 1))
+    if tablemode#table#IsRow(line - 1) && tablemode#utils#strlen(line_val) < tablemode#utils#strlen(getline(line - 1))
      let line_val = getline(line - 1)
    endif
-    if tablemode#utils#strlen(line_val) <= 1 | return s:DefaultHeaderBorder() | 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 border = substitute(border, '[^' . g:table_mode_corner . ']', g:table_mode_fillchar, 'g')
+    if tablemode#utils#strlen(line_val) <= 1 | return s:DefaultBorder() | endif
+
+    let tline = line_val[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)]
+    let fillchar = tablemode#table#IsHeader(line - 1) ? g:table_mode_header_fillchar : g:table_mode_fillchar
+    let seperator_match_regex = g:table_mode_separator . '\zs\([^' . g:table_mode_separator . ']*\)\ze' . g:table_mode_separator
+    let border = substitute(tline, seperator_match_regex, '\=repeat(fillchar, tablemode#utils#StrDisplayWidth(submatch(0)))', 'g')
+    let border = substitute(border, g:table_mode_separator, g:table_mode_corner, 'g')
    let border = substitute(border, '^' . g:table_mode_corner . '\(.*\)' . g:table_mode_corner . '$', g:table_mode_corner_corner . '\1' . g:table_mode_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 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
+          " 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:]
+          endif
+        endif
+      endfor
+      let border = join(gcols, '')
+    endif
+
    let cstartexpr = tablemode#table#StartCommentExpr()
    if tablemode#utils#strlen(cstartexpr) > 0 && getline(line) =~# cstartexpr
      let sce = matchstr(line_val, tablemode#table#StartCommentExpr())
@@ -62,18 +71,18 @@ function! s:GenerateHeaderBorder(line) "{{{2
      return border
    endif
  else
-    return s:DefaultHeaderBorder()
+    return s:DefaultBorder()
  endif
 endfunction

 " Public Functions {{{1
-function! tablemode#table#sid() "{{{2
-  return maparg('<sid>', 'n')
-endfunction
-nnoremap <sid> <sid>
-
-function! tablemode#table#scope() "{{{2
-  return s:
+function! tablemode#table#GetCommentStart() "{{{2
+  let cstring = &commentstring
+  if tablemode#utils#strlen(cstring) > 0
+    return substitute(split(cstring, '%s')[0], '[^()]', '\\\0', 'g')
+  else
+    return ''
+  endif
 endfunction

 function! tablemode#table#StartCommentExpr() "{{{2
@@ -85,30 +94,12 @@ function! tablemode#table#StartCommentExpr() "{{{2
  endif
 endfunction

-function! tablemode#table#EndCommentExpr() "{{{2
-  let cendexpr = tablemode#table#GetCommentEnd()
-  if tablemode#utils#strlen(cendexpr) > 0
-    return '.*\zs\s\+' . cendexpr . '\s*$'
-  else
-    return ''
-  endif
-endfunction
-
-function! tablemode#table#GetCommentStart() "{{{2
-  let cstring = &commentstring
-  if tablemode#utils#strlen(cstring) > 0
-    return substitute(split(cstring, '%s')[0], '.', '\\\0', 'g')
-  else
-    return ''
-  endif
-endfunction
-
 function! tablemode#table#GetCommentEnd() "{{{2
  let cstring = &commentstring
  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
@@ -117,6 +108,15 @@ function! tablemode#table#GetCommentEnd() "{{{2
  endif
 endfunction

+function! tablemode#table#EndCommentExpr() "{{{2
+  let cendexpr = tablemode#table#GetCommentEnd()
+  if tablemode#utils#strlen(cendexpr) > 0
+    return '.*\zs\s\+' . cendexpr . '\s*$'
+  else
+    return ''
+  endif
+endfunction
+
 function! tablemode#table#StartExpr() "{{{2
  let cstart = tablemode#table#GetCommentStart()
  if tablemode#utils#strlen(cstart) > 0
@@ -135,109 +135,65 @@ function! tablemode#table#EndExpr() "{{{2
  endif
 endfunction

-function! tablemode#table#IsATableRow(line) "{{{2
-  return getline(a:line) =~# (tablemode#table#StartExpr() . g:table_mode_separator . '[^' .
-        \ g:table_mode_fillchar . ']*[^' . g:table_mode_corner . ']*$')
+function! tablemode#table#IsBorder(line) "{{{2
+  return !s:blank(getline(a:line)) && getline(a:line) =~# s:BorderExpr()
 endfunction

-function! tablemode#table#IsATableHeader(line) "{{{2
-  return getline(a:line) =~# s:HeaderBorderExpr()
+function! tablemode#table#IsHeader(line) "{{{2
+  let line = tablemode#utils#line(a:line)
+  " if line <= 0 || line > line('$') | return 0 | endif
+  return tablemode#table#IsRow(line)
+        \ && !tablemode#table#IsRow(line-1)
+        \ && !tablemode#table#IsRow(line-2)
+        \ && !tablemode#table#IsBorder(line-2)
+        \ && tablemode#table#IsBorder(line+1)
 endfunction

-function! tablemode#table#AddHeaderBorder(line) "{{{2
+function! tablemode#table#IsRow(line) "{{{2
+  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
  call setline(a:line, s:GenerateHeaderBorder(a:line))
 endfunction

-function! tablemode#table#TableRealign(line) "{{{2
+function! tablemode#table#Realign(line) "{{{2
  let line = tablemode#utils#line(a:line)

-  let [lnums, lines] = [[], []]
-  let [tline, blines] = [line, []]
-  while tablemode#table#IsATableRow(tline) || tablemode#table#IsATableHeader(tline)
-    if tablemode#table#IsATableHeader(tline)
-      call insert(blines, tline)
-      let tline -= 1
+  let lines = []
+  let [lnum, blines] = [line, []]
+  while tablemode#table#IsTable(lnum)
+    if tablemode#table#IsBorder(lnum)
+      call insert(blines, lnum)
+      let lnum -= 1
      continue
    endif
-    call insert(lnums, tline)
-    call insert(lines, getline(tline))
-    let tline -= 1
+    call insert(lines, {'lnum': lnum, 'text': getline(lnum)})
+    let lnum -= 1
  endwhile

-  let tline = line + 1
-
-  while tablemode#table#IsATableRow(tline) || tablemode#table#IsATableHeader(tline)
-    if tablemode#table#IsATableHeader(tline)
-      call insert(blines, tline)
-      let tline += 1
+  let lnum = line + 1
+  while tablemode#table#IsTable(lnum)
+    if tablemode#table#IsBorder(lnum)
+      call add(blines, lnum)
+      let lnum += 1
      continue
    endif
-    call add(lnums, tline)
-    call add(lines, getline(tline))
-    let tline += 1
+    call add(lines, {'lnum': lnum, 'text': getline(lnum)})
+    let lnum += 1
  endwhile

  let lines = tablemode#align#Align(lines)

-  for lnum in lnums
-    let index = index(lnums, lnum)
-    call setline(lnum, lines[index])
+  for aline in lines
+    call setline(aline.lnum, aline.text)
  endfor

  for bline in blines
-    call tablemode#table#AddHeaderBorder(bline)
+    call tablemode#table#AddBorder(bline)
  endfor
 endfunction
-
-function! tablemode#table#TableMotion(direction, ...) "{{{2
-  let l:count = a:0 ? a:1 : v:count1
-  if tablemode#table#IsATableRow('.')
-    for ii in range(l:count)
-      if a:direction ==# 'l'
-        if tablemode#spreadsheet#IsLastCell()
-          if !tablemode#table#IsATableRow(line('.') + 1) || (tablemode#table#IsATableHeader(line('.') + 1) && !tablemode#table#IsATableRow(line('.') + 2 * 1))
-            return
-          endif
-          call tablemode#table#TableMotion('j', 1)
-          normal! 0
-        endif
-
-        " If line starts with g:table_mode_separator
-        if getline('.')[col('.')-1] ==# g:table_mode_separator
-          normal! 2l
-        else
-          execute 'normal! f' . g:table_mode_separator . '2l'
-        endif
-      elseif a:direction ==# 'h'
-        if tablemode#spreadsheet#IsFirstCell()
-          if !tablemode#table#IsATableRow(line('.') - 1) || (tablemode#table#IsATableHeader(line('.') - 1) && !tablemode#table#IsATableRow(line('.') - 2 * 1))
-            return
-          endif
-          call tablemode#table#TableMotion('k', 1)
-          normal! $
-        endif
-
-        " If line ends with g:table_mode_separator
-        if getline('.')[col('.')-1] ==# g:table_mode_separator
-          execute 'normal! F' . g:table_mode_separator . '2l'
-        else
-          execute 'normal! 2F' . g:table_mode_separator . '2l'
-        endif
-      elseif a:direction ==# 'j'
-        if tablemode#table#IsATableRow(line('.') + 1)
-          execute 'normal! ' . 1 . 'j'
-        elseif tablemode#table#IsATableHeader(line('.') + 1) && tablemode#table#IsATableRow(line('.') + 2)
-          execute 'normal! ' . (1 + 1) . 'j'
-        endif
-      elseif a:direction ==# 'k'
-        if tablemode#table#IsATableRow(line('.') - 1)
-          execute 'normal! ' . 1 . 'k'
-        elseif tablemode#table#IsATableHeader(line('.') - 1) && tablemode#table#IsATableRow(line('.') - 2)
-          execute 'normal! ' . (1 + 1) . 'k'
-        endif
-      endif
-    endfor
-  endif
-endfunction
-
-" vim: sw=2 sts=2 fdl=0 fdm=marker
--- a/autoload/tablemode/utils.vim
+++ b/autoload/tablemode/utils.vim
@@ -1,35 +1,6 @@
-" ==============================  Header ======================================
-" File:          autoload/tablemode/utils.vim
-" Description:   Table mode for vim for creating neat tables.
-" Author:        Dhruva Sagar <http://dhruvasagar.com/>
-" License:       MIT (http://www.opensource.org/licenses/MIT)
-" Website:       https://github.com/dhruvasagar/vim-table-mode
-" Version:       4.1.0
-" Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
-"                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
-"
-" Copyright Notice:
-"                Permission is hereby granted to use and distribute this code,
-"                with or without modifications, provided that this copyright
-"                notice is copied with it. Like anything else that's free,
-"                table-mode.vim is provided *as is* and comes with no warranty
-"                of any kind, either expressed or implied. In no event will
-"                the copyright holder be liable for any damamges resulting
-"                from the use of this software.
-" =============================================================================
-
 " Private Functions {{{1

 " Public Functions {{{1
-function! tablemode#utils#sid() "{{{2
-  return maparg('<sid>', 'n')
-endfunction
-nnoremap <sid> <sid>
-
-function! tablemode#utils#scope() "{{{2
-  return s:
-endfunction
-
 function! tablemode#utils#throw(string) abort "{{{2
  let v:errmsg = 'table-mode: ' . a:string
  throw v:errmsg
@@ -52,3 +23,27 @@ endfunction
 function! tablemode#utils#strlen(text)
  return strlen(substitute(a:text, '.', 'x', 'g'))
 endfunction
+
+function! tablemode#utils#StrDisplayWidth(string) "{{{2
+  if exists('*strdisplaywidth')
+    return strdisplaywidth(a:string)
+  else
+    " Implement the tab handling part of strdisplaywidth for vim 7.2 and
+    " earlier - not much that can be done about handling doublewidth
+    " characters.
+    let rv = 0
+    let i = 0
+
+    for char in split(a:string, '\zs')
+      if char == "\t"
+        let rv += &ts - i
+        let i = 0
+      else
+        let rv += 1
+        let i = (i + 1) % &ts
+      endif
+    endfor
+
+    return rv
+  endif
+endfunction
--- a/doc/table-mode.txt
+++ b/doc/table-mode.txt
@@ -1,7 +1,7 @@
-*table-mode.txt*		Table Mode for easy table formatting. v4.1.0
+*table-mode.txt*			Table Mode for easy table formatting
 ===============================================================================
 	Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
-				 VERSION 4.1.0
+                               VERSION 4.6.6

 		Author: Dhruva Sagar <http://dhruvasagar.com/>
 		License: MIT <http://opensource.org/licenses/MIT/>
@@ -34,6 +34,11 @@ Create Table on the fly:
 	each additional separator you add, it aligns the table properly,
 	without having to do anything else.

+        Table Mode now supports gfm style tables and allows to define column
+        alignments with the aid of placing ':' (configured using
+        |g:table_mode_align_char|) on the table header border appropriately to
+        align content left or right.
+
 	The table mode is disabled by default and you can enter table mode
 	using |table-mode-toggle-map| or you can also enable it permanently
 	using |table-mode-always-active| if you wish though not recommended.
@@ -81,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
@@ -99,11 +104,14 @@ Formula Expressions :

 		'$n': This matches the table column number 'n'. So the formula
 		would be evaluated for each cell in that column and the result
-		would be placed in it.
+		would be placed in it. You can use negative indice to
+                represent column relative to the last, -1 being the last.

 		'$n,m': This matches the table cell n,m (row, column). So in
 		this case the formula would be evaluated and the result will
-		be placed in this cell.
+		be placed in this cell. You can also use negative values to
+                refer to cells relative to the size, -1 being the last (row or
+                column).

 	The formula can be a simple mathematical expression involving cells
 	which are also defined by the same format as that of the target cell.
@@ -111,7 +119,7 @@ Formula Expressions :
 	special functions 'Sum' and 'Average'. Both these functions take a
 	range as input. A range can be of two forms :

-		'n,m': This represents cells in the current column from row
+		'n:m': This represents cells in the current column from row
 		'n' through 'm'. If 'm' is negative it represents 'm' row
 		above the current row (of the target cell).

@@ -130,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.
@@ -139,11 +148,39 @@ Overview:
 	|table-mode-delimiter| .......... Set the delimiter for Tableize.
        |table-mode-corner-corner| ...... Set the character to be used for
                                        extreme corners of the table border.
+        |table-mode-align-char|.......... Set the alignment character which
+                                        can be added to the table header
+                                        border to control alignment of that
+                                        column.
+        |table-mode-motion-up-map| ...... Set the table motion up mapping
+        |table-mode-motion-down-map| .... Set the table motion down mapping
+        |table-mode-motion-left-map| .... Set the table motion left mapping
+        |table-mode-motion-right-map| ... Set the table motion right mapping
+        |table-mode-cell-text-object-a-map|
+                                        Set the 'a' cell text object
+                                        mapping
+        |table-mode-cell-text-object-i-map|
+                                        Set the 'i' cell text object
+                                        mapping
+        |table-mode-realign-map| ........ Set the realign mapping
+        |table-mode-delete-row-map| ..... Set the delete row mapping
+        |table-mode-delete-column-map| .. Set the delete column mapping
+        |table-mode-add-formula-map| .... Set the add formula mapping
+        |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 = '+'
@@ -196,6 +233,88 @@ g:table_mode_corner_corner                           *table-mode-corner-corner*
        corners of the table border. >
                let g: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
+        alignments for columns in the table header border. >
+                let g:table_mode_align_char = ':'
+<
+g:table_mode_disable_mappings                      *table-mode-disable-mappings*
+        Set this to true to disable all mappings. >
+                let g:table_mode_disable_mappings = 1
+<
+g:table_mode_motion_up_map                            *table-mode-motion-up-map*
+        Set this to configure the mapping to move up a cell vertically. >
+                let g:table_mode_motion_up_map = '{<Bar>'
+<
+g:table_mode_motion_down_map                        *table-mode-motion-down-map*
+        Set this to configure the mapping to move down a cell vertically. >
+                let g:table_mode_motion_down_map = '}<Bar>'
+>
+g:table_mode_motion_left_map                        *table-mode-motion-left-map*
+        Set this to configure the mapping to move to the left cell. >
+                let g:table_mode_motion_left_map = '[<Bar>'
+>
+g:table_mode_motion_right_map                      *table-mode-motion-right-map*
+        Set this to configure the mapping to move to the right cell. >
+                let g:table_mode_motion_right_map = ']<Bar>'
+>
+g:table_mode_cell_text_object_a_map          *table-mode-cell-text-object-a-map*
+        Set this to configure the mapping to define the text object for around
+        cell object. >
+                let g:table_mode_cell_text_object_a_map = 'a<Bar>'
+>
+g:table_mode_cell_text_object_i_map           *table-mode-cell-text-object-i-map*
+        Set this to configure the mapping to define the text object for inner
+        cell object. >
+                let g:table_mode_cell_text_object_i_map = 'i<Bar>'
+>
+g:table_mode_realign_map                                *table-mode-realign-map*
+        Set this to configure the mapping for table realign. >
+                let g:table_mode_realign_map = '<Leader>tr'
+>
+g:table_mode_delete_row_map                          *table-mode-delete-row-map*
+        Set this to configure the mapping for deleting a table row. >
+                let g:table_mode_delete_row_map = '<Leader>tdd'
+>
+g:table_mode_delete_column_map                    *table-mode-delete-column-map*
+        Set this to configure the mapping for deleting a table column. >
+                let g:table_mode_delete_column_map = '<Leader>tdc'
+>
+g:table_mode_add_formula_map                        *table-mode-add-formula-map*
+        Set this to configure the mapping for adding a formula for a table
+        cell. >
+                let g:table_mode_add_formula_map = '<Leader>tfa'
+>
+g:table_mode_eval_formula_map                      *table-mode-eval-formula-map*
+        Set this to configure the mapping for evaluating the formula line. >
+                let g:table_mode_eval_formula_map = '<Leader>tfe'
+>
+g:table_mode_echo_cell_map                            *table-mode-echo-cell-map*
+        Set this to configure the mapping for echoing the tablemode
+        representation of the current cell. >
+                let g:table_mode_echo_cell_map = '<Leader>t?'
+>
+g:table_mode_sort_map                                      *table-mode-sort-map*
+        Set this to configure the mapping for sorting the table mode by
+        current column. >
+                let g:table_mode_sort_map = '<Leader>ts'
+>
+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*
@@ -254,6 +373,10 @@ 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
@@ -321,6 +444,14 @@ 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*

--- a/plugin/table-mode.vim
+++ b/plugin/table-mode.vim
@@ -1,23 +1,3 @@
-" =============================================================================
-" File:          plugin/table-mode.vim
-" Description:   Table mode for vim for creating neat tables.
-" Author:        Dhruva Sagar <http://dhruvasagar.com/>
-" License:       MIT (http://www.opensource.org/licenses/MIT)
-" Website:       http://github.com/dhruvasagar/vim-table-mode
-" Version:       3.3.3
-" Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
-"                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
-"
-" Copyright Notice:
-"                Permission is hereby granted to use and distribute this code,
-"                with or without modifications, provided that this copyright
-"                notice is copied with it. Like anything else that's free,
-"                table-mode.vim is provided *as is* and comes with no warranty
-"                of any kind, either expressed or implied. In no event will
-"                the copyright holder be liable for any damamges resulting
-"                from the use of this software.
-" =============================================================================
-
 " Finish if already loaded {{{1
 if exists('g:loaded_table_mode')
  finish
@@ -36,27 +16,50 @@ endfunction

 " Set Global Defaults {{{1
 call s:SetGlobalOptDefault('table_mode_corner', '+')
+call s:SetGlobalOptDefault('table_mode_verbose', 1)
 call s:SetGlobalOptDefault('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')
 call s:SetGlobalOptDefault('table_mode_toggle_map', 'm')
 call s:SetGlobalOptDefault('table_mode_always_active', 0)
 call s:SetGlobalOptDefault('table_mode_delimiter', ',')
 call s:SetGlobalOptDefault('table_mode_corner_corner', '|')
+call s:SetGlobalOptDefault('table_mode_align_char', ':')
+call s:SetGlobalOptDefault('table_mode_disable_mappings', 0)
+
+call s:SetGlobalOptDefault('table_mode_motion_up_map', '{<Bar>')
+call s:SetGlobalOptDefault('table_mode_motion_down_map', '}<Bar>')
+call s:SetGlobalOptDefault('table_mode_motion_left_map', '[<Bar>')
+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_delete_row_map', '<Leader>tdd')
+call s:SetGlobalOptDefault('table_mode_delete_column_map', '<Leader>tdc')
+call s:SetGlobalOptDefault('table_mode_add_formula_map', '<Leader>tfa')
+call s:SetGlobalOptDefault('table_mode_eval_formula_map', '<Leader>tfe')
+call s:SetGlobalOptDefault('table_mode_echo_cell_map', '<Leader>t?')
+call s:SetGlobalOptDefault('table_mode_sort_map', '<Leader>ts')
+
+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#IsATableRow('.')
+  if tablemode#table#IsRow('.')
    echomsg '$' . tablemode#spreadsheet#RowNr('.') . ',' . tablemode#spreadsheet#ColumnNr('.')
  endif
 endfunction

 " Define Commands & Mappings {{{1
 if !g:table_mode_always_active "{{{2
-  exec "nnoremap <silent> " . g:table_mode_map_prefix . g:table_mode_toggle_map .
-       \ " <Esc>:call tablemode#TableModeToggle()<CR>"
-  command! -nargs=0 TableModeToggle call tablemode#TableModeToggle()
-  command! -nargs=0 TableModeEnable call tablemode#TableModeEnable()
-  command! -nargs=0 TableModeDisable call tablemode#TableModeDisable()
+  exec "nnoremap <silent>" g:table_mode_map_prefix . g:table_mode_toggle_map ":<C-U>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()
 else
  let table_mode_separator_map = g:table_mode_separator
  " '|' is a special character, we need to map <Bar> instead
@@ -68,84 +71,57 @@ else
 endif
 " }}}2

-command! -nargs=? -range Tableize <line1>,<line2>call tablemode#table#TableizeRange(<q-args>)
-command! TableAddFormula call tablemode#spreadsheet#AddFormula()
-command! TableModeRealign call tablemode#spreadsheet#TableRealign('.')
-command! TableEvalFormulaLine call tablemode#spreadsheet#EvaluateFormulaLine()
+command! -nargs=? -range Tableize <line1>,<line2>call tablemode#TableizeRange(<q-args>)
+command! -nargs=? -bang TableSort 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()
+
+" '|' is a special character, we need to map <Bar> instead
+if g:table_mode_separator ==# '|' | let separator_map = '<Bar>' | endif
+execute 'inoremap <silent> <Plug>(table-mode-tableize)' separator_map . '<Esc>:call tablemode#TableizeInsertMode()<CR>a'

 nnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR>
 xnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR>
 xnoremap <silent> <Plug>(table-mode-tableize-delimiter) :<C-U>call tablemode#TableizeByDelimiter()<CR>

-nnoremap <silent> <Plug>(table-mode-realign) :call tablemode#table#TableRealign('.')<CR>
+nnoremap <silent> <Plug>(table-mode-realign) :call tablemode#table#Realign('.')<CR>

-nnoremap <silent> <Plug>(table-mode-motion-up) :<C-U>call tablemode#table#TableMotion('k')<CR>
-nnoremap <silent> <Plug>(table-mode-motion-down) :<C-U>call tablemode#table#TableMotion('j')<CR>
-nnoremap <silent> <Plug>(table-mode-motion-left) :<C-U>call tablemode#table#TableMotion('h')<CR>
-nnoremap <silent> <Plug>(table-mode-motion-right) :<C-U>call tablemode#table#TableMotion('l')<CR>
+nnoremap <silent> <Plug>(table-mode-motion-up) :<C-U>call tablemode#spreadsheet#cell#Motion('k')<CR>
+nnoremap <silent> <Plug>(table-mode-motion-down) :<C-U>call tablemode#spreadsheet#cell#Motion('j')<CR>
+nnoremap <silent> <Plug>(table-mode-motion-left) :<C-U>call tablemode#spreadsheet#cell#Motion('h')<CR>
+nnoremap <silent> <Plug>(table-mode-motion-right) :<C-U>call tablemode#spreadsheet#cell#Motion('l')<CR>

-onoremap <silent> <Plug>(table-mode-cell-text-object-a) :<C-U>call tablemode#spreadsheet#CellTextObject(0)<CR>
-onoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spreadsheet#CellTextObject(1)<CR>
+onoremap <silent> <Plug>(table-mode-cell-text-object-a) :<C-U>call tablemode#spreadsheet#cell#TextObject(0)<CR>
+onoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spreadsheet#cell#TextObject(1)<CR>
+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-column) :call tablemode#spreadsheet#DeleteColumn()<CR>

-nnoremap <silent> <Plug>(table-mode-add-formula) :call tablemode#spreadsheet#AddFormula()<CR>
-nnoremap <silent> <Plug>(table-mode-eval-formula) :call tablemode#spreadsheet#EvaluateFormulaLine()<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>
+
 if !hasmapto('<Plug>(table-mode-tableize)')
-  nmap <Leader>tt <Plug>(table-mode-tableize)
-  xmap <Leader>tt <Plug>(table-mode-tableize)
+  exec "nmap" g:table_mode_map_prefix . "t <Plug>(table-mode-tableize)"
+  exec "xmap" g:table_mode_map_prefix . "t <Plug>(table-mode-tableize)"
 endif

 if !hasmapto('<Plug>(table-mode-tableize-delimiter)')
  xmap <Leader>T <Plug>(table-mode-tableize-delimiter)
 endif

-if !hasmapto('<Plug>(table-mode-realign)')
-  nmap <Leader>tr <Plug>(table-mode-realign)
-endif
-
-if !hasmapto('<Plug>(table-mode-motion-up)')
-  nmap {<Bar> <Plug>(table-mode-motion-up)
-endif
-if !hasmapto('<Plug>(table-mode-motion-down)')
-  nmap }<Bar> <Plug>(table-mode-motion-down)
-endif
-if !hasmapto('<Plug>(table-mode-motion-left)')
-  nmap [<Bar> <Plug>(table-mode-motion-left)
-endif
-if !hasmapto('<Plug>(table-mode-motion-right)')
-  nmap ]<Bar> <Plug>(table-mode-motion-right)
-endif
-
-if !hasmapto('<Plug>(table-mode-cell-text-object-a)')
-  omap a<Bar> <Plug>(table-mode-cell-text-object-a)
-endif
-if !hasmapto('<Plug>(table-mode-cell-text-object-i)')
-  omap i<Bar> <Plug>(table-mode-cell-text-object-i)
-endif
-
-if !hasmapto('<Plug>(table-mode-delete-row)')
-  nmap <Leader>tdd <Plug>(table-mode-delete-row)
-endif
-if !hasmapto('<Plug>(table-mode-delete-column)')
-  nmap <Leader>tdc <Plug>(table-mode-delete-column)
-endif
-
-if !hasmapto('<Plug>(table-mode-add-formula)')
-  nmap <Leader>tfa <Plug>(table-mode-add-formula)
-endif
-if !hasmapto('<Plug>(table-mode-eval-formula)')
-  nmap <Leader>tfe <Plug>(table-mode-eval-formula)
-endif
-
-if !hasmapto('<Plug>(table-mode-echo-cell)')
-  nmap <Leader>t? <Plug>(table-mode-echo-cell)
-endif
+augroup TableMode "{{{1
+  au!

+  autocmd User TableModeEnabled call tablemode#logger#log('Table Mode Enabled')
+  autocmd User TableModeDisabled call tablemode#logger#log('Table Mode Disabled')
+augroup END
 " Avoiding side effects {{{1
 let &cpo = s:save_cpo

--- a/t/align.vim
+++ b/t/align.vim
@@ -1,14 +1,20 @@
 " vim: fdm=indent
-source t/config.vim
+source t/config/options.vim

-call vspec#hint({'scope': 'tablemode#align#scope()', 'sid': 'tablemode#align#sid()'})
+function! ConvertLines2Dict(lines)
+  let lines = []
+  for idx in range(len(a:lines))
+    call insert(lines, {"lnum": idx+1, "text": a:lines[idx]})
+  endfor
+  return lines
+endfunction

 describe 'Align'
  it 'should align table content correctly'
-    Expect tablemode#align#Align(readfile('t/fixtures/align/simple_before.txt')) == readfile('t/fixtures/align/simple_after.txt')
+    Expect tablemode#align#Align(ConvertLines2Dict(readfile('t/fixtures/align/simple_before.txt'))) == ConvertLines2Dict(readfile('t/fixtures/align/simple_after.txt'))
  end

  it 'should align table content with unicode characters correctly'
-    Expect tablemode#align#Align(readfile('t/fixtures/align/unicode_before.txt')) == readfile('t/fixtures/align/unicode_after.txt')
+    Expect tablemode#align#Align(ConvertLines2Dict(readfile('t/fixtures/align/unicode_before.txt'))) == ConvertLines2Dict(readfile('t/fixtures/align/unicode_after.txt'))
  end
 end
--- a/t/cell.vim
+++ b/t/cell.vim
@@ -0,0 +1,135 @@
+" vim: fdm=indent
+source t/config/options.vim
+
+describe 'cell'
+  describe 'API'
+    before
+      new
+      read t/fixtures/sample.txt
+    end
+
+    it 'should return the cells with GetCells'
+      Expect tablemode#spreadsheet#cell#GetCells(2, 1, 1) ==# 'test11'
+      " Get Rows
+      Expect tablemode#spreadsheet#cell#GetCells(2, 1) == ['test11', 'test12']
+      Expect tablemode#spreadsheet#cell#GetCells(2, 2) == ['test21', 'test22']
+      " Get Columns
+      Expect tablemode#spreadsheet#cell#GetCells(2, 0, 1) == ['test11', 'test21']
+      Expect tablemode#spreadsheet#cell#GetCells(2, 0, 2) == ['test12', 'test22']
+    end
+
+    it 'should return the row with GetRow'
+      Expect tablemode#spreadsheet#cell#GetRow(1, 2) == ['test11', 'test12']
+      Expect tablemode#spreadsheet#cell#GetRow(2, 2) == ['test21', 'test22']
+    end
+
+    it 'should return the column with GetColumn'
+      Expect tablemode#spreadsheet#cell#GetColumn(1, 2) == ['test11', 'test21']
+      Expect tablemode#spreadsheet#cell#GetColumn(2, 2) == ['test12', 'test22']
+    end
+
+    it 'should return the cells in a range with GetCellRange'
+      " Entire table as range
+      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:2,2', 2, 1) == [['test11', 'test21'], ['test12', 'test22']]
+
+      " Get Rows given different seed lines and columns
+      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 2, 1) == ['test11', 'test12']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 2, 2) == ['test11', 'test12']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 1) == ['test11', 'test12']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 2) == ['test11', 'test12']
+      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 2, 1) == ['test21', 'test22']
+      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 2, 2) == ['test21', 'test22']
+      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 1) == ['test21', 'test22']
+      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 2) == ['test21', 'test22']
+
+      " Get Columns given different seed lines and column
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 2, 1) == ['test11', 'test21']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 2, 2) == ['test12', 'test22']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 1) == ['test11', 'test21']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 2) == ['test12', 'test22']
+
+      " Get Column given negative values in range for representing rows from
+      " the end, -1 being the second last row.
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 2, 1) == ['test11']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 1) == ['test11']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 2, 2) == ['test12']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 2) == ['test12']
+    end
+  end
+
+  describe 'Motions'
+    describe 'left or right'
+      before
+        new
+        normal! ggdG
+        read t/fixtures/sample.txt
+        call cursor(2, 3)
+      end
+
+      it 'should move left when not on first column'
+        call cursor(2, 12)
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+        call tablemode#spreadsheet#cell#Motion('h')
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+      end
+
+      it 'should move to the previous row last column if it exists when on first column'
+        call cursor(3, 3)
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('h')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+      end
+
+      it 'should move right when not on last column'
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('l')
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+      end
+
+      it 'should move to the next row first column if it exists when on last column'
+        call cursor(2, 12)
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+        call tablemode#spreadsheet#cell#Motion('l')
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+      end
+    end
+
+    describe 'up or down'
+      before
+        new
+        normal! ggdG
+        read t/fixtures/sample.txt
+        call cursor(2, 3)
+      end
+
+      it 'should move a row up unless on first row'
+        call cursor(3, 3)
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+        call tablemode#spreadsheet#cell#Motion('k')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+      end
+
+      it 'should remain on first row when trying to move up'
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('k')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+      end
+
+      it 'should move a row down unless on last row'
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('j')
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+      end
+
+      it 'should remain on last row when trying to move down'
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('k')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+      end
+    end
+  end
+end
--- a/t/config.vim
+++ b/t/config.vim
@@ -1,8 +0,0 @@
-let g:table_mode_corner = '+'
-let g:table_mode_separator = '|'
-let g:table_mode_fillchar = '-'
-let g:table_mode_map_prefix = '<Leader>t'
-let g:table_mode_toggle_map = 'm'
-let g:table_mode_always_active = 0
-let g:table_mode_delimiter = ','
-let g:table_mode_corner_corner = '|'
--- a/t/config/options.vim
+++ b/t/config/options.vim
@@ -0,0 +1,31 @@
+let g:table_mode_corner = '+'
+let g:table_mode_separator = '|'
+let g:table_mode_fillchar = '-'
+let g:table_mode_header_fillchar = '-'
+let g:table_mode_map_prefix = '<Leader>t'
+let g:table_mode_toggle_map = 'm'
+let g:table_mode_always_active = 0
+let g:table_mode_delimiter = ','
+let g:table_mode_corner_corner = '|'
+let g:table_mode_align_char = ':'
+let g:table_mode_disable_mappings = 0
+
+let g:table_mode_motion_up_map = '{<Bar>'
+let g:table_mode_motion_down_map = '}<Bar>'
+let g:table_mode_motion_left_map = '[<Bar>'
+let g:table_mode_motion_right_map = ']<Bar>'
+
+let g:table_mode_cell_text_object_a_map = 'a<Bar>'
+let g:table_mode_cell_text_object_i_map = 'i<Bar>'
+
+let g:table_mode_realign_map = '<Leader>tr'
+let g:table_mode_delete_row_map = '<Leader>tdd'
+let g:table_mode_delete_column_map = '<Leader>tdc'
+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_syntax = 1
+let g:table_mode_auto_align = 1
+let g:table_mode_update_time = 500
--- a/t/fixtures/align/unicode_before.txt
+++ b/t/fixtures/align/unicode_before.txt
@@ -1,2 +1,2 @@
-| This | is 測試 | table |
-| This | is also | a table |
+|This|is 測試|table|
+|This|is also|a table|
--- a/t/fixtures/cell/sample.txt
+++ b/t/fixtures/cell/sample.txt
@@ -0,0 +1,2 @@
+| 1 | 2 |
+| 3 | 4 |
--- a/t/fixtures/formula/formula.txt
+++ b/t/fixtures/formula/formula.txt
@@ -0,0 +1,7 @@
+| Item     | Cost  |
+|----------+-------|
+| Bread    |    20 |
+| Tomatoes |     5 |
+| Pasta    |   100 |
+| Total    |     0 |
+/* tmf: $4,2=Sum(1:-1) */
--- a/t/fixtures/formula/sample.txt
+++ b/t/fixtures/formula/sample.txt
@@ -0,0 +1,7 @@
+| Item     | Cost |
+|----------+------|
+| Bread    |   20 |
+| Tomatoes |    5 |
+| Pasta    |  100 |
+| Total    |      |
+| Test     |      |
--- a/t/fixtures/table/sample.txt
+++ b/t/fixtures/table/sample.txt
@@ -0,0 +1,4 @@
+
+| test11 | test12 |
+| test21 | test22 |
+
--- a/t/fixtures/table/sample_for_header.txt
+++ b/t/fixtures/table/sample_for_header.txt
@@ -0,0 +1,3 @@
+| test11 | test12 |
+
+| test21 | test22 |
--- a/t/fixtures/table/sample_for_header_unicode.txt
+++ b/t/fixtures/table/sample_for_header_unicode.txt
@@ -0,0 +1,9 @@
+
+| abc          | 测试长度         | 长测试     |
+
+| 长           | 测试测试测试测试 | 测试测试   |
+
+| 测试测试     | 测试             | 测试测测试 |
+
+| 测试测试测试 | 测试测试         | 测试       |
+
--- a/t/fixtures/table/sample_header_realign_after.txt
+++ b/t/fixtures/table/sample_header_realign_after.txt
@@ -0,0 +1,4 @@
+| S. No | Title | Message |
+|-------+:------+:-------:|
+| 1     | t1    |   msg1  |
+| 2     | t2    |   msg2  |
--- a/t/fixtures/table/sample_header_realign_before.txt
+++ b/t/fixtures/table/sample_header_realign_before.txt
@@ -0,0 +1,4 @@
+|S. No|Title|Message|
+|-----+:----+:-----:|
+|1|t1|msg1|
+|2|t2|msg2|
--- a/t/fixtures/table/sample_header_realign_unicode_after.txt
+++ b/t/fixtures/table/sample_header_realign_unicode_after.txt
@@ -0,0 +1,8 @@
+|--------------+------------------+------------|
+| 测试测试     |     测试长度     |     长测试 |
+|--------------+:----------------:+-----------:|
+| abc          |     测试长度     |     长测试 |
+| 长           | 测试测试测试测试 |   测试测试 |
+| 测试测试     |       测试       | 测试测测试 |
+| 测试测试测试 |     测试测试     |       测试 |
+|--------------+------------------+------------|
--- a/t/fixtures/table/sample_header_realign_unicode_before.txt
+++ b/t/fixtures/table/sample_header_realign_unicode_before.txt
@@ -0,0 +1,8 @@
+|--------+--------+------|
+|测试测试|测试长度|长测试|
+|--------+:------:+-----:|
+|abc|测试长度|长测试|
+|长|测试测试测试测试|测试测试|
+|测试测试|测试|测试测测试|
+|测试测试测试|测试测试|测试|
+|------------+--------+----|
--- a/t/fixtures/table/sample_realign_after.txt
+++ b/t/fixtures/table/sample_realign_after.txt
@@ -0,0 +1,2 @@
+| test11 | test12 |
+| test21 | test22 |
--- a/t/fixtures/table/sample_realign_before.txt
+++ b/t/fixtures/table/sample_realign_before.txt
@@ -0,0 +1,2 @@
+|test11|test12|
+|test21|test22|
--- a/t/fixtures/table/sample_realign_unicode_after.txt
+++ b/t/fixtures/table/sample_realign_unicode_after.txt
@@ -0,0 +1,4 @@
+| abc          | 测试长度         | 长测试     |
+| 长           | 测试测试测试测试 | 测试测试   |
+| 测试测试     | 测试             | 测试测测试 |
+| 测试测试测试 | 测试测试         | 测试       |
--- a/t/fixtures/table/sample_realign_unicode_before.txt
+++ b/t/fixtures/table/sample_realign_unicode_before.txt
@@ -0,0 +1,4 @@
+|abc|测试长度|长测试|
+|长|测试测试测试测试|测试测试|
+|测试测试|测试|测试测测试|
+|测试测试测试|测试测试|测试|
--- a/t/fixtures/table/sample_with_header.txt
+++ b/t/fixtures/table/sample_with_header.txt
@@ -0,0 +1,7 @@
+|--------+---------|
+| Title  | Message |
+|--------+---------|
+| test11 | test12  |
+| test21 | test22  |
+|--------+---------|
+
--- a/t/formula.vim
+++ b/t/formula.vim
@@ -0,0 +1,39 @@
+" vim: fdm=indent
+source t/config/options.vim
+
+describe 'Formulas'
+  describe 'Add Formula'
+    before
+      new
+      read t/fixtures/formula/sample.txt
+    end
+
+    it 'should add a formula successfully'
+      call cursor(6, 15)
+      call tablemode#spreadsheet#formula#Add("Sum(1:3)")
+      Expect tablemode#spreadsheet#cell#GetCell() == '125.0'
+      call cursor(8, 15)
+      Expect getline('.') == '/* tmf: $4,2=Sum(1:3) */'
+
+      call cursor(7, 15)
+      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) */'
+    end
+  end
+
+  describe 'Evaluate Formula'
+    before
+      new
+      read t/fixtures/formula/formula.txt
+    end
+
+    it 'should evaluate the formula successfull'
+      call cursor(6, 15)
+      call tablemode#spreadsheet#formula#EvaluateFormulaLine()
+      Expect &modified == 1
+      Expect tablemode#spreadsheet#cell#GetCell() == '125.0'
+    end
+  end
+end
--- a/t/spreadsheet.vim
+++ b/t/spreadsheet.vim
@@ -1,7 +1,5 @@
 " vim: fdm=indent
-source t/config.vim
-
-call vspec#hint({'scope': 'tablemode#spreadsheet#scope()', 'sid': 'tablemode#spreadsheet#sid()'})
+source t/config/options.vim

 describe 'spreadsheet'
  describe 'API'
@@ -25,6 +23,27 @@ describe 'spreadsheet'
      Expect tablemode#spreadsheet#ColumnCount(3) == 2
    end

+    it 'should return the column number'
+      call cursor(2,3)
+      Expect tablemode#spreadsheet#ColumnNr('.') == 1
+      call cursor(2,12)
+      Expect tablemode#spreadsheet#ColumnNr('.') == 2
+    end
+
+    it 'should return true when in the first cell'
+      call cursor(2,3)
+      Expect tablemode#spreadsheet#IsFirstCell() to_be_true
+      call cursor(2,12)
+      Expect tablemode#spreadsheet#IsFirstCell() to_be_false
+    end
+
+    it 'should return true when in the last cell'
+      call cursor(2,3)
+      Expect tablemode#spreadsheet#IsLastCell() to_be_false
+      call cursor(2,12)
+      Expect tablemode#spreadsheet#IsLastCell() to_be_true
+    end
+
    it 'should return the line number of the first row'
      Expect tablemode#spreadsheet#GetFirstRow(2) == 2
      Expect tablemode#spreadsheet#GetFirstRow(3) == 2
@@ -35,50 +54,40 @@ describe 'spreadsheet'
      Expect tablemode#spreadsheet#GetLastRow(3) == 3
    end

-    it 'should return the cells'
-      Expect tablemode#spreadsheet#GetCells(2, 1, 1) ==# 'test11'
-      " Get Rows
-      Expect tablemode#spreadsheet#GetCells(2, 1) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#GetCells(2, 2) == ['test21', 'test22']
-      " Get Columns
-      Expect tablemode#spreadsheet#GetCells(2, 0, 1) == ['test11', 'test21']
-      Expect tablemode#spreadsheet#GetCells(2, 0, 2) == ['test12', 'test22']
-    end
+    describe 'Math'
+      before
+        new
+        read t/fixtures/cell/sample.txt
+      end

-    it 'should return the cells in a range'
-      " Entire table as range
-      Expect tablemode#spreadsheet#GetCellRange('1,1:2,2', 2, 1) == [['test11', 'test21'], ['test12', 'test22']]
+      it 'should return the sum of cell range'
+        call cursor(1,3)
+        Expect tablemode#spreadsheet#Sum('1:2') == 4.0
+        Expect tablemode#spreadsheet#Sum('1,1:1,2') == 3.0
+        Expect tablemode#spreadsheet#Sum('1,1:2,2') == 10.0
+        call cursor(2,7)
+        Expect tablemode#spreadsheet#Sum('1:2') == 6.0
+        Expect tablemode#spreadsheet#Sum('2,1:2,2') == 7.0
+      end

-      " Get Rows given different seed lines and columns
-      Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 2, 1) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 2, 2) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 3, 1) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 3, 2) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 2, 1) == ['test21', 'test22']
-      Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 2, 2) == ['test21', 'test22']
-      Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 3, 1) == ['test21', 'test22']
-      Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 3, 2) == ['test21', 'test22']
-
-      " Get Columns given different seed lines and column
-      Expect tablemode#spreadsheet#GetCellRange('1:2', 2, 1) == ['test11', 'test21']
-      Expect tablemode#spreadsheet#GetCellRange('1:2', 2, 2) == ['test12', 'test22']
-      Expect tablemode#spreadsheet#GetCellRange('1:2', 3, 1) == ['test11', 'test21']
-      Expect tablemode#spreadsheet#GetCellRange('1:2', 3, 2) == ['test12', 'test22']
-
-      " Get Column given negative values in range for representing rows from
-      " the end, -1 being the second last row.
-      Expect tablemode#spreadsheet#GetCellRange('1:-1', 2, 1) == ['test11']
-      Expect tablemode#spreadsheet#GetCellRange('1:-1', 3, 1) == ['test11']
-      Expect tablemode#spreadsheet#GetCellRange('1:-1', 2, 2) == ['test12']
-      Expect tablemode#spreadsheet#GetCellRange('1:-1', 3, 2) == ['test12']
+      it 'should return the average of cell range'
+        call cursor(1,3)
+        Expect tablemode#spreadsheet#Average('1:2') == 2.0
+        Expect tablemode#spreadsheet#Average('1,1:1,2') == 1.5
+        Expect tablemode#spreadsheet#Average('1,1:2,2') == 5.0
+        call cursor(2,7)
+        Expect tablemode#spreadsheet#Average('1:2') == 3.0
+        Expect tablemode#spreadsheet#Average('2,1:2,2') == 3.5
+      end
    end
  end

  describe 'Manipulations'
    before
      new
-      normal i|test11|test12|
-|test21|test22|
+      normal! ggdG
+      read t/fixtures/sample.txt
+      call cursor(2, 3)
    end

    it 'should delete a row successfully'
--- a/t/table.vim
+++ b/t/table.vim
@@ -1,119 +1,183 @@
 " vim: fdm=indent
-source t/config.vim
-
-call vspec#hint({'scope': 'tablemode#table#scope()', 'sid': 'tablemode#table#sid()'})
+source t/config/options.vim

 describe 'table'
-  describe 'API'
+  describe 'IsRow'
    before
      new
-      read t/fixtures/sample.txt
+      normal! ggdG
+      read t/fixtures/table/sample.txt
    end

-    it 'should return true when inside a table'
-      Expect tablemode#table#IsATableRow(2) to_be_true
+    it 'should be true when on a table row'
+      Expect tablemode#table#IsRow(2) to_be_true
+      Expect tablemode#table#IsRow(3) to_be_true
    end

-    it 'should return false when outside a table'
-      Expect tablemode#table#IsATableRow(4) to_be_false
+    it 'should be false when not on a table row'
+      Expect tablemode#table#IsRow(1) to_be_false
+      Expect tablemode#table#IsRow(4) to_be_false
    end
  end

-  describe 'Tableize'
+  describe 'IsBorder'
    before
      new
-      read t/fixtures/tableize.txt
+      normal! ggdG
+      read t/fixtures/table/sample_with_header.txt
    end

-    it 'should tableize with default delimiter'
-      :2,3call tablemode#TableizeRange('')
-      Expect tablemode#table#IsATableRow(2) to_be_true
-      Expect tablemode#spreadsheet#RowCount(2) == 2
-      Expect tablemode#spreadsheet#ColumnCount(2) == 3
+    it 'should be true on a table border'
+      Expect tablemode#table#IsBorder(1) to_be_true
+      Expect tablemode#table#IsBorder(3) to_be_true
+      Expect tablemode#table#IsBorder(6) to_be_true
    end

-    it 'should tableize with given delimiter'
-      :2,3call tablemode#TableizeRange('/;')
-      Expect tablemode#table#IsATableRow(2) to_be_true
-      Expect tablemode#spreadsheet#RowCount(2) == 2
-      Expect tablemode#spreadsheet#ColumnCount(2) == 2
+    it 'should be false when not on a table border'
+      Expect tablemode#table#IsBorder(2) to_be_false
+      Expect tablemode#table#IsBorder(4) to_be_false
+      Expect tablemode#table#IsBorder(5) to_be_false
    end
  end

-  describe 'Motions'
-    describe 'left or right'
+  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
+      normal! ggdG
+      read t/fixtures/table/sample_with_header.txt
+    end
+
+    it 'should be true on the table header'
+      Expect tablemode#table#IsHeader(2) to_be_true
+    end
+
+    it 'should be false anywhere else'
+      Expect tablemode#table#IsHeader(1) to_be_false
+      Expect tablemode#table#IsHeader(4) to_be_false
+      Expect tablemode#table#IsHeader(5) to_be_false
+      Expect tablemode#table#IsHeader(6) to_be_false
+      Expect tablemode#table#IsHeader(7) to_be_false
+    end
+  end
+
+  describe 'AddBorder'
+    before
+      new
+      normal! ggdG
+      read t/fixtures/table/sample_for_header.txt
+    end
+
+    it 'should add border to line'
+      call tablemode#table#AddBorder(2)
+      Expect tablemode#table#IsHeader(1) to_be_true
+      Expect tablemode#table#IsBorder(2) to_be_true
+    end
+
+    describe 'for unicode'
      before
        new
        normal! ggdG
-        call tablemode#TableModeEnable()
-        normal i|test11|test12|
-|test21|test22|
+        read t/fixtures/table/sample_for_header_unicode.txt
      end

-
-      it 'should move left when not on first column'
-        call cursor(1, 12)
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-        call tablemode#table#TableMotion('h')
+      it 'should add border to line'
+        call tablemode#table#AddBorder(1)
+        call tablemode#table#AddBorder(3)
+        call tablemode#table#AddBorder(5)
+        call tablemode#table#AddBorder(7)
+        call tablemode#table#AddBorder(9)
+
+        Expect tablemode#table#IsBorder(1) to_be_true
+        Expect tablemode#utils#StrDisplayWidth(getline(1)) == tablemode#utils#StrDisplayWidth(getline(2))
+        Expect tablemode#table#IsBorder(3) to_be_true
+        Expect tablemode#utils#StrDisplayWidth(getline(3)) == tablemode#utils#StrDisplayWidth(getline(4))
+        Expect tablemode#table#IsBorder(5) to_be_true
+        Expect tablemode#utils#StrDisplayWidth(getline(5)) == tablemode#utils#StrDisplayWidth(getline(6))
+        Expect tablemode#table#IsBorder(7) to_be_true
+        Expect tablemode#utils#StrDisplayWidth(getline(7)) == tablemode#utils#StrDisplayWidth(getline(8))
+        Expect tablemode#table#IsBorder(9) to_be_true
+        Expect tablemode#utils#StrDisplayWidth(getline(9)) == tablemode#utils#StrDisplayWidth(getline(8))
+      end
+    end
+  end
+
+  describe 'Realign'
+    describe 'without header alignments'
+      describe 'for simple'
+        before
+          new
+          normal! ggdG
+          read t/fixtures/table/sample_realign_before.txt
+        end
+
+        it 'should be aligned properly'
+          call tablemode#table#Realign(1)
+          Expect getline(1,'$') == readfile('t/fixtures/table/sample_realign_after.txt')
+        end
      end

-
-      it 'should move to the previous row last column if it exists when on first column'
-        call cursor(2, 3)
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-        call tablemode#table#TableMotion('h')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+      describe 'for unicode'
+        before
+          new
+          normal! ggdG
+          read t/fixtures/table/sample_realign_unicode_before.txt
+        end

-
-      it 'should move right when not on last column'
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-        call tablemode#table#TableMotion('l')
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-      end
-
-      it 'should move to the next row first column if it exists when on last column'
-        call cursor(1, 12)
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-        call tablemode#table#TableMotion('l')
-        Expect tablemode#spreadsheet#RowNr('.') == 2
+        it 'should be aligned properly'
+          call tablemode#table#Realign(1)
+          Expect getline(1,'$') == readfile('t/fixtures/table/sample_realign_unicode_after.txt')
+        end
      end
    end

-
-    describe 'up or down'
-      before
-        new
-        normal! ggdG
-        call tablemode#TableModeEnable()
-        normal i|test11|test12|
+    describe 'with header alignments'
+      describe 'for simple'
+        before
+          new
+          normal! ggdG
+          read t/fixtures/table/sample_header_realign_before.txt
+        end
+
+        it 'should be aligned properly'
+          call tablemode#table#Realign(1)
+          Expect getline(1,'$') == readfile('t/fixtures/table/sample_header_realign_after.txt')
+        end
      end

-      end
-
-      it 'should move a row up unless on first row'
-        call cursor(2, 3)
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        call tablemode#table#TableMotion('k')
+      describe 'for unicode'
+        before
+          new
+          normal! ggdG
+          read t/fixtures/table/sample_header_realign_unicode_before.txt
+        end

-      end
-
-      it 'should remain on first row when trying to move up'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#table#TableMotion('k')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-      end
-
-      it 'should move a row down unless on last row'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#table#TableMotion('j')
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-      end
-
-      it 'should remain on last row when trying to move down'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
+        it 'should be aligned properly'
+          call tablemode#table#Realign(1)
+          Expect getline(1,'$') == readfile('t/fixtures/table/sample_header_realign_unicode_after.txt')
+        end
      end
    end
  end
--- a/t/tablemode.vim
+++ b/t/tablemode.vim
@@ -1,13 +1,11 @@
 " vim: fdm=indent
-source t/config.vim
-
-call vspec#hint({'scope': 'tablemode#scope()', 'sid': 'tablemode#sid()'})
+source t/config/options.vim

 describe 'tablemode'
  describe 'Activation'
-    describe 'tablemode#TableModeEnable()'
+    describe 'tablemode#Enable()'
      before
-        call tablemode#TableModeEnable()
+        call tablemode#Enable()
      end

      it 'should enable table mode'
@@ -15,9 +13,9 @@ describe 'tablemode'
      end
    end

-    describe 'tablemode#TableModeDisable()'
+    describe 'tablemode#Disable()'
      before
-        call tablemode#TableModeDisable()
+        call tablemode#Disable()
      end

      it 'should disable table mode'
@@ -25,13 +23,34 @@ describe 'tablemode'
      end
    end

-    describe 'tablemode#TableModeToggle()'
+    describe 'tablemode#Toggle()'
      it 'should toggle table mode'
-        call tablemode#TableModeToggle()
+        call tablemode#Toggle()
        Expect b:table_mode_active to_be_true
-        call tablemode#TableModeToggle()
+        call tablemode#Toggle()
        Expect b:table_mode_active to_be_false
      end
    end
  end
+
+  describe 'Tableize'
+    before
+      new
+      read t/fixtures/tableize.txt
+    end
+
+    it 'should tableize with default delimiter'
+      :2,3call tablemode#TableizeRange('')
+      Expect tablemode#table#IsRow(2) to_be_true
+      Expect tablemode#spreadsheet#RowCount(2) == 2
+      Expect tablemode#spreadsheet#ColumnCount(2) == 3
+    end
+
+    it 'should tableize with given delimiter'
+      :2,3call tablemode#TableizeRange('/;')
+      Expect tablemode#table#IsRow(2) to_be_true
+      Expect tablemode#spreadsheet#RowCount(2) == 2
+      Expect tablemode#spreadsheet#ColumnCount(2) == 2
+    end
+  end
 end
--- a/t/utils.vim
+++ b/t/utils.vim
@@ -1,33 +1,45 @@
 " vim: fdm=indent
-source t/config.vim
+source t/config/options.vim

-call vspec#hint({'scope': 'tablemode#utils#scope()', 'sid': 'tablemode#utils#sid()'})
+describe 'utils'
+  describe 'line'
+    it 'should return the current line number'
+      Expect tablemode#utils#line('.') == line('.')
+    end

-describe 'line'
-  it 'should return the current line number'
-    Expect tablemode#utils#line('.') == line('.')
+    it 'should return the line number itself if it is a number'
+      Expect tablemode#utils#line(1) == 1
+    end
  end

-  it 'should return the line number itself if it is a number'
-    Expect tablemode#utils#line(1) == 1
-  end
-end
-
-describe 'strip'
-  it 'should strip all initial or trailing whitespace from a string'
-    let string = ' This is awesome  '
-    Expect tablemode#utils#strip(string) == 'This is awesome'
-  end
-end
-
-describe 'strlen'
-  it 'should return the length of a string correctly'
-    let string = 'this is a test'
-    Expect tablemode#utils#strlen(string) == 14
-  end
-
-  it 'should return the length of a unicode string correctly'
-    let string = '測試 is good.'
-    Expect tablemode#utils#strlen(string) == 11
+  describe 'strip'
+    it 'should strip all initial or trailing whitespace from a string'
+      let string = ' This is awesome  '
+      Expect tablemode#utils#strip(string) == 'This is awesome'
+    end
+  end
+
+  describe 'strlen'
+    it 'should return the length of a string correctly'
+      let string = 'this is a test'
+      Expect tablemode#utils#strlen(string) == 14
+    end
+
+    it 'should return the length of a unicode string correctly'
+      let string = '測試 is good.'
+      Expect tablemode#utils#strlen(string) == 11
+    end
+  end
+
+  describe 'strdisplaywidth'
+    it 'should return the display width of a string correctly'
+      let string = 'this is a test'
+      Expect tablemode#utils#StrDisplayWidth(string) == 14
+    end
+
+    it 'should return the display width of a unicode string correctly'
+      let string = '測試 is good.'
+      Expect tablemode#utils#StrDisplayWidth(string) == 13
+    end
  end
 end
--- a/youtube.png
+++ b/youtube.png
Author	SHA1	Message	Date
Dhruva Sagar	d4cb68e8e1	Fix for option g:table_mode_update_time	2017-03-10 06:51:47 +05:30
Dhruva Sagar	79bf3f9bb7	Add configuration option table_mode_update_time #73 This is for better experience with auto align, we override the updatetime with the value of the configuration g:table_mode_update_time. Once table mode is disabled prior defaults are restored.	2017-03-10 06:48:30 +05:30
Dhruva Sagar	ef66b3ec2f	Revert "Also auto realign on InsertLeave #73 " This reverts commit `6584cee4a4`.	2017-03-09 15:02:42 +05:30
Dhruva Sagar	6584cee4a4	Also auto realign on InsertLeave #73	2017-03-09 14:24:15 +05:30
Dhruva Sagar	1eef73fc5b	Add option to auto align table while editing #73	2017-03-09 11:00:19 +05:30
Dhruva Sagar	d3b70df0a6	Merge pull request #112 from polyzen/patch-1 readme: Fix minor Vint (Vim linter) warnings	2017-03-08 16:25:11 +05:30
Daniel M. Capella	096165718e	readme: Fix minor Vint (Vim linter) warnings	2017-03-08 06:59:39 +00:00
Dhruva Sagar	30a3eba816	Fix #103 : Refactored border creation Border creation should not conflict with the contents of the row	2017-01-05 11:42:10 +05:30
Dhruva Sagar	cc0055f329	Fixed align unicode fixture The before fixture should not have any unnecessary spaces	2017-01-04 16:15:46 +05:30
Dhruva Sagar	8d3affcf5f	Minor refactor for table syntax	2017-01-04 16:03:24 +05:30
Dhruva Sagar	9edd6d7d20	Add config to disable table mode syntax Since table mode syntax can hamper performance, it is now possible to disable it with a global config	2017-01-04 15:49:35 +05:30
Dhruva Sagar	441c30c35a	Merge pull request #98 from harriott/master enabling toggle notification by default	2016-09-28 19:27:31 +05:30
Joseph Harriott	ebd16eef19	Merge remote-tracking branch 'gh/master'	2016-09-28 15:39:23 +02:00
Joseph Harriott	141efc3edd	corrected spurious loaded_table_verbose	2016-09-28 15:29:07 +02:00
Joseph Harriott	c82bc292c5	deleted tags, as requested	2016-09-27 23:30:29 +02:00
Dhruva Sagar	8209b59215	Bumped the version	2016-09-21 14:07:59 +05:30
Dhruva Sagar	5b3b2f7c05	Updated the README Fixed the tip	2016-09-21 14:05:56 +05:30
harriott	47f60d2972	doc adjusted for default verbose	2016-09-09 11:03:00 +02:00
harriott	0f680bfd1b	'table_mode_verbose', 1	2016-09-09 10:53:18 +02:00
harriott	19f2f5c26f	reset gitignore tags	2016-09-09 10:50:30 +02:00
harriott	e07c240940	fixed logger.vim and announce g:table_mode_verbose	2016-09-09 10:39:01 +02:00
Dhruva Sagar	8bacd0ba66	Bumped ruby version for travis	2016-08-23 09:29:00 +05:30
Dhruva Sagar	8309a33aa7	Fix #90 Allow for multiple formula lines	2016-08-23 09:26:24 +05:30
Dhruva Sagar	293c847cdf	Bumped ruby version for tests	2016-08-23 09:25:56 +05:30
Dhruva Sagar	96236638a8	Fix #92 Improved mappings for table mode	2016-07-11 13:39:28 +05:30
Dhruva Sagar	1d14a027a8	Merge branch 'master' of github.com:dhruvasagar/vim-table-mode	2016-07-11 13:24:27 +05:30
Dhruva Sagar	e490373435	Fix #88 Added the iabbrevs to README	2016-07-11 13:23:37 +05:30
Dhruva Sagar	b420dedbf5	Fix #88 Added the iabbrevs to README	2016-07-11 13:22:12 +05:30
Dhruva Sagar	1bf139b30d	Bumped version	2016-05-09 09:07:40 +05:30
Dhruva Sagar	b613e39bd0	Fix #89 Unescape special characters () within the commmentstring	2016-05-08 15:57:13 +05:30
Dhruva Sagar	7c56d298bb	Updated test for formula validation	2016-05-08 15:56:48 +05:30
Dhruva Sagar	4cf1f53430	Fix #86 Fixed issue with table formula addition when there exists one already and the comment string is singular, i.e. no end delimiter.	2016-04-09 12:55:29 +05:30
Dhruva Sagar	01289c0752	Merge branch 'master' of github.com:dhruvasagar/vim-table-mode	2015-12-03 22:53:41 +05:30
Dhruva Sagar	2ab64777a5	Merge pull request #75 from hein09/patch-1 Fixed sort in doc	2015-12-03 21:11:39 +05:30
hein09	26b21e3454	Fixed sort in doc Fixed sort-parts in documentation breaking the help-tag-indexing of vim	2015-12-03 15:48:18 +01:00
Dhruva Sagar	fdfa4b12c2	Add tablemode#table#IsTable	2015-11-23 14:53:05 +05:30
Dhruva Sagar	e7373c9083	Merge pull request #71 from arecarn/fix-sort Fix sort command, and add documentation for the command and mapping.	2015-11-17 06:43:19 +01:00
Ryan Carney	6872024827	add docs for table sorting command and mapping ---- Related Issues: #38	2015-11-15 14:46:47 -08:00
Ryan Carney	50b3b01a33	fix mapping to table sort Symptom: when trying to sort a column using <leader>ts the following error would be displayed: E119: Not enough arguments for function: tablemode#spreadsheet#Sort Problem: Function call tablemode#spreadsheet#Sort() was missing a arguemnts for it's named parameter bang. Solution: Add a blank value of '' as the argument for the bang parameter ---- Related Issues: #38	2015-11-15 14:45:05 -08:00
Dhruva Sagar	5395c9f52b	Merge pull request #65 from axil/master Updated readme	2015-06-05 06:22:58 -07:00
Lev Maximov	13d836dbfe	included header_fillchar into the rst example	2015-06-05 11:28:55 +06:00
Lev Maximov	b1e4041e43	changed the video to a more recent one	2015-06-05 02:15:11 +06:00
Lev Maximov	bba1bf8d6e	restructured the headers	2015-06-05 02:15:11 +06:00
Lev Maximov	4baf9cfd2e	more detailed how-to-start instructions, with pictures	2015-06-05 02:14:50 +06:00
Dhruva Sagar	8d2e013756	Updated youtube video * Updated the youtube video link to the more recent video.	2015-06-04 10:29:49 -07:00
Dhruva Sagar	cc723fe8cd	Merge pull request #61 from rafaeln/patch-1 fix table in table-mode.txt	2015-04-21 13:48:06 -07:00
rafaeln	2c06812c39	fix table in table-mode.txt immidiately --> immediately	2015-04-21 16:13:55 -03:00
Dhruva Sagar	2471a3b1da	Updated docs	2015-04-14 15:57:49 -07:00
Dhruva Sagar	74d1492f2b	Add support for center alignment. Fix #57 We now have support for center alignment, simply add a header border with the `g:table_mode_align_char` as both the first and the last character so it would look something like `+:.....:+` to center align the column values.	2015-04-14 15:56:09 -07:00
Dhruva Sagar	c0a6d43f21	Updated ruby version in travis	2015-03-17 15:43:02 -07:00
Dhruva Sagar	af182b1387	Updated README * Updated documentation with regards to manual installation	2015-03-17 13:53:24 -07:00
Dhruva Sagar	757d1f95eb	Updated ruby version	2015-03-17 13:50:26 -07:00
Dhruva Sagar	d1908c04f3	Updated READMEs	2015-02-27 08:53:26 +05:30
Dhruva Sagar	33c00df509	Fix #56 * Fixed tablemode#spreadsheet#cell#SetCell() to accommodate the fact that we can have borders anywhere in the table. Using tablemode#spreadsheet#LineNr() to get get the line of the actual row in the table. * Fixed tablemode#spreadsheet#LineNr()	2015-02-27 08:53:03 +05:30
Dhruva Sagar	3096a26db4	Merge pull request #51 from jensbodal/patch-1 File names incorrect for files to copy	2015-01-11 17:08:48 +05:30
jensbodal	acde7918e8	File names incorrect for files to copy If you're interested I made a script to install this plugin and install pathogen. I've never installed a plugin before and for me the instructions were not very easy to follow in order to get this working. It looks like exactly what I was looking for though, so thank you very much for putting this together. # Script for UNIX only -- not tested on OSX or Windows # Make necessary directories mkdir -p ~/.vim/autoload ~/.vim/bundle ~/.vim/doc ~/.vim/plugin # Install pathogen (https://github.com/tpope/vim-pathogen) curl -LSso ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim # Install vim-table-mode plugin (https://github.com/dhruvasagar/vim-table-mode) git clone https://github.com/dhruvasagar/vim-table-mode.git ~/.vim/bundle/vim-table-mode # Place vim-table-mode files where they need to be cp ~/.vim/bundle/vim-table-mode/autoload/tablemode.vim ~/.vim/autoload cp ~/.vim/bundle/vim-table-mode/plugin/table-mode.vim ~/.vim/plugin cp ~/.vim/bundle/vim-table-mode/doc/table-mode.txt ~/.vim/doc # Add options to ~/.vimrc to run pathogen when vim starts echo >> ~/.vimrc echo \"Start pathogen manager on startup >> ~/.vimrc echo execute pathogen\#infect\(\) >> ~/.vimrc echo >> ~/.vimrc echo \"Enable indent on for plugin filetypes >> ~/.vimrc echo filetype plugin indent on >> ~/.vimrc echo Test out vim-table-mode using :TableModeToggle or :TableModeEnable or :TableModeDisable	2015-01-10 22:05:36 -08:00
Dhruva Sagar	1e94ae39cc	Merge pull request #46 from grodzik/master Use table_mode_map_prefix for the tableize mappings	2014-12-08 18:22:05 +05:30
Paweł Tomak	84e382123d	Use table_mode_map_prefix for the tableize mappings	2014-12-08 13:44:03 +01:00
Dhruva Sagar	e125870212	Fixed s:Map to not throw error for empty a:to	2014-11-21 07:02:38 +05:30
Dhruva Sagar	d5152bde5e	Fixed typo #39	2014-11-20 07:21:43 +05:30
Dhruva Sagar	b22c9bf7b1	Skip empty maps	2014-11-20 07:19:23 +05:30
Dhruva Sagar	5103dae89d	Updated CHANGELOG	2014-11-18 08:20:28 +05:30
Dhruva Sagar	29cae13802	Fixed #44 Added tablemode#logger#log && g:table_mode_verbose Use logger wherever needed for logging general things, in future we can scale this to do more things like write to a log file for debugging. It uses g:table_mode_verbose to determine whether or not to actually log the message.	2014-11-18 07:57:45 +05:30
Dhruva Sagar	af0254e816	Improved tablemode#table#IsHeader() Automatically improves header border creation, especially when overriding g:table_mode_header_fillchar #31	2014-11-18 07:48:23 +05:30
Dhruva Sagar	8810818e32	Updated docs & bumped version	2014-11-16 13:42:27 +05:30
Dhruva Sagar	bba22a4f04	Added g:table_mode_header_fillchar * Allows configuring a separate character for header border to be used with pandoc	2014-11-16 13:40:14 +05:30
Dhruva Sagar	ffc734c38d	Added TableModeEnabled & TableModeDisabled autocmd * Added custom User autocmds TableModeEnabled & TableModeDisabled for working with other plugins like vim-pandoc #43	2014-11-15 16:38:22 +05:30
Dhruva Sagar	ea78f62565	Releasing Table Mode v4.6.1 * Added configurable table mappings. * Updated docs & README.	2014-10-28 13:31:16 +05:30
Dhruva Sagar	7e06786708	Minor formatting	2014-10-28 08:04:39 +05:30
Dhruva Sagar	ef0eef0f35	Fixed #38 Added a mapping `<Plug>(table-mode-sort)` which is mapped by default to `<Leader>ts` that sorts the current table by the column in which the cursor is currently. Also added `TableSort` command that gives you a little more control over the sorting, you can pass in additional :sort flags like u, i, n etc and also use it with a `!` to sort in reverse order.	2014-09-17 01:36:59 +05:30
Dhruva Sagar	c5258f7ae8	Merge pull request #37 from andrwj/master show table-mode status	2014-08-24 07:44:46 +05:30
A.J	a3e3269658	show table-mode status	2014-08-24 07:42:51 +09:00
Dhruva Sagar	8e4a4e7dc4	Bumped the version	2014-08-15 09:43:07 +05:30
Dhruva Sagar	761a67b36b	Fixed #16 Altered table mode behavior such that if there is a header line, i.e. the first line of the table is separated by a border with the rest of the table, then it is not taken into account for formulas and cell arithmetic	2014-08-15 09:40:29 +05:30
Dhruva Sagar	8683146a5f	Removed unnecessary code / headers	2014-08-15 07:55:19 +05:30
Dhruva Sagar	82863fa8eb	Merge pull request #35 from p0deje/master Added option to disable all mappings. Fixes #34	2014-07-25 07:27:53 +05:30
Alex Rodionov	6b89fe5c9e	Fix specs	2014-07-24 19:15:36 +07:00
Alex Rodionov	67969ae5cf	Set table_mode_disable_mappings to 0 by default	2014-07-23 10:23:09 +07:00
Alex Rodionov	135d571e9c	Added option to disable all mappings	2014-07-23 08:59:28 +07:00
Dhruva Sagar	4c91a4efa2	Updated tests	2014-05-30 12:20:46 +05:30
Dhruva Sagar	8d9a0082f5	Updated docs	2014-05-30 12:20:38 +05:30
Dhruva Sagar	0f1254e1fe	Updated table syntax to get toggled with table mode	2014-05-30 12:05:31 +05:30
Dhruva Sagar	e7e806916f	Refactored toggleMapping	2014-05-30 11:49:13 +05:30
Dhruva Sagar	9336261063	Added cell text object for visual mode	2014-05-15 11:02:21 +05:30
Dhruva Sagar	a5ae0253be	Added modeline to CHANGELOG	2014-05-13 11:21:11 +05:30
Dhruva Sagar	80ec86e385	Version 4.4.2 * Updated mappings to be buffer local * Updated mappings to toggle with Table Mode	2014-05-13 11:18:42 +05:30
Dhruva Sagar	7eff1e30f1	Fixed #30 In case there is nothing to align, it was failing with an error, this ensures it exists gracefully in this situation.	2014-05-10 15:27:36 +05:30
Dhruva Sagar	7258a56d20	Updated Table syntax to incorporate commented tables	2014-05-04 10:13:40 +05:30
Dhruva Sagar	8d3c4912a2	Added syntax for matching tables	2014-05-03 02:19:19 +05:30
Dhruva Sagar	13e1a20002	Fixing tests	2014-05-01 21:29:31 +05:30
Dhruva Sagar	d73236f964	Fixing ruby version	2014-05-01 21:21:31 +05:30
Dhruva Sagar	c5efbe1ad7	Bumped ruby version for travis	2014-05-01 21:16:56 +05:30
Dhruva Sagar	8970d5ffbb	Improved tests	2014-05-01 21:14:49 +05:30
Dhruva Sagar	859eb42856	Added more tests for Realigning unicode content	2014-05-01 21:07:53 +05:30
Dhruva Sagar	d7ad97f099	Fixing tests	2014-05-01 16:56:11 +05:30
Dhruva Sagar	dbd79f2c1e	Minor refactor & improved test coverage	2014-05-01 16:35:25 +05:30
Dhruva Sagar	fa568fe91b	Improved test for utils	2014-04-30 23:05:19 +05:30
Dhruva Sagar	53da3fb4c2	Fixed #28 Altered border generation code to incorporate true display width of characters, hence generate more accurate borders.	2014-04-30 21:30:44 +05:30
Dhruva Sagar	6007953f0e	Fixed typo in docs	2014-04-28 14:14:26 +05:30
Dhruva Sagar	766066394c	Updated docs	2014-04-28 13:48:17 +05:30
Dhruva Sagar	f2f62d78e5	Added support for negative indices When defining formulas you can now use negative indices for target / cells to refer to them relative to the last. -1 being the last and so on.	2014-04-28 13:41:21 +05:30
Dhruva Sagar	7810ce0ca0	Fixed #26 Not assuming a length for alignments, looping through all and adding 'l' as default first then updating as per the column alignments.	2014-04-26 23:52:18 +05:30
Dhruva Sagar	b22d793135	Improved fix for #20 Instead of relying on a /g or /gg flag based on gdefault, I temporarily disable gdefault and set it back to the old value aftwards.	2014-04-25 18:18:19 +05:30
Dhruva Sagar	de2ad0b71d	Fixed header creation as first line of table	2014-04-25 18:10:12 +05:30
Dhruva Sagar	29c7ec1a23	Cosmetic change changed variable name from i to jdx since for consistency, i is short for insert which is a vim ex command so to make things unambiguous.	2014-04-25 15:59:08 +05:30
Dhruva Sagar	9ce981cc77	Updated README.md	2014-04-25 15:05:19 +05:30
Dhruva Sagar	0c9cd8fb50	Releasing v4.3.0	2014-04-25 15:02:27 +05:30
Dhruva Sagar	da39088fd8	Merge branch 'feature/gfm_column_alignment'	2014-04-25 14:55:22 +05:30
Dhruva Sagar	a0fcb89f43	Fixed #19 Updated tablemode#table#IsRow() to allow hiphens within the row.	2014-04-25 14:54:43 +05:30
Dhruva Sagar	5007e5f728	Added support for column alignment #23 Now we can define gfm-style aligment by adding them to the header column	2014-04-25 14:42:02 +05:30
Dhruva Sagar	71051e2c22	Merge branch 'master' into feature/gfm_column_alignment Conflicts: autoload/tablemode/table.vim	2014-04-25 14:31:33 +05:30
Dhruva Sagar	43d0c0ff6f	Cosmetic refactoring * Changed the API calls to be more sensible & simple and free of redundancy.	2014-04-25 11:09:14 +05:30
Dhruva Sagar	00c54e8e02	Refactoring alignment	2014-04-24 15:48:57 +05:30
Dhruva Sagar	cfbac6979d	Fixed #25 Minor refactoring & corrected variable names	2014-04-23 11:27:25 +05:30
Dhruva Sagar	7e00cea7f5	Improved table.vim tests. Fixed #24 .	2014-04-22 00:11:40 +05:30
Dhruva Sagar	79166b3d4e	Fixing #24 Exposed a public api for IsTableModeActive and using it instead.	2014-04-21 14:58:02 +05:30
Dhruva Sagar	6862a8b7e4	Update CHANGELOG.md	2014-04-09 14:40:31 +05:30
Dhruva Sagar	d889c342d3	Fixed the tests with new changes	2014-04-09 11:45:02 +05:30
Dhruva Sagar	8a54ef28ab	Removed CellTextObject() from spreadsheet.vim	2014-04-09 11:34:54 +05:30
Dhruva Sagar	a2492fbf08	Removed old TableMotion from autoload/tablemode/table.vim	2014-04-09 11:32:03 +05:30
Dhruva Sagar	652de4d29c	Releasing v4.2.0 * Refactored cell & formula logic out into separate files * Added more tests to test things independently.	2014-04-09 11:20:10 +05:30
Dhruva Sagar	f91782fca2	Added tests for formula evaluation * Minor fixes as detected by the tests	2014-04-09 08:09:28 +05:30
Dhruva Sagar	1ef8c812d6	Fixed table motions over corners with borders	2014-04-07 22:21:16 +05:30