Add config to disable tableize mappings. Fix 176

Releasing version 4.7.0
Merge pull request #175 from insanum/formulas
2025-11-08 11:03:47 -05:00 · 2020-05-06 20:20:53 +05:30 · 2020-04-19 22:02:25 +05:30 · 2020-04-19 21:55:36 +05:30 · 2020-04-19 00:20:55 -07:00 · 2020-04-18 21:47:22 -07:00
37 changed files with 1274 additions and 459 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
 # These are supported funding model platforms
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: vim-table-mode
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.1
+  - 2.5.3
 script: rake ci
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # 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
--- a/1
+++ b/1
@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 ruby '2.5.3'
 gem 'rake'
 gem 'vim-flavor', '~> 1.1'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,7 +4,7 @@ GEM
    blankslate (2.1.2.4)
    parslet (1.5.0)
      blankslate (~> 2.0)
-    rake (10.1.0)
+    rake (12.3.3)
    thor (0.18.1)
    vim-flavor (1.1.3)
      parslet (~> 1.0)
@@ -16,3 +16,9 @@ PLATFORMS
 DEPENDENCIES
  rake
  vim-flavor (~> 1.1)
 RUBY VERSION
   ruby 2.5.3p105
 BUNDLED WITH
   2.0.1
--- a/README.md
+++ b/README.md
@@ -1,14 +1,10 @@
-# VIM Table Mode v4.5.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.7.1 [![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
+## Getting Started 
 See <a
 href="https://github.com/dhruvasagar/vim-table-mode/blob/master/CHANGELOG.md">
 CHANGELOG.md </a>
 ## Getting Started
 ### Installation
 There are several ways to do this
@@ -21,38 +17,114 @@ There are several ways to do this
   href="https://github.com/tpope/vim-pathogen">pathogen.vim</a>, then
   add a git submodule for your plugin:
-   ```sh
+```sh
 $ cd ~/.vim
 $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-mode
-   ```
+```
-3. Copy autoload/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
+> Tip :
-   `g:table_mode_separator` option. As soon as you type it on a new line (ignores
+> You can use the following to quickly enable / disable table mode in insert
-   indentation) the script gets to work on creating a table around it. As you
+> mode by using `||` or `__` :
-   type and define more columns, the table is completed, formatted and aligned
+> ```vim
-   automatically on the fly.
+> function! s:isAtStartOfLine(mapping)
 >   let text_before_cursor = getline('.')[0 : col('.')-1]
 >   let mapping_pattern = '\V' . escape(a:mapping, '\')
 >   let comment_pattern = '\V' . escape(substitute(&l:commentstring, '%s.*$', '', ''), '\')
 >   return (text_before_cursor =~? '^' . ('\v(' . comment_pattern . '\v)?') . '\s*\v' . mapping_pattern . '\v$')
 > endfunction
 > 
 > inoreabbrev <expr> <bar><bar>
 >           \ <SID>isAtStartOfLine('\|\|') ?
 >           \ '<c-o>:TableModeEnable<cr><bar><space><bar><left><left>' : '<bar><bar>'
 > inoreabbrev <expr> __
 >           \ <SID>isAtStartOfLine('__') ?
 >           \ '<c-o>:silent! TableModeDisable<cr>' : '__'
 > ```
-   Since this could lead to unwanted behavior I have disabled table mode by
+Enter the first line, delimiting columns by the `|` symbol. The plugin reacts by inserting spaces between the text and the separator if you omit them:
-   default. You have to use `:TableModeToggle` command or the table mode
+
-   toggle mapping, which is <kbd>\<Leader\>tm</kbd> defined by `g:table_mode_toggle_map`
+    | name | address | phone |
-   option to toggle the table mode or you can directly use `:TableModeEnable`
+
-   and `:TableModeDisable` to enable or disable the table mode. This is on a
+In the second line (without leaving Insert mode), enter `|` twice. The plugin will write a properly formatted horizontal line:
-   per buffer basis and so it does not cause any unusual behavior unless it is
+
-   enabled explicitly. Please read `:h table-mode` for further information.
+    | name | address | phone |
    |------+---------+-------|
 When you enter the subsequent lines, the plugin will automatically adjust the formatting to match the text you’re entering every time you press `|`:
    | name       | address | phone |
    |------------+---------+-------|
    | John Adams |
 Go on until the table is ready:
    | name            | address                  | phone      |
    |-----------------+--------------------------+------------|
    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
    |-----------------+--------------------------+------------|
    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
    |-----------------+--------------------------+------------|
 Then you can return to the first line and above it enter `||`:
    |-----------------+--------------------------+------------|
    | name            | address                  | phone      |
    |-----------------+--------------------------+------------|
    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
    |-----------------+--------------------------+------------|
    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
    |-----------------+--------------------------+------------|
 Corner separators are adjustable:
 For Markdown-compatible tables use
    let g:table_mode_corner='|'
    |-----------------|--------------------------|------------|
    | name            | address                  | phone      |
    |-----------------|--------------------------|------------|
    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
    |-----------------|--------------------------|------------|
    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
    |-----------------|--------------------------|------------|
 To get ReST-compatible tables use
    let g:table_mode_corner_corner='+'
    let g:table_mode_header_fillchar='='
    +-----------------+--------------------------+------------+
    | name            | address                  | phone      |
    +=================+==========================+============+
    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
    +-----------------+--------------------------+------------+
    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
    +-----------------+--------------------------+------------+
 Markdown and ReST filetypes have automatically configured corners.
   You can also define in a table header border how it's content should be
-   aligned, whether right or left by using a `:` character defined by
+   aligned, whether center, right or left by using a `:` character defined by
   `g:table_mode_align_char` option.
- **Format existing content into a table** :
+If you manipulate the table when table mode is disabled or copy paste a table
 from clipboard from outside and it ends up being misaligned, you can realign
 it using `:TableModeRealign` or using the default mapping
 <kbd>\<Leader\>tr</kbd> defined by `g:table_mode_relign_map` option.
 ### Formatting existing content into a table
   Table Mode wouldn't justify it's name if it didn't allow formatting
   existing content into a table. And it does as promised. Like table creation
@@ -74,7 +146,7 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
   You can use the mapping <kbd>\<Leader\>T</kbd> with a `[count]` to apply it to the
   next `[count]` lines in standard vim style.
- **Move between cells** :
+### Moving around 
   Now you can move between cells using table mode motions <kbd>[|</kbd>,
   <kbd>]|</kbd>, <kbd>{|</kbd> & <kbd>}|</kbd> to move left | right | up |
@@ -82,7 +154,7 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
   and move to the next | previous row after the last | first cell in the
   current row if one exists. 
- **Manipulating Table** :
+### Manipulating Table
  - **Cell Text Object** :
@@ -105,7 +177,19 @@ $ 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** :
+  - **Insert Column** :
      You can use the <kbd>\<Leader\>tic</kbd> mapping defined by the option
      `g:table_mode_insert_column_after_map` to insert a column after the
      cursor (provided you are within a table row). Of course you can use the
      <kbd>\<Leader\>tiC</kbd> mapping defined by
      `g:table_mode_insert_column_before_map` to insert a column before the
      cursor. Both can also be preceeded with a [count] to insert multiple
      columns.
 ## Advanced Usage: Spreadsheet Capabilities
 ### Table Formulas
  Table Mode now has support for formulas like a spreadsheet. There are 2 ways
  of defining formulas :
@@ -129,7 +213,7 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
  NOTE: You can now use the mapping <kbd>\<Leader\>t?</kbd>
- **Formula Expressions** :
+### Formula Expressions
  Expressions are of the format `$target = formula`.
@@ -170,10 +254,15 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
      - `$5,3 = Sum(1,2:5,2)/$5,1`
      - `$5,3 = Average(1,2:5,2)/$5,1`
-### Demo
+## Demo
-<a href="http://www.youtube.com/watch?v=sK2IH1hiDkw"><img
+<a href="http://www.youtube.com/watch?v=9lVQ0VJY3ps"><img
-src="https://raw.github.com/dhruvasagar/vim-table-mode/master/youtube.png"/></a>
+src="https://raw.github.com/axil/vim-table-mode/master/youtube.png"/></a>
 ## Change Log
 See <a
 href="https://github.com/dhruvasagar/vim-table-mode/blob/master/CHANGELOG.md">
 CHANGELOG.md </a>
 ## Contributing
@@ -193,3 +282,33 @@ named <a href="https://gist.github.com/tpope/287147">cucumbertables.vim</a>.
 Also a shout out to godlygeek who developed the incredible <a
 href="http://github.com/godlygeek/tabular">Tabular</a> plugin.
 ## Contributors
 ### Code Contributors
 This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
 <a href="https://github.com/dhruvasagar/vim-table-mode/graphs/contributors"><img src="https://opencollective.com/vim-table-mode/contributors.svg?width=890&button=false" /></a>
 ### Financial Contributors
 Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/vim-table-mode/contribute)]
 #### Individuals
 <a href="https://opencollective.com/vim-table-mode"><img src="https://opencollective.com/vim-table-mode/individuals.svg?width=890"></a>
 #### Organizations
 Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/vim-table-mode/contribute)]
 <a href="https://opencollective.com/vim-table-mode/organization/0/website"><img src="https://opencollective.com/vim-table-mode/organization/0/avatar.svg"></a>
 <a href="https://opencollective.com/vim-table-mode/organization/1/website"><img src="https://opencollective.com/vim-table-mode/organization/1/avatar.svg"></a>
 <a href="https://opencollective.com/vim-table-mode/organization/2/website"><img src="https://opencollective.com/vim-table-mode/organization/2/avatar.svg"></a>
 <a href="https://opencollective.com/vim-table-mode/organization/3/website"><img src="https://opencollective.com/vim-table-mode/organization/3/avatar.svg"></a>
 <a href="https://opencollective.com/vim-table-mode/organization/4/website"><img src="https://opencollective.com/vim-table-mode/organization/4/avatar.svg"></a>
 <a href="https://opencollective.com/vim-table-mode/organization/5/website"><img src="https://opencollective.com/vim-table-mode/organization/5/avatar.svg"></a>
 <a href="https://opencollective.com/vim-table-mode/organization/6/website"><img src="https://opencollective.com/vim-table-mode/organization/6/avatar.svg"></a>
 <a href="https://opencollective.com/vim-table-mode/organization/7/website"><img src="https://opencollective.com/vim-table-mode/organization/7/avatar.svg"></a>
 <a href="https://opencollective.com/vim-table-mode/organization/8/website"><img src="https://opencollective.com/vim-table-mode/organization/8/avatar.svg"></a>
 <a href="https://opencollective.com/vim-table-mode/organization/9/website"><img src="https://opencollective.com/vim-table-mode/organization/9/avatar.svg"></a>
--- a/autoload/tablemode.vim
+++ b/autoload/tablemode.vim
@@ -1,46 +1,19 @@
 " ==============================  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
 " 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:Map(map, to, mode)
+function! s:Map(map, to, mode) "{{{2
-  if !hasmapto(a:map, a:mode)
+  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
-function! s:UnMap(map, mode)
+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
@@ -53,54 +26,63 @@ function! s:ToggleMapping() "{{{2
  " '|' is a special character, we need to map <Bar> instead
  if g:table_mode_separator ==# '|' | let separator_map = '<Bar>' | endif
