Improve CI

Switch to vim testify

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: dhruvasagar
+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']

.github/workflows/ci.yml

@@ -0,0 +1,46 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  tests:
+    name: Vim Table Mode Tests
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          path: pack/plugins/start/vim-table-mode
+
+      - name: Checkout vim-testify
+        uses: actions/checkout@v3
+        with:
+          repository: dhruvasagar/vim-testify
+          path: pack/plugins/start/vim-testify
+
+      - name: Install Vim or neovim
+        uses: rhysd/action-setup-vim@v1
+        id: vim
+        with:
+          neovim: true
+          version: nightly
+
+      - name: Run unit tests
+        env:
+          VIM: ${{ steps.vim.outputs.executable }}
+        run: |
+          cd ${{ github.workspace }}/pack/plugins/start/vim-table-mode
+          echo "set packpath+=${{ github.workspace }}" > vimrc
+          ${VIM} --headless -u vimrc +TestifySuite +qall

.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.1
+  - 3.0.0
 script: rake ci

CHANGELOG.md

@@ -1,4 +1,75 @@
 # Change Log
+
+## Version 4.8.0
+* Improved formula engine
+  - Does not cast column values to float
+  - Silences errors during evaluation, see `v:errmsg` for error information
+    from last evaluation for debugging issues with formulas
+
+## Version 4.7.6.1
+* Improved handling of `g:table_mode_ignore_align` configuration, now allows
+  per buffer overrides
+
+## Version 4.7.6
+* Add configuration `g:table_mode_ignore_align`
+
+## Version 4.7.5
+* Improved undo
+
+## Version 4.7.3
+* Adding option `g:table_mode_tableize_auto_border` to enable automatic border
+  creation when using Tableize to create tables
+
+## Version 4.7.2
+* Fix formula evaluation to respect border rows and apply formula expressions
+  correctly
+
+## Version 4.6.8
+* Upgrade rake
+
+## Version 4.6.7
+* Remove auto align feature for insert mode
+
+## Version 4.6.6
+* Add configuration `g:table_mode_update_time`
+
+## Version 4.6.5
+* Add support for auto aligning
+
+## Version 4.6.4.1
+* Added a fix for markdown commentstring
+
+## Version 4.6.4
+* Added support for center aligning columns
+
+## Version 4.6.3
+* Fixed tablemode#spreadsheet#LineNr()
+* Fixed tablemode#spreadsheet#cell#SetCell()
+
+## Version 4.6.2
+* Added custom User autocmd event for tablemode activation (enabled /
+  disabled)
+* Adding better header support for pandoc, headers can now have a different
+  fillchar configured with `g:table_mode_header_fillchar`
+
+## Version 4.6.1
+* Minor bug fixes
+
+## Version 4.6.0
+* Added better table header support. The first line of the table if separated
+  by a table border will be considered as the header. This also means that it
+  will not be considered / included when evaluating table formulas and that
+  the first line after the header would be considered the first line of the
+  table.
+
+## Version 4.5.0
+* Refactored toggled mappings
+* Table Syntax now gets toggled with Table Mode
+
+## Version 4.4.2
+* Updated mappings to be buffer local.
+* Updated mappings to toggle and function only when table mode is active.
+
 ## Version 4.4.1
 * Added syntax for matching tables
 
@@ -106,3 +177,7 @@
 
 ## Version 1.0 :
 * First stable release, create tables as you type.
+
+<!--
+  vim: ft=markdown
+-->

Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'vim-flavor', '~> 1.1'

Gemfile.lock

@@ -1,18 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    blankslate (2.1.2.4)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    rake (10.1.0)
-    thor (0.18.1)
-    vim-flavor (1.1.3)
-      parslet (~> 1.0)
-      thor (~> 0.14)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake
-  vim-flavor (~> 1.1)

README.md

@@ -1,195 +1,341 @@
-# VIM Table Mode v4.4.1 [![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.8.1 ![Build](https://github.com/dhruvasagar/vim-table-mode/actions/workflows/ci.yml/badge.svg)
 
 An awesome automatic table creator & formatter allowing one to create neat
 tables as you type.
 
+## Getting Started
+
+### Installation
+
+#### <a href="https://www.danielfranklin.id.au/vim-8-package-management/">Vim 8+ native package manager</a>
+
+clone into `.vim/pack/plugins/start` (the `plugins` folder can have any name)
+
+Add `packloadall` in your `~/.vimrc`.
+
+#### <a href="https://github.com/Shougo/neobundle.vim">NeoBundle</a>
+
+Add `NeoBundle 'dhruvasagar/vim-table-mode'` to your `~/.vimrc`.
+
+#### <a href="https://github.com/tpope/vim-pathogen">pathogen.vim</a>
+
+Add a git submodule for your plugin:
+
+```sh
+$ cd ~/.vim
+$ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-mode
+```
+
+Copy all files under `autoload/`, `plugin/`, and `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.
+
+#### <a href="https://github.com/junegunn/vim-plug">vim-plug</a>
+
+Add `Plug 'dhruvasagar/vim-table-mode'` to your `~/.vimrc`.
+
+### Creating table on-the-fly
+
+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>).
+
+Tip:
+You can use the following to quickly enable / disable table mode in insert mode by using `||` or `__`:
+
+> ```vim
+> function! s:isAtStartOfLine(mapping)
+>   let text_before_cursor = getline('.')[0 : col('.')-1]
+>   let mapping_pattern = '\V' . escape(a:mapping, '\')
+>   let comment_pattern = '\V' . escape(substitute(&l:commentstring, '%s.*$', '', ''), '\')
+>   return (text_before_cursor =~? '^' . ('\v(' . comment_pattern . '\v)?') . '\s*\v' . mapping_pattern . '\v$')
+> endfunction
+>
+> inoreabbrev <expr> <bar><bar>
+>           \ <SID>isAtStartOfLine('\|\|') ?
+>           \ '<c-o>:TableModeEnable<cr><bar><space><bar><left><left>' : '<bar><bar>'
+> inoreabbrev <expr> __
+>           \ <SID>isAtStartOfLine('__') ?
+>           \ '<c-o>:silent! TableModeDisable<cr>' : '__'
+> ```
+
+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:
+
+    | name | address | phone |
+
+In the second line (without leaving Insert mode), enter `|` twice. The plugin will write a properly formatted horizontal line:
+
+    | name | address | phone |
+    |------+---------+-------|
+
+When you enter the subsequent lines, the plugin will automatically adjust the formatting to match the text you’re entering every time you press `|`:
+
+    | name       | address | phone |
+    |------------+---------+-------|
+    | John Adams |
+
+Go on until the table is ready:
+
+    | name            | address                  | phone      |
+    |-----------------+--------------------------+------------|
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    |-----------------+--------------------------+------------|
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    |-----------------+--------------------------+------------|
+
+Then you can return to the first line and above it enter `||`:
+
+    |-----------------+--------------------------+------------|
+    | name            | address                  | phone      |
+    |-----------------+--------------------------+------------|
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    |-----------------+--------------------------+------------|
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    |-----------------+--------------------------+------------|
+
+Corner separators are adjustable:
+
+For Markdown-compatible tables use
+
+    let g:table_mode_corner='|'
+
+
+    |-----------------|--------------------------|------------|
+    | name            | address                  | phone      |
+    |-----------------|--------------------------|------------|
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    |-----------------|--------------------------|------------|
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    |-----------------|--------------------------|------------|
+
+To get ReST-compatible tables use
+
+    let g:table_mode_corner_corner='+'
+    let g:table_mode_header_fillchar='='
+
+
+    +-----------------+--------------------------+------------+
+    | name            | address                  | phone      |
+    +=================+==========================+============+
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    +-----------------+--------------------------+------------+
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    +-----------------+--------------------------+------------+
+
+Markdown and ReST filetypes have automatically configured corners.
+
+> If you wish to override their configurations, it should be done in an after
+> plugin, for example :
+>
+> In a `$VIM/after/ftplugin/markdown/custom.vim` you can add the following :
+>
+> ```viml
+> let b:table_mode_corner='+'
+> ```
+
+You can also define in a table header border how its content should be
+aligned, whether center, right or left by using a `:` character defined by
+`g:table_mode_align_char` option.
+
+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 the option `g:table_mode_relign_map`).
+
+### Formatting existing content into a table
+
+Table Mode wouldn't justify its name if it didn't allow formatting
+existing content into a table. And it does as promised. Like table creation typing on the fly,
+formatting existing content into a table is equally
+simple. You can visually select multiple lines and call `:Tableize` on it.
+Alternatively, the mapping <kbd>\<Leader\>tt</kbd> can be used (defined by the
+option `g:table_mode_tableize_map`). This converts CSV (Comma-separated
+Values) data into a table.
+
+If however you wish to use a different delimiter, you can use the command
+`:Tableize/{pattern}` in a similar fashion as you tabulate (e.g.
+`:Tableize/;` uses ';' as the delimiter) or use the mapping <kbd>\<Leader\>T</kbd>
+(defined by the option `g:table_mode_tableize_op_map`) which takes input in the
+cmd-line and uses the `{pattern}` input as the delimiter.
+
+`:Tableize` also accepts a range. Call it by giving
+lines manually like `:line1,line2Tableize`. However this may not be intuitive.
+You can use the mapping <kbd>\<Leader\>T</kbd> with a `[count]` to apply it to the
+next `[count]` lines in standard vim style.
+
+### 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 |
+down cells respectively. 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.
+
+### Manipulating Table
+
+- **Cell Text Object** :
+
+  Tableize provides a text object for manipulating table cells. Following
+  the vim philosophy the you have <kbd>i|</kbd> & <kbd>a|</kbd> for the
+  inner and around (including the immediate right table separator) the
+  table cell.
+
+- **Delete Row** :
+
+  You can use the <kbd>\<Leader\>tdd</kbd> mapping (defined by the option
+  `g:table_mode_delete_row_map`) to delete the current table row (provided
+  you are within a table row). This can be preceeded with a `[count]` to
+  delete multiple rows as per Vim command grammar.
+
+- **Delete Column** :
+
+  You can use the <kbd>\<Leader\>tdc</kbd> mapping (defined by the option
+  `g:table_mode_delete_column_map`) to delete the entire current column
+  (provided you are within a table row), this can also be preceeded with a
+  `[count]` to delete multiple columns.
+
+- **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.
+
+### Highlight cells based on content
+
+You can highlight cells based on content by setting `let g:table_mode_color_cells` : - cells starting with `yes` will use the `yesCell` highlight group. - cells starting with `no` will use the `noCell` highlight group. - cells starting with `?` will use the `maybeCell` hightlight group.
+
+You can overwrite any highlight group. For exemple use `hi yesCell ctermfg=2` to remove the background color.
+
+## Advanced Usage: Spreadsheet Capabilities
+
+### Table Formulas
+
+Table Mode now has support for formulas like a spreadsheet. There are 2 ways
+of defining formulas :
+
+- You can add formulas using `:TableAddFormula` or the mapping <kbd>\<Leader\>tfa</kbd>
+  (defined by the option `g:table_mode_add_formula_map`) from within a table
+  cell, which will ask for input on the cmd-line with a `f=` prompt. The
+  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.
+
+- You can directly add / manipulate formula expressions in the formula line.
+  The formula line is a commented line right after the table, or optionally
+  separated from the table by a single empty line. It begins with 'tmf:'
+  (table mode formula). eg) `# tmf: $3=$2*$1`. You can add multiple formulas on
+  the line separated with a ';' eg) `# tmf: $3=$2*$1;$4=$3/3.14`
+
+You can evaluate the formula line using `:TableEvalFormulaLine` or the
+mapping <kbd>\<Leader\>tfe</kbd> (defined by the option `g:table_mode_eval_expr_map`)
+from anywhere inside the table or while on the formula line.
+
+NOTE: You can now use the mapping <kbd>\<Leader\>t?</kbd>
+
+### Formula Expressions
+
+Expressions are of the format `$target = formula`.
+
+- The `target` can be of 2 forms :
+
+  - `$n`: This matches the table column number `n`. So the `formula` would
+    be evaluated for each cell in that column and the result would be placed
+    in it. You can use negative indice to represent column relative to the
+    last, -1 being the last.
+
+  - `$n,m`: This matches the table cell n,m (row, column). So in this case
+    the formula would be evaluated and the result will be placed in this
+    cell. You can also use negative values to refer to cells relative to
+    the size, -1 being the last (row or column).
+
+- The `formula` can be a simple mathematical expression involving cells
+  which are also defined by the same format as that of the target cell. You
+  can use all native vim functions within the formula. Apart from that table
+  mode also provides 2 special functions `Sum` and `Average`. Both these
+  functions take a range as input. A range can be of two forms:
+
+  - `r1:r2`: This represents cells in the current column from row `r1`
+    through `r2`. If `r2` is negative it represents `r2` rows above the
+    current row (of the target cell).
+
+  - `r1,c1:r2,c2`: This represents cells in the table from cell r1,c1
+    through cell r2,c2 (row, column).
+
+- Examples :
+  - `$2 = $1 * $1`
+  - `$2 = pow($1, 5)` NOTE: Remember to put space between the $1, and 5
+    here otherwise it will be treated like a table cell.
+  - `$2 = $1 / $1,3`
+  - `$1,2 = $1,1 * $1,1`
+  - `$5,1 = Sum(1:-1)`
+  - `$5,1 = float2nr(Sum(1:-1))`
+  - `$5,3 = Sum(1,2:5,2)`
+  - `$5,3 = Sum(1,2:5,2)/$5,1`
+  - `$5,3 = Average(1,2:5,2)/$5,1`
+
+## Demo
+
+<a href="http://www.youtube.com/watch?v=9lVQ0VJY3ps"><img
+src="https://raw.github.com/axil/vim-table-mode/master/youtube.png"/></a>
+
 ## Change Log
+
 See <a
 href="https://github.com/dhruvasagar/vim-table-mode/blob/master/CHANGELOG.md">
 CHANGELOG.md </a>
 
-## Getting Started
-### Installation
-
-There are several ways to do this
-
-1. I recommend installing <a
-   href="https://github.com/Shougo/neobundle.vim">NeoBundle</a> and then just
-   add `NeoBundle 'dhruvasagar/vim-table-mode'` to your ~/.vimrc
-
-2. If you are using <a
-   href="https://github.com/tpope/vim-pathogen">pathogen.vim</a>, then
-   add a git submodule for your plugin:
-
-   ```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 
-   vimfiles/autoload/, vimfiles/plugin/ and vimfiles/doc under WINDOWS and
-   restart VIM
-
-### Usage
-
-- **On the fly table creation** :
-
-   By default the table column separator is <kbd>|</kbd> defined by the
-   `g:table_mode_separator` option. As soon as you type it on a new line (ignores
-   indentation) the script gets to work on creating a table around it. As you
-   type and define more columns, the table is completed, formatted and aligned
-   automatically on the fly.
-
-   Since this could lead to unwanted behavior I have disabled table mode by
-   default. You have to use `:TableModeToggle` command or the table mode
-   toggle mapping, which is <kbd>\<Leader\>tm</kbd> defined by `g:table_mode_toggle_map`
-   option to toggle the table mode or you can directly use `:TableModeEnable`
-   and `:TableModeDisable` to enable or disable the table mode. This is on a
-   per buffer basis and so it does not cause any unusual behavior unless it is
-   enabled explicitly. Please read `:h table-mode` for further information.
-
-   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
-   `g:table_mode_align_char` option.
-
-- **Format 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
-   on the fly as you type, formatting existing content into a table is equally
-   simple. You can visually select multiple lines and call `:Tableize` on it,
-   or alternatively use the mapping <kbd>\<Leader\>tt</kbd> defined by the
-   `g:table_mode_tableize_map` option which would convert CSV (Comma Separated
-   Value) data into a table and use `,` defined by `g:table_mode_delimiter`
-   option as the delimiter.
-
-   If however you wish to use a different delimiter, you can use the command
-   `:Tableize/{pattern}` in a similar fashion as you use tabular (eg.
-   `:Tableize/;` uses ';' as the delimiter) or use the mapping <kbd>\<Leader\>T</kbd>
-   defined by `g:table_mode_tableize_op_map` option which takes input in the
-   cmd-line and uses the `{pattern}` input as the delimiter.
-
-   `:Tableize` also accepts a range and so you can also call it by giving
-   lines manually like `:line1,line2Tableize`, but this is not very intuitive.
-   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** :
-
-   Now you can move between cells using table mode motions <kbd>[|</kbd>,
-   <kbd>]|</kbd>, <kbd>{|</kbd> & <kbd>}|</kbd> to move left | right | up |
-   down cells respectively. 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. 
-
-- **Manipulating Table** :
-
-  - **Cell Text Object** :
-
-      Tableize provides a text object for manipulating table cells. Following
-      the vim philosophy the you have <kbd>i|</kbd> & <kbd>a|</kbd> for the
-      inner and around (including the immidiate right table separator) the
-      table cell.
-
-  - **Delete Row** :
-
-      You can use the <kbd>\<Leader\>tdd</kbd> mapping defined by the option
-      `g:table_mode_delete_row_map` to delete the current table row (provided
-      you are within a table row), this can be preceeded with a [count] to
-      delete multiple rows just like you would with 'dd'.
-
-  - **Delete Column** :
-
-      You can use the <kbd>\<Leader\>tdc</kbd> mapping defined by the option
-      `g:table_mode_delete_column_map` to delete the entire current column
-      (provided you are within a table row), this can also be preceeded with a
-      [count] to delete multiple columns.
-
-- **Table Formulas** :
-
-  Table Mode now has support for formulas like a spreadsheet. There are 2 ways
-  of defining formulas :
-
-  - You can add formulas using `:TableAddFormula` or the mapping <kbd>\<Leader\>tfa</kbd>
-    defined by the option `g:table_mode_add_formula_map` from within a table
-    cell, which will ask for input on the cmd-line with a `f=` prompt. The
-    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.
-
-  - You can directly add / manipulate formula expressions in the formula line.
-    The formula line is a commented line right after the table, beginning with
-    'tmf:' (table mode formula). eg) `# tmf: $3=$2*$1`.  You can add multiple
-    formulas on the line separated with a ';' eg) `# tmf: $3=$2*$1;$4=$3/3.14`
-
-  You can evaluate the formula line using `:TableEvalFormulaLine` or the
-  mapping <kbd>\<Leader\>tfe</kbd> defined by the option `g:table_mode_eval_expr_map`
-  from anywhere inside the table or while on the formula line.
-
-  NOTE: You can now use the mapping <kbd>\<Leader\>t?</kbd>
-
-- **Formula Expressions** :
-
-  Expressions are of the format `$target = formula`.
-
-  - The `target` can be of 2 forms :
-
-      - `$n`: This matches the table column number `n`. So the `formula` would
-        be evaluated for each cell in that column and the result would be placed
-        in it. You can use negative indice to represent column relative to the
-        last, -1 being the last.
-
-      - `$n,m`: This matches the table cell n,m (row, column). So in this case
-        the formula would be evaluated and the result will be placed in this
-        cell. You can also use negative values to refer to cells relative to
-        the size, -1 being the last (row or column).
-
-  - The `formula` can be a simple mathematical expression involving cells
-    which are also defined by the same format as that of the target cell.  You
-    can use all native vim functions within the formula. Apart from that table
-    mode also provides 2 special functions `Sum` and `Average`. Both these
-    functions take a range as input. A range can be of two forms :
-
-      - `r1:r2`: This represents cells in the current column from row `r1`
-        through `r2`. If `r2` is negative it represents `r2` rows above the
-        current row (of the target cell).
-
-      - `r1,c1:r2,c2`: This represents cells in the table from cell r1,c1
-        through cell r2,c2 (row, column).
-
-  - Examples :
-      - `$2 = $1 * $1`
-      - `$2 = pow($1, 5)` NOTE: Remember to put space between the $1, and 5
-        here otherwise it will be treated like a table cell.
-      - `$2 = $1 / $1,3`
-      - `$1,2 = $1,1 * $1,1`
-      - `$5,1 = Sum(1:-1)`
-      - `$5,1 = float2nr(Sum(1:-1))`
-      - `$5,3 = Sum(1,2:5,2)`
-      - `$5,3 = Sum(1,2:5,2)/$5,1`
-      - `$5,3 = Average(1,2:5,2)/$5,1`
-
-### Demo
-
-<a href="http://www.youtube.com/watch?v=sK2IH1hiDkw"><img
-src="https://raw.github.com/dhruvasagar/vim-table-mode/master/youtube.png"/></a>
-
 ## Contributing
 
 ### Reporting an Issue :
+
 - Use <a href="https://github.com/dhruvasagar/vim-table-mode/issues">Github
   Issue Tracker</a>
 
 ### Contributing to code :
+
 - Fork it.
 - Commit your changes and give your commit message some love.
 - Push to your fork on github.
 - Open a Pull Request.
 
 ## Credit
+
 I must thank Tim Pope for inspiration. The initial concept was created by him
 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>

Rakefile

@@ -1,13 +0,0 @@
-#!/usr/bin/env rake
-
-task :ci => [:dump, :test]
-
-task :dump do
-  sh 'vim --version'
-end
-
-task :test do
-  sh 'bundle exec vim-flavor test'
-end
-
-task :default => :test

VimFlavor.lock

@@ -1 +0,0 @@
-kana/vim-vspec (1.1.2)

autoload/tablemode.vim

@@ -1,53 +1,158 @@
-" ==============================  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:ToggleMapping() "{{{2
-  if exists('b:table_mode_active') && b:table_mode_active
-    call s:SetBufferOptDefault('table_mode_separator_map', g:table_mode_separator)
-    " '|' is a special character, we need to map <Bar> instead
-    if g:table_mode_separator ==# '|' | let b:table_mode_separator_map = '<Bar>' | endif
+function! s:Map(map, to, mode) "{{{2
+  if !empty(a:to) && !hasmapto(a:map, a:mode)
+    for l:mode in split(a:mode, '.\zs')
+      execute l:mode . 'map <buffer>' a:to a:map
+    endfor
+  endif
+endfunction
+
+function! s:UnMap(map, mode) "{{{2
+  if !empty(maparg(a:map, a:mode))
+    for mode in split(a:mode, '.\zs')
+      execute l:mode . 'unmap <buffer>' a:map
+    endfor
+  endif
+endfunction
+
+function! s:ToggleMapping() "{{{2
+  if !g:table_mode_disable_mappings
+    if tablemode#IsActive()
+      call s:Map('<Plug>(table-mode-tableize)', g:table_mode_separator_map, 'i')
+      call s:Map('<Plug>(table-mode-motion-up)', g:table_mode_motion_up_map, 'n')
+      call s:Map('<Plug>(table-mode-motion-down)', g:table_mode_motion_down_map, 'n')
+      call s:Map('<Plug>(table-mode-motion-left)', g:table_mode_motion_left_map, 'n')
+      call s:Map('<Plug>(table-mode-motion-right)', g:table_mode_motion_right_map, 'n')
+
+      call s:Map('<Plug>(table-mode-cell-text-object-a)', g:table_mode_cell_text_object_a_map, 'ox')
+      call s:Map('<Plug>(table-mode-cell-text-object-i)', g:table_mode_cell_text_object_i_map, 'ox')
+
+      call s:Map('<Plug>(table-mode-realign)', g:table_mode_realign_map, 'n')
+      call s:Map('<Plug>(table-mode-delete-row)', g:table_mode_delete_row_map, 'n')
+      call s:Map('<Plug>(table-mode-delete-column)', g:table_mode_delete_column_map, 'n')
+      call s:Map('<Plug>(table-mode-insert-column-before)', g:table_mode_insert_column_before_map, 'n')
+      call s:Map('<Plug>(table-mode-insert-column-after)', g:table_mode_insert_column_after_map, 'n')
+      call s:Map('<Plug>(table-mode-add-formula)', g:table_mode_add_formula_map, 'n')
+      call s:Map('<Plug>(table-mode-eval-formula)', g:table_mode_eval_formula_map, 'n')
+      call s:Map('<Plug>(table-mode-echo-cell)', g:table_mode_echo_cell_map, 'n')
+      call s:Map('<Plug>(table-mode-sort)', g:table_mode_sort_map, 'n')
+    else
+      call s:UnMap(g:table_mode_separator_map, 'i')
+      call s:UnMap(g:table_mode_motion_up_map, 'n')
+      call s:UnMap(g:table_mode_motion_down_map, 'n')
+      call s:UnMap(g:table_mode_motion_left_map, 'n')
+      call s:UnMap(g:table_mode_motion_right_map, 'n')
+
+      call s:UnMap(g:table_mode_cell_text_object_a_map, 'ox')
+      call s:UnMap(g:table_mode_cell_text_object_i_map, 'ox')
+
+      call s:UnMap(g:table_mode_realign_map, 'n')
+      call s:UnMap(g:table_mode_delete_row_map, 'n')
+      call s:UnMap(g:table_mode_delete_column_map, 'n')
+      call s:UnMap(g:table_mode_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! s:ToggleSyntax() "{{{2
+  if !g:table_mode_syntax | return | endif
+
+  if tablemode#IsActive()
+    exec 'syntax match Table'
+          \ '/' . tablemode#table#StartExpr() . '\zs|.\+|\ze' . tablemode#table#EndExpr() . '/'
+          \ 'contains=TableBorder,TableSeparator,TableColumnAlign,yesCell,noCell,maybeCell,redCell,greenCell,yellowCell,blueCell,whiteCell,darkCell'
+          \ '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
+
+    syntax match redCell '|\@<= *r:[^|]*' contained
+    hi redCell ctermfg=9 ctermbg=1
+
+    syntax match greenCell '|\@<= *g:[^|]*' contained
+    hi greenCell ctermfg=10 ctermbg=2
+
+    syntax match yellowCell '|\@<= *y:[^|]*' contained
+    hi yellowCell ctermfg=11 ctermbg=3
+
+    syntax match blueCell '|\@<= *b:[^|]*' contained
+    hi blueCell ctermfg=12 ctermbg=4
+
+    syntax match whiteCell '|\@<= *w:[^|]*' contained
+    hi whiteCell ctermfg=0 ctermbg=15
+
+    syntax match darkCell '|\@<= *d:[^|]*' contained
+    hi darkCell ctermfg=15 ctermbg=0
+
+    if exists("g:table_mode_color_cells") && g:table_mode_color_cells
+      syntax match yesCell '|\@<= *yes[^|]*' contained
+      syntax match noCell '|\@<= *no\A[^|]*' contained " \A to exclude words like notes
+      syntax match maybeCell '|\@<= *?[^|]*' contained
+      " '|\@<=' : Match previous characters, excluding them from the group
+    endif
 
-    execute "inoremap <silent> <buffer> " . b:table_mode_separator_map . ' ' .
-          \ b:table_mode_separator_map . "<Esc>:call tablemode#TableizeInsertMode()<CR>a"
   else
-    silent! execute "iunmap <silent> <buffer> " . b:table_mode_separator_map
+    syntax clear Table
+    syntax clear TableBorder
+    syntax clear TableSeparator
+    syntax clear TableColumnAlign
+
+    hi! link TableBorder NONE
+    hi! link TableSeparator NONE
+    hi! link TableColumnAlign NONE
+  endif
+endfunction
+
+function! s:ToggleAutoAlign() "{{{2
+  if !g:table_mode_auto_align | return | endif
+
+  if tablemode#IsActive()
+    augroup TableModeAutoAlign
+      au!
+
+      autocmd CursorHold <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
@@ -83,15 +188,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
 
@@ -100,15 +196,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)
-    call tablemode#table#AddBorder('.')
-    normal! A
-  elseif tablemode#IsActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
-    let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g'))
-    let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*'))
-    call tablemode#table#Realign('.')
-    normal! 0
-    call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
+  if tablemode#IsActive()
+    if getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator . tablemode#table#EndExpr())
+      call tablemode#table#AddBorder('.')
+      normal! A
+    elseif getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
+      let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g'))
+      let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*'))
+      call tablemode#table#Realign('.')
+      normal! 0
+      call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
+    endif
   endif
 endfunction
 
@@ -131,9 +229,24 @@ endfunction
 
 function! tablemode#TableizeRange(...) range "{{{2
   let lnum = a:firstline
-  while lnum < (a:firstline + (a:lastline - a:firstline + 1))
+  let total = (a:lastline - a:firstline + 1)
+  " echom total
+  let cntr = 1
+  while cntr <= total
     call s:Tableizeline(lnum, a:1)
     undojoin
+    if g:table_mode_tableize_auto_border
+      if cntr == 1
+        normal! O
+        call tablemode#table#AddBorder('.')
+        normal! j
+        let lnum += 1
+      endif
+      normal! o
+      call tablemode#table#AddBorder('.')
+      let lnum += 1
+    endif
+    let cntr += 1
     let lnum += 1
   endwhile
 
@@ -148,3 +261,7 @@ function! tablemode#TableizeByDelimiter() "{{{2
     exec line("'<") . ',' . line("'>") . "call tablemode#TableizeRange('/' . delim)"
   endif
 endfunction
+
+if !hlexists('yesCell') | hi yesCell cterm=bold ctermfg=10 ctermbg=2 | endif |
+if !hlexists('noCell') | hi noCell cterm=bold ctermfg=9 ctermbg=1 | endif |
+if !hlexists('maybeCell') | hi maybeCell cterm=bold ctermfg=11 ctermbg=3 | endif |

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,21 +64,29 @@ 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] !~# '[^0-9\.]' | let alignments[idx] = 'r' | endif
+      if hcols[idx] =~# achr . '[^'.achr.']\+' . achr
+        let alignments[idx] = 'c'
+      elseif hcols[idx] =~# achr . '$'
+        let alignments[idx] = 'r'
+      endif
+      " if hcols[idx] !~# '[^0-9\.]' | let alignments[idx] = 'r' | endif
     endfor
   end
   return alignments
 endfunction
 
 function! tablemode#align#Align(lines) "{{{2
-  let lines = map(a:lines, 'map(v:val, "v:key =~# \"text\" ? tablemode#align#Split(v:val, g:table_mode_separator) : v:val")')
+  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_escaped_separator_regex) : v:val")')
 
   for line in lines
     let stext = line.text
@@ -135,7 +115,11 @@ function! tablemode#align#Align(lines) "{{{2
     endfor
   endfor
 
-  let alignments = tablemode#align#alignments(lines[0].lnum, len(lines[0].text))
+  if tablemode#utils#get_buffer_or_global_option('table_mode_ignore_align') ==# 1
+    let alignments = []
+  else
+    let alignments = tablemode#align#alignments(lines[0].lnum, len(lines[0].text))
+  endif
 
   for idx in range(len(lines))
     let tlnum = lines[idx].lnum

autoload/tablemode/logger.vim

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

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
-  if tablemode#table#IsRow('.')
-    let line = tablemode#spreadsheet#GetFirstRow('.')
+function! tablemode#spreadsheet#LineNr(line, row) "{{{2
+  if tablemode#table#IsRow(a:line)
+    let line = tablemode#spreadsheet#GetFirstRow(a:line)
     let row_nr = 0
 
-    while tablemode#table#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#strlen(substitute(getline(line), '[^' . g:table_mode_separator . ']', '', 'g'))-1
+  return tablemode#utils#SeparatorCount(getline(tablemode#utils#line(a:line))) - 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()
-    normal! 2l
-  else
-    execute 'normal! F' . g:table_mode_separator . '2l'
+  if getline('.')[col('.')-1] !=# g:table_mode_separator || tablemode#spreadsheet#IsLastCell()
+    call search(g:table_mode_escaped_separator_regex, 'b', line('.'))
   endif
+  normal! 2l
 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)