-  if tablemode#IsActive()
+  if !g:table_mode_disable_mappings
-    call s:Map('<Plug>(table-mode-tableize)', separator_map, 'i')
+    if tablemode#IsActive()
-    call s:Map('<Plug>(table-mode-motion-up)', '{<Bar>', 'n')
+      call s:Map('<Plug>(table-mode-tableize)', separator_map, 'i')
-    call s:Map('<Plug>(table-mode-motion-down)', '}<Bar>', 'n')
+      call s:Map('<Plug>(table-mode-motion-up)', g:table_mode_motion_up_map, 'n')
-    call s:Map('<Plug>(table-mode-motion-left)', '[<Bar>', 'n')
+      call s:Map('<Plug>(table-mode-motion-down)', g:table_mode_motion_down_map, 'n')
-    call s:Map('<Plug>(table-mode-motion-right)', ']<Bar>', '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)', 'a<Bar>', 'ox')
+      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)', 'i<Bar>', '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)', '<Leader>tr', 'n')
+      call s:Map('<Plug>(table-mode-realign)', g:table_mode_realign_map, 'n')
-    call s:Map('<Plug>(table-mode-delete-row)', '<Leader>tdd', 'n')
+      call s:Map('<Plug>(table-mode-delete-row)', g:table_mode_delete_row_map, 'n')
-    call s:Map('<Plug>(table-mode-delete-column)', '<Leader>tdc', 'n')
+      call s:Map('<Plug>(table-mode-delete-column)', g:table_mode_delete_column_map, 'n')
-    call s:Map('<Plug>(table-mode-add-formula)', '<Leader>tfa', 'n')
+      call s:Map('<Plug>(table-mode-insert-column-before)', g:table_mode_insert_column_before_map, 'n')
-    call s:Map('<Plug>(table-mode-eval-formula)', '<Leader>tfe', 'n')
+      call s:Map('<Plug>(table-mode-insert-column-after)', g:table_mode_insert_column_after_map, 'n')
-    call s:Map('<Plug>(table-mode-echo-cell)', '<Leader>t?', 'n')
+      call s:Map('<Plug>(table-mode-add-formula)', g:table_mode_add_formula_map, 'n')
-  else
+      call s:Map('<Plug>(table-mode-eval-formula)', g:table_mode_eval_formula_map, 'n')
-    call s:UnMap(separator_map, 'i')
+      call s:Map('<Plug>(table-mode-echo-cell)', g:table_mode_echo_cell_map, 'n')
-    call s:UnMap('{<Bar>', 'n')
+      call s:Map('<Plug>(table-mode-sort)', g:table_mode_sort_map, 'n')
-    call s:UnMap('}<Bar>', 'n')
+    else
-    call s:UnMap('[<Bar>', 'n')
+      call s:UnMap(separator_map, 'i')
-    call s:UnMap(']<Bar>', 'n')
+      call s:UnMap(g:table_mode_motion_up_map, 'n')
-    call s:UnMap('a<Bar>', 'o')
+      call s:UnMap(g:table_mode_motion_down_map, 'n')
-    call s:UnMap('i<Bar>', 'o')
+      call s:UnMap(g:table_mode_motion_left_map, 'n')
-    call s:UnMap('<Leader>tdd', 'n')
+      call s:UnMap(g:table_mode_motion_right_map, 'n')
-    call s:UnMap('<Leader>tdc', 'n')
+
-    call s:UnMap('<Leader>tfa', 'n')
+      call s:UnMap(g:table_mode_cell_text_object_a_map, 'ox')
-    call s:UnMap('<Leader>tfe', 'n')
+      call s:UnMap(g:table_mode_cell_text_object_i_map, 'ox')
-    call s:UnMap('<Leader>t?', 'n')
+
      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_insert_column_before_map, 'n')
      call s:UnMap(g:table_mode_insert_column_after_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! tablemode#SyntaxEnable()
+function! s:ToggleSyntax() "{{{2
-  exec 'syntax match Table'
+  if !g:table_mode_syntax | return | endif
        \ '/' . tablemode#table#StartExpr() . '\zs|.\+|\ze' . tablemode#table#EndExpr() . '/'
        \ 'contains=TableBorder,TableSeparator,TableColumnAlign containedin=ALL'
  syntax match TableSeparator /|/ contained
  syntax match TableColumnAlign /:/ contained
  syntax match TableBorder /[\-+]\+/ contained
  hi! link TableBorder Delimiter
  hi! link TableSeparator Delimiter
  hi! link TableColumnAlign Type
 endfunction
 function! s:ToggleSyntax()
  if tablemode#IsActive()
-    call tablemode#SyntaxEnable()
+    exec 'syntax match Table'
          \ '/' . tablemode#table#StartExpr() . '\zs|.\+|\ze' . tablemode#table#EndExpr() . '/'
          \ 'contains=TableBorder,TableSeparator,TableColumnAlign containedin=ALL'
    syntax match TableSeparator /|/ contained
    syntax match TableColumnAlign /:/ contained
    syntax match TableBorder /[\-+]\+/ contained
    hi! link TableBorder Delimiter
    hi! link TableSeparator Delimiter
    hi! link TableColumnAlign Type
  else
    syntax clear Table
    syntax clear TableBorder
@@ -113,10 +95,41 @@ function! s:ToggleSyntax()
  endif
 endfunction
 function! s:ToggleAutoAlign() "{{{2
  if !g:table_mode_auto_align | return | endif
  if tablemode#IsActive()
    augroup TableModeAutoAlign
      au!
      autocmd CursorHold <buffer> nested silent! if &modified | call tablemode#table#Realign('.') | endif
      " autocmd InsertLeave <buffer> nested silent! if &modified | call tablemode#table#Realign('.') | endif
    augroup END
  else
    autocmd! TableModeAutoAlign
  endif
 endfunction
 function! s:ToggleOptions() "{{{2
  if tablemode#IsActive()
    let b:old_update_time = &updatetime
    exec 'set updatetime='.g:table_mode_update_time
  else
    exec 'set updatetime='.get(b:, 'old_update_time', 4000)
  endif
 endfunction
 function! s:SetActive(bool) "{{{2
  let b:table_mode_active = a:bool
  call s:ToggleSyntax()
  call s:ToggleMapping()
  call s:ToggleAutoAlign()
  call s:ToggleOptions()
  if tablemode#IsActive()
    doautocmd User TableModeEnabled
  else
    doautocmd User TableModeDisabled
  endif
 endfunction
 function! s:ConvertDelimiterToSeparator(line, ...) "{{{2
@@ -152,15 +165,6 @@ function! s:Tableizeline(line, ...) "{{{2
 endfunction
 " Public API {{{1
 function! tablemode#sid() "{{{2
  return maparg('<SID>', 'n')
 endfunction
 nnoremap <SID> <SID>
 function! tablemode#scope() "{{{2
  return s:
 endfunction
 function! tablemode#IsActive() "{{{2
  if g:table_mode_always_active | return 1 | endif
@@ -169,15 +173,17 @@ function! tablemode#IsActive() "{{{2
 endfunction
 function! tablemode#TableizeInsertMode() "{{{2
-  if tablemode#IsActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator)
+  if tablemode#IsActive()
-    call tablemode#table#AddBorder('.')
+    if getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator . tablemode#table#EndExpr()) 
-    normal! A
+      call tablemode#table#AddBorder('.')
-  elseif tablemode#IsActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
+      normal! A
-    let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g'))
+    elseif getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
-    let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*'))
+      let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g'))
-    call tablemode#table#Realign('.')
+      let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*'))
-    normal! 0
+      call tablemode#table#Realign('.')
-    call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
+      normal! 0
      call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
    endif
  endif
 endfunction
--- a/autoload/tablemode/align.vim
+++ b/autoload/tablemode/align.vim
@@ -1,22 +1,3 @@
 " ==============================  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
 " 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
 " function! s:StripTrailingSpaces(string) - Remove all trailing spaces {{{2
@@ -32,22 +13,13 @@ function! s:Padding(string, length, where) "{{{3
  elseif a:where =~# 'r'
    return repeat(" ", gap_length) . a:string
  elseif a:where =~# 'c'
-    let right = spaces / 2
+    let right = gap_length / 2
    let left = right + (right * 2 != gap_length)
    return repeat(" ", left) . a:string . repeat(" ", right)
  endif
 endfunction
 " Public Functions {{{1
 function! tablemode#align#sid() "{{{2
  return maparg('<sid>', 'n')
 endfunction
 nnoremap <sid> <sid>
 function! tablemode#align#scope() "{{{2
  return s:
 endfunction
 " 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
@@ -92,14 +64,21 @@ function! tablemode#align#Split(string, delim)
 endfunction
 function! tablemode#align#alignments(lnum, ncols) "{{{2
  let achr = g:table_mode_align_char
  let alignments = []
  if tablemode#table#IsBorder(a:lnum+1)
-    let hcols = tablemode#align#Split(getline(a:lnum+1), '[' . g:table_mode_corner . g:table_mode_corner_corner . ']')
+    let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
    let corner_corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner_corner')
    let hcols = tablemode#align#Split(getline(a:lnum+1), '[' . corner . corner_corner . ']')
    for idx in range(len(hcols))
      " Right align if header
      call add(alignments, 'l')
-      if hcols[idx] =~# g:table_mode_align_char . '$' | let alignments[idx] = 'r' | endif
+      if hcols[idx] =~# achr . '[^'.achr.']\+' . achr
-      if hcols[idx] !~# '[^0-9\.]' | let alignments[idx] = 'r' | endif
+        let alignments[idx] = 'c'
      elseif hcols[idx] =~# achr . '$'
        let alignments[idx] = 'r'
      endif
      " if hcols[idx] !~# '[^0-9\.]' | let alignments[idx] = 'r' | endif
    endfor
  end
  return alignments
@@ -107,7 +86,7 @@ endfunction
 function! tablemode#align#Align(lines) "{{{2
  if empty(a:lines) | return [] | endif
-  let lines = map(a:lines, 'map(v:val, "v:key =~# \"text\" ? tablemode#align#Split(v:val, g:table_mode_separator) : v:val")')
+  let lines = map(a:lines, 'map(v:val, "v:key =~# \"text\" ? tablemode#align#Split(v:val, g:table_mode_escaped_separator_regex) : v:val")')
  for line in lines
    let stext = line.text
--- 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,106 @@
 " ==============================  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
 " 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:TotalCells(list) "{{{2
  let result = 0
  for item in a:list
    if type(item) == type([])
      let result += s:TotalCells(item)
    else
      let result += 1
    endif
  endfor
  return result
 endfunction
 function! s:Min(list) "{{{2
  let found = v:false
  let result = 0
  for item in a:list
    if empty(item)
      continue
    endif
    if type(item) == type(1) || type(item) == type(1.0)
      if found == v:false || item < result
        let found = v:true
        let result = item
      endif
    elseif type(item) == type('')
      let val = str2float(item)
      if found == v:false || val < result
        let found = v:true
        let result = val
      endif
    elseif type(item) == type([])
      let val = s:Min(item)
      if found == v:false || val < result
        let found = v:true
        let result = val
      endif
    endif
  endfor
  return result
 endfunction
 function! s:Max(list) "{{{2
  let found = v:false
  let result = 0
  for item in a:list
    if empty(item)
      continue
    endif
    if type(item) == type(1) || type(item) == type(1.0)
      if found == v:false || item > result
        let found = v:true
        let result = item
      endif
    elseif type(item) == type('')
      let val = str2float(item)
      if found == v:false || val > result
        let found = v:true
        let result = val
      endif
    elseif type(item) == type([])
      let val = s:Max(item)
      if found == v:false || val > result
        let found = v:true
        let result = val
      endif
    endif
  endfor
  return result
 endfunction
 function! s:CountE(list) "{{{2
  let result = 0
  for item in a:list
    if empty(item)
      let result += 1
    elseif type(item) == type([])
      let result += s:CountE(item)
    endif
  endfor
  return result
 endfunction
 function! s:CountNE(list) "{{{2
  let result = 0
  for item in a:list
    if type(item) == type([])
      let result += s:CountNE(item)
    elseif !empty(item)
      let result += 1
    endif
  endfor
  return result
 endfunction
 function! s:PercentE(list) "{{{2
  return (s:CountE(a:list)*100)/s:TotalCells(a:list)
 endfunction
 function! s:PercentNE(list) "{{{2
  return (s:CountNE(a:list)*100)/s:TotalCells(a:list)
 endfunction
 function! s:Sum(list) "{{{2
  let result = 0.0
  for item in a:list
@@ -33,24 +116,32 @@ function! s:Sum(list) "{{{2
 endfunction
 function! s:Average(list) "{{{2
-  return s:Sum(a:list)/len(a:list)
+  return s:Sum(a:list)/s:TotalCells(a:list)
 endfunction
 function! s:AverageNE(list) "{{{2
  return s:Sum(a:list)/s:CountNE(a:list)
 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#IsRow(a:line)
    let line = tablemode#utils#line(a:line)
-    while tablemode#table#IsRow(line - 1) || tablemode#table#IsBorder(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#IsBorder(line) | let line += 1 | endif
    return line
  endif
 endfunction
 function! tablemode#spreadsheet#GetFirstRowOrHeader(line) "{{{2
  if tablemode#table#IsRow(a:line)
    let line = tablemode#utils#line(a:line)
    while tablemode#table#IsTable(line - 1)
      let line -= 1
    endwhile
    if tablemode#table#IsBorder(line) | let line += 1 | endif
@@ -61,7 +152,13 @@ endfunction
 function! tablemode#spreadsheet#MoveToFirstRow() "{{{2
  if tablemode#table#IsRow('.')
-    call cursor(tablemode#spreadsheet#GetFirstRow('.'), col('.'))
+    call tablemode#utils#MoveToLine(tablemode#spreadsheet#GetFirstRow('.'))
  endif
 endfunction
 function! tablemode#spreadsheet#MoveToFirstRowOrHeader() "{{{2
  if tablemode#table#IsRow('.')
    call tablemode#utils#MoveToLine(tablemode#spreadsheet#GetFirstRowOrHeader('.'))
  endif
 endfunction
@@ -69,7 +166,7 @@ function! tablemode#spreadsheet#GetLastRow(line) "{{{2
  if tablemode#table#IsRow(a:line)
    let line = tablemode#utils#line(a:line)
-    while tablemode#table#IsRow(line + 1) || tablemode#table#IsBorder(line + 1)
+    while tablemode#table#IsTable(line + 1)
      let line += 1
    endwhile
    if tablemode#table#IsBorder(line) | let line -= 1 | endif
@@ -80,19 +177,19 @@ endfunction
 function! tablemode#spreadsheet#MoveToLastRow() "{{{2
  if tablemode#table#IsRow('.')
-    call cursor(tablemode#spreadsheet#GetLastRow('.'), col('.'))
+    call tablemode#utils#MoveToLine(tablemode#spreadsheet#GetLastRow('.'))
  endif
 endfunction
-function! tablemode#spreadsheet#LineNr(row) "{{{2
+function! tablemode#spreadsheet#LineNr(line, row) "{{{2
-  if tablemode#table#IsRow('.')
+  if tablemode#table#IsRow(a:line)
-    let line = tablemode#spreadsheet#GetFirstRow('.')
+    let line = tablemode#spreadsheet#GetFirstRow(a:line)
    let row_nr = 0
-    while tablemode#table#IsRow(line + 1) || tablemode#table#IsBorder(line + 1)
+    while tablemode#table#IsTable(line + 1)
      if tablemode#table#IsRow(line)
        let row_nr += 1
-        if row ==# row_nr | break | endif
+        if a:row ==# row_nr | break | endif
      endif
      let line += 1
    endwhile
@@ -105,7 +202,7 @@ function! tablemode#spreadsheet#RowNr(line) "{{{2
  let line = tablemode#utils#line(a:line)
  let rowNr = 0
-  while tablemode#table#IsRow(line) || tablemode#table#IsBorder(line)
+  while !tablemode#table#IsHeader(line) && tablemode#table#IsTable(line)
    if tablemode#table#IsRow(line) | let rowNr += 1 | endif
    let line -= 1
  endwhile
@@ -117,13 +214,13 @@ function! tablemode#spreadsheet#RowCount(line) "{{{2
  let line = tablemode#utils#line(a:line)
  let [tline, totalRowCount] = [line, 0]
-  while tablemode#table#IsRow(tline) || tablemode#table#IsBorder(tline)
+  while !tablemode#table#IsHeader(tline) && tablemode#table#IsTable(tline)
    if tablemode#table#IsRow(tline) | let totalRowCount += 1 | endif
    let tline -= 1
  endwhile
  let tline = line + 1
-  while tablemode#table#IsRow(tline) || tablemode#table#IsBorder(tline)
+  while !tablemode#table#IsHeader(tline) && tablemode#table#IsTable(tline)
    if tablemode#table#IsRow(tline) | let totalRowCount += 1 | endif
    let tline += 1
  endwhile
@@ -141,13 +238,11 @@ function! tablemode#spreadsheet#ColumnNr(pos) "{{{2
    return 0
  endif
  let row_start = stridx(getline(pos[0]), g:table_mode_separator)
-  return tablemode#utils#strlen(substitute(getline(pos[0])[(row_start):pos[1]-2], '[^' . g:table_mode_separator . ']', '', 'g'))
+  return tablemode#utils#SeparatorCount(getline(pos[0])[row_start:pos[1]-2])
 endfunction
 function! tablemode#spreadsheet#ColumnCount(line) "{{{2
-  let line = tablemode#utils#line(a:line)
+  return tablemode#utils#SeparatorCount(getline(tablemode#utils#line(a:line))) - 1
  return tablemode#utils#strlen(substitute(getline(line), '[^' . g:table_mode_separator . ']', '', 'g'))-1
 endfunction
 function! tablemode#spreadsheet#IsFirstCell() "{{{2
@@ -159,45 +254,25 @@ function! tablemode#spreadsheet#IsLastCell() "{{{2
 endfunction
 function! tablemode#spreadsheet#MoveToStartOfCell() "{{{2
-  if getline('.')[col('.')-1] ==# g:table_mode_separator && !tablemode#spreadsheet#IsLastCell()
+  if getline('.')[col('.')-1] !=# g:table_mode_separator || tablemode#spreadsheet#IsLastCell()
-    normal! 2l
+    call search(g:table_mode_escaped_separator_regex, 'b', line('.'))
  else
    execute 'normal! F' . g:table_mode_separator . '2l'
  endif
  normal! 2l
 endfunction
-function! tablemode#spreadsheet#GetFirstRow(line) "{{{2
+function! tablemode#spreadsheet#MoveToEndOfCell() "{{{2
-  if tablemode#table#IsRow(a:line)
+  call search(g:table_mode_escaped_separator_regex, 'z', line('.'))
-    let line = tablemode#utils#line(a:line)
+  normal! 2h
    while tablemode#table#IsRow(line - 1) || tablemode#table#IsBorder(line - 1)
      let line -= 1
    endwhile
    if tablemode#table#IsBorder(line) | let line += 1 | endif
    return line
  endif
 endfunction
 function! tablemode#spreadsheet#GetLastRow(line) "{{{2
  if tablemode#table#IsRow(a:line)
    let line = tablemode#utils#line(a:line)
    while tablemode#table#IsRow(line + 1) || tablemode#table#IsBorder(line + 1)
      let line += 1
    endwhile
    if tablemode#table#IsBorder(line) | let line -= 1 | endif
    return line
  endif
 endfunction
 function! tablemode#spreadsheet#DeleteColumn() "{{{2
  if tablemode#table#IsRow('.')
    for i in range(v:count1)
      call tablemode#spreadsheet#MoveToStartOfCell()
-      call tablemode#spreadsheet#MoveToFirstRow()
+      call tablemode#spreadsheet#MoveToFirstRowOrHeader()
-      silent! execute "normal! h\<C-V>f" . g:table_mode_separator
+      silent! execute "normal! h\<C-V>"
      call tablemode#spreadsheet#MoveToEndOfCell()
      normal! 2l
      call tablemode#spreadsheet#MoveToLastRow()
      normal! d
    endfor
@@ -222,6 +297,95 @@ function! tablemode#spreadsheet#DeleteRow() "{{{2
  endif
 endfunction
 function! tablemode#spreadsheet#InsertColumn(after) "{{{2
  if tablemode#table#IsRow('.')
    let quantity = v:count1
    call tablemode#spreadsheet#MoveToFirstRowOrHeader()
    call tablemode#spreadsheet#MoveToStartOfCell()
    if a:after
      call tablemode#spreadsheet#MoveToEndOfCell()
      normal! 3l
    endif
    execute "normal! h\<C-V>"
    call tablemode#spreadsheet#MoveToLastRow()
    normal! y
    let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
    if a:after
      let cell_line = g:table_mode_separator.'  '
      let header_line = corner.g:table_mode_fillchar.g:table_mode_fillchar
    else
      let cell_line = '  '.g:table_mode_separator
      let header_line = g:table_mode_fillchar.g:table_mode_fillchar.corner
    endif
    let cell_line = escape(cell_line, '\&')
    let header_line = escape(header_line, '\&')
    " This transforms the character column before or after the column separator
    " into a new column with separator.
    " This requires, that
    "      g:table_mode_separator != g:table_mode_fillchar
    "   && g:table_mode_separator != g:table_mode_header_fillchar
    "   && g:table_mode_separator != g:table_mode_align_char
    call setreg(
      \ '"',
      \ substitute(
      \   substitute(@", ' ', cell_line, 'g'),
      \   '\V\C'.escape(g:table_mode_fillchar, '\')
      \     .'\|'.escape(g:table_mode_header_fillchar, '\')
      \     .'\|'.escape(g:table_mode_align_char, '\'),
      \   header_line,
      \   'g'),
      \ 'b')
    if a:after
      execute "normal! ".quantity."pl"
    else
      execute "normal! ".quantity."P"
    endif
    call tablemode#table#Realign('.')
    startinsert
  endif
 endfunction
 function! tablemode#spreadsheet#Min(range, ...) abort "{{{2
  let args = copy(a:000)
  call insert(args, a:range)
  return s:Min(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 function! tablemode#spreadsheet#Max(range, ...) abort "{{{2
  let args = copy(a:000)
  call insert(args, a:range)
  return s:Max(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 function! tablemode#spreadsheet#CountE(range, ...) abort "{{{2
  let args = copy(a:000)
  call insert(args, a:range)
  return s:CountE(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 function! tablemode#spreadsheet#CountNE(range, ...) abort "{{{2
  let args = copy(a:000)
  call insert(args, a:range)
  return s:CountNE(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 function! tablemode#spreadsheet#PercentE(range, ...) abort "{{{2
  let args = copy(a:000)
  call insert(args, a:range)
  return s:PercentE(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 function! tablemode#spreadsheet#PercentNE(range, ...) abort "{{{2
  let args = copy(a:000)
  call insert(args, a:range)
  return s:PercentNE(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 function! tablemode#spreadsheet#Sum(range, ...) abort "{{{2
  let args = copy(a:000)
  call insert(args, a:range)
@@ -234,3 +398,25 @@ function! tablemode#spreadsheet#Average(range, ...) abort "{{{2
  return s:Average(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 function! tablemode#spreadsheet#AverageNE(range, ...) abort "{{{2
  let args = copy(a:000)
  call insert(args, a:range)
  return s:AverageNE(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 function! tablemode#spreadsheet#Sort(bang, ...) range "{{{2
  if exists('*getcurpos')
    let col = getcurpos()[4] " curswant
  else
    let col = col('.')
  endif
  let opts = a:0 ? a:1 : ''
  let bang = a:bang ? '!' : ''
  if a:firstline == a:lastline
    let [firstRow, lastRow] = [tablemode#spreadsheet#GetFirstRow('.'), tablemode#spreadsheet#GetLastRow('.')]
  else
    let [firstRow, lastRow] = [a:firstline, a:lastline]
  endif
  call tablemode#spreadsheet#MoveToStartOfCell()
  exec ':undojoin | '.firstRow.','.lastRow . 'sort'.bang opts '/.*\%'.col.'v/'
 endfunction
--- a/autoload/tablemode/spreadsheet/cell.vim
+++ b/autoload/tablemode/spreadsheet/cell.vim
@@ -1,21 +1,3 @@
 " ==============================  Header ======================================
 " File:          autoload/tablemode/spreadsheet/cell.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
 " 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:ParseRange(range, ...) {{{2
 " range: A string representing range of cells.
@@ -55,15 +37,6 @@ endfunction
 " Public Functions {{{1
 function! tablemode#spreadsheet#cell#sid() "{{{2
  return maparg('<sid>', 'n')
 endfunction
 nnoremap <sid> <sid>
 function! tablemode#spreadsheet#cell#scope() "{{{2
  return s:
 endfunction
 " 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.
@@ -85,7 +58,7 @@ function! tablemode#spreadsheet#cell#GetCells(line, ...) abort
    if row == 0
      let values = []
      let line = first_row
-      while tablemode#table#IsRow(line) || tablemode#table#IsBorder(line)
+      while tablemode#table#IsTable(line)
        if tablemode#table#IsRow(line)
          let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
          call add(values, tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, '')))
@@ -97,7 +70,7 @@ function! tablemode#spreadsheet#cell#GetCells(line, ...) abort
      let row_nr = 0
      let row_diff = row > 0 ? 1 : -1
      let line = row > 0 ? first_row : last_row
-      while tablemode#table#IsRow(line) || tablemode#table#IsBorder(line)
+      while tablemode#table#IsTable(line)
        if tablemode#table#IsRow(line)
          let row_nr += row_diff
          if row ==# row_nr | break | endif
@@ -200,7 +173,7 @@ function! tablemode#spreadsheet#cell#SetCell(val, ...) "{{{2
  if colm < 0 | let colm = tablemode#spreadsheet#ColumnCount(line) + colm + 1 | endif
  if tablemode#table#IsRow(line)
-    let line = tablemode#utils#line(line) + (row - tablemode#spreadsheet#RowNr(line)) * 1
+    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)
--- a/autoload/tablemode/spreadsheet/formula.vim
+++ b/autoload/tablemode/spreadsheet/formula.vim
@@ -1,34 +1,13 @@
 " ==============================  Header ======================================
 " File:          autoload/tablemode/spreadsheet/formula.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
 " 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:IsHTMLComment(line) "{{{2
  return getline(a:line) =~# '^\s*<!--'
 endfunction
 function! s:IsFormulaLine(line) "{{{2
  return getline(a:line) =~# 'tmf: '
 endfunction
 " Public Functions {{{1
 function! tablemode#spreadsheet#formula#sid() "{{{2
  return maparg('<sid>', 'n')
 endfunction
 nnoremap <sid> <sid>
 function! tablemode#spreadsheet#formula#scope() "{{{2
  return s:
 endfunction
 function! tablemode#spreadsheet#formula#Add(...) "{{{2
  let fr = a:0 ? a:1 : input('f=')
  let row = tablemode#spreadsheet#RowNr('.')
@@ -40,11 +19,15 @@ function! tablemode#spreadsheet#formula#Add(...) "{{{2
    let fr = '$' . row . ',' . colm . '=' . fr
    let fline = tablemode#spreadsheet#GetLastRow('.') + 1
    if tablemode#table#IsBorder(fline) | let fline += 1 | endif
    if s:IsHTMLComment(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 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)
@@ -77,6 +60,30 @@ function! tablemode#spreadsheet#formula#EvaluateExpr(expr, line) abort "{{{2
    let [row, colm] = [0, str2nr(cell)]
  endif
  if expr =~# 'Min(.*)'
    let expr = substitute(expr, 'Min(\([^)]*\))', 'tablemode#spreadsheet#Min("\1",'.line.','.colm.')', 'g')
  endif
  if expr =~# 'Max(.*)'
    let expr = substitute(expr, 'Max(\([^)]*\))', 'tablemode#spreadsheet#Max("\1",'.line.','.colm.')', 'g')
  endif
  if expr =~# 'CountE(.*)'
    let expr = substitute(expr, 'CountE(\([^)]*\))', 'tablemode#spreadsheet#CountE("\1",'.line.','.colm.')', 'g')
  endif
  if expr =~# 'CountNE(.*)'
    let expr = substitute(expr, 'CountNE(\([^)]*\))', 'tablemode#spreadsheet#CountNE("\1",'.line.','.colm.')', 'g')
  endif
  if expr =~# 'PercentE(.*)'
    let expr = substitute(expr, 'PercentE(\([^)]*\))', 'tablemode#spreadsheet#PercentE("\1",'.line.','.colm.')', 'g')
  endif
  if expr =~# 'PercentNE(.*)'
    let expr = substitute(expr, 'PercentNE(\([^)]*\))', 'tablemode#spreadsheet#PercentNE("\1",'.line.','.colm.')', 'g')
  endif
  if expr =~# 'Sum(.*)'
    let expr = substitute(expr, 'Sum(\([^)]*\))', 'tablemode#spreadsheet#Sum("\1",'.line.','.colm.')', 'g')
  endif
@@ -85,8 +92,12 @@ function! tablemode#spreadsheet#formula#EvaluateExpr(expr, line) abort "{{{2
    let expr = substitute(expr, 'Average(\([^)]*\))', 'tablemode#spreadsheet#Average("\1",'.line.','.colm.')', 'g')
  endif
-  if expr =~# '\$\d\+,\d\+'
+  if expr =~# 'AverageNE(.*)'
-    let expr = substitute(expr, '\$\(\d\+\),\(\d\+\)',
+    let expr = substitute(expr, 'AverageNE(\([^)]*\))', 'tablemode#spreadsheet#AverageNE("\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
@@ -129,15 +140,24 @@ function! tablemode#spreadsheet#formula#EvaluateFormulaLine() abort "{{{2
  if tablemode#table#IsRow('.') " We're inside the table
    let line = tablemode#spreadsheet#GetLastRow('.')
    let fline = line + 1
    if s:IsHTMLComment(fline) | let fline += 1 | endif
    if tablemode#table#IsBorder(fline) | let fline += 1 | endif
-    if getline(fline) =~# 'tmf: '
+    while s:IsFormulaLine(fline)
-      let exprs = split(matchstr(getline(fline), matchexpr), ';')
+      let exprs += split(matchstr(getline(fline), matchexpr), ';')
-    endif
+      let fline += 1
-  elseif getline('.') =~# 'tmf: ' " We're on the formula line
+    endwhile
  elseif s:IsFormulaLine('.')
    let fline = line('.')
    let line = line('.') - 1
    while s:IsFormulaLine(line) | let fline = line | let line -= 1 | endwhile
    if s:IsHTMLComment(line) | let line -= 1 | endif
    if tablemode#table#IsBorder(line) | let line -= 1 | endif
    if tablemode#table#IsRow(line)
-      let exprs = split(matchstr(getline('.'), matchexpr), ';')
+      " let exprs = split(matchstr(getline('.'), matchexpr), ';')
      while s:IsFormulaLine(fline)
        let exprs += split(matchstr(getline(fline), matchexpr), ';')
        let fline += 1
      endwhile
    endif
  endif
--- a/autoload/tablemode/table.vim
+++ b/autoload/tablemode/table.vim
@@ -1,34 +1,24 @@
 " ==============================  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
 " 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
  let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
  let corner_corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner_corner')
  let header_fillchar = tablemode#utils#get_buffer_or_global_option('table_mode_header_fillchar')
  return tablemode#table#StartExpr() .
-        \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
+        \ '[' . corner . corner_corner . ']' .
-        \ '[' . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_align_char . ']*' .
+        \ '[' . escape(g:table_mode_fillchar . header_fillchar . corner . g:table_mode_align_char, '-') . ']\+' .
-        \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
+        \ '[' . corner . corner_corner . ']' .
        \ tablemode#table#EndExpr()
 endfunction
-function! s:DefaultHeaderBorder() "{{{2
+function! s:DefaultBorder() "{{{2
  if tablemode#IsActive()
-    return g:table_mode_corner_corner . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_fillchar . g:table_mode_corner_corner
+    let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
    let corner_corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner_corner')
    return corner_corner . g:table_mode_fillchar . corner . g:table_mode_fillchar . corner_corner
  else
    return ''
  endif
@@ -44,23 +34,35 @@ function! s:GenerateHeaderBorder(line) "{{{2
    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
+    if tablemode#utils#strlen(line_val) <= 1 | return s:DefaultBorder() | endif
-    let border = substitute(line_val[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator, g:table_mode_corner, 'g')
+    let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
-    " To accurately deal with unicode double width characters
+    let corner_corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner_corner')
-    let fill_columns = map(split(border, g:table_mode_corner),  'repeat(g:table_mode_fillchar, tablemode#utils#StrDisplayWidth(v:val))')
+    let header_fillchar = tablemode#utils#get_buffer_or_global_option('table_mode_header_fillchar')
-    let border = g:table_mode_corner . join(fill_columns, g:table_mode_corner) . g:table_mode_corner
+
-    let border = substitute(border, '^' . g:table_mode_corner . '\(.*\)' . g:table_mode_corner . '$', g:table_mode_corner_corner . '\1' . g:table_mode_corner_corner, '')
+    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) ? header_fillchar : g:table_mode_fillchar
    let special_replacement = '___'
    let border = substitute(tline, g:table_mode_escaped_separator_regex, special_replacement, 'g')
    let seperator_match_regex = special_replacement . '\zs\(.\{-}\)\ze' . special_replacement
    let border = substitute(border, seperator_match_regex, '\=repeat(fillchar, tablemode#utils#StrDisplayWidth(submatch(0)))', 'g')
    let border = substitute(border, special_replacement, g:table_mode_separator, 'g')
    let border = substitute(border, g:table_mode_separator, corner, 'g')
    let border = substitute(border, '^' . corner . '\(.*\)' . corner . '$', corner_corner . '\1' . corner_corner, '')
    " Incorporate header alignment chars
    if getline(line) =~# g:table_mode_align_char
-      let pat = '[' . g:table_mode_corner_corner . g:table_mode_corner . ']'
+      let pat = '[' . corner_corner . corner . ']'
      let hcols = tablemode#align#Split(getline(line), pat)
      let gcols = tablemode#align#Split(border, pat)
      for idx in range(len(hcols))
        if hcols[idx] =~# g:table_mode_align_char
-          if hcols[idx] =~# g:table_mode_align_char . '$'
+          " center align
          if hcols[idx] =~# g:table_mode_align_char . '[^'.g:table_mode_align_char.']\+' . g:table_mode_align_char
            let gcols[idx] = g:table_mode_align_char . gcols[idx][1:-2] . g:table_mode_align_char
          elseif hcols[idx] =~# g:table_mode_align_char . '$'
            let gcols[idx] = gcols[idx][:-2] . g:table_mode_align_char
          else
            let gcols[idx] = g:table_mode_align_char . gcols[idx][1:]
@@ -82,24 +84,15 @@ 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:
 endfunction
 function! tablemode#table#GetCommentStart() "{{{2
  let cstring = &commentstring
  if tablemode#utils#strlen(cstring) > 0
-    return substitute(split(cstring, '%s')[0], '.', '\\\0', 'g')
+    return substitute(split(cstring, '%s')[0], '[^(%)]', '\\\0', 'g')
  else
    return ''
  endif
@@ -119,7 +112,7 @@ function! tablemode#table#GetCommentEnd() "{{{2
  if tablemode#utils#strlen(cstring) > 0
    let cst = split(cstring, '%s')
    if len(cst) == 2
-      return substitute(cst[1], '.', '\\\0', 'g')
+      return substitute(cst[1], '[^()]', '\\\0', 'g')
    else
      return ''
    endif
@@ -156,16 +149,25 @@ function! tablemode#table#EndExpr() "{{{2
 endfunction
 function! tablemode#table#IsBorder(line) "{{{2
-  return getline(a:line) =~# s:HeaderBorderExpr()
+  return !s:blank(getline(a:line)) && getline(a:line) =~# s:BorderExpr()
 endfunction
 function! tablemode#table#IsHeader(line) "{{{2
  let line = tablemode#utils#line(a:line)
-  return tablemode#table#IsBorder(line+1) && !tablemode#table#IsRow(line-1) && !tablemode#table#IsRow(line-2)
+  " 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#IsRow(line) "{{{2
-  return !tablemode#table#IsBorder(a:line) && getline(a:line) =~# (tablemode#table#StartExpr() . g:table_mode_separator)
+  return !tablemode#table#IsBorder(a:line) && getline(a:line) =~# (tablemode#table#StartExpr() . g:table_mode_separator) . '[^' . g:table_mode_separator . ']\+'
 endfunction
 function! tablemode#table#IsTable(line) "{{{2
  return tablemode#table#IsRow(a:line) || tablemode#table#IsBorder(a:line)
 endfunction
 function! tablemode#table#AddBorder(line) "{{{2
@@ -173,11 +175,14 @@ function! tablemode#table#AddBorder(line) "{{{2
 endfunction
 function! tablemode#table#Realign(line) "{{{2
  let current_fm = &foldmethod " save foldmethod to be restored
  setlocal foldmethod=manual " manual foldmethod while table is being aligned
  let line = tablemode#utils#line(a:line)
  let lines = []
  let [lnum, blines] = [line, []]
-  while tablemode#table#IsRow(lnum) || tablemode#table#IsBorder(lnum)
+  while tablemode#table#IsTable(lnum)
    if tablemode#table#IsBorder(lnum)
      call insert(blines, lnum)
      let lnum -= 1
@@ -188,7 +193,7 @@ function! tablemode#table#Realign(line) "{{{2
  endwhile
  let lnum = line + 1
-  while tablemode#table#IsRow(lnum) || tablemode#table#IsBorder(lnum)
+  while tablemode#table#IsTable(lnum)
    if tablemode#table#IsBorder(lnum)
      call add(blines, lnum)
      let lnum += 1
@@ -207,4 +212,7 @@ function! tablemode#table#Realign(line) "{{{2
  for bline in blines
    call tablemode#table#AddBorder(bline)
  endfor
  " restore foldmethod
  execute "setlocal foldmethod=" . current_fm
 endfunction
--- a/autoload/tablemode/utils.vim
+++ b/autoload/tablemode/utils.vim
@@ -1,34 +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
 " 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
@@ -75,3 +47,20 @@ function! tablemode#utils#StrDisplayWidth(string) "{{{2
    return rv
  endif
 endfunction
 function! tablemode#utils#get_buffer_or_global_option(table_option) "{{{2
  return get(b:, a:table_option, get(g:, a:table_option))
 endf
 function tablemode#utils#MoveToLine(line) "{{{2
  let offset = tablemode#utils#line(a:line) - line('.')
  if offset > 0
    execute "normal! ".offset."j"
  elseif offset < 0
    execute "normal! ".(-offset)."k"
  endif
 endfunction
 function! tablemode#utils#SeparatorCount(str)
  return tablemode#utils#strlen(substitute(a:str, '\V\C\(\\' . escape(g:table_mode_separator, '\') . '\|\[^' . escape(g:table_mode_separator, ']^-\') . ']\)', '', 'g'))
 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.5.0
+*table-mode.txt*			Table Mode for easy table formatting
 ===============================================================================
 	Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
-				 VERSION 4.5.0
+                               VERSION 4.7.1
 		Author: Dhruva Sagar <http://dhruvasagar.com/>
 		License: MIT <http://opensource.org/licenses/MIT/>
@@ -20,7 +20,7 @@ CONTENTS						*table-mode-contents*
 INTRODUCTION					*table-mode-introduction*
 Table Mode is simple plugin that makes building tables in vim a breeze. It is
-inspired from tpope's auto aligning script for creating tables in vim - 
+inspired from tpope's auto aligning script for creating tables in vim -
 https://gist.github.com/tpope/287147, which in turn utilizes the Tabular
 Plugin.
@@ -57,7 +57,7 @@ Move between cells :
 	You can use |table-mode-map-prefix| option to define the prefix
 	mapping to be used before 'hjkl'. The left | right motions wrap around
 	the table and move to the next | previous row after the last | first
-	cell in the current row if one exists. 
+	cell in the current row if one exists.
 Manipulation of tables:
 	Tableize provides 3 easy ways to quickly manipulate tables.
@@ -75,6 +75,10 @@ Manipulation of tables:
 	3. Delete Row : Delete an entire table row using
 	|table-mode-delete-row-map|
 	4. Insert Column : Insert a table column either before the cursor
        using |table-mode-insert-column-before-map| or after the cusor using
 	|table-mode-insert-column-after-map|.
 Table Formulas:
 	Table Mode now has support for formulas like a spreadsheet. There
 	are 2 ways of defining formulas :
@@ -86,7 +90,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
@@ -116,8 +120,11 @@ Formula Expressions :
 	The formula can be a simple mathematical expression involving cells
 	which are also defined by the same format as that of the target cell.
 	Apart from basic mathematical expressions, table mode also provides
-	special functions 'Sum' and 'Average'. Both these functions take a
+	special functions 'Min', 'Max', 'CountE' (number of empty cells),
-	range as input. A range can be of two forms :
+        'CountNE' (number of non-empty cells), 'PercentE' (percent of empty
        cells), 'PercentNE' (percent of non-empty cells), 'Sum', 'Average',
        and 'AverageNE' (average over non-empty cells). All 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' through 'm'. If 'm' is negative it represents 'm' row
@@ -138,6 +145,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.
@@ -151,14 +159,47 @@ Overview:
                                        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-insert-column-before-map|
                                        Set the insert column before the
                                        cursor mapping
        |table-mode-insert-column-after-map|
                                        Set the insert column after the
                                        cursor 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 = '+'
 <
        Or only in the current buffer: >
 		let b:table_mode_corner = '+'
 <
 g:table_mode_separator					*table-mode-separator*
 	Use this option to define the table column separator character: >
@@ -207,12 +248,115 @@ g:table_mode_corner_corner                           *table-mode-corner-corner*
        Use this option to define the character to be used for the extreme
        corners of the table border. >
                let g:table_mode_corner_corner = '|'
 <
        Or only in the current buffer: >
 		let b:table_mode_corner_corner = '|'
 <
 g:table_mode_align_char                                  *table-mode-align-char*
        Use this option to define the character to be used for defining
        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_insert_column_before_map      *table-mode-insert-column-before-map*
        Set this to configure the mapping for inserting a table column before
        the cursor. >
                let g:table_mode_insert_column_before_map = '<Leader>tiC'
 >
 g:table_mode_insert_column_after_map        *table-mode-insert-column-after-map*
        Set this to configure the mapping for inserting a table column after
        the cursor. >
                let g:table_mode_insert_column_after_map = '<Leader>tic'
 >
 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_tableize_map                              *table-mode-tableize-map*
        Set this to configure the mapping for converting the visual selection
        to a table. >
                let g:table_mode_tableize_map = '<Leader>tt'
 >
 g:table_mode_tableize_d_map                          *table-mode-tableize-d-map*
        Set this to configure the mapping for converting the visual selection
        to a table, asking the user for a delimiter. >
                let g:table_mode_tableize_d_map = '<Leader>T'
 >
 g:table_mode_syntax                                          *table-mode-syntax*
        Control whether table mode should define table syntax definitions or
        not. >
                let g:table_mode_syntax = 1
 <
 g:table_mode_auto_align                                *table-mode-auto-align*
        Set if the table mode should auto align as you type when table mode is
        active. >
                let g:table_mode_auto_align = 1
 <
 g:table_mode_update_time                              *table-mode-update-time*
        Set the value of updatetime to be used when table mode is active,
        used in combination with |table-mode-auto-align|. >
                let g:table_mode_update_time = 500
 <
 g:table_mode_disable_tableize_mappings  *table-mode-disable-tableize-mappings*
        Disables mappings for tableize
 ===============================================================================
 MAPPINGS						*table-mode-mappings*
@@ -224,7 +368,7 @@ MAPPINGS						*table-mode-mappings*
 						*table-mode-mappings-toggle*
 <Leader>tm	Toggle table mode for the current buffer. You can change this
 		using the |toggle-mode-options-toggle-map| option.
-		
+
                NOTE This is applicable only if |table-mode-always-active| is
                not set.
@@ -261,6 +405,16 @@ MAPPINGS						*table-mode-mappings*
 		with a [count] to delete multiple columns to the right. You
 		can change this using |table-mode-delete-column-map| option.
                                    *table-mode-mappings-insert-column-before*
 <Leader>tiC	Insert a table column before the column you are within. You can
 		preceed it with a [count] to insert multiple columns. You can
 		change this using |table-mode-insert-column-before-map| option.
                                     *table-mode-mappings-insert-column-after*
 <Leader>tic	Insert a table column after the column you are within. You can
 		preceed it with a [count] to insert multiple columns. You can
 		change this using |table-mode-insert-column-after-map| option.
                                             *table-mode-mappings-add-formula*
 <Leader>tfa	Add a fomula for the current table cell. This invokes
 		|TableAddFormula| command.
@@ -271,9 +425,13 @@ MAPPINGS						*table-mode-mappings*
 		would evaluate the formula line and update the table
 		accordingly. This invokes the |TableEvalFormulaLine| command.
                                               *table-mode-mappings-sort-column*
 <Leader>ts      Sort a column under the cursor. This invokes |TableSort|
 ||              Expands to a header border. You can change this by changing
-                |table-mode-separator| option. You can change the character to 
+                |table-mode-separator| option. You can change the character to
-                be used for te extreme corners of the border by changing
+                be used for the extreme corners of the border by changing
                |table-mode-corner-corner| option.
 ===============================================================================
@@ -298,7 +456,7 @@ COMMANDS						*table-mode-commands*
                                                           *:TableModeDisable*
                                                *table-mode-:TableModeDisable*
 :TableModeDisable
-	Disables Table Mode. 
+	Disables Table Mode.
 	NOTE this is applicable only if |table-mode-always-active| is
 	not set.
@@ -338,17 +496,25 @@ COMMANDS						*table-mode-commands*
 	This command when invoked from anywhere within the table or directly
 	on the formula line evaluates it and updates the table accordingly.
                                                                  *:TableSort*
                                                       *table-mode-:TableSort*
 :TableSort[!] [i][u][r][n][x][o]
        This command sorts column under the cursor and inherits the same flags
        as the |:sort| command.
        With [!] the order is reversed.
 ===============================================================================
 CONTRIBUTING						*table-mode-contributing*
 If you want to take a stab at it, by all means, send me a pull request on
-Github (http://github.com/dhruvasagar/table-mode) or get in touch with me
+Github (http://github.com/dhruvasagar/vim-table-mode) or get in touch with me
 directly via e-mail at dhruva 'dot' sagar 'at' gmail.com.
 ===============================================================================
 REPORT ISSUES					      *table-mode-report-issues*
 If you discover any issues, please report them at
-http://github.com/dhruvasagar/table-mode/issues.
+http://github.com/dhruvasagar/vim-table-mode/issues.
 vim:tw=78:ts=8:ft=help:norl:ai:et
--- a/ftplugin/markdown_tablemode.vim
+++ b/ftplugin/markdown_tablemode.vim
@@ -0,0 +1 @@
 let b:table_mode_corner = '|'
--- a/ftplugin/rst_tablemode.vim
+++ b/ftplugin/rst_tablemode.vim
@@ -0,0 +1,2 @@
 let b:table_mode_corner_corner = '+'
 let b:table_mode_header_fillchar = '='
--- a/plugin/table-mode.vim
+++ b/plugin/table-mode.vim
@@ -1,22 +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
 " 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
@@ -35,14 +16,43 @@ 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_escaped_separator_regex', '\V\C\\\@1<!'.escape(g:table_mode_separator, '\'))
 call s:SetGlobalOptDefault('table_mode_fillchar', '-')
 call s:SetGlobalOptDefault('table_mode_header_fillchar', '-')
 call s:SetGlobalOptDefault('table_mode_map_prefix', '<Leader>t')
 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_disable_tableize_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', g:table_mode_map_prefix.'r')
 call s:SetGlobalOptDefault('table_mode_delete_row_map', g:table_mode_map_prefix.'dd')
 call s:SetGlobalOptDefault('table_mode_delete_column_map', g:table_mode_map_prefix.'dc')
 call s:SetGlobalOptDefault('table_mode_insert_column_before_map', g:table_mode_map_prefix.'iC')
 call s:SetGlobalOptDefault('table_mode_insert_column_after_map', g:table_mode_map_prefix.'ic')
 call s:SetGlobalOptDefault('table_mode_add_formula_map', g:table_mode_map_prefix.'fa')
 call s:SetGlobalOptDefault('table_mode_eval_formula_map', g:table_mode_map_prefix.'fe')
 call s:SetGlobalOptDefault('table_mode_echo_cell_map', g:table_mode_map_prefix.'?')
 call s:SetGlobalOptDefault('table_mode_sort_map', g:table_mode_map_prefix.'s')
 call s:SetGlobalOptDefault('table_mode_tableize_map', g:table_mode_map_prefix.'t')
 call s:SetGlobalOptDefault('table_mode_tableize_d_map', '<Leader>T')
 call s:SetGlobalOptDefault('table_mode_syntax', 1)
 call s:SetGlobalOptDefault('table_mode_auto_align', 1)
 call s:SetGlobalOptDefault('table_mode_update_time', 500)
 function! s:TableEchoCell() "{{{1
  if tablemode#table#IsRow('.')
@@ -50,16 +60,9 @@ function! s:TableEchoCell() "{{{1
  endif
 endfunction
 augroup TableMode
  au!
  autocmd Syntax * if tablemode#IsActive() | call tablemode#SyntaxEnable() | endif
 augroup END
 " Define Commands & Mappings {{{1
 if !g:table_mode_always_active "{{{2
-  exec "nnoremap <silent> " . g:table_mode_map_prefix . g:table_mode_toggle_map .
+  exec "nnoremap <silent>" g:table_mode_map_prefix . g:table_mode_toggle_map ":<C-U>call tablemode#Toggle()<CR>"
       \ " <Esc>:call tablemode#Toggle()<CR>"
  command! -nargs=0 TableModeToggle call tablemode#Toggle()
  command! -nargs=0 TableModeEnable call tablemode#Enable()
  command! -nargs=0 TableModeDisable call tablemode#Disable()
@@ -75,6 +78,7 @@ endif
 " }}}2
 command! -nargs=? -range Tableize <line1>,<line2>call tablemode#TableizeRange(<q-args>)
 command! -nargs=? -bang -range TableSort <line1>,<line2>call tablemode#spreadsheet#Sort(<bang>0, <q-args>)
 command! TableAddFormula call tablemode#spreadsheet#formula#Add()
 command! TableModeRealign call tablemode#table#Realign('.')
 command! TableEvalFormulaLine call tablemode#spreadsheet#formula#EvaluateFormulaLine()
@@ -99,23 +103,35 @@ onoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spr
 xnoremap <silent> <Plug>(table-mode-cell-text-object-a) :<C-U>call tablemode#spreadsheet#cell#TextObject(0)<CR>
 xnoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spreadsheet#cell#TextObject(1)<CR>
-nnoremap <silent> <Plug>(table-mode-delete-row) :call tablemode#spreadsheet#DeleteRow()<CR>
+nnoremap <silent> <Plug>(table-mode-delete-row) :<C-U>call tablemode#spreadsheet#DeleteRow()<CR>
-nnoremap <silent> <Plug>(table-mode-delete-column) :call tablemode#spreadsheet#DeleteColumn()<CR>
+nnoremap <silent> <Plug>(table-mode-delete-column) :<C-U>call tablemode#spreadsheet#DeleteColumn()<CR>
 nnoremap <silent> <Plug>(table-mode-insert-column-before) :<C-U>call tablemode#spreadsheet#InsertColumn(0)<CR>
 nnoremap <silent> <Plug>(table-mode-insert-column-after) :<C-U>call tablemode#spreadsheet#InsertColumn(1)<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>
-if !hasmapto('<Plug>(table-mode-tableize)')
+nnoremap <silent> <Plug>(table-mode-sort) :call tablemode#spreadsheet#Sort('')<CR>
-  nmap <Leader>tt <Plug>(table-mode-tableize)
+
-  xmap <Leader>tt <Plug>(table-mode-tableize)
+if !g:table_mode_disable_tableize_mappings 
  if !hasmapto('<Plug>(table-mode-tableize)')
    exec "nmap" g:table_mode_tableize_map "<Plug>(table-mode-tableize)"
    exec "xmap" g:table_mode_tableize_map "<Plug>(table-mode-tableize)"
  endif
  if !hasmapto('<Plug>(table-mode-tableize-delimiter)')
    exec "xmap" g:table_mode_tableize_d_map "<Plug>(table-mode-tableize-delimiter)"
  endif
 endif
-if !hasmapto('<Plug>(table-mode-tableize-delimiter)')
+augroup TableMode "{{{1
-  xmap <Leader>T <Plug>(table-mode-tableize-delimiter)
+  au!
 endif
  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,8 +1,6 @@
 " vim: fdm=indent
 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))
--- a/t/cell.vim
+++ b/t/cell.vim
@@ -1,8 +1,6 @@
 " vim: fdm=indent
 source t/config/options.vim
 call vspec#hint({'scope': 'tablemode#spreadsheet#cell#scope()', 'sid': 'tablemode#spreadsheet#cell#sid()'})
 describe 'cell'
  describe 'API'
    before
--- a/t/config/options.vim
+++ b/t/config/options.vim
@@ -1,9 +1,36 @@
 let g:table_mode_corner = '+'
 let g:table_mode_separator = '|'
 let g:table_mode_escaped_separator_regex = '\V\C\\\@1<!|'
 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_insert_column_before_map = '<Leader>tiC'
 let g:table_mode_insert_column_after_map = '<Leader>tic'
 let g:table_mode_add_formula_map = '<Leader>tfa'
 let g:table_mode_eval_formula_map = '<Leader>tfe'
 let g:table_mode_echo_cell_map = '<Leader>t?'
 let g:table_mode_sort_map = '<Leader>ts'
 let g:table_mode_tableize_map = '<Leader>tt'
 let g:table_mode_tableize_d_map = '<Leader>T'
 let g:table_mode_syntax = 1
 let g:table_mode_auto_align = 1
 let g:table_mode_update_time = 500
--- a/t/fixtures/align/unicode_before.txt
+++ b/t/fixtures/align/unicode_before.txt
@@ -1,2 +1,2 @@
-| This | is 測試 | table |
+|This|is 測試|table|
-| This | is also | a table |
+|This|is also|a table|
--- a/t/fixtures/big_sample.txt
+++ b/t/fixtures/big_sample.txt
@@ -0,0 +1,7 @@
 |---+---+---+---|
 | 1 | 9 | a | z |
 | 2 | 8 | b | y |
 | 3 | 7 | c | x |
 | 4 | 6 | d | w |
 | 5 | 5 | e | v |
 |---+---+---+---|
--- a/t/fixtures/cell/counts.txt
+++ b/t/fixtures/cell/counts.txt
@@ -0,0 +1,3 @@
 | 1 | 2 | 3 |
 |   | 0 |   |
 | 4 | 5 | 6 |
--- a/t/fixtures/complex_header.txt
+++ b/t/fixtures/complex_header.txt
@@ -0,0 +1,9 @@
 |----------+----------+----------+----------|
 | counting | backward | alphabet | backward |
 |:========:+:=========+=========:+==========|
 |     1    | 9        |        a | z        |
 |     2    | 8        |        b | y        |
 |     3    | 7        |        c | x        |
 |     4    | 6        |        d | w        |
 |     5    | 5        |        e | v        |
 |----------+----------+----------+----------|
--- a/t/fixtures/escaped_seperator.txt
+++ b/t/fixtures/escaped_seperator.txt
@@ -0,0 +1,9 @@
 |-------------------+---------------------------|
 | The \| works as   | It can be escaped by a \. |
 | a separator.      |                           |
 |                   |                           |
 | Escaping \ with   | This feature would        |
 | a \ doesn't work. | be unnecessary, because   |
 |                   | a separator must be       |
 |                   | preceded by a space.      |
 |-------------------+---------------------------|
--- a/t/fixtures/formula/formula.txt
+++ b/t/fixtures/formula/formula.txt
@@ -4,4 +4,4 @@
 | Tomatoes |     5 |
 | Pasta    |   100 |
 | Total    |     0 |
-/* tmf: $5,2=Sum(1:-1) */
+/* tmf: $4,2=Sum(1:-1) */
--- a/t/fixtures/table/sample_header_realign_after.txt
+++ b/t/fixtures/table/sample_header_realign_after.txt
@@ -1,4 +1,4 @@
-| Title | Message |
+| S. No | Title | Message |
-|------:+--------:|
+|-------+:------+:-------:|
-|    t1 |    msg1 |
+| 1     | t1    |   msg1  |
-|    t2 |    msg2 |
+| 2     | t2    |   msg2  |
--- a/t/fixtures/table/sample_header_realign_before.txt
+++ b/t/fixtures/table/sample_header_realign_before.txt
@@ -1,4 +1,4 @@
-| Title | Message |
+|S. No|Title|Message|
-|------:+--------:|
+|-----+:----+:-----:|
-| t1    | msg1    |
+|1|t1|msg1|
-| t2    | msg2    |
+|2|t2|msg2|
--- a/t/fixtures/table/sample_header_realign_unicode_after.txt
+++ b/t/fixtures/table/sample_header_realign_unicode_after.txt
@@ -1,8 +1,8 @@
 |--------------+------------------+------------|
-| 测试测试     | 测试长度         |     长测试 |
+| 测试测试     |     测试长度     |     长测试 |
-|--------------+------------------+-----------:|
+|--------------+:----------------:+-----------:|
-| abc          | 测试长度         |     长测试 |
+| abc          |     测试长度     |     长测试 |
 | 长           | 测试测试测试测试 |   测试测试 |
-| 测试测试     | 测试             | 测试测测试 |
+| 测试测试     |       测试       | 测试测测试 |
-| 测试测试测试 | 测试测试         |       测试 |
+| 测试测试测试 |     测试测试     |       测试 |
 |--------------+------------------+------------|
--- a/t/fixtures/table/sample_header_realign_unicode_before.txt
+++ b/t/fixtures/table/sample_header_realign_unicode_before.txt
@@ -1,6 +1,6 @@
 |--------+--------+------|
 |测试测试|测试长度|长测试|
-|--------+--------+-----:|
+|--------+:------:+-----:|
 |abc|测试长度|长测试|
 |长|测试测试测试测试|测试测试|
 |测试测试|测试|测试测测试|
--- a/t/formula.vim
+++ b/t/formula.vim
@@ -1,8 +1,6 @@
 " vim: fdm=indent
 source t/config/options.vim
 call vspec#hint({'scope': 'tablemode#spreadsheet#formula#scope()', 'sid': 'tablemode#spreadsheet#formula#sid()'})
 describe 'Formulas'
  describe 'Add Formula'
    before
@@ -12,16 +10,16 @@ describe 'Formulas'
    it 'should add a formula successfully'
      call cursor(6, 15)
-      call tablemode#spreadsheet#formula#Add("Sum(1:4)")
+      call tablemode#spreadsheet#formula#Add("Sum(1:3)")
      Expect tablemode#spreadsheet#cell#GetCell() == '125.0'
      call cursor(8, 15)
-      Expect getline('.') == '/* tmf: $5,2=Sum(1:4) */'
+      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: $5,2=Sum(1:4) ; $6,2=Sum(1:-1) */'
+      Expect getline('.') == '/* tmf: $4,2=Sum(1:3); $5,2=Sum(1:-1) */'
    end
  end
--- a/t/spreadsheet.vim
+++ b/t/spreadsheet.vim
@@ -1,8 +1,6 @@
 " vim: fdm=indent
 source t/config/options.vim
 call vspec#hint({'scope': 'tablemode#spreadsheet#scope()', 'sid': 'tablemode#spreadsheet#sid()'})
 describe 'spreadsheet'
  describe 'API'
    before
@@ -76,11 +74,93 @@ describe 'spreadsheet'
        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
+        Expect tablemode#spreadsheet#Average('1,1:2,2') == 2.5
        call cursor(2,7)
        Expect tablemode#spreadsheet#Average('1:2') == 3.0
        Expect tablemode#spreadsheet#Average('2,1:2,2') == 3.5
      end
      it 'should return the min of cell range'
        call cursor(1,3)
        Expect tablemode#spreadsheet#Min('1:2') == 1.0
        Expect tablemode#spreadsheet#Min('1,1:1,2') == 1.0
        Expect tablemode#spreadsheet#Min('1,1:2,2') == 1.0
        call cursor(2,7)
        Expect tablemode#spreadsheet#Min('1:2') == 2.0
        Expect tablemode#spreadsheet#Min('2,1:2,2') == 3.0
      end
      it 'should return the max of cell range'
        call cursor(1,3)
        Expect tablemode#spreadsheet#Max('1:2') == 3.0
        Expect tablemode#spreadsheet#Max('1,1:1,2') == 2.0
        Expect tablemode#spreadsheet#Max('1,1:2,2') == 4.0
        call cursor(2,7)
        Expect tablemode#spreadsheet#Max('1:2') == 4.0
        Expect tablemode#spreadsheet#Max('2,1:2,2') == 4.0
      end
    end
    describe 'Count'
      before
        new
        read t/fixtures/cell/counts.txt
      end
      it 'should return the count of empty cell range'
        call cursor(1,3)
        Expect tablemode#spreadsheet#CountE('1:3') == 1
        Expect tablemode#spreadsheet#CountE('1,1:1,3') == 0
        Expect tablemode#spreadsheet#CountE('2,1:2,3') == 2
        Expect tablemode#spreadsheet#CountE('1,1:3,3') == 2
        call cursor(3,11)
        Expect tablemode#spreadsheet#CountE('1:3') == 1
        Expect tablemode#spreadsheet#CountE('3,1:3,3') == 0
      end
      it 'should return the count of not-empty cell range'
        call cursor(1,3)
        Expect tablemode#spreadsheet#CountNE('1:3') == 2
        Expect tablemode#spreadsheet#CountNE('1,1:1,3') == 3
        Expect tablemode#spreadsheet#CountNE('2,1:2,3') == 1
        Expect tablemode#spreadsheet#CountNE('1,1:3,3') == 7
        call cursor(3,11)
        Expect tablemode#spreadsheet#CountNE('1:3') == 2
        Expect tablemode#spreadsheet#CountNE('3,1:3,3') == 3
      end
      it 'should return the percent count of empty cell range'
        call cursor(1,3)
        Expect tablemode#spreadsheet#PercentE('1:3') == 33
        Expect tablemode#spreadsheet#PercentE('1,1:1,3') == 0
        Expect tablemode#spreadsheet#PercentE('2,1:2,3') == 66
        Expect tablemode#spreadsheet#PercentE('1,1:3,3') == 22
        call cursor(3,11)
        Expect tablemode#spreadsheet#PercentE('1:3') == 33
        Expect tablemode#spreadsheet#PercentE('3,1:3,3') == 0
      end
      it 'should return the percent count of not-empty cell range'
        call cursor(1,3)
        Expect tablemode#spreadsheet#PercentNE('1:3') == 66
        Expect tablemode#spreadsheet#PercentNE('1,1:1,3') == 100
        Expect tablemode#spreadsheet#PercentNE('2,1:2,3') == 33
        Expect tablemode#spreadsheet#PercentNE('1,1:3,3') == 77
        call cursor(3,11)
        Expect tablemode#spreadsheet#PercentNE('1:3') == 66
        Expect tablemode#spreadsheet#PercentNE('3,1:3,3') == 100
      end
      it 'should return the average of not-empty cell range'
        call cursor(1,3)
        Expect tablemode#spreadsheet#AverageNE('1:3') == 2.5
        Expect tablemode#spreadsheet#AverageNE('1,1:1,3') == 2.0
        Expect tablemode#spreadsheet#AverageNE('2,1:2,3') == 0.0
        Expect tablemode#spreadsheet#AverageNE('1,1:3,3') == 3.0
        call cursor(3,11)
        Expect tablemode#spreadsheet#AverageNE('1:3') == 4.5
        Expect tablemode#spreadsheet#AverageNE('3,1:3,3') == 5.0
      end
    end
  end
@@ -103,5 +183,159 @@ describe 'spreadsheet'
      call tablemode#spreadsheet#DeleteColumn()
      Expect tablemode#spreadsheet#ColumnCount('.') == 1
    end
    it 'should successfully insert a column before the cursor'
      Expect tablemode#spreadsheet#ColumnCount('.') == 2
      call tablemode#spreadsheet#InsertColumn(0)
      Expect tablemode#spreadsheet#ColumnCount('.') == 3
      Expect getline('.') == '|  | test11 | test12 |'
    end
    it 'should successfully insert a column after the cursor'
      normal! $
      Expect tablemode#spreadsheet#ColumnCount('.') == 2
      call tablemode#spreadsheet#InsertColumn(1)
      Expect tablemode#spreadsheet#ColumnCount('.') == 3
      Expect getline('.') == '| test11 | test12 |  |'
    end
  end
  describe 'Manipulation of tables with headers'
    before
      new
      normal! ggdG
      let g:table_mode_header_fillchar = '='
      read t/fixtures/complex_header.txt
      call cursor(4, 7)
    end
    it 'should successfully delete a row '
      Expect tablemode#spreadsheet#RowCount('.') == 5
      call tablemode#spreadsheet#DeleteRow()
      Expect tablemode#spreadsheet#RowCount('.') == 4
      Expect getline(4) == '|     2    | 8        |        b | y        |'
    end
    it 'should successfully delete a column'
      Expect tablemode#spreadsheet#ColumnCount('.') == 4
      call tablemode#spreadsheet#DeleteColumn()
      Expect tablemode#spreadsheet#ColumnCount('.') == 3
      Expect getline(4) == '| 9        |        a | z        |'
    end
    it 'should successfully insert a column before the cursor'
      Expect tablemode#spreadsheet#ColumnCount('.') == 4
      call tablemode#spreadsheet#InsertColumn(0)
      Expect tablemode#spreadsheet#ColumnCount('.') == 5
      Expect getline(4) == '|  |     1    | 9        |        a | z        |'
    end
    it 'should successfully insert a column after the cursor'
      normal! $
      Expect tablemode#spreadsheet#ColumnCount('.') == 4
      call tablemode#spreadsheet#InsertColumn(1)
      Expect tablemode#spreadsheet#ColumnCount('.') == 5
      Expect getline(4) == '|     1    | 9        |        a | z        |  |'
    end
  end
  describe 'Repeated Manipulations'
    before
      new
      normal! ggdG
      read t/fixtures/big_sample.txt
      call cursor(2, 3)
    end
    it 'should delete multiple rows correctly'
      Expect tablemode#spreadsheet#RowCount('.') == 5
      .,.+1 call tablemode#spreadsheet#DeleteRow()
      Expect tablemode#spreadsheet#RowCount('.') == 3
    end
    it 'should delete multiple columns correctly'
      Expect tablemode#spreadsheet#ColumnCount('.') == 4
      .,.+1 call tablemode#spreadsheet#DeleteColumn()
      Expect tablemode#spreadsheet#ColumnCount('.') == 2
    end
    it 'should insert multiple columns before the cursor correctly'
      call cursor(2, 7)
      Expect tablemode#spreadsheet#ColumnCount('.') == 4
      execute "normal! 2:\<C-u>call tablemode#spreadsheet#InsertColumn(0)\<CR>"
      Expect tablemode#spreadsheet#ColumnCount('.') == 6
      Expect getline('.') == '| 1 |  |  | 9 | a | z |'
    end
    it 'should insert multiple columns after the cursor correctly'
      call cursor(2, 7)
      Expect tablemode#spreadsheet#ColumnCount('.') == 4
      execute "normal! 2:\<C-u>call tablemode#spreadsheet#InsertColumn(1)\<CR>"
      Expect tablemode#spreadsheet#ColumnCount('.') == 6
      Expect getline('.') == '| 1 | 9 |  |  | a | z |'
    end
  end
  describe 'Unicode table separators'
    before
      new
      normal! ggdG
      read t/fixtures/table/sample_realign_unicode_after.txt
      call cursor(2, 19)
    end
    it 'should not prevent the deletion of rows'
      Expect tablemode#spreadsheet#RowCount('.') == 4
      call tablemode#spreadsheet#DeleteRow()
      Expect tablemode#spreadsheet#RowCount('.') == 3
    end
    it 'should not prevent the deletion of columns'
      Expect tablemode#spreadsheet#ColumnCount('.') == 3
      call tablemode#spreadsheet#DeleteColumn()
      Expect tablemode#spreadsheet#ColumnCount('.') == 2
    end
    it 'should not prevent the insertion of columns before the cursor'
      Expect tablemode#spreadsheet#ColumnCount('.') == 3
      call tablemode#spreadsheet#InsertColumn(1)
      Expect tablemode#spreadsheet#ColumnCount('.') == 4
    end
    it 'should not prevent the insertion of columns after the cursor'
      Expect tablemode#spreadsheet#ColumnCount('.') == 3
      call tablemode#spreadsheet#InsertColumn(1)
      Expect tablemode#spreadsheet#ColumnCount('.') == 4
    end
  end
  describe 'Escaped table separators'
    before
      new
      normal! ggdG
      read t/fixtures/escaped_seperator.txt
      call cursor(2, 3)
    end
    it 'should not prevent the deletion of rows'
      Expect tablemode#spreadsheet#RowCount('.') == 7
      call tablemode#spreadsheet#DeleteRow()
      Expect tablemode#spreadsheet#RowCount('.') == 6
      Expect getline('.') == '| a separator.      |                         |'
    end
    it 'should not prevent the deletion of columns'
      Expect tablemode#spreadsheet#ColumnCount('.') == 2
      call tablemode#spreadsheet#DeleteColumn()
      Expect tablemode#spreadsheet#ColumnCount('.') == 1
      Expect getline('.') == '| It can be escaped by a \. |'
    end
    it 'should not prevent the insertion of columns'
      Expect tablemode#spreadsheet#ColumnCount('.') == 2
      call tablemode#spreadsheet#InsertColumn(1)
      Expect tablemode#spreadsheet#ColumnCount('.') == 3
      Expect getline('.') == '| The \| works as   |  | It can be escaped by a \. |'
    end
  end
 end
--- a/t/table.vim
+++ b/t/table.vim
@@ -1,8 +1,6 @@
 " vim: fdm=indent
 source t/config/options.vim
 call vspec#hint({'scope': 'tablemode#table#scope()', 'sid': 'tablemode#table#sid()'})
 describe 'table'
  describe 'IsRow'
    before
@@ -42,6 +40,29 @@ describe 'table'
    end
  end
  describe 'IsTable'
    before
      new normal! ggdG
      read t/fixtures/table/sample_with_header.txt
    end
    it 'should be true on a table row'
      Expect tablemode#table#IsTable(2) to_be_true
      Expect tablemode#table#IsTable(4) to_be_true
      Expect tablemode#table#IsTable(5) to_be_true
    end
    it 'should be true when on a table border'
      Expect tablemode#table#IsTable(1) to_be_true
      Expect tablemode#table#IsTable(3) to_be_true
      Expect tablemode#table#IsTable(6) to_be_true
    end
    it 'should not be true when not on a table'
      Expect tablemode#table#IsTable(7) to_be_false
    end
  end
  describe 'IsHeader'
    before
      new
--- a/t/tablemode.vim
+++ b/t/tablemode.vim
@@ -1,8 +1,6 @@
 " vim: fdm=indent
 source t/config/options.vim
 call vspec#hint({'scope': 'tablemode#scope()', 'sid': 'tablemode#sid()'})
 describe 'tablemode'
  describe 'Activation'
    describe 'tablemode#Enable()'
--- a/t/utils.vim
+++ b/t/utils.vim
@@ -1,8 +1,6 @@
 " vim: fdm=indent
 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'
--- a/youtube.png
+++ b/youtube.png
Author	SHA1	Message	Date
Dhruva Sagar	c9b13e5d30	Add config to disable tableize mappings. Fix 176	2020-05-06 20:20:53 +05:30
Dhruva Sagar	6a6f3565c3	Releasing version 4.7.0	2020-04-19 22:02:25 +05:30
Dhruva Sagar	0b1dcf2e4c	Merge pull request #175 from insanum/formulas added some new formula functions	2020-04-19 21:55:36 +05:30
Eric Davis	2e5713ae6a	fixed the Average function and test case when spanning rows/columns fixed a Vim error(E907) in Min/Max when comparing v:null to a float fixed CountE/CountNE/PercentE/PercentNE to support spanning rows/columns added test cases for all the new formula functions	2020-04-19 00:20:55 -07:00
Eric Davis	f755285cf3	simplified the CountE function cleanup for HTML comment tag checks	2020-04-18 21:47:22 -07:00
Eric Davis	5cdf3c2ac1	Added the following formula functions: - Min: get the lowest value - Max: get the highest value - CountE: count the number of empty cells - CountNE: count the number of non-empty cells - PercentE: percent of empty cells - PercentNE: percent of non-empty cells - AverageNE: average over non-empty cells Also added a subtle tweak that ignores an HTML comment tag ('<!--') found between the table and the starting formula line. Being able to wrap all the formula lines with an HTML comment prevents the formulas from being rendered in Markdown/ReST output.	2020-04-18 18:46:21 -07:00
Dhruva Sagar	29e7cb41bb	Merge pull request #174 from ibbem/feature/add-columns Add a way to insert columns	2020-04-17 20:16:39 +05:30
ibbem	46e4493b30	Start insert mode after adding a column	2020-04-13 22:34:44 +02:00
ibbem	85a5e3d4e1	Fix the column modifications on escaped separators If a g:table_mode_separator is escaped by a backslash, the table is aligned ignoring this instance of the g:table_mode_separator, but the column deletion and insertion functions did not consider this behaviour. The g:table_mode_escaped_separator regex is simplified and optimized a little bit. Also more care is taken to prevent unexpected behaviour if special characters are used as g:table_mode_separator.	2020-04-04 15:27:23 +02:00
ibbem	67129cd1e0	Fix column modifications if Unicode is involved	2020-04-04 15:27:23 +02:00
ibbem	0b58003b68	Add support for inserting columns #130 Two mappings are introduced to enable usage of this feature like vim's pasting with p and P.	2020-04-04 15:27:19 +02:00
ibbem	6912880697	Include the header when deleting columns	2020-03-31 18:21:45 +02:00
Dhruva Sagar	6412352b54	Merge pull request #169 from dhruvasagar/dependabot/bundler/rake-12.3.3 Bump rake from 10.1.0 to 12.3.3	2020-03-02 00:08:27 -05:00
dependabot[bot]	a5909a01b9	Bump rake from 10.1.0 to 12.3.3 Bumps [rake](https://github.com/ruby/rake) from 10.1.0 to 12.3.3. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/rake-10.1.0...v12.3.3) Signed-off-by: dependabot[bot] <support@github.com>	2020-02-29 08:29:09 +00:00
Dhruva Sagar	0af25d72eb	Update dependencies, use ruby 2.5.3 for testing	2019-12-17 14:29:38 -05:00
Dhruva Sagar	06adb63764	Trying to fix travis	2019-12-17 14:22:58 -05:00
Dhruva Sagar	aedcd8e077	Fix #161 , Add documentation about :TableModeRealign and mapping to README	2019-12-17 14:08:09 -05:00
Dhruva Sagar	5ac34a22db	Fix #156 , improved cursor column detection	2019-12-10 16:13:23 -05:00
Dhruva Sagar	8677840826	Rename ftplugins to avoid clobbering with other ftplugins	2019-12-10 16:13:23 -05:00
Dhruva Sagar	5ec330d114	Merge pull request #158 from I-am-the-doctor/fix-delete Fix repeated deletions of rows and columns	2019-11-16 13:11:40 -05:00
Benjamin Moosherr	d670f5e0f8	Tests for issue #157	2019-11-16 17:17:29 +01:00
Benjamin Moosherr	9781613f66	Fix issue #157 Because tablemode#spreadsheet#DeleteColumn() and tablemode#spreadsheet#DeleteRow() take v:count1 into account, the automatic repetition of vim has to be suppressed.	2019-11-16 17:17:07 +01:00
Dhruva Sagar	126897a6fb	Merge pull request #154 from opencollective/opencollective Activating Open Collective	2019-09-28 15:03:33 -04:00
Jess	49c41900f5	Added financial contributors to the README	2019-09-28 11:55:35 -07:00
Dhruva Sagar	934778947e	Create FUNDING.yml	2019-09-05 13:28:06 -04:00
Dhruva Sagar	865563f785	Allow range for TableSort. Fix #133	2019-04-25 23:14:05 +05:30
Dhruva Sagar	a40ef26c5c	Merge pull request #146 from elig0n/patch-1 Fix github repo links in documentation	2019-03-22 13:52:06 +05:30
Eliran Gonen	b6210c9392	Fix github repo links From 'table-mode' to 'vim-table-mode'	2019-03-22 10:21:19 +02:00
Dhruva Sagar	fdfcb85fb3	Add fold marker for improved folding	2019-02-20 09:43:50 +05:30
Dhruva Sagar	229916cd00	Fix markdown ftplugin	2019-02-20 09:36:23 +05:30
Dhruva Sagar	ad9229c937	Fix #141 . Allow negative row reference in formula expressions	2019-01-21 15:20:10 +05:30
Dhruva Sagar	cdf33f680f	Merge pull request #137 from idbrii/auto-corner Automatically setup table options	2019-01-02 17:11:07 +05:30
David Briscoe	5c3c30a9cc	Automatically setup table options Readme mentions settings for Markdown and ReST, but we can apply them automatically for the current filetype. If a user is editing a no filetype scratch buffer, they'll still need to configure these options themselves. But this provides better defaults when editing a buffer of these filetypes. Adds get_buffer_or_global_option that could be used for any other buffer-local (filetype-specific) options.	2018-12-19 12:50:47 -08:00
Dhruva Sagar	130e835ff7	Merge pull request #135 from idbrii/safer-borders Only insert borders on blank/whitespace-only lines	2018-10-21 06:02:50 +05:30
Dhruva Sagar	a1be216c94	Update tablemode.vim	2018-10-21 05:53:36 +05:30
David Briscoe	cf11264525	Only insert borders on blank/whitespace-only lines Fixes #45. Require our end expr to insert a border. This prevents borders from clobbering other text and makes it possible to use visual block to insert a new column.	2018-05-19 06:15:36 -07:00
Dhruva Sagar	5483e163bd	Merge pull request #134 from jeetsukumaran/master Disable/restore foldmethod during realignment	2018-05-16 19:50:04 +05:30
Jeet Sukumaran	09f4336954	Disable/restore foldmethod during realignment	2018-05-15 18:07:30 -04:00
Dhruva Sagar	e646bee5c4	Fix #132 Disabling InsertLeave autocmd for realign since it is getting triggered multiple times during realignment and causes issues while creation of tables	2018-03-22 09:40:50 +05:30
Dhruva Sagar	d0a6405189	Fix #131 . Cleanly disable auto align when table mode is disabled.	2018-03-17 08:06:45 +05:30
Dhruva Sagar	c35fd9b104	Remove CursorHoldI for auto-align. Fix #128 Since auto-align in insert mode causes snags, removing it and instead doing it on InsertLeave instead	2018-02-13 08:34:35 +05:30
Dhruva Sagar	bdd96b05cb	AutoAlign only if buffer is already modified. Fix #126	2018-01-22 16:59:50 +05:30
Dhruva Sagar	b25fe6f9f0	Fix #124 Underscores should not create an issue	2018-01-04 12:18:22 +05:30
Dhruva Sagar	322503e814	Add support for escaping the separator #118 Initial support. Alignment and border creation is fixed and is consistent in considering the escaped table separator as part of the column. TODO : * Fix syntax to reflect the above. * Fix cell definition, motion & formula engine to incorporate this.	2017-12-28 01:04:45 +05:30
Dhruva Sagar	40fe641708	Merge pull request #123 from vbwx/master Mappings for tableize commands	2017-10-26 07:12:22 +05:30
Bernhard Waldbrunner	1d9d512ed1	Allow dynamic prefix for all mappings	2017-10-25 21:19:32 +02:00
Dhruva Sagar	9f383b92be	Play nice with vimwiki. Fix #110 In order to use vim table mode over vimwiki native table formatting support you need to add the following vimwiki settings to your vimrc : ```vim let g:vimwiki_table_mappings=0 let g:vimwiki_table_auto_fmt=0 ```	2017-10-09 20:44:50 +05:30
Dhruva Sagar	a646b4033b	Fix #122 : Disable auto align properly after disabling Table Mode	2017-07-31 06:06:22 +05:30
Dhruva Sagar	4e41af8e5f	Remove Auto Align in insert mode #115 Since realigning doesn't work well in insert mode, I have removed auto align feature for it. Auto align will now kick in once you have made changes and get back to normal mode.	2017-04-20 10:08:18 +05:30
Dhruva Sagar	35b41e0822	Merge pull request #113 from lbischof/patch-1 Fix readme formatting	2017-04-03 10:11:58 +05:30
Lorenz Bischof	f5d4b4e46d	Fix readme formatting	2017-04-02 18:17:55 +02:00
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
		`@@ -0,0 +1,2 @@`
							`let b:table_mode_corner_corner = '+'`
							`let b:table_mode_header_fillchar = '='`
`@@ -1,2 +1,2 @@`
	`\| This \| is 測試 \| table \|`	`\|This\|is 測試\|table\|`
	`\| This \| is also \| a table \|`	`\|This\|is also\|a table\|`