-      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
+function! tablemode#spreadsheet#MoveToEndOfCell() "{{{2
+  call search(g:table_mode_escaped_separator_regex, 'z', line('.'))
+  normal! 2h
 endfunction
 
 function! tablemode#spreadsheet#DeleteColumn() "{{{2
   if tablemode#table#IsRow('.')
     for i in range(v:count1)
       call tablemode#spreadsheet#MoveToStartOfCell()
-      call tablemode#spreadsheet#MoveToFirstRow()
-      silent! execute "normal! h\<C-V>f" . g:table_mode_separator
+      call tablemode#spreadsheet#MoveToFirstRowOrHeader()
+      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,31 @@ 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
+
+function! tablemode#spreadsheet#EchoCell()
+  if tablemode#table#IsRow('.')
+    echomsg '$' . tablemode#spreadsheet#RowNr('.') . ',' . tablemode#spreadsheet#ColumnNr('.')
+  endif
+endfunction

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)
@@ -228,7 +201,7 @@ function! tablemode#spreadsheet#cell#TextObject(inner) "{{{2
   endif
 endfunction
 function! tablemode#spreadsheet#cell#Motion(direction, ...) "{{{2
-  let l:count = a:0 ? a:1 : v:count1
+  let l:count = a:0 ? a:1 : (v:count + 1)
   if tablemode#table#IsRow('.')
     for ii in range(l:count)
       if a:direction ==# 'l'

autoload/tablemode/spreadsheet/formula.vim

@@ -1,34 +1,17 @@
-" ==============================  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:IsFormulaLine(line) "{{{2
+  return getline(a:line) =~# 'tmf: '
+endfunction
+
+function! s:IsHTMLComment(line) "{{{2
+  return !s:IsFormulaLine(a:line) && getline(a:line) =~# '^\s*<!--'
+endfunction
+
+function! s:IsBlankLine(line) "{{{2
+  return getline(a:line) =~# '^\s*$'
+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 +23,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)
@@ -67,7 +54,7 @@ function! tablemode#spreadsheet#formula#Add(...) "{{{2
   endif
 endfunction
 
-function! tablemode#spreadsheet#formula#EvaluateExpr(expr, line) abort "{{{2
+function! tablemode#spreadsheet#formula#EvaluateExpr(expr, line) "{{{2
   let line = tablemode#utils#line(a:line)
   let [target, expr] = map(split(a:expr, '='), 'tablemode#utils#strip(v:val)')
   let cell = substitute(target, '\$', '', '')
@@ -77,6 +64,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,34 +96,40 @@ 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\+'
-    let expr = substitute(expr, '\$\(\d\+\),\(\d\+\)',
-          \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, submatch(1), submatch(2)))', 'g')
+  if expr =~# 'AverageNE(.*)'
+    let expr = substitute(expr, 'AverageNE(\([^)]*\))', 'tablemode#spreadsheet#AverageNE("\1",'.line.','.colm.')', 'g')
+  endif
+
+  if expr =~# '\$\-\?\d\+,\-\?\d\+'
+    let expr = substitute(expr, '\$\(\-\?\d\+\),\(\-\?\d\+\)',
+          \ '\=tablemode#spreadsheet#cell#GetCells(line, submatch(1), submatch(2))', 'g')
   endif
 
   if cell =~# ','
     if expr =~# '\$'
       let expr = substitute(expr, '\$\(\d\+\)',
-          \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, row, submatch(1)))', 'g')
+          \ '\=tablemode#spreadsheet#cell#GetCells(line, row, submatch(1))', 'g')
     endif
-    call tablemode#spreadsheet#cell#SetCell(eval(expr), line, row, colm)
+    silent! call tablemode#spreadsheet#cell#SetCell(eval(expr), line, row, colm)
   else
     let [row, line] = [1, tablemode#spreadsheet#GetFirstRow(line)]
-    while tablemode#table#IsRow(line)
-      let texpr = expr
-      if expr =~# '\$'
-        let texpr = substitute(texpr, '\$\(\d\+\)',
-              \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, row, submatch(1)))', 'g')
-      endif
+    while !s:IsFormulaLine(line)
+      if !tablemode#table#IsBorder(line)
+        let texpr = expr
+        if expr =~# '\$'
+          let texpr = substitute(texpr, '\$\(\d\+\)',
+                \ '\=tablemode#spreadsheet#cell#GetCells(line, row, submatch(1))', 'g')
+        endif
 
-      call tablemode#spreadsheet#cell#SetCell(eval(texpr), line, row, colm)
-      let row += 1
+        silent! call tablemode#spreadsheet#cell#SetCell(eval(texpr), line, row, colm)
+        let row += 1
+      endif
       let line += 1
     endwhile
   endif
 endfunction
 
-function! tablemode#spreadsheet#formula#EvaluateFormulaLine() abort "{{{2
+function! tablemode#spreadsheet#formula#EvaluateFormulaLine() "{{{2
   let exprs = []
   let cstring = &commentstring
   let matchexpr = ''
@@ -129,15 +146,35 @@ 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: '
-      let exprs = split(matchstr(getline(fline), matchexpr), ';')
-    endif
-  elseif getline('.') =~# 'tmf: ' " We're on the formula line
+    if s:IsBlankLine(fline) | let fline += 1 | endif
+    while s:IsFormulaLine(fline)
+      let exprs += split(matchstr(getline(fline), matchexpr), ';')
+      let fline += 1
+    endwhile
+  elseif s:IsBlankLine('.') " We're possibly in the blank line above the formula line
+    let fline = line('.') + 1
     let line = line('.') - 1
+    if s:IsHTMLComment(fline) | let fline += 1 | endif
+    if tablemode#table#IsBorder(line) | let line -= 1 | endif
+    while s:IsFormulaLine(fline)
+      let exprs += split(matchstr(getline(fline), matchexpr), ';')
+      let fline += 1
+    endwhile
+  elseif s:IsFormulaLine('.')
+    let fline = line('.')
+    let line = line('.') - 1
+    while s:IsFormulaLine(line) | let fline = line | let line -= 1 | endwhile
+    if s:IsHTMLComment(line) | let line -= 1 | endif
+    if s:IsBlankLine(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
 

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 . ']' .
-        \ '[' . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_align_char . ']*' .
-        \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
+        \ '[' . corner . corner_corner . ']' .
+        \ '[' . escape(g:table_mode_fillchar . header_fillchar . corner . g:table_mode_align_char, '-') . ']\+' .
+        \ '[' . 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')
-    " To accurately deal with unicode double width characters
-    let fill_columns = map(split(border, g:table_mode_corner),  'repeat(g:table_mode_fillchar, tablemode#utils#StrDisplayWidth(v:val))')
-    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 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')
+
+    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,20 @@ function! tablemode#table#AddBorder(line) "{{{2
 endfunction
 
 function! tablemode#table#Realign(line) "{{{2
+  let utree = undotree()
+  if utree.seq_cur != utree.seq_last
+    " skip during undo
+    return
+  endif
+
+  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 +199,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
@@ -201,10 +212,13 @@ function! tablemode#table#Realign(line) "{{{2
   let lines = tablemode#align#Align(lines)
 
   for aline in lines
-    call setline(aline.lnum, aline.text)
+    undojoin | keepjumps call setline(aline.lnum, aline.text)
   endfor
 
   for bline in blines
-    call tablemode#table#AddBorder(bline)
+    undojoin | keepjumps call tablemode#table#AddBorder(bline)
   endfor
+
+  " restore foldmethod
+  execute "setlocal foldmethod=" . current_fm
 endfunction

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

doc/table-mode.txt

@@ -1,7 +1,7 @@
-*table-mode.txt*		Table Mode for easy table formatting. v4.4.1
+*table-mode.txt*			Table Mode for easy table formatting
 ===============================================================================
 	Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
-				 VERSION 4.4.1
+                               VERSION 4.8.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.
 
@@ -53,11 +53,10 @@ Tableize content:
 
 Move between cells :
 	Now you can move between cells using table mode motions
-	'<Leader>t[hjkl]' to move left | down | up | right cells respectively.
-	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. 
+	'[|, ]|, {|, }|' to move left | down | up | right cells respectively.
+	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.
 
 Manipulation of tables:
 	Tableize provides 3 easy ways to quickly manipulate tables.
@@ -75,6 +74,11 @@ 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 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
@@ -97,6 +101,7 @@ Table Formulas:
 	You can evaluate the formula line using |:TableEvalFormulaLine| or the
 	mapping |<Leader>tfe| defined by the option |table-mode-expr-calc-map|
 
+                                                         *formula-expressions*
 Formula Expressions :
 	Expressions are of the format '$target = formula'.
 
@@ -116,8 +121,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
-	range as input. A range can be of two forms :
+	special functions 'Min', 'Max', 'CountE' (number of empty cells),
+        '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,9 +146,12 @@ 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.
+	|table-mode-separator-map| ...... Set separator mapping.
+	|table-mode-fillchar| ........... Set table border fillchar character.
+	|table-mode-header-fillchar| .... Set table header border fillchar character.
 	|table-mode-map-prefix| ......... Set prefix for table mode commands.
 	|table-mode-toggle-map| ......... Set table mode toggle mapping.
 	|table-mode-always-active| ...... Set table mode to always enabled.
@@ -151,14 +162,49 @@ 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
+        |table-mode-tableize-auto-border| Set if tableize adds row borders
+        |table-mode-ignore-align| ....... Set to ignore alignment characters
 
 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: >
@@ -167,7 +213,17 @@ g:table_mode_separator					*table-mode-separator*
 	This option also defines the trigger to be used to start creating a
 	table row in insert mode.
 
+g:table_mode_separator_map			*table-mode-separator-map*
+	Use this option to define the mapping to be used for the table separator. >
+		let g:table_mode_separator_map = '<Bar>'
+<
+
 g:table_mode_fillchar					*table-mode-fillchar*
+	Use this option to define the table border fill character: >
+		let g:table_mode_fillchar = '-'
+<
+
+g:table_mode_header_fillchar				*table-mode-header-fillchar*
 	Use this option to define the table header border fill character: >
 		let g:table_mode_fillchar = '-'
 <
@@ -207,12 +263,128 @@ 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. >
+                let g:table_mode_disable_tableize_mappings = 0
+<
+                                             *table-mode-tableize-auto-border*
+g:table_mode_tableize_auto_border
+        Enables adding row borders to tables when created using tableize. >
+                let g:table_mode_tableize_auto_border = 0
+<
+                                                       *table-mode-ignore-align*
+g:table_mode_ignore_align
+        If enabled, ignores alignment characters on the header border and always
+        left aligns. >
+                let g:table_mode_ignore_align = 0
+<
 
 ===============================================================================
 MAPPINGS						*table-mode-mappings*
@@ -224,7 +396,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 +433,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 +453,13 @@ MAPPINGS						*table-mode-mappings*
 		would evaluate the formula line and update the table
 		accordingly. This invokes the |TableEvalFormulaLine| command.
 
+
+                                               *table-mode-mappings-sort-column*
+<Leader>ts      Sort a column under the cursor. This invokes |TableSort|
+
 ||              Expands to a header border. You can change this by changing
-                |table-mode-separator| option. You can change the character to 
-                be used for te extreme corners of the border by changing
+                |table-mode-separator| option. You can change the character to
+                be used for the extreme corners of the border by changing
                 |table-mode-corner-corner| option.
 
 ===============================================================================
@@ -298,7 +484,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 +524,23 @@ 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.
-
- vim:tw=78:ts=8:ft=help:norl:ai:et
+http://github.com/dhruvasagar/vim-table-mode/issues.

ftplugin/markdown_tablemode.vim

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

ftplugin/rst_tablemode.vim

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

plugin/table-mode.vim

@@ -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,61 +16,72 @@ endfunction
 
 " Set Global Defaults {{{1
 call s:SetGlobalOptDefault('table_mode_corner', '+')
+call s:SetGlobalOptDefault('table_mode_verbose', 1)
 call s:SetGlobalOptDefault('table_mode_separator', '|')
+" '|' is a special character, we need to map <Bar> instead
+" the character to map from
+let g:table_mode_separator_map = get(g:, 'table_mode_separator_map', g:table_mode_separator)
+if g:table_mode_separator_map ==# '|' | let g:table_mode_separator_map = '<Bar>' | endif
+" the character to map to (when inserting the separator)
+let g:table_mode_separator_map_target = g:table_mode_separator
+if g:table_mode_separator_map_target ==# '|' | let g:table_mode_separator_map_target = '<Bar>' | endif
+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)
 
-function! s:TableEchoCell() "{{{1
-  if tablemode#table#IsRow('.')
-    echomsg '$' . tablemode#spreadsheet#RowNr('.') . ',' . tablemode#spreadsheet#ColumnNr('.')
-  endif
-endfunction
+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>')
 
-function! s:EnableTableSyntax() "{{{1
-  syntax match Table /^\s*|.\+|\s*$/ contains=TableBorder,TableSeparator,TableColumnAlign containedin=ALL
-  syntax match TableSeparator /|/ contained
-  syntax match TableColumnAlign /:/ contained
-  syntax match TableBorder /[\-+]\+/ contained
-endfunction
+call s:SetGlobalOptDefault('table_mode_cell_text_object_a_map', 'a<Bar>')
+call s:SetGlobalOptDefault('table_mode_cell_text_object_i_map', 'i<Bar>')
 
-augroup TableMode
-  au!
+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')
 
-  autocmd Syntax * call <SID>EnableTableSyntax()
-augroup END
+call s:SetGlobalOptDefault('table_mode_syntax', 1)
+call s:SetGlobalOptDefault('table_mode_auto_align', 1)
+call s:SetGlobalOptDefault('table_mode_update_time', 500)
+call s:SetGlobalOptDefault('table_mode_tableize_auto_border', 0)
+call s:SetGlobalOptDefault('table_mode_ignore_align', 0)
 
-hi! link TableBorder Delimiter
-hi! link TableSeparator Delimiter
-hi! link TableColumnAlign Type
-
-" Define Commands & Mappings {{{1
 if !g:table_mode_always_active "{{{2
-  exec "nnoremap <silent> " . g:table_mode_map_prefix . g:table_mode_toggle_map .
-       \ " <Esc>:call tablemode#Toggle()<CR>"
+  exec "nnoremap <silent>" g:table_mode_map_prefix . g:table_mode_toggle_map ":<C-U>call tablemode#Toggle()<CR>"
   command! -nargs=0 TableModeToggle call tablemode#Toggle()
   command! -nargs=0 TableModeEnable call tablemode#Enable()
   command! -nargs=0 TableModeDisable call tablemode#Disable()
 else
-  let table_mode_separator_map = g:table_mode_separator
-  " '|' is a special character, we need to map <Bar> instead
-  if g:table_mode_separator ==# '|' | let table_mode_separator_map = '<Bar>' | endif
-
-  execute "inoremap <silent> " . table_mode_separator_map . ' ' .
-        \ table_mode_separator_map . "<Esc>:call tablemode#TableizeInsertMode()<CR>a"
-  unlet table_mode_separator_map
+  execute "inoremap <silent> " . g:table_mode_separator_map . ' ' .
+        \ g:table_mode_separator_map_target . "<Esc>:call tablemode#TableizeInsertMode()<CR>a"
 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()
 
+execute 'inoremap <silent> <Plug>(table-mode-tableize)' g:table_mode_separator_map . '<Esc>:call tablemode#TableizeInsertMode()<CR>a'
+
 nnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR>
 xnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR>
 xnoremap <silent> <Plug>(table-mode-tableize-delimiter) :<C-U>call tablemode#TableizeByDelimiter()<CR>
@@ -103,66 +95,38 @@ nnoremap <silent> <Plug>(table-mode-motion-right) :<C-U>call tablemode#spreadshe
 
 onoremap <silent> <Plug>(table-mode-cell-text-object-a) :<C-U>call tablemode#spreadsheet#cell#TextObject(0)<CR>
 onoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spreadsheet#cell#TextObject(1)<CR>
+xnoremap <silent> <Plug>(table-mode-cell-text-object-a) :<C-U>call tablemode#spreadsheet#cell#TextObject(0)<CR>
+xnoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spreadsheet#cell#TextObject(1)<CR>
 
-nnoremap <silent> <Plug>(table-mode-delete-row) :call tablemode#spreadsheet#DeleteRow()<CR>
-nnoremap <silent> <Plug>(table-mode-delete-column) :call tablemode#spreadsheet#DeleteColumn()<CR>
+nnoremap <silent> <Plug>(table-mode-delete-row) :<C-U>call tablemode#spreadsheet#DeleteRow()<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>
+nnoremap <silent> <Plug>(table-mode-echo-cell) :call tablemode#spreadsheet#EchoCell()<CR>
 
-if !hasmapto('<Plug>(table-mode-tableize)')
-  nmap <Leader>tt <Plug>(table-mode-tableize)
-  xmap <Leader>tt <Plug>(table-mode-tableize)
+nnoremap <silent> <Plug>(table-mode-sort) :call tablemode#spreadsheet#Sort('')<CR>
+
+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)')
-  xmap <Leader>T <Plug>(table-mode-tableize-delimiter)
-endif
-
-if !hasmapto('<Plug>(table-mode-realign)')
-  nmap <Leader>tr <Plug>(table-mode-realign)
-endif
-
-if !hasmapto('<Plug>(table-mode-motion-up)')
-  nmap {<Bar> <Plug>(table-mode-motion-up)
-endif
-if !hasmapto('<Plug>(table-mode-motion-down)')
-  nmap }<Bar> <Plug>(table-mode-motion-down)
-endif
-if !hasmapto('<Plug>(table-mode-motion-left)')
-  nmap [<Bar> <Plug>(table-mode-motion-left)
-endif
-if !hasmapto('<Plug>(table-mode-motion-right)')
-  nmap ]<Bar> <Plug>(table-mode-motion-right)
-endif
-
-if !hasmapto('<Plug>(table-mode-cell-text-object-a)')
-  omap a<Bar> <Plug>(table-mode-cell-text-object-a)
-endif
-if !hasmapto('<Plug>(table-mode-cell-text-object-i)')
-  omap i<Bar> <Plug>(table-mode-cell-text-object-i)
-endif
-
-if !hasmapto('<Plug>(table-mode-delete-row)')
-  nmap <Leader>tdd <Plug>(table-mode-delete-row)
-endif
-if !hasmapto('<Plug>(table-mode-delete-column)')
-  nmap <Leader>tdc <Plug>(table-mode-delete-column)
-endif
-
-if !hasmapto('<Plug>(table-mode-add-formula)')
-  nmap <Leader>tfa <Plug>(table-mode-add-formula)
-endif
-if !hasmapto('<Plug>(table-mode-eval-formula)')
-  nmap <Leader>tfe <Plug>(table-mode-eval-formula)
-endif
-
-if !hasmapto('<Plug>(table-mode-echo-cell)')
-  nmap <Leader>t? <Plug>(table-mode-echo-cell)
-endif
+augroup TableMode "{{{1
+  au!
 
+  autocmd User TableModeEnabled call tablemode#logger#log('Table Mode Enabled')
+  autocmd User TableModeDisabled call tablemode#logger#log('Table Mode Disabled')
+augroup END
 " Avoiding side effects {{{1
 let &cpo = s:save_cpo
 

t/align.vim

@@ -1,22 +0,0 @@
-" 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))
-    call insert(lines, {"lnum": idx+1, "text": a:lines[idx]})
-  endfor
-  return lines
-endfunction
-
-describe 'Align'
-  it 'should align table content correctly'
-    Expect tablemode#align#Align(ConvertLines2Dict(readfile('t/fixtures/align/simple_before.txt'))) == ConvertLines2Dict(readfile('t/fixtures/align/simple_after.txt'))
-  end
-
-  it 'should align table content with unicode characters correctly'
-    Expect tablemode#align#Align(ConvertLines2Dict(readfile('t/fixtures/align/unicode_before.txt'))) == ConvertLines2Dict(readfile('t/fixtures/align/unicode_after.txt'))
-  end
-end

t/autoload/tablemode/align_test.vim

@@ -0,0 +1,23 @@
+source t/config/options.vim
+
+function! ConvertLines2Dict(lines)
+  let lines = []
+  for idx in range(len(a:lines))
+    call insert(lines, {"lnum": idx+1, "text": a:lines[idx]})
+  endfor
+  return lines
+endfunction
+
+function! s:TestAlignTable()
+  let actual = tablemode#align#Align(ConvertLines2Dict(readfile('t/fixtures/align/simple_before.txt')))
+  let expected = ConvertLines2Dict(readfile('t/fixtures/align/simple_after.txt'))
+  call testify#assert#equals(actual, expected)
+endfunction
+call testify#it('Align should align table content', function('s:TestAlignTable'))
+
+function! s:TestAlignTableUnicode()
+  let actual = tablemode#align#Align(ConvertLines2Dict(readfile('t/fixtures/align/unicode_before.txt')))
+  let expected = ConvertLines2Dict(readfile('t/fixtures/align/unicode_after.txt'))
+  call testify#assert#equals(actual, expected)
+endfunction
+call testify#it('Align should align table content with unicode characters', function('s:TestAlignTableUnicode'))

t/autoload/tablemode/spreadsheet/api/count_test.vim

@@ -0,0 +1,194 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/cell/counts.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestCountE()
+  call cursor(3, 3)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#CountE('1:3'),
+        \   'expected': 1,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#CountE('1,1:1,3'),
+        \   'expected': 0,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#CountE('2,1:2,3'),
+        \   'expected': 2,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#CountE('1,1:3,3'),
+        \   'expected': 2,
+        \ },
+        \]
+  call utils#TableTest(tests)
+
+  call cursor(5, 11)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#CountE('1:3'),
+        \   'expected': 1,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#CountE('3,1:3,3'),
+        \   'expected': 0,
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('CountE should return the count of empty cells within cell range', function('s:TestCountE'))
+
+function! s:TestCountNE()
+  call cursor(3, 3)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#CountNE('1:3'),
+        \   'expected': 2,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#CountNE('1,1:1,3'),
+        \   'expected': 3,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#CountNE('2,1:2,3'),
+        \   'expected': 1,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#CountNE('1,1:3,3'),
+        \   'expected': 7,
+        \ },
+        \]
+  call utils#TableTest(tests)
+
+  call cursor(5, 11)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#CountNE('1:3'),
+        \   'expected': 2,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#CountNE('3,1:3,3'),
+        \   'expected': 3,
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('CountNE should return the count of non-empty cells within cell range', function('s:TestCountNE'))
+
+function! s:TestPercentE()
+  call cursor(3, 3)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentE('1:3'),
+        \   'expected': 33,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentE('1,1:1,3'),
+        \   'expected': 0,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentE('2,1:2,3'),
+        \   'expected': 66,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentE('1,1:3,3'),
+        \   'expected': 22,
+        \ },
+        \]
+  call utils#TableTest(tests)
+
+  call cursor(5, 11)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentE('1:3'),
+        \   'expected': 33,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentE('3,1:3,3'),
+        \   'expected': 0,
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('PercentE should return the percent count of empty cells within cell range', function('s:TestPercentE'))
+
+function! s:TestPercentNE()
+  call cursor(3, 3)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentNE('1:3'),
+        \   'expected': 66,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentNE('1,1:1,3'),
+        \   'expected': 100,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentNE('2,1:2,3'),
+        \   'expected': 33,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentNE('1,1:3,3'),
+        \   'expected': 77,
+        \ },
+        \]
+  call utils#TableTest(tests)
+
+  call cursor(5, 11)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentNE('1:3'),
+        \   'expected': 66,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#PercentNE('3,1:3,3'),
+        \   'expected': 100,
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('PercentNE should return the percent count of non-empty cells within cell range', function('s:TestPercentNE'))
+
+function! s:TestAverageNE()
+  call cursor(3, 3)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#AverageNE('1:3'),
+        \   'expected': 2.5,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#AverageNE('1,1:1,3'),
+        \   'expected': 2.0,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#AverageNE('2,1:2,3'),
+        \   'expected': 0.0,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#AverageNE('1,1:3,3'),
+        \   'expected': 3.0,
+        \ },
+        \]
+  call utils#TableTest(tests)
+
+  call cursor(5, 11)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#AverageNE('1:3'),
+        \   'expected': 4.5,
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#AverageNE('3,1:3,3'),
+        \   'expected': 5.0,
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('AverageNE should return the average of non-empty cells within cell range', function('s:TestAverageNE'))

t/autoload/tablemode/spreadsheet/api/manipulation_test.vim

@@ -0,0 +1,52 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/sample.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestDeleteRow()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#RowCount('.'), 2)
+  call tablemode#spreadsheet#DeleteRow()
+  call testify#assert#equals(tablemode#spreadsheet#RowCount('.'), 1)
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('DeleteRow should delete a row', function('s:TestDeleteRow'))
+
+function! s:TestDeleteColumn()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 2)
+  call tablemode#spreadsheet#DeleteColumn()
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 1)
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('DeleteColumn should delete a column', function('s:TestDeleteColumn'))
+
+function! s:TestInsertColumn()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 2)
+  call tablemode#spreadsheet#InsertColumn(0)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 3)
+  " InsertColumn leaves us in insert mode
+  stopinsert
+  call testify#assert#equals(getline('.'), '|  | test11 | test12 |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('InsertColumn should insert a new column before the current column', function('s:TestInsertColumn'))
+
+function! s:TestInserColumnAfter()
+  call cursor(3, 3)
+  normal! $
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 2)
+  call tablemode#spreadsheet#InsertColumn(1)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 3)
+  " InsertColumn leaves us in insert mode
+  stopinsert
+  call testify#assert#equals(getline('.'), '| test11 | test12 |  |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('InsertColumn should be able to insert a new column after the current column', function('s:TestInserColumnAfter'))

t/autoload/tablemode/spreadsheet/api/manipulation_with_escaped_table_separator_test.vim

@@ -0,0 +1,51 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/escaped_seperator.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestDeleteRow()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#RowCount('.'), 7)
+  call tablemode#spreadsheet#DeleteRow()
+  call testify#assert#equals(tablemode#spreadsheet#RowCount('.'), 6)
+  call testify#assert#equals(getline('.'), '| a separator.      |                         |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('DeleteRow should be able to delete a row with escaped table separator', function('s:TestDeleteRow'))
+
+function! s:TestDeleteColumn()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 2)
+  call tablemode#spreadsheet#DeleteColumn()
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 1)
+  call testify#assert#equals(getline('.'), '| It can be escaped by a \. |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('DeleteColumn should be able to delete a column with escaped table separator', function('s:TestDeleteColumn'))
+
+function! s:TestInsertColumnBefore()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 2)
+  call tablemode#spreadsheet#InsertColumn(0)
+  stopinsert
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 3)
+  call testify#assert#equals(getline('.'), '|  | The \| works as   | It can be escaped by a \. |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('InsertColumn should be able to insert a column before the current column with escaped table separator', function('s:TestInsertColumnBefore'))
+
+function! s:TestInsertColumnAfter()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 2)
+  call tablemode#spreadsheet#InsertColumn(1)
+  stopinsert
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 3)
+  call testify#assert#equals(getline('.'), '| The \| works as   |  | It can be escaped by a \. |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('InsertColumn should be able to insert a column after the current column with escabled table separator', function('s:TestInsertColumnAfter'))

t/autoload/tablemode/spreadsheet/api/manipulation_with_headers_test.vim

@@ -0,0 +1,58 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/complex_header.txt'
+function! s:setup()
+  let g:table_mode_header_fillchar = '='
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+
+function! s:teardown()
+  let g:table_mode_header_fillchar = '-'
+  bw!
+endfunction
+call testify#teardown(function('s:teardown'))
+
+function! s:TestDeleteRow()
+  call cursor(5, 7)
+  call testify#assert#equals(tablemode#spreadsheet#RowCount('.'), 5)
+  call tablemode#spreadsheet#DeleteRow()
+  call testify#assert#equals(tablemode#spreadsheet#RowCount('.'), 4)
+  call testify#assert#equals(getline(5), '|     2    | 8        |        b | y        |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('DeleteRow should delete a row in a table with headers', function('s:TestDeleteRow'))
+
+function! s:TestDeleteColumn()
+  call cursor(5, 7)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 4)
+  call tablemode#spreadsheet#DeleteColumn()
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 3)
+  call testify#assert#equals(getline(5), '| 9        |        a | z        |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('DeleteColumn should delete a column in a table with headers', function('s:TestDeleteColumn'))
+
+function! s:TestInsertColumn()
+  call cursor(5, 7)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 4)
+  call tablemode#spreadsheet#InsertColumn(0)
+  stopinsert
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 5)
+  call testify#assert#equals(getline(5), '|  |     1    | 9        |        a | z        |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('InsertColumn should insert a new column before the current column in a table with headers in a table with headers', function('s:TestInsertColumn'))
+
+function! s:TestInserColumnAfter()
+  call cursor(5, 7)
+  normal! $
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 4)
+  call tablemode#spreadsheet#InsertColumn(1)
+  stopinsert
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 5)
+  call testify#assert#equals(getline(5), '|     1    | 9        |        a | z        |  |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('InsertColumn should be able to insert a new column after the current column in a table with headers', function('s:TestInserColumnAfter'))

t/autoload/tablemode/spreadsheet/api/manipulation_with_unicode_test.vim

@@ -0,0 +1,47 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/table//sample_realign_unicode_after.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestDeleteRow()
+  call cursor(3, 19)
+  call testify#assert#equals(tablemode#spreadsheet#RowCount('.'), 4)
+  call tablemode#spreadsheet#DeleteRow()
+  call testify#assert#equals(tablemode#spreadsheet#RowCount('.'), 3)
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('DeleteRow should be able to delete a row with unicode characters', function('s:TestDeleteRow'))
+
+function! s:TestDeleteColumn()
+  call cursor(3, 19)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 3)
+  call tablemode#spreadsheet#DeleteColumn()
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 2)
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('DeleteColumn should be able to delete a column with unicode characters', function('s:TestDeleteColumn'))
+
+function! s:TestInsertColumnBefore()
+  call cursor(3, 19)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 3)
+  call tablemode#spreadsheet#InsertColumn(0)
+  stopinsert
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 4)
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('InsertColumn should be able to insert a column before the current column with unicode characters', function('s:TestInsertColumnBefore'))
+
+function! s:TestInsertColumnAfter()
+  call cursor(3, 19)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 3)
+  call tablemode#spreadsheet#InsertColumn(1)
+  stopinsert
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 4)
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('InsertColumn should be able to insert a column after the current column with unicode characters', function('s:TestInsertColumnAfter'))

t/autoload/tablemode/spreadsheet/api/math_test.vim

@@ -0,0 +1,141 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/cell/sample.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestSum()
+  call cursor(3, 3)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#Sum('1:2'),
+        \   'expected': 4.0
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Sum('1,1:1,2'),
+        \   'expected': 3.0
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Sum('1,1:2,2'),
+        \   'expected': 10.0
+        \ },
+        \]
+  call utils#TableTest(tests)
+
+  call cursor(4, 7)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#Sum('1:2'),
+        \   'expected': 6.0
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Sum('2,1:2,2'),
+        \   'expected': 7.0
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('Sum should return the sum of cell range', function('s:TestSum'))
+
+function! s:TestAverage()
+  call cursor(3, 3)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#Average('1:2'),
+        \   'expected': 2.0
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Average('1,1:1,2'),
+        \   'expected': 1.5
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Average('1,1:2,2'),
+        \   'expected': 2.5
+        \ },
+        \]
+  call utils#TableTest(tests)
+
+  call cursor(4, 7)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#Average('1:2'),
+        \   'expected': 3.0
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Average('2,1:2,2'),
+        \   'expected': 3.5
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('Average should return the average of cell range', function('s:TestAverage'))
+
+function! s:TestMin()
+  call cursor(3, 3)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#Min('1:2'),
+        \   'expected': 1.0
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Min('1,1:1,2'),
+        \   'expected': 1.0
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Min('1,1:2,2'),
+        \   'expected': 1.0
+        \ },
+        \]
+  call utils#TableTest(tests)
+
+  call cursor(4, 7)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#Min('1:2'),
+        \   'expected': 2.0
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Min('2,1:2,2'),
+        \   'expected': 3.0
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('Min should return the min of cell range', function('s:TestMin'))
+
+function! s:TestMax()
+  call cursor(3, 3)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#Max('1:2'),
+        \   'expected': 3.0
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Max('1,1:1,2'),
+        \   'expected': 2.0
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Max('1,1:2,2'),
+        \   'expected': 4.0
+        \ },
+        \]
+  call utils#TableTest(tests)
+
+  call cursor(4, 7)
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#Max('1:2'),
+        \   'expected': 4.0
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#Max('2,1:2,2'),
+        \   'expected': 4.0
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('Max should return the max of cell range', function('s:TestMax'))

t/autoload/tablemode/spreadsheet/api/repeated_manipulations_test.vim

@@ -0,0 +1,49 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/big_sample.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestDeleteRowWithRange()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#RowCount('.'), 5)
+  .,.+1 call tablemode#spreadsheet#DeleteRow()
+  call testify#assert#equals(tablemode#spreadsheet#RowCount('.'), 3)
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('DeleteRow should work with a range', function('s:TestDeleteRowWithRange'))
+
+function! s:TestDeleteColumnWithRange()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 4)
+  .,.+1 call tablemode#spreadsheet#DeleteColumn()
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 2)
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('DeleteColumn should work with a range', function('s:TestDeleteColumnWithRange'))
+
+function! s:TestInsertColumnWithCountBefore()
+  call cursor(3, 7)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 4)
+  execute "normal! 2:\<C-U>call tablemode#spreadsheet#InsertColumn(0)\<CR>"
+  stopinsert
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 6)
+  call testify#assert#equals(getline('.'), '| 1 |  |  | 9 | a | z |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('InsertColumn should work with a count to add columns before current column', function('s:TestInsertColumnWithCountBefore'))
+
+function! s:TestInsertColumnWithCountAfter()
+  call cursor(3, 7)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 4)
+  execute "normal! 2:\<C-U>call tablemode#spreadsheet#InsertColumn(1)\<CR>"
+  stopinsert
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount('.'), 6)
+  call testify#assert#equals(getline('.'), '| 1 | 9 |  |  | a | z |')
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('InsertColumn should work with a count to add columns after current column', function('s:TestInsertColumnWithCountAfter'))

t/autoload/tablemode/spreadsheet/api/test.vim

@@ -0,0 +1,66 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/sample.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestRowCount()
+  call testify#assert#equals(tablemode#spreadsheet#RowCount(3), 2)
+  call testify#assert#equals(tablemode#spreadsheet#RowCount(4), 2)
+endfunction
+call testify#it('RowCount should return the correct row count', function('s:TestRowCount'))
+
+function! s:TestRowNr()
+  call testify#assert#equals(tablemode#spreadsheet#RowNr(3), 1)
+  call testify#assert#equals(tablemode#spreadsheet#RowNr(4), 2)
+endfunction
+call testify#it('RowNr should return the correct row number', function('s:TestRowNr'))
+
+function! s:TestColumnCount()
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount(3), 2)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount(4), 2)
+endfunction
+call testify#it('ColumnCount should return the correct column count', function('s:TestColumnCount'))
+
+function! s:TestColumnNr()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnNr('.'), 1)
+
+  call cursor(3, 12)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnNr('.'), 2)
+endfunction
+call testify#it('ColumnNr should return the correct column number', function('s:TestColumnNr'))
+
+function! s:TestIsFirstCell()
+  call cursor(3, 3)
+  call testify#assert#assert(tablemode#spreadsheet#IsFirstCell())
+
+  call cursor(3, 12)
+  call testify#assert#assert(!tablemode#spreadsheet#IsFirstCell())
+endfunction
+call testify#it('IsFirstCell should return true when in the first cell', function('s:TestIsFirstCell'))
+
+function! s:TestIsLastCell()
+  call cursor(3, 3)
+  call testify#assert#assert(!tablemode#spreadsheet#IsLastCell())
+
+  call cursor(3, 12)
+  call testify#assert#assert(tablemode#spreadsheet#IsLastCell())
+endfunction
+call testify#it('IsLastCell should return true when in the last cell', function('s:TestIsLastCell'))
+
+function! s:TestGetFirstRow()
+  call testify#assert#equals(tablemode#spreadsheet#GetFirstRow(3), 3)
+  call testify#assert#equals(tablemode#spreadsheet#GetFirstRow(4), 3)
+endfunction
+call testify#it('GetFirstRow should return the line number of the first row', function('s:TestGetFirstRow'))
+
+function! s:TestGetLastRow()
+  call testify#assert#equals(tablemode#spreadsheet#GetLastRow(3), 4)
+  call testify#assert#equals(tablemode#spreadsheet#GetLastRow(4), 4)
+endfunction
+call testify#it('GetLastRow should return the line number of the last row', function('s:TestGetLastRow'))

t/autoload/tablemode/spreadsheet/cell_test.vim

@@ -0,0 +1,208 @@
+source t/config/options.vim
+source t/utils.vim
+
+function! s:setup()
+  call utils#TestSetup('t/fixtures/sample.txt')
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestGetCells()
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCells(3, 1, 1),
+        \   'expected': 'test11'
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCells(3, 1),
+        \   'expected': ['test11', 'test12']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCells(3, 2),
+        \   'expected': ['test21', 'test22']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCells(3, 0, 1),
+        \   'expected': ['test11', 'test21']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCells(3, 0, 2),
+        \   'expected': ['test12', 'test22']
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('GetCells should return correct cell value', function('s:TestGetCells'))
+
+function! s:TestGetRow()
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetRow(1, 3),
+        \   'expected': ['test11', 'test12']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetRow(2, 3),
+        \   'expected': ['test21', 'test22']
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('GetRow should return the row', function('s:TestGetRow'))
+
+function! s:TestGetColumn()
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetColumn(1, 3),
+        \   'expected': ['test11', 'test21']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetRow(2, 3),
+        \   'expected': ['test21', 'test22']
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('GetColumn should return the column', function('s:TestGetColumn'))
+
+function! s:TestGetCellRange()
+  let tests = [
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1,1:2,2', 3, 1),
+        \   'expected': [['test11', 'test21'], ['test12', 'test22']]
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 1),
+        \   'expected': ['test11', 'test12']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 2),
+        \   'expected': ['test11', 'test12']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 4, 1),
+        \   'expected': ['test11', 'test12']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 4, 2),
+        \   'expected': ['test11', 'test12']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 1),
+        \   'expected': ['test21', 'test22']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 2),
+        \   'expected': ['test21', 'test22']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 4, 1),
+        \   'expected': ['test21', 'test22']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 4, 2),
+        \   'expected': ['test21', 'test22']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 1),
+        \   'expected': ['test11', 'test21']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 2),
+        \   'expected': ['test12', 'test22']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1:2', 4, 1),
+        \   'expected': ['test11', 'test21']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1:2', 4, 2),
+        \   'expected': ['test12', 'test22']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 1),
+        \   'expected': ['test11']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1:-1', 4, 1),
+        \   'expected': ['test11']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 2),
+        \   'expected': ['test12']
+        \ },
+        \ {
+        \   'actual': tablemode#spreadsheet#cell#GetCellRange('1:-1', 4, 2),
+        \   'expected': ['test12']
+        \ },
+        \]
+  call utils#TableTest(tests)
+endfunction
+call testify#it('GetCellRange should return the cell values in given range', function('s:TestGetCellRange'))
+
+function! s:TestLeftMotion()
+  call cursor(3, 12)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnNr('.'), 2)
+  call tablemode#spreadsheet#cell#Motion('h')
+  call testify#assert#equals(tablemode#spreadsheet#ColumnNr('.'), 1)
+endfunction
+call testify#it('Motion "h" should move cursor to the left column', function('s:TestLeftMotion'))
+
+function! s:TestLeftMotionFirstColumn() abort
+  call cursor(4, 3)
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 2)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnNr('.'), 1)
+  call tablemode#spreadsheet#cell#Motion('h')
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 1)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnNr('.'), 2)
+endfunction
+call testify#it('Motion "h" should move cursor to the last column of previous row when on first column', function('s:TestLeftMotionFirstColumn'))
+
+function! s:TestRightMotion()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnNr('.'), 1)
+  call tablemode#spreadsheet#cell#Motion('l')
+  call testify#assert#equals(tablemode#spreadsheet#ColumnNr('.'), 2)
+endfunction
+call testify#it('Motion "l" should move cursor to the right column', function('s:TestRightMotion'))
+
+function! s:TestRightMotionLastColumn()
+  call cursor(3, 12)
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 1)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnNr('.'), 2)
+  call tablemode#spreadsheet#cell#Motion('l')
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 2)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnNr('.'), 1)
+endfunction
+call testify#it('Motion "l" should move cursor to the first column of next row when on last column', function('s:TestRightMotionLastColumn'))
+
+function! s:TestUpMotion()
+  call cursor(4, 3)
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 2)
+  call tablemode#spreadsheet#cell#Motion('k')
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 1)
+endfunction
+call testify#it('Motion "k" should move cursor to the column above', function('s:TestUpMotion'))
+
+function! s:TestUpMotionFirstRow()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 1)
+  call tablemode#spreadsheet#cell#Motion('k')
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 1)
+endfunction
+call testify#it('Motion "k" should remain on first row when trying to move up', function('s:TestUpMotionFirstRow'))
+
+function! s:TestDownMotion()
+  call cursor(3, 3)
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 1)
+  call tablemode#spreadsheet#cell#Motion('j')
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 2)
+endfunction
+call testify#it('Motion "j" should move cursor to the column above', function('s:TestDownMotion'))
+
+function! s:TestDownMotionFirstRow()
+  call cursor(4, 3)
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 2)
+  call tablemode#spreadsheet#cell#Motion('j')
+  call testify#assert#equals(tablemode#spreadsheet#RowNr('.'), 2)
+endfunction
+call testify#it('Motion "j" should remain on last row when trying to move down', function('s:TestDownMotionFirstRow'))

t/autoload/tablemode/spreadsheet/formula/add_test.vim

@@ -0,0 +1,28 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/formula/sample.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestAddFormula()
+  call cursor(7, 15)
+  call tablemode#spreadsheet#formula#Add('Sum(1:3)')
+  let cell_value = tablemode#spreadsheet#cell#GetCell()
+  call testify#assert#equals(cell_value, '125.0')
+
+  call cursor(9, 15)
+  call testify#assert#equals(getline('.'), ' tmf: $4,2=Sum(1:3) ')
+
+  call cursor(8, 15)
+  call tablemode#spreadsheet#formula#Add('Sum(1:-1)')
+  let cell_value = tablemode#spreadsheet#cell#GetCell()
+  call testify#assert#equals(cell_value, '250.0')
+
+  call cursor(9, 15)
+  call testify#assert#equals(getline('.'), ' tmf: $4,2=Sum(1:3) ; $5,2=Sum(1:-1)')
+endfunction
+call testify#it('Should Add a formula to the table correctly', function('s:TestAddFormula'))

t/autoload/tablemode/spreadsheet/formula/eval_test.vim

@@ -0,0 +1,18 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/formula/formula.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestEvalFormula()
+  call cursor(7, 15)
+  call tablemode#spreadsheet#formula#EvaluateFormulaLine()
+  call testify#assert#equals(&modified, 1)
+  let cell_value = tablemode#spreadsheet#cell#GetCell()
+  call testify#assert#equals(cell_value, '125.0')
+endfunction
+call testify#it('Should evaluate the formula correctly', function('s:TestEvalFormula'))

t/autoload/tablemode/table/add_border_test.vim

@@ -0,0 +1,18 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/table/sample_for_header.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestAddBorder()
+  call testify#assert#assert(!tablemode#table#IsHeader(2))
+  call tablemode#table#AddBorder(3)
+  call testify#assert#assert(tablemode#table#IsHeader(2))
+  call testify#assert#assert(tablemode#table#IsBorder(3))
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('AddBorder should be able to add borders correctly', function('s:TestAddBorder'))

t/autoload/tablemode/table/add_border_with_unicode_test.vim

@@ -0,0 +1,37 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/table/sample_for_header_unicode.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestAddBorder()
+  call tablemode#table#AddBorder(2)
+  call tablemode#table#AddBorder(4)
+  call tablemode#table#AddBorder(6)
+  call tablemode#table#AddBorder(8)
+  call tablemode#table#AddBorder(10)
+
+  call testify#assert#assert(tablemode#table#IsHeader(3))
+
+  call testify#assert#assert(tablemode#table#IsBorder(2))
+  call testify#assert#assert(tablemode#table#IsBorder(4))
+  call testify#assert#assert(tablemode#table#IsBorder(6))
+  call testify#assert#assert(tablemode#table#IsBorder(8))
+  call testify#assert#assert(tablemode#table#IsBorder(10))
+
+  call testify#assert#equals(tablemode#utils#StrDisplayWidth(getline(2)), tablemode#utils#StrDisplayWidth(getline(3)))
+  call testify#assert#equals(tablemode#utils#StrDisplayWidth(getline(3)), tablemode#utils#StrDisplayWidth(getline(4)))
+  call testify#assert#equals(tablemode#utils#StrDisplayWidth(getline(4)), tablemode#utils#StrDisplayWidth(getline(5)))
+  call testify#assert#equals(tablemode#utils#StrDisplayWidth(getline(5)), tablemode#utils#StrDisplayWidth(getline(6)))
+  call testify#assert#equals(tablemode#utils#StrDisplayWidth(getline(6)), tablemode#utils#StrDisplayWidth(getline(7)))
+  call testify#assert#equals(tablemode#utils#StrDisplayWidth(getline(7)), tablemode#utils#StrDisplayWidth(getline(8)))
+  call testify#assert#equals(tablemode#utils#StrDisplayWidth(getline(8)), tablemode#utils#StrDisplayWidth(getline(9)))
+  call testify#assert#equals(tablemode#utils#StrDisplayWidth(getline(9)), tablemode#utils#StrDisplayWidth(getline(10)))
+
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('AddBorder should be able to add borders correctly with unicode characters', function('s:TestAddBorder'))

t/autoload/tablemode/table/is_border_test.vim

@@ -0,0 +1,21 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/table/sample_with_header.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestIsBorder()
+  call testify#assert#assert(tablemode#table#IsBorder(2))
+  call testify#assert#assert(tablemode#table#IsBorder(4))
+  call testify#assert#assert(tablemode#table#IsBorder(7))
+
+  call testify#assert#assert(!tablemode#table#IsBorder(1))
+  call testify#assert#assert(!tablemode#table#IsBorder(3))
+  call testify#assert#assert(!tablemode#table#IsBorder(5))
+  call testify#assert#assert(!tablemode#table#IsBorder(6))
+endfunction
+call testify#it('IsBorder should be correct', function('s:TestIsBorder'))

t/autoload/tablemode/table/is_header_test.vim

@@ -0,0 +1,21 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/table/sample_with_header.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestIsHeader()
+  call testify#assert#assert(tablemode#table#IsHeader(3))
+
+  call testify#assert#assert(!tablemode#table#IsHeader(1))
+  call testify#assert#assert(!tablemode#table#IsHeader(2))
+  call testify#assert#assert(!tablemode#table#IsHeader(4))
+  call testify#assert#assert(!tablemode#table#IsHeader(5))
+  call testify#assert#assert(!tablemode#table#IsHeader(6))
+  call testify#assert#assert(!tablemode#table#IsHeader(7))
+endfunction
+call testify#it('IsHeader should be correct', function('s:TestIsHeader'))

t/autoload/tablemode/table/is_row_test.vim

@@ -0,0 +1,18 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/table/sample.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestIsRow()
+  call testify#assert#assert(tablemode#table#IsRow(3))
+  call testify#assert#assert(tablemode#table#IsRow(4))
+
+  call testify#assert#assert(!tablemode#table#IsRow(1))
+  call testify#assert#assert(!tablemode#table#IsRow(5))
+endfunction
+call testify#it('IsRow should be correct', function('s:TestIsRow'))

t/autoload/tablemode/table/is_table_test.vim

@@ -0,0 +1,25 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/table/sample_with_header.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestIsTable()
+  " when on row
+  call testify#assert#assert(tablemode#table#IsTable(2))
+  call testify#assert#assert(tablemode#table#IsTable(4))
+  call testify#assert#assert(tablemode#table#IsTable(7))
+
+  " when on border
+  call testify#assert#assert(tablemode#table#IsTable(3))
+  call testify#assert#assert(tablemode#table#IsTable(5))
+  call testify#assert#assert(tablemode#table#IsTable(6))
+
+  " when not in a table
+  call testify#assert#assert(!tablemode#table#IsTable(1))
+endfunction
+call testify#it('IsTable should be correct', function('s:TestIsTable'))

t/autoload/tablemode/table/realign_test.vim

@@ -0,0 +1,16 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/table/sample_realign_before.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestRealign()
+  call tablemode#table#Realign(2)
+  call testify#assert#equals(getline(2, '$'), readfile('t/fixtures/table/sample_realign_after.txt'))
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('Realign should align table properly', function('s:TestRealign'))

t/autoload/tablemode/table/realign_with_header_alignments_test.vim

@@ -0,0 +1,16 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/table/sample_header_realign_before.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestRealign()
+  call tablemode#table#Realign(2)
+  call testify#assert#equals(getline(2, '$'), readfile('t/fixtures/table/sample_header_realign_after.txt'))
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('Realign should align table properly with header realignments', function('s:TestRealign'))

t/autoload/tablemode/table/realign_with_header_realignments_and_unicode_test.vim

@@ -0,0 +1,16 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/table/sample_header_realign_unicode_before.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestRealign()
+  call tablemode#table#Realign(2)
+  call testify#assert#equals(getline(2, '$'), readfile('t/fixtures/table/sample_header_realign_unicode_after.txt'))
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('Realign should align table properly with header realignments and unicode characters', function('s:TestRealign'))

t/autoload/tablemode/table/realign_with_unicode_test.vim

@@ -0,0 +1,16 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/table/sample_realign_unicode_before.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestRealign()
+  call tablemode#table#Realign(2)
+  call testify#assert#equals(getline(2, '$'), readfile('t/fixtures/table/sample_realign_unicode_after.txt'))
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('Realign should align table properly with unicode characters', function('s:TestRealign'))

t/autoload/tablemode_tableize_test.vim

@@ -0,0 +1,27 @@
+source t/config/options.vim
+source t/utils.vim
+
+let s:test_file = 't/fixtures/tableize.txt'
+function! s:setup()
+  call utils#TestSetup(s:test_file)
+endfunction
+call testify#setup(function('s:setup'))
+call testify#teardown(function('utils#TestTeardown'))
+
+function! s:TestTabelize()
+  :3,4call tablemode#TableizeRange('')
+  call testify#assert#assert(tablemode#table#IsRow(3))
+  call testify#assert#equals(tablemode#spreadsheet#RowCount(3), 2)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount(3), 3)
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('Tableize should tableize with default delimiter correctly', function('s:TestTabelize'))
+
+function! s:TestTabelizeCustomDelimiter()
+  :3,4call tablemode#TableizeRange('/;')
+  call testify#assert#assert(tablemode#table#IsRow(3))
+  call testify#assert#equals(tablemode#spreadsheet#RowCount(3), 2)
+  call testify#assert#equals(tablemode#spreadsheet#ColumnCount(3), 2)
+  call utils#TestUndo(s:test_file)
+endfunction
+call testify#it('Tableize should tableize with custom delimiter correctly', function('s:TestTabelizeCustomDelimiter'))

t/autoload/tablemode_test.vim

@@ -0,0 +1,24 @@
+source t/config/options.vim
+
+function! s:TestTablemodeEnable()
+  silent call tablemode#Enable()
+  call testify#assert#assert(b:table_mode_active)
+endfunction
+call testify#it('tablemode#Enable should work', function('s:TestTablemodeEnable'))
+
+function! s:TestTablemodeDisable()
+  silent call tablemode#Disable()
+  call testify#assert#assert(!b:table_mode_active)
+endfunction
+call testify#it('tablemode#Disable should work', function('s:TestTablemodeDisable'))
+
+function! s:TestTablemodeToggle()
+  if exists('b:table_mode_active')
+    call testify#assert#assert(!b:table_mode_active)
+  endif
+  silent call tablemode#Toggle()
+  call testify#assert#assert(b:table_mode_active)
+  silent call tablemode#Toggle()
+  call testify#assert#assert(!b:table_mode_active)
+endfunction
+call testify#it('tablemode#Toggle should work', function('s:TestTablemodeToggle'))

t/cell.vim

@@ -1,139 +0,0 @@
-" 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
-      new
-      read t/fixtures/sample.txt
-    end
-
-    it 'should return the cells with GetCells'
-      Expect tablemode#spreadsheet#cell#GetCells(2, 1, 1) ==# 'test11'
-      " Get Rows
-      Expect tablemode#spreadsheet#cell#GetCells(2, 1) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#cell#GetCells(2, 2) == ['test21', 'test22']
-      " Get Columns
-      Expect tablemode#spreadsheet#cell#GetCells(2, 0, 1) == ['test11', 'test21']
-      Expect tablemode#spreadsheet#cell#GetCells(2, 0, 2) == ['test12', 'test22']
-    end
-
-    it 'should return the row with GetRow'
-      Expect tablemode#spreadsheet#cell#GetRow(1, 2) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#cell#GetRow(2, 2) == ['test21', 'test22']
-    end
-
-    it 'should return the column with GetColumn'
-      Expect tablemode#spreadsheet#cell#GetColumn(1, 2) == ['test11', 'test21']
-      Expect tablemode#spreadsheet#cell#GetColumn(2, 2) == ['test12', 'test22']
-    end
-
-    it 'should return the cells in a range with GetCellRange'
-      " Entire table as range
-      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:2,2', 2, 1) == [['test11', 'test21'], ['test12', 'test22']]
-
-      " Get Rows given different seed lines and columns
-      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 2, 1) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 2, 2) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 1) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 2) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 2, 1) == ['test21', 'test22']
-      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 2, 2) == ['test21', 'test22']
-      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 1) == ['test21', 'test22']
-      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 2) == ['test21', 'test22']
-
-      " Get Columns given different seed lines and column
-      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 2, 1) == ['test11', 'test21']
-      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 2, 2) == ['test12', 'test22']
-      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 1) == ['test11', 'test21']
-      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 2) == ['test12', 'test22']
-
-      " Get Column given negative values in range for representing rows from
-      " the end, -1 being the second last row.
-      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 2, 1) == ['test11']
-      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 1) == ['test11']
-      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 2, 2) == ['test12']
-      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 2) == ['test12']
-    end
-  end
-
-  describe 'Motions'
-    describe 'left or right'
-      before
-        new
-        normal! ggdG
-        call tablemode#Enable()
-        normal i|test11|test12|
-|test21|test22|
-        call cursor(1, 3)
-      end
-
-      it 'should move left when not on first column'
-        call cursor(1, 12)
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-        call tablemode#spreadsheet#cell#Motion('h')
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-      end
-
-      it 'should move to the previous row last column if it exists when on first column'
-        call cursor(2, 3)
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-        call tablemode#spreadsheet#cell#Motion('h')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-      end
-
-      it 'should move right when not on last column'
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-        call tablemode#spreadsheet#cell#Motion('l')
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-      end
-
-      it 'should move to the next row first column if it exists when on last column'
-        call cursor(1, 12)
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-        call tablemode#spreadsheet#cell#Motion('l')
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-      end
-    end
-
-    describe 'up or down'
-      before
-        new
-        normal! ggdG
-        call tablemode#Enable()
-        normal i|test11|test12|
-|test21|test22|
-        call cursor(1, 3)
-      end
-
-      it 'should move a row up unless on first row'
-        call cursor(2, 3)
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        call tablemode#spreadsheet#cell#Motion('k')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-      end
-
-      it 'should remain on first row when trying to move up'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#spreadsheet#cell#Motion('k')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-      end
-
-      it 'should move a row down unless on last row'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#spreadsheet#cell#Motion('j')
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-      end
-
-      it 'should remain on last row when trying to move down'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#spreadsheet#cell#Motion('k')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-      end
-    end

t/config/options.vim

@@ -1,9 +1,39 @@
 let g:table_mode_corner = '+'
 let g:table_mode_separator = '|'
+let g:table_mode_separator_map = '<Bar>'
+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
+let g:table_mode_tableize_auto_border = 0
+let g:table_mode_ignore_align = 0

t/fixtures/align/unicode_before.txt

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

t/fixtures/big_sample.txt

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

t/fixtures/cell/counts.txt

@@ -0,0 +1,3 @@
+| 1 | 2 | 3 |
+|   | 0 |   |
+| 4 | 5 | 6 |

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        |
+|----------+----------+----------+----------|

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.      |
+|-------------------+---------------------------|

t/fixtures/formula/formula.txt

@@ -1,7 +1,7 @@
-| Item     | Cost  |
-|----------+-------|
-| Bread    |    20 |
-| Tomatoes |     5 |
-| Pasta    |   100 |
-| Total    |     0 |
-/* tmf: $5,2=Sum(1:-1) */
+| Item     | Cost |
+|----------+------|
+| Bread    | 20   |
+| Tomatoes | 5    |
+| Pasta    | 100  |
+| Total    | 0    |
+ tmf: $4,2=Sum(1:-1)

t/fixtures/table/sample_header_realign_after.txt

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

t/fixtures/table/sample_header_realign_before.txt

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

t/fixtures/table/sample_header_realign_unicode_after.txt

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

t/fixtures/table/sample_header_realign_unicode_before.txt

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

t/formula.vim

@@ -1,41 +0,0 @@
-" 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
-      new
-      read t/fixtures/formula/sample.txt
-    end
-
-    it 'should add a formula successfully'
-      call cursor(6, 15)
-      call tablemode#spreadsheet#formula#Add("Sum(1:4)")
-      Expect tablemode#spreadsheet#cell#GetCell() == '125.0'
-      call cursor(8, 15)
-      Expect getline('.') == '/* tmf: $5,2=Sum(1:4) */'
-
-      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) */'
-    end
-  end
-
-  describe 'Evaluate Formula'
-    before
-      new
-      read t/fixtures/formula/formula.txt
-    end
-
-    it 'should evaluate the formula successfull'
-      call cursor(6, 15)
-      call tablemode#spreadsheet#formula#EvaluateFormulaLine()
-      Expect &modified == 1
-      Expect tablemode#spreadsheet#cell#GetCell() == '125.0'
-    end
-  end
-end

t/spreadsheet.vim

@@ -1,108 +0,0 @@
-" vim: fdm=indent
-source t/config/options.vim
-
-call vspec#hint({'scope': 'tablemode#spreadsheet#scope()', 'sid': 'tablemode#spreadsheet#sid()'})
-
-describe 'spreadsheet'
-  describe 'API'
-    before
-      new
-      read t/fixtures/sample.txt
-    end
-
-    it 'should return the row count'
-      Expect tablemode#spreadsheet#RowCount(2) == 2
-      Expect tablemode#spreadsheet#RowCount(3) == 2
-    end
-
-    it 'should return the row number'
-      Expect tablemode#spreadsheet#RowNr(2) == 1
-      Expect tablemode#spreadsheet#RowNr(3) == 2
-    end
-
-    it 'should return the column count'
-      Expect tablemode#spreadsheet#ColumnCount(2) == 2
-      Expect tablemode#spreadsheet#ColumnCount(3) == 2
-    end
-
-    it 'should return the column number'
-      call cursor(2,3)
-      Expect tablemode#spreadsheet#ColumnNr('.') == 1
-      call cursor(2,12)
-      Expect tablemode#spreadsheet#ColumnNr('.') == 2
-    end
-
-    it 'should return true when in the first cell'
-      call cursor(2,3)
-      Expect tablemode#spreadsheet#IsFirstCell() to_be_true
-      call cursor(2,12)
-      Expect tablemode#spreadsheet#IsFirstCell() to_be_false
-    end
-
-    it 'should return true when in the last cell'
-      call cursor(2,3)
-      Expect tablemode#spreadsheet#IsLastCell() to_be_false
-      call cursor(2,12)
-      Expect tablemode#spreadsheet#IsLastCell() to_be_true
-    end
-
-    it 'should return the line number of the first row'
-      Expect tablemode#spreadsheet#GetFirstRow(2) == 2
-      Expect tablemode#spreadsheet#GetFirstRow(3) == 2
-    end
-
-    it 'should return the line nuber of the last row'
-      Expect tablemode#spreadsheet#GetLastRow(2) == 3
-      Expect tablemode#spreadsheet#GetLastRow(3) == 3
-    end
-
-    describe 'Math'
-      before
-        new
-        read t/fixtures/cell/sample.txt
-      end
-
-      it 'should return the sum of cell range'
-        call cursor(1,3)
-        Expect tablemode#spreadsheet#Sum('1:2') == 4.0
-        Expect tablemode#spreadsheet#Sum('1,1:1,2') == 3.0
-        Expect tablemode#spreadsheet#Sum('1,1:2,2') == 10.0
-        call cursor(2,7)
-        Expect tablemode#spreadsheet#Sum('1:2') == 6.0
-        Expect tablemode#spreadsheet#Sum('2,1:2,2') == 7.0
-      end
-
-      it 'should return the average of cell range'
-        call cursor(1,3)
-        Expect tablemode#spreadsheet#Average('1:2') == 2.0
-        Expect tablemode#spreadsheet#Average('1,1:1,2') == 1.5
-        Expect tablemode#spreadsheet#Average('1,1:2,2') == 5.0
-        call cursor(2,7)
-        Expect tablemode#spreadsheet#Average('1:2') == 3.0
-        Expect tablemode#spreadsheet#Average('2,1:2,2') == 3.5
-      end
-    end
-  end
-
-  describe 'Manipulations'
-    before
-      new
-      normal! ggdG
-      call tablemode#Enable()
-      normal i|test11|test12|
-|test21|test22|
-      call cursor(1, 3)
-    end
-
-    it 'should delete a row successfully'
-      Expect tablemode#spreadsheet#RowCount('.') == 2
-      call tablemode#spreadsheet#DeleteRow()
-      Expect tablemode#spreadsheet#RowCount('.') == 1
-    end
-
-    it 'should successfully delete column'
-      Expect tablemode#spreadsheet#ColumnCount('.') == 2
-      call tablemode#spreadsheet#DeleteColumn()
-      Expect tablemode#spreadsheet#ColumnCount('.') == 1
-    end
-  end

t/table.vim

@@ -1,163 +0,0 @@
-" vim: fdm=indent
-source t/config/options.vim
-
-call vspec#hint({'scope': 'tablemode#table#scope()', 'sid': 'tablemode#table#sid()'})
-
-describe 'table'
-  describe 'IsRow'
-    before
-      new
-      normal! ggdG
-      read t/fixtures/table/sample.txt
-    end
-
-    it 'should be true when on a table row'
-      Expect tablemode#table#IsRow(2) to_be_true
-      Expect tablemode#table#IsRow(3) to_be_true
-    end
-
-    it 'should be false when not on a table row'
-      Expect tablemode#table#IsRow(1) to_be_false
-      Expect tablemode#table#IsRow(4) to_be_false
-    end
-  end
-
-  describe 'IsBorder'
-    before
-      new
-      normal! ggdG
-      read t/fixtures/table/sample_with_header.txt
-    end
-
-    it 'should be true on a table border'
-      Expect tablemode#table#IsBorder(1) to_be_true
-      Expect tablemode#table#IsBorder(3) to_be_true
-      Expect tablemode#table#IsBorder(6) to_be_true
-    end
-
-    it 'should be false when not on a table border'
-      Expect tablemode#table#IsBorder(2) to_be_false
-      Expect tablemode#table#IsBorder(4) to_be_false
-      Expect tablemode#table#IsBorder(5) to_be_false
-    end
-  end
-
-  describe 'IsHeader'
-    before
-      new
-      normal! ggdG
-      read t/fixtures/table/sample_with_header.txt
-    end
-
-    it 'should be true on the table header'
-      Expect tablemode#table#IsHeader(2) to_be_true
-    end
-
-    it 'should be false anywhere else'
-      Expect tablemode#table#IsHeader(1) to_be_false
-      Expect tablemode#table#IsHeader(4) to_be_false
-      Expect tablemode#table#IsHeader(5) to_be_false
-      Expect tablemode#table#IsHeader(6) to_be_false
-      Expect tablemode#table#IsHeader(7) to_be_false
-    end
-  end
-
-  describe 'AddBorder'
-    before
-      new
-      normal! ggdG
-      read t/fixtures/table/sample_for_header.txt
-    end
-
-    it 'should add border to line'
-      call tablemode#table#AddBorder(2)
-      Expect tablemode#table#IsHeader(1) to_be_true
-      Expect tablemode#table#IsBorder(2) to_be_true
-    end
-
-    describe 'for unicode'
-      before
-        new
-        normal! ggdG
-        read t/fixtures/table/sample_for_header_unicode.txt
-      end
-
-      it 'should add border to line'
-        call tablemode#table#AddBorder(1)
-        call tablemode#table#AddBorder(3)
-        call tablemode#table#AddBorder(5)
-        call tablemode#table#AddBorder(7)
-        call tablemode#table#AddBorder(9)
-
-        Expect tablemode#table#IsBorder(1) to_be_true
-        Expect tablemode#utils#StrDisplayWidth(getline(1)) == tablemode#utils#StrDisplayWidth(getline(2))
-        Expect tablemode#table#IsBorder(3) to_be_true
-        Expect tablemode#utils#StrDisplayWidth(getline(3)) == tablemode#utils#StrDisplayWidth(getline(4))
-        Expect tablemode#table#IsBorder(5) to_be_true
-        Expect tablemode#utils#StrDisplayWidth(getline(5)) == tablemode#utils#StrDisplayWidth(getline(6))
-        Expect tablemode#table#IsBorder(7) to_be_true
-        Expect tablemode#utils#StrDisplayWidth(getline(7)) == tablemode#utils#StrDisplayWidth(getline(8))
-        Expect tablemode#table#IsBorder(9) to_be_true
-        Expect tablemode#utils#StrDisplayWidth(getline(9)) == tablemode#utils#StrDisplayWidth(getline(8))
-      end
-    end
-  end
-
-  describe 'Realign'
-    describe 'without header alignments'
-      describe 'for simple'
-        before
-          new
-          normal! ggdG
-          read t/fixtures/table/sample_realign_before.txt
-        end
-
-        it 'should be aligned properly'
-          call tablemode#table#Realign(1)
-          Expect getline(1,'$') == readfile('t/fixtures/table/sample_realign_after.txt')
-        end
-      end
-
-      describe 'for unicode'
-        before
-          new
-          normal! ggdG
-          read t/fixtures/table/sample_realign_unicode_before.txt
-        end
-
-        it 'should be aligned properly'
-          call tablemode#table#Realign(1)
-          Expect getline(1,'$') == readfile('t/fixtures/table/sample_realign_unicode_after.txt')
-        end
-      end
-    end
-
-    describe 'with header alignments'
-      describe 'for simple'
-        before
-          new
-          normal! ggdG
-          read t/fixtures/table/sample_header_realign_before.txt
-        end
-
-        it 'should be aligned properly'
-          call tablemode#table#Realign(1)
-          Expect getline(1,'$') == readfile('t/fixtures/table/sample_header_realign_after.txt')
-        end
-      end
-
-      describe 'for unicode'
-        before
-          new
-          normal! ggdG
-          read t/fixtures/table/sample_header_realign_unicode_before.txt
-        end
-
-        it 'should be aligned properly'
-          call tablemode#table#Realign(1)
-          Expect getline(1,'$') == readfile('t/fixtures/table/sample_header_realign_unicode_after.txt')
-        end
-      end
-    end
-  end
-end

t/tablemode.vim

@@ -1,58 +0,0 @@
-" vim: fdm=indent
-source t/config/options.vim
-
-call vspec#hint({'scope': 'tablemode#scope()', 'sid': 'tablemode#sid()'})
-
-describe 'tablemode'
-  describe 'Activation'
-    describe 'tablemode#Enable()'
-      before
-        call tablemode#Enable()
-      end
-
-      it 'should enable table mode'
-        Expect b:table_mode_active to_be_true
-      end
-    end
-
-    describe 'tablemode#Disable()'
-      before
-        call tablemode#Disable()
-      end
-
-      it 'should disable table mode'
-        Expect b:table_mode_active to_be_false
-      end
-    end
-
-    describe 'tablemode#Toggle()'
-      it 'should toggle table mode'
-        call tablemode#Toggle()
-        Expect b:table_mode_active to_be_true
-        call tablemode#Toggle()
-        Expect b:table_mode_active to_be_false
-      end
-    end
-  end
-
-  describe 'Tableize'
-    before
-      new
-      read t/fixtures/tableize.txt
-    end
-
-    it 'should tableize with default delimiter'
-      :2,3call tablemode#TableizeRange('')
-      Expect tablemode#table#IsRow(2) to_be_true
-      Expect tablemode#spreadsheet#RowCount(2) == 2
-      Expect tablemode#spreadsheet#ColumnCount(2) == 3
-    end
-
-    it 'should tableize with given delimiter'
-      :2,3call tablemode#TableizeRange('/;')
-      Expect tablemode#table#IsRow(2) to_be_true
-      Expect tablemode#spreadsheet#RowCount(2) == 2
-      Expect tablemode#spreadsheet#ColumnCount(2) == 2
-    end
-  end
-end

t/utils.vim

@@ -1,47 +1,19 @@
-" vim: fdm=indent
-source t/config/options.vim
+function! utils#TestSetup(file) abort
+  new
+  silent! exec 'read' a:file
+endfunction
 
-call vspec#hint({'scope': 'tablemode#utils#scope()', 'sid': 'tablemode#utils#sid()'})
+function! utils#TestTeardown() abort
+  bw!
+endfunction
 
-describe 'utils'
-  describe 'line'
-    it 'should return the current line number'
-      Expect tablemode#utils#line('.') == line('.')
-    end
+function! utils#TestUndo(file) abort
+  :%delete
+  silent! exec 'read' a:file
+endfunction
 
-    it 'should return the line number itself if it is a number'
-      Expect tablemode#utils#line(1) == 1
-    end
-  end
-
-  describe 'strip'
-    it 'should strip all initial or trailing whitespace from a string'
-      let string = ' This is awesome  '
-      Expect tablemode#utils#strip(string) == 'This is awesome'
-    end
-  end
-
-  describe 'strlen'
-    it 'should return the length of a string correctly'
-      let string = 'this is a test'
-      Expect tablemode#utils#strlen(string) == 14
-    end
-
-    it 'should return the length of a unicode string correctly'
-      let string = '測試 is good.'
-      Expect tablemode#utils#strlen(string) == 11
-    end
-  end
-
-  describe 'strdisplaywidth'
-    it 'should return the display width of a string correctly'
-      let string = 'this is a test'
-      Expect tablemode#utils#StrDisplayWidth(string) == 14
-    end
-
-    it 'should return the display width of a unicode string correctly'
-      let string = '測試 is good.'
-      Expect tablemode#utils#StrDisplayWidth(string) == 13
-    end
-  end
-end
+function! utils#TableTest(tests) abort
+  for test in a:tests
+    call testify#assert#equals(test.actual, test.expected)
+  endfor
+endfunction