Improve Tableize. Fix #109.

This adds a new option `g:table_mode_tableize_auto_border` that allows
to enable automatic border creation when using Tableize to create tables

.github/FUNDING.yml

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

.travis.yml

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

CHANGELOG.md

@@ -1,4 +1,47 @@
 # Change Log
+
+## Version 4.6.4.1
+* Added a fix for markdown commentstring
+
+## Version 4.6.4
+* Added support for center aligning columns
+
+## Version 4.6.3
+* Fixed tablemode#spreadsheet#LineNr()
+* Fixed tablemode#spreadsheet#cell#SetCell()
+
+## Version 4.6.2
+* Added custom User autocmd event for tablemode activation (enabled /
+  disabled)
+* Adding better header support for pandoc, headers can now have a different
+  fillchar configured with `g:table_mode_header_fillchar`
+
+## Version 4.6.1
+* Minor bug fixes
+
+## Version 4.6.0
+* Added better table header support. The first line of the table if separated
+  by a table border will be considered as the header. This also means that it
+  will not be considered / included when evaluating table formulas and that
+  the first line after the header would be considered the first line of the
+  table.
+
+## Version 4.5.0
+* Refactored toggled mappings
+* Table Syntax now gets toggled with Table Mode
+
+## Version 4.4.2
+* Updated mappings to be buffer local.
+* Updated mappings to toggle and function only when table mode is active.
+
+## Version 4.4.1
+* Added syntax for matching tables
+
+## Version 4.4.0
+* Minor bug fixes
+* Added feature to allow using negative indices within formulas to access rows,
+  columns relative to the last, -1 being the last.
+
 ## Version 4.3.0
 * Refactored some more
 * Fixed issue #19, hiphens in the table broke alignment
@@ -98,3 +141,7 @@
 
 ## Version 1.0 :
 * First stable release, create tables as you type.
+
+<!--
+  vim: ft=markdown
+-->

Gemfile

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

Gemfile.lock

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

README.md

@@ -1,14 +1,10 @@
-# VIM Table Mode v4.3.0 [![Build Status](https://travis-ci.org/dhruvasagar/vim-table-mode.png?branch=master)](https://travis-ci.org/dhruvasagar/vim-table-mode)
+# VIM Table Mode v4.7.3 [![Build Status](https://travis-ci.org/dhruvasagar/vim-table-mode.png?branch=master)](https://travis-ci.org/dhruvasagar/vim-table-mode)
 
 An awesome automatic table creator & formatter allowing one to create neat
 tables as you type.
 
-## Change Log
+## Getting Started 
-See <a
-href="https://github.com/dhruvasagar/vim-table-mode/blob/master/CHANGELOG.md">
-CHANGELOG.md </a>
 
-## Getting Started
 ### Installation
 
 There are several ways to do this
@@ -21,56 +17,136 @@ There are several ways to do this
    href="https://github.com/tpope/vim-pathogen">pathogen.vim</a>, then
    add a git submodule for your plugin:
 
-   ```sh
+```sh
 $ cd ~/.vim
 $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-mode
-   ```
+```
-3. Copy autoload/todomode.vim, plugin/todo-mode.vim, doc/todo-mode.txt to
+
-   respective ~/.vim/autoload/, ~/.vim/plugin and ~/.vim/doc under UNIX or 
+3. Copy all files under autoload/, plugin/, doc/ to respective
+   ~/.vim/autoload/, ~/.vim/plugin and ~/.vim/doc under UNIX or
    vimfiles/autoload/, vimfiles/plugin/ and vimfiles/doc under WINDOWS and
    restart VIM
+   
+4. Alternatively, if using <a href="https://github.com/junegunn/vim-plug">vim-plug</a>, then add `Plug 'dhruvasagar/vim-table-mode'` to your ~/.vimrc. 
 
-### Usage
+### Creating table on-the-fly
 
-- **On the fly table creation** :
+To start using the plugin in the on-the-fly mode use `:TableModeToggle` mapped to <kbd>\<Leader\>tm</kbd> by default (which means <kbd>\\</kbd> <kbd>t</kbd> <kbd>m</kbd> if you didn't override the <Leader> by `:let mapleader = ','` to have <kbd>,</kbd> <kbd>t</kbd> <kbd>m</kbd>).
 
-   By default the table column separator is <kbd>|</kbd> defined by the
+Tip:
-   `g:table_mode_separator` option. As soon as you type it on a new line (ignores
+You can use the following to quickly enable / disable table mode in insert mode by using `||` or `__`:
-   indentation) the script gets to work on creating a table around it. As you
+> ```vim
-   type and define more columns, the table is completed, formatted and aligned
+> function! s:isAtStartOfLine(mapping)
-   automatically on the fly.
+>   let text_before_cursor = getline('.')[0 : col('.')-1]
+>   let mapping_pattern = '\V' . escape(a:mapping, '\')
+>   let comment_pattern = '\V' . escape(substitute(&l:commentstring, '%s.*$', '', ''), '\')
+>   return (text_before_cursor =~? '^' . ('\v(' . comment_pattern . '\v)?') . '\s*\v' . mapping_pattern . '\v$')
+> endfunction
+> 
+> inoreabbrev <expr> <bar><bar>
+>           \ <SID>isAtStartOfLine('\|\|') ?
+>           \ '<c-o>:TableModeEnable<cr><bar><space><bar><left><left>' : '<bar><bar>'
+> inoreabbrev <expr> __
+>           \ <SID>isAtStartOfLine('__') ?
+>           \ '<c-o>:silent! TableModeDisable<cr>' : '__'
+> ```
 
-   Since this could lead to unwanted behavior I have disabled table mode by
+Enter the first line, delimiting columns by the `|` symbol. The plugin reacts by inserting spaces between the text and the separator if you omit them:
-   default. You have to use `:TableModeToggle` command or the table mode
-   toggle mapping, which is <kbd>\<Leader\>tm</kbd> defined by `g:table_mode_toggle_map`
-   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.
 
-- **Format existing content into a table** :
+    | name | address | phone |
 
-   Table Mode wouldn't justify it's name if it didn't allow formatting
+In the second line (without leaving Insert mode), enter `|` twice. The plugin will write a properly formatted horizontal line:
-   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
+    | name | address | phone |
-   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
+When you enter the subsequent lines, the plugin will automatically adjust the formatting to match the text you’re entering every time you press `|`:
-   Value) data into a table and use `,` defined by `g:table_mode_delimiter`
+
-   option as the delimiter.
+    | name       | address | phone |
+    |------------+---------+-------|
+    | John Adams |
+
+Go on until the table is ready:
+
+    | name            | address                  | phone      |
+    |-----------------+--------------------------+------------|
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    |-----------------+--------------------------+------------|
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    |-----------------+--------------------------+------------|
+
+Then you can return to the first line and above it enter `||`:
+
+    |-----------------+--------------------------+------------|
+    | name            | address                  | phone      |
+    |-----------------+--------------------------+------------|
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    |-----------------+--------------------------+------------|
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    |-----------------+--------------------------+------------|
+
+Corner separators are adjustable:
+
+For Markdown-compatible tables use
+
+    let g:table_mode_corner='|'
+
+
+    |-----------------|--------------------------|------------|
+    | name            | address                  | phone      |
+    |-----------------|--------------------------|------------|
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    |-----------------|--------------------------|------------|
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    |-----------------|--------------------------|------------|
+
+To get ReST-compatible tables use
+
+    let g:table_mode_corner_corner='+'
+    let g:table_mode_header_fillchar='='
+
+
+    +-----------------+--------------------------+------------+
+    | name            | address                  | phone      |
+    +=================+==========================+============+
+    | John Adams      | 1600 Pennsylvania Avenue | 0123456789 |
+    +-----------------+--------------------------+------------+
+    | Sherlock Holmes | 221B Baker Street        | 0987654321 |
+    +-----------------+--------------------------+------------+
+
+Markdown and ReST filetypes have automatically configured corners.
+
+   You can also define in a table header border how 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 use tabular (eg.
+   `: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 `g:table_mode_tableize_op_map` option which takes input in the
+   (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 and so you can also call it by giving
+   `:Tableize` also accepts a range. Call it by giving
-   lines manually like `:line1,line2Tableize`, but this is not very intuitive.
+   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.
 
-- **Move between cells** :
+### Moving around 
 
    Now you can move between cells using table mode motions <kbd>[|</kbd>,
    <kbd>]|</kbd>, <kbd>{|</kbd> & <kbd>}|</kbd> to move left | right | up |
@@ -78,36 +154,48 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
    and move to the next | previous row after the last | first cell in the
    current row if one exists. 
 
-- **Manipulating Table** :
+### Manipulating Table
 
   - **Cell Text Object** :
 
       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
+      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
+      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
+      `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
+      you are within a table row). This can be preceeded with a `[count]` to
-      delete multiple rows just like you would with 'dd'.
+      delete multiple rows as per Vim command grammar.
 
   - **Delete Column** :
 
-      You can use the <kbd>\<Leader\>tdc</kbd> mapping defined by the option
+      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
+      `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.
+      `[count]` to delete multiple columns.
 
-- **Table Formulas** :
+  - **Insert Column** :
+
+      You can use the <kbd>\<Leader\>tic</kbd> mapping (defined by the option
+      `g:table_mode_insert_column_after_map`) to insert a column after the
+      cursor (provided you are within a table row). Of course you can use the
+      <kbd>\<Leader\>tiC</kbd> mapping defined by
+      `g:table_mode_insert_column_before_map` to insert a column before the
+      cursor. Both can also be preceeded with a [count] to insert multiple
+      columns.
+
+## Advanced Usage: Spreadsheet Capabilities
+
+### Table Formulas
 
   Table Mode now has support for formulas like a spreadsheet. There are 2 ways
   of defining formulas :
 
   - 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
+    (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
@@ -120,12 +208,12 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
     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`
+  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** :
+### Formula Expressions
 
   Expressions are of the format `$target = formula`.
 
@@ -133,19 +221,21 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
 
       - `$n`: This matches the table column number `n`. So the `formula` would
         be evaluated for each cell in that column and the result would be placed
-        in it.
+        in it. You can use negative indice to represent column relative to the
+        last, -1 being the last.
 
       - `$n,m`: This matches the table cell n,m (row, column). So in this case
         the formula would be evaluated and the result will be placed in this
-        cell.
+        cell. You can also use negative values to refer to cells relative to
+        the size, -1 being the last (row or column).
 
   - The `formula` can be a simple mathematical expression involving cells
     which are also defined by the same format as that of the target cell.  You
     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 :
+    functions take a range as input. A range can be of two forms:
 
-      - `r1,r2`: This represents cells in the current column from row `r1`
+      - `r1:r2`: This represents cells in the current column from row `r1`
         through `r2`. If `r2` is negative it represents `r2` rows above the
         current row (of the target cell).
 
@@ -164,10 +254,15 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
       - `$5,3 = Sum(1,2:5,2)/$5,1`
       - `$5,3 = Average(1,2:5,2)/$5,1`
 
-### Demo
+## Demo
 
-<a href="http://www.youtube.com/watch?v=sK2IH1hiDkw"><img
+<a href="http://www.youtube.com/watch?v=9lVQ0VJY3ps"><img
-src="https://raw.github.com/dhruvasagar/vim-table-mode/master/youtube.png"/></a>
+src="https://raw.github.com/axil/vim-table-mode/master/youtube.png"/></a>
+
+## Change Log
+See <a
+href="https://github.com/dhruvasagar/vim-table-mode/blob/master/CHANGELOG.md">
+CHANGELOG.md </a>
 
 ## Contributing
 
@@ -187,3 +282,33 @@ named <a href="https://gist.github.com/tpope/287147">cucumbertables.vim</a>.
 
 Also a shout out to godlygeek who developed the incredible <a
 href="http://github.com/godlygeek/tabular">Tabular</a> plugin.
+
+## Contributors
+
+### Code Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="https://github.com/dhruvasagar/vim-table-mode/graphs/contributors"><img src="https://opencollective.com/vim-table-mode/contributors.svg?width=890&button=false" /></a>
+
+### Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/vim-table-mode/contribute)]
+
+#### Individuals
+
+<a href="https://opencollective.com/vim-table-mode"><img src="https://opencollective.com/vim-table-mode/individuals.svg?width=890"></a>
+
+#### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/vim-table-mode/contribute)]
+
+<a href="https://opencollective.com/vim-table-mode/organization/0/website"><img src="https://opencollective.com/vim-table-mode/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/1/website"><img src="https://opencollective.com/vim-table-mode/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/2/website"><img src="https://opencollective.com/vim-table-mode/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/3/website"><img src="https://opencollective.com/vim-table-mode/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/4/website"><img src="https://opencollective.com/vim-table-mode/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/5/website"><img src="https://opencollective.com/vim-table-mode/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/6/website"><img src="https://opencollective.com/vim-table-mode/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/7/website"><img src="https://opencollective.com/vim-table-mode/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/8/website"><img src="https://opencollective.com/vim-table-mode/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/vim-table-mode/organization/9/website"><img src="https://opencollective.com/vim-table-mode/organization/9/avatar.svg"></a>

autoload/tablemode.vim

@@ -1,63 +1,145 @@
-" ==============================  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
+function! s:Map(map, to, mode) "{{{2
-  if exists('b:table_mode_active') && b:table_mode_active
+  if !empty(a:to) && !hasmapto(a:map, a:mode)
-    call s:SetBufferOptDefault('table_mode_separator_map', g:table_mode_separator)
+    for l:mode in split(a:mode, '.\zs')
-    " '|' is a special character, we need to map <Bar> instead
+      execute l:mode . 'map <buffer>' a:to a:map
-    if g:table_mode_separator ==# '|' | let b:table_mode_separator_map = '<Bar>' | endif
+    endfor
+  endif
+endfunction
 
-    execute "inoremap <silent> <buffer> " . b:table_mode_separator_map . ' ' .
+function! s:UnMap(map, mode) "{{{2
-          \ b:table_mode_separator_map . "<Esc>:call tablemode#TableizeInsertMode()<CR>a"
+  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
+  let separator_map = g:table_mode_separator
+  " '|' is a special character, we need to map <Bar> instead
+  if g:table_mode_separator ==# '|' | let separator_map = '<Bar>' | endif
+
+  if !g:table_mode_disable_mappings
+    if tablemode#IsActive()
+      call s:Map('<Plug>(table-mode-tableize)', separator_map, 'i')
+      call s:Map('<Plug>(table-mode-motion-up)', g:table_mode_motion_up_map, 'n')
+      call s:Map('<Plug>(table-mode-motion-down)', g:table_mode_motion_down_map, 'n')
+      call s:Map('<Plug>(table-mode-motion-left)', g:table_mode_motion_left_map, 'n')
+      call s:Map('<Plug>(table-mode-motion-right)', g:table_mode_motion_right_map, 'n')
+
+      call s:Map('<Plug>(table-mode-cell-text-object-a)', g:table_mode_cell_text_object_a_map, 'ox')
+      call s:Map('<Plug>(table-mode-cell-text-object-i)', g:table_mode_cell_text_object_i_map, 'ox')
+
+      call s:Map('<Plug>(table-mode-realign)', g:table_mode_realign_map, 'n')
+      call s:Map('<Plug>(table-mode-delete-row)', g:table_mode_delete_row_map, 'n')
+      call s:Map('<Plug>(table-mode-delete-column)', g:table_mode_delete_column_map, 'n')
+      call s:Map('<Plug>(table-mode-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(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 containedin=ALL'
+    syntax match TableSeparator /|/ contained
+    syntax match TableColumnAlign /:/ contained
+    syntax match TableBorder /[\-+]\+/ contained
+
+    hi! link TableBorder Delimiter
+    hi! link TableSeparator Delimiter
+    hi! link TableColumnAlign Type
   else
-    silent! execute "iunmap <silent> <buffer> " . b:table_mode_separator_map
+    syntax clear Table
+    syntax clear TableBorder
+    syntax clear TableSeparator
+    syntax clear TableColumnAlign
+
+    hi! link TableBorder NONE
+    hi! link TableSeparator NONE
+    hi! link TableColumnAlign NONE
+  endif
+endfunction
+
+function! s:ToggleAutoAlign() "{{{2
+  if !g:table_mode_auto_align | return | endif
+
+  if tablemode#IsActive()
+    augroup TableModeAutoAlign
+      au!
+
+      autocmd CursorHold <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
-  let gflag = 'g'
+  let old_gdefault = &gdefault
-  if &gdefault | let gflag = 'gg' | endif
+  set nogdefault
 
   let delim = g:table_mode_delimiter
   if a:0 | let delim = a:1 | endif
   if delim ==# ','
-    silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs,\\ze[^\'\"]*[\'\"]/__COMMA__/" . gflag
+    silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs,\\ze[^\'\"]*[\'\"]/__COMMA__/g"
   endif
 
   let [cstart, cend] = [tablemode#table#GetCommentStart(), tablemode#table#GetCommentEnd()]
@@ -67,11 +149,13 @@ function! s:ConvertDelimiterToSeparator(line, ...) "{{{2
 
   silent! execute a:line . 's/' . tablemode#table#StartExpr() . '\zs\ze' . match_char_start .
         \ '\|' . delim .  '\|' . match_char_end . '\zs\ze' . tablemode#table#EndExpr() . '/' .
-        \ g:table_mode_separator . '/' . gflag
+        \ g:table_mode_separator . '/g'
 
   if delim ==# ','
-    silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs__COMMA__\\ze[^\'\"]*[\'\"]/,/" . gflag
+    silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs__COMMA__\\ze[^\'\"]*[\'\"]/,/g"
   endif
+
+  let &gdefault=old_gdefault
 endfunction
 
 function! s:Tableizeline(line, ...) "{{{2
@@ -81,15 +165,6 @@ function! s:Tableizeline(line, ...) "{{{2
 endfunction
 
 " Public API {{{1
-function! tablemode#sid() "{{{2
-  return maparg('<SID>', 'n')
-endfunction
-nnoremap <SID> <SID>
-
-function! tablemode#scope() "{{{2
-  return s:
-endfunction
-
 function! tablemode#IsActive() "{{{2
   if g:table_mode_always_active | return 1 | endif
 
@@ -98,15 +173,17 @@ function! tablemode#IsActive() "{{{2
 endfunction
 
 function! tablemode#TableizeInsertMode() "{{{2
-  if tablemode#IsActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator)
+  if tablemode#IsActive()
-    call tablemode#table#AddHeaderBorder('.')
+    if getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator . tablemode#table#EndExpr()) 
-    normal! A
+      call tablemode#table#AddBorder('.')
-  elseif tablemode#IsActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
+      normal! A
-    let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g'))
+    elseif getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
-    let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*'))
+      let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g'))
-    call tablemode#table#Realign('.')
+      let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*'))
-    normal! 0
+      call tablemode#table#Realign('.')
-    call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
+      normal! 0
+      call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
+    endif
   endif
 endfunction
 
@@ -129,9 +206,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
 

autoload/tablemode/align.vim

@@ -1,50 +1,5 @@
-" ==============================  Header ======================================
-" File:          autoload/tablemode/align.vim
-" Description:   Table mode for vim for creating neat tables.
-" Author:        Dhruva Sagar <http://dhruvasagar.com/>
-" License:       MIT (http://www.opensource.org/licenses/MIT)
-" Website:       https://github.com/dhruvasagar/vim-table-mode
-" Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
-"                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
-"
-" Copyright Notice:
-"                Permission is hereby granted to use and distribute this code,
-"                with or without modifications, provided that this copyright
-"                notice is copied with it. Like anything else that's free,
-"                table-mode.vim is provided *as is* and comes with no warranty
-"                of any kind, either expressed or implied. In no event will
-"                the copyright holder be liable for any damamges resulting
-"                from the use of this software.
-" =============================================================================
-
 " Borrowed from Tabular
 " Private Functions {{{1
-" Return the number of bytes in a string after expanding tabs to spaces.  {{{2
-" This expansion is done based on the current value of 'tabstop'
-if exists('*strdisplaywidth')
-  " Needs vim 7.3
-  let s:Strlen = function("strdisplaywidth")
-else
-  function! s:Strlen(string)
-    " Implement the tab handling part of strdisplaywidth for vim 7.2 and
-    " earlier - not much that can be done about handling doublewidth
-    " characters.
-    let rv = 0
-    let i = 0
-
-    for char in split(a:string, '\zs')
-      if char == "\t"
-        let rv += &ts - i
-        let i = 0
-      else
-        let rv += 1
-        let i = (i + 1) % &ts
-      endif
-    endfor
-
-    return rv
-  endfunction
-endif
 " function! s:StripTrailingSpaces(string) - Remove all trailing spaces {{{2
 " from a string.
 function! s:StripTrailingSpaces(string)
@@ -52,28 +7,19 @@ function! s:StripTrailingSpaces(string)
 endfunction
 
 function! s:Padding(string, length, where) "{{{3
-  let gap_length = a:length - s:Strlen(a:string)
+  let gap_length = a:length - tablemode#utils#StrDisplayWidth(a:string)
   if a:where =~# 'l'
     return a:string . repeat(" ", gap_length)
   elseif a:where =~# 'r'
     return repeat(" ", gap_length) . a:string
   elseif a:where =~# 'c'
-    let right = spaces / 2
+    let right = gap_length / 2
     let left = right + (right * 2 != gap_length)
     return repeat(" ", left) . a:string . repeat(" ", right)
   endif
 endfunction
 
 " 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
@@ -118,19 +64,29 @@ function! tablemode#align#Split(string, delim)
 endfunction
 
 function! tablemode#align#alignments(lnum, ncols) "{{{2
-  let alignments = repeat(['l'], a:ncols) " For each column
+  let achr = g:table_mode_align_char
-  if tablemode#table#IsHeader(a:lnum+1)
+  let alignments = []
-    let hcols = tablemode#align#Split(getline(a:lnum+1), '[' . g:table_mode_corner . g:table_mode_corner_corner . ']')
+  if tablemode#table#IsBorder(a:lnum+1)
+    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
-      if hcols[idx] =~# g:table_mode_align_char . '$' | let alignments[idx] = 'r' | endif
+      call add(alignments, 'l')
+      if hcols[idx] =~# achr . '[^'.achr.']\+' . achr
+        let alignments[idx] = 'c'
+      elseif hcols[idx] =~# achr . '$'
+        let alignments[idx] = 'r'
+      endif
+      " if hcols[idx] !~# '[^0-9\.]' | let alignments[idx] = 'r' | endif
     endfor
   end
   return alignments
 endfunction
 
 function! tablemode#align#Align(lines) "{{{2
-  let lines = map(a:lines, '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
@@ -152,9 +108,9 @@ function! tablemode#align#Align(lines) "{{{2
     if len(stext) <= 1 | continue | endif
     for i in range(len(stext))
       if i == len(maxes)
-        let maxes += [ s:Strlen(stext[i]) ]
+        let maxes += [ tablemode#utils#StrDisplayWidth(stext[i]) ]
       else
-        let maxes[i] = max([ maxes[i], s:Strlen(stext[i]) ])
+        let maxes[i] = max([ maxes[i], tablemode#utils#StrDisplayWidth(stext[i]) ])
       endif
     endfor
   endfor
@@ -166,9 +122,11 @@ function! tablemode#align#Align(lines) "{{{2
     let tline = lines[idx].text
 
     if len(tline) <= 1 | continue | endif
-    for i in range(len(tline))
+    for jdx in range(len(tline))
-      let field = s:Padding(tline[i], maxes[i], alignments[i])
+      " Dealing with the header being the first line
-      let tline[i] = field . (i == 0 || i == len(tline) ? '' : ' ')
+      if jdx >= len(alignments) | call add(alignments, 'l') | endif
+      let field = s:Padding(tline[jdx], maxes[jdx], alignments[jdx])
+      let tline[jdx] = field . (jdx == 0 || jdx == len(tline) ? '' : ' ')
     endfor
 
     let lines[idx].text = s:StripTrailingSpaces(join(tline, ''))

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,27 +116,35 @@ 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#IsHeader(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#IsHeader(line) | let line += 1 | endif
+    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
 
     return line
   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,10 +166,10 @@ 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#IsHeader(line + 1)
+    while tablemode#table#IsTable(line + 1)
       let line += 1
     endwhile
-    if tablemode#table#IsHeader(line) | let line -= 1 | endif
+    if tablemode#table#IsBorder(line) | let line -= 1 | endif
 
     return line
   endif
@@ -80,19 +177,19 @@ endfunction
 
 function! tablemode#spreadsheet#MoveToLastRow() "{{{2
   if tablemode#table#IsRow('.')
-    call cursor(tablemode#spreadsheet#GetLastRow('.'), col('.'))
+    call tablemode#utils#MoveToLine(tablemode#spreadsheet#GetLastRow('.'))
   endif
 endfunction
 
-function! tablemode#spreadsheet#LineNr(row) "{{{2
+function! tablemode#spreadsheet#LineNr(line, row) "{{{2
-  if tablemode#table#IsRow('.')
+  if tablemode#table#IsRow(a:line)
-    let line = tablemode#spreadsheet#GetFirstRow('.')
+    let line = tablemode#spreadsheet#GetFirstRow(a:line)
     let row_nr = 0
 
-    while tablemode#table#IsRow(line + 1) || tablemode#table#IsHeader(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#IsHeader(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#IsHeader(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#IsHeader(tline)
+  while !tablemode#table#IsHeader(tline) && tablemode#table#IsTable(tline)
     if tablemode#table#IsRow(tline) | let totalRowCount += 1 | endif
     let tline += 1
   endwhile
@@ -141,13 +238,11 @@ function! tablemode#spreadsheet#ColumnNr(pos) "{{{2
     return 0
   endif
   let row_start = stridx(getline(pos[0]), g:table_mode_separator)
-  return tablemode#utils#strlen(substitute(getline(pos[0])[(row_start):pos[1]-2], '[^' . g:table_mode_separator . ']', '', 'g'))
+  return tablemode#utils#SeparatorCount(getline(pos[0])[row_start:pos[1]-2])
 endfunction
 
 function! tablemode#spreadsheet#ColumnCount(line) "{{{2
-  let line = tablemode#utils#line(a:line)
+  return tablemode#utils#SeparatorCount(getline(tablemode#utils#line(a:line))) - 1
-
-  return tablemode#utils#strlen(substitute(getline(line), '[^' . g:table_mode_separator . ']', '', 'g'))-1
 endfunction
 
 function! tablemode#spreadsheet#IsFirstCell() "{{{2
@@ -159,45 +254,25 @@ function! tablemode#spreadsheet#IsLastCell() "{{{2
 endfunction
 
 function! tablemode#spreadsheet#MoveToStartOfCell() "{{{2
-  if getline('.')[col('.')-1] ==# g:table_mode_separator && !tablemode#spreadsheet#IsLastCell()
+  if getline('.')[col('.')-1] !=# g:table_mode_separator || tablemode#spreadsheet#IsLastCell()
-    normal! 2l
+    call search(g:table_mode_escaped_separator_regex, 'b', line('.'))
-  else
-    execute 'normal! F' . g:table_mode_separator . '2l'
   endif
+  normal! 2l
 endfunction
 
-function! tablemode#spreadsheet#GetLastRow(line) "{{{2
+function! tablemode#spreadsheet#MoveToEndOfCell() "{{{2
-  if tablemode#table#IsRow(a:line)
+  call search(g:table_mode_escaped_separator_regex, 'z', line('.'))
-    let line = tablemode#utils#line(a:line)
+  normal! 2h
-
-    while tablemode#table#IsRow(line + 1) || tablemode#table#IsHeader(line + 1)
-      let line += 1
-    endwhile
-    if tablemode#table#IsHeader(line) | let line -= 1 | endif
-
-    return line
-  endif
-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#IsHeader(line - 1)
-      let line -= 1
-    endwhile
-    if tablemode#table#IsHeader(line) | let line += 1 | endif
-
-    return line
-  endif
 endfunction
 
 function! tablemode#spreadsheet#DeleteColumn() "{{{2
   if tablemode#table#IsRow('.')
     for i in range(v:count1)
       call tablemode#spreadsheet#MoveToStartOfCell()
-      call tablemode#spreadsheet#MoveToFirstRow()
+      call tablemode#spreadsheet#MoveToFirstRowOrHeader()
-      silent! execute "normal! h\<C-V>f" . g:table_mode_separator
+      silent! execute "normal! h\<C-V>"
+      call tablemode#spreadsheet#MoveToEndOfCell()
+      normal! 2l
       call tablemode#spreadsheet#MoveToLastRow()
       normal! d
     endfor
@@ -222,6 +297,95 @@ function! tablemode#spreadsheet#DeleteRow() "{{{2
   endif
 endfunction
 
+function! tablemode#spreadsheet#InsertColumn(after) "{{{2
+  if tablemode#table#IsRow('.')
+    let quantity = v:count1
+
+    call tablemode#spreadsheet#MoveToFirstRowOrHeader()
+    call tablemode#spreadsheet#MoveToStartOfCell()
+    if a:after
+      call tablemode#spreadsheet#MoveToEndOfCell()
+      normal! 3l
+    endif
+    execute "normal! h\<C-V>"
+    call tablemode#spreadsheet#MoveToLastRow()
+    normal! y
+
+    let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
+    if a:after
+      let cell_line = g:table_mode_separator.'  '
+      let header_line = corner.g:table_mode_fillchar.g:table_mode_fillchar
+    else
+      let cell_line = '  '.g:table_mode_separator
+      let header_line = g:table_mode_fillchar.g:table_mode_fillchar.corner
+    endif
+    let cell_line = escape(cell_line, '\&')
+    let header_line = escape(header_line, '\&')
+
+    " This transforms the character column before or after the column separator
+    " into a new column with separator.
+    " This requires, that
+    "      g:table_mode_separator != g:table_mode_fillchar
+    "   && g:table_mode_separator != g:table_mode_header_fillchar
+    "   && g:table_mode_separator != g:table_mode_align_char
+    call setreg(
+      \ '"',
+      \ substitute(
+      \   substitute(@", ' ', cell_line, 'g'),
+      \   '\V\C'.escape(g:table_mode_fillchar, '\')
+      \     .'\|'.escape(g:table_mode_header_fillchar, '\')
+      \     .'\|'.escape(g:table_mode_align_char, '\'),
+      \   header_line,
+      \   'g'),
+      \ 'b')
+
+    if a:after
+      execute "normal! ".quantity."pl"
+    else
+      execute "normal! ".quantity."P"
+    endif
+
+    call tablemode#table#Realign('.')
+    startinsert
+  endif
+endfunction
+
+function! tablemode#spreadsheet#Min(range, ...) abort "{{{2
+  let args = copy(a:000)
+  call insert(args, a:range)
+  return s:Min(call('tablemode#spreadsheet#cell#GetCellRange', args))
+endfunction
+
+function! tablemode#spreadsheet#Max(range, ...) abort "{{{2
+  let args = copy(a:000)
+  call insert(args, a:range)
+  return s:Max(call('tablemode#spreadsheet#cell#GetCellRange', args))
+endfunction
+
+function! tablemode#spreadsheet#CountE(range, ...) abort "{{{2
+  let args = copy(a:000)
+  call insert(args, a:range)
+  return s:CountE(call('tablemode#spreadsheet#cell#GetCellRange', args))
+endfunction
+
+function! tablemode#spreadsheet#CountNE(range, ...) abort "{{{2
+  let args = copy(a:000)
+  call insert(args, a:range)
+  return s:CountNE(call('tablemode#spreadsheet#cell#GetCellRange', args))
+endfunction
+
+function! tablemode#spreadsheet#PercentE(range, ...) abort "{{{2
+  let args = copy(a:000)
+  call insert(args, a:range)
+  return s:PercentE(call('tablemode#spreadsheet#cell#GetCellRange', args))
+endfunction
+
+function! tablemode#spreadsheet#PercentNE(range, ...) abort "{{{2
+  let args = copy(a:000)
+  call insert(args, a:range)
+  return s:PercentNE(call('tablemode#spreadsheet#cell#GetCellRange', args))
+endfunction
+
 function! tablemode#spreadsheet#Sum(range, ...) abort "{{{2
   let args = copy(a:000)
   call insert(args, a:range)
@@ -234,3 +398,25 @@ function! tablemode#spreadsheet#Average(range, ...) abort "{{{2
   return s:Average(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 
+function! tablemode#spreadsheet#AverageNE(range, ...) abort "{{{2
+  let args = copy(a:000)
+  call insert(args, a:range)
+  return s:AverageNE(call('tablemode#spreadsheet#cell#GetCellRange', args))
+endfunction
+
+function! tablemode#spreadsheet#Sort(bang, ...) range "{{{2
+  if exists('*getcurpos')
+    let col = getcurpos()[4] " curswant
+  else
+    let col = col('.')
+  endif
+  let opts = a:0 ? a:1 : ''
+  let bang = a:bang ? '!' : ''
+  if a:firstline == a:lastline
+    let [firstRow, lastRow] = [tablemode#spreadsheet#GetFirstRow('.'), tablemode#spreadsheet#GetLastRow('.')]
+  else
+    let [firstRow, lastRow] = [a:firstline, a:lastline]
+  endif
+  call tablemode#spreadsheet#MoveToStartOfCell()
+  exec ':undojoin | '.firstRow.','.lastRow . 'sort'.bang opts '/.*\%'.col.'v/'
+endfunction

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.
@@ -81,10 +54,11 @@ function! tablemode#spreadsheet#cell#GetCells(line, ...) abort
     endif
 
     let first_row = tablemode#spreadsheet#GetFirstRow(line)
+    let last_row = tablemode#spreadsheet#GetLastRow(line)
     if row == 0
       let values = []
       let line = first_row
-      while tablemode#table#IsRow(line) || tablemode#table#IsHeader(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, '')))
@@ -94,13 +68,14 @@ function! tablemode#spreadsheet#cell#GetCells(line, ...) abort
       return values
     else
       let row_nr = 0
-      let line = first_row
+      let row_diff = row > 0 ? 1 : -1
-      while tablemode#table#IsRow(line) || tablemode#table#IsHeader(line)
+      let line = row > 0 ? first_row : last_row
+      while tablemode#table#IsTable(line)
         if tablemode#table#IsRow(line)
-          let row_nr += 1
+          let row_nr += row_diff
           if row ==# row_nr | break | endif
         endif
-        let line += 1
+        let line += row_diff
       endwhile
 
       let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
@@ -125,10 +100,27 @@ function! tablemode#spreadsheet#cell#GetCell(...) "{{{2
 endfunction
 
 function! tablemode#spreadsheet#cell#GetRow(row, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
+  let line = a:0 ? a:1 : '.'
   return tablemode#spreadsheet#cell#GetCells(line, a:row)
 endfunction
 
+function! tablemode#spreadsheet#cell#GetRowColumn(col, ...) abort "{{{2
+  let line = a:0 ? a:1 : '.'
+  let row = tablemode#spreadsheet#RowNr('.')
+  return tablemode#spreadsheet#cell#GetCells(line, row, a:col)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetColumn(col, ...) abort "{{{2
+  let line = a:0 ? a:1 : '.'
+  return tablemode#spreadsheet#cell#GetCells(line, 0, a:col)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetColumnRow(row, ...) abort "{{{2
+  let line = a:0 ? a:1 : '.'
+  let col = tablemode#spreadsheet#ColumnNr('.')
+  return tablemode#spreadsheet#cell#GetCells(line, a:row, col)
+endfunction
+
 function! tablemode#spreadsheet#cell#GetCellRange(range, ...) abort "{{{2
   if a:0 < 1
     let [line, colm] = ['.', tablemode#spreadsheet#ColumnNr('.')]
@@ -167,23 +159,6 @@ function! tablemode#spreadsheet#cell#GetCellRange(range, ...) abort "{{{2
   return values
 endfunction
 
-function! tablemode#spreadsheet#cell#GetRowColumn(col, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
-  let row = tablemode#spreadsheet#RowNr('.')
-  return tablemode#spreadsheet#cell#GetCells(line, row, a:col)
-endfunction
-
-function! tablemode#spreadsheet#cell#GetColumn(col, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
-  return tablemode#spreadsheet#cell#GetCells(line, 0, a:col)
-endfunction
-
-function! tablemode#spreadsheet#cell#GetColumnRow(row, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
-  let col = tablemode#spreadsheet#ColumnNr('.')
-  return tablemode#spreadsheet#cell#GetCells(line, a:row, col)
-endfunction
-
 function! tablemode#spreadsheet#cell#SetCell(val, ...) "{{{2
   if a:0 == 0
     let [line, row, colm] = ['.', tablemode#spreadsheet#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
@@ -193,8 +168,12 @@ function! tablemode#spreadsheet#cell#SetCell(val, ...) "{{{2
     let [line, row, colm] = a:000
   endif
 
+  " Account for negative values to reference from relatively from the last
+  if row < 0 | let row = tablemode#spreadsheet#RowCount(line) + row + 1 | endif
+  if colm < 0 | let colm = tablemode#spreadsheet#ColumnCount(line) + colm + 1 | endif
+
   if tablemode#table#IsRow(line)
-    let line = tablemode#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)
@@ -227,7 +206,7 @@ function! tablemode#spreadsheet#cell#Motion(direction, ...) "{{{2
     for ii in range(l:count)
       if a:direction ==# 'l'
         if tablemode#spreadsheet#IsLastCell()
-          if !tablemode#table#IsRow(line('.') + 1) && (tablemode#table#IsHeader(line('.') + 1) && !tablemode#table#IsRow(line('.') + 2))
+          if !tablemode#table#IsRow(line('.') + 1) && (tablemode#table#IsBorder(line('.') + 1) && !tablemode#table#IsRow(line('.') + 2))
             return
           endif
           call tablemode#spreadsheet#cell#Motion('j', 1)
@@ -242,7 +221,7 @@ function! tablemode#spreadsheet#cell#Motion(direction, ...) "{{{2
         endif
       elseif a:direction ==# 'h'
         if tablemode#spreadsheet#IsFirstCell()
-          if !tablemode#table#IsRow(line('.') - 1) && (tablemode#table#IsHeader(line('.') - 1) && !tablemode#table#IsRow(line('.') - 2))
+          if !tablemode#table#IsRow(line('.') - 1) && (tablemode#table#IsBorder(line('.') - 1) && !tablemode#table#IsRow(line('.') - 2))
             return
           endif
           call tablemode#spreadsheet#cell#Motion('k', 1)
@@ -259,7 +238,7 @@ function! tablemode#spreadsheet#cell#Motion(direction, ...) "{{{2
         if tablemode#table#IsRow(line('.') + 1)
           " execute 'normal! ' . 1 . 'j'
           normal! j
-        elseif tablemode#table#IsHeader(line('.') + 1) && tablemode#table#IsRow(line('.') + 2)
+        elseif tablemode#table#IsBorder(line('.') + 1) && tablemode#table#IsRow(line('.') + 2)
           " execute 'normal! ' . 2 . 'j'
           normal! 2j
         endif
@@ -267,7 +246,7 @@ function! tablemode#spreadsheet#cell#Motion(direction, ...) "{{{2
         if tablemode#table#IsRow(line('.') - 1)
           " execute 'normal! ' . 1 . 'k'
           normal! k
-        elseif tablemode#table#IsHeader(line('.') - 1) && tablemode#table#IsRow(line('.') - 2)
+        elseif tablemode#table#IsBorder(line('.') - 1) && tablemode#table#IsRow(line('.') - 2)
           " execute 'normal! ' . (1 + 1) . 'k'
           normal! 2k
         endif

autoload/tablemode/spreadsheet/formula.vim

@@ -1,34 +1,13 @@
-" ==============================  Header ======================================
-" File:          autoload/tablemode/spreadsheet/formula.vim
-" Description:   Table mode for vim for creating neat tables.
-" Author:        Dhruva Sagar <http://dhruvasagar.com/>
-" License:       MIT (http://www.opensource.org/licenses/MIT)
-" Website:       https://github.com/dhruvasagar/vim-table-mode
-" Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
-"                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
-"
-" Copyright Notice:
-"                Permission is hereby granted to use and distribute this code,
-"                with or without modifications, provided that this copyright
-"                notice is copied with it. Like anything else that's free,
-"                table-mode.vim is provided *as is* and comes with no warranty
-"                of any kind, either expressed or implied. In no event will
-"                the copyright holder be liable for any damamges resulting
-"                from the use of this software.
-" =============================================================================
-
 " Private Functions {{{1
+function! s:IsHTMLComment(line) "{{{2
+  return getline(a:line) =~# '^\s*<!--'
+endfunction
+
+function! s:IsFormulaLine(line) "{{{2
+  return getline(a:line) =~# 'tmf: '
+endfunction
 
 " Public Functions {{{1
-function! tablemode#spreadsheet#formula#sid() "{{{2
-  return maparg('<sid>', 'n')
-endfunction
-nnoremap <sid> <sid>
-
-function! tablemode#spreadsheet#formula#scope() "{{{2
-  return s:
-endfunction
-
 function! tablemode#spreadsheet#formula#Add(...) "{{{2
   let fr = a:0 ? a:1 : input('f=')
   let row = tablemode#spreadsheet#RowNr('.')
@@ -39,12 +18,16 @@ function! tablemode#spreadsheet#formula#Add(...) "{{{2
   if fr !=# ''
     let fr = '$' . row . ',' . colm . '=' . fr
     let fline = tablemode#spreadsheet#GetLastRow('.') + 1
-    if tablemode#table#IsHeader(fline) | let fline += 1 | endif
+    if tablemode#table#IsBorder(fline) | let fline += 1 | endif
+    if s:IsHTMLComment(fline) | let fline += 1 | endif
     let cursor_pos = [line('.'), col('.')]
     if getline(fline) =~# 'tmf: '
       " Comment line correctly
       let line_val = getline(fline)
-      let line_expr = line_val[match(line_val, tablemode#table#StartCommentExpr()):match(line_val, tablemode#table#EndCommentExpr())]
+      let start_pos = match(line_val, tablemode#table#StartCommentExpr())
+      let end_pos = match(line_val, tablemode#table#EndCommentExpr())
+      if empty(end_pos) | let end_pos = len(line_val) | endif
+      let line_expr = strpart(line_val, start_pos, end_pos)
       let sce = matchstr(line_val, tablemode#table#StartCommentExpr() . '\zs')
       let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
       call setline(fline, sce . line_expr . '; ' . fr . ece)
@@ -77,6 +60,30 @@ function! tablemode#spreadsheet#formula#EvaluateExpr(expr, line) abort "{{{2
     let [row, colm] = [0, str2nr(cell)]
   endif
 
+  if expr =~# 'Min(.*)'
+    let expr = substitute(expr, 'Min(\([^)]*\))', 'tablemode#spreadsheet#Min("\1",'.line.','.colm.')', 'g')
+  endif
+
+  if expr =~# 'Max(.*)'
+    let expr = substitute(expr, 'Max(\([^)]*\))', 'tablemode#spreadsheet#Max("\1",'.line.','.colm.')', 'g')
+  endif
+
+  if expr =~# 'CountE(.*)'
+    let expr = substitute(expr, 'CountE(\([^)]*\))', 'tablemode#spreadsheet#CountE("\1",'.line.','.colm.')', 'g')
+  endif
+
+  if expr =~# 'CountNE(.*)'
+    let expr = substitute(expr, 'CountNE(\([^)]*\))', 'tablemode#spreadsheet#CountNE("\1",'.line.','.colm.')', 'g')
+  endif
+
+  if expr =~# 'PercentE(.*)'
+    let expr = substitute(expr, 'PercentE(\([^)]*\))', 'tablemode#spreadsheet#PercentE("\1",'.line.','.colm.')', 'g')
+  endif
+
+  if expr =~# 'PercentNE(.*)'
+    let expr = substitute(expr, 'PercentNE(\([^)]*\))', 'tablemode#spreadsheet#PercentNE("\1",'.line.','.colm.')', 'g')
+  endif
+
   if expr =~# 'Sum(.*)'
     let expr = substitute(expr, 'Sum(\([^)]*\))', 'tablemode#spreadsheet#Sum("\1",'.line.','.colm.')', 'g')
   endif
@@ -85,8 +92,12 @@ function! tablemode#spreadsheet#formula#EvaluateExpr(expr, line) abort "{{{2
     let expr = substitute(expr, 'Average(\([^)]*\))', 'tablemode#spreadsheet#Average("\1",'.line.','.colm.')', 'g')
   endif
 
-  if expr =~# '\$\d\+,\d\+'
+  if expr =~# 'AverageNE(.*)'
-    let expr = substitute(expr, '\$\(\d\+\),\(\d\+\)',
+    let expr = substitute(expr, 'AverageNE(\([^)]*\))', 'tablemode#spreadsheet#AverageNE("\1",'.line.','.colm.')', 'g')
+  endif
+
+  if expr =~# '\$\-\?\d\+,\-\?\d\+'
+    let expr = substitute(expr, '\$\(\-\?\d\+\),\(\-\?\d\+\)',
           \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, submatch(1), submatch(2)))', 'g')
   endif
 
@@ -98,15 +109,17 @@ function! tablemode#spreadsheet#formula#EvaluateExpr(expr, line) abort "{{{2
     call tablemode#spreadsheet#cell#SetCell(eval(expr), line, row, colm)
   else
     let [row, line] = [1, tablemode#spreadsheet#GetFirstRow(line)]
-    while tablemode#table#IsRow(line)
+    while !s:IsFormulaLine(line)
-      let texpr = expr
+      if !tablemode#table#IsBorder(line)
-      if expr =~# '\$'
+        let texpr = expr
-        let texpr = substitute(texpr, '\$\(\d\+\)',
+        if expr =~# '\$'
-              \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, row, submatch(1)))', 'g')
+          let texpr = substitute(texpr, '\$\(\d\+\)',
-      endif
+                \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, row, submatch(1)))', 'g')
+        endif
 
-      call tablemode#spreadsheet#cell#SetCell(eval(texpr), line, row, colm)
+        call tablemode#spreadsheet#cell#SetCell(eval(texpr), line, row, colm)
-      let row += 1
+        let row += 1
+      endif
       let line += 1
     endwhile
   endif
@@ -129,15 +142,24 @@ function! tablemode#spreadsheet#formula#EvaluateFormulaLine() abort "{{{2
   if tablemode#table#IsRow('.') " We're inside the table
     let line = tablemode#spreadsheet#GetLastRow('.')
     let fline = line + 1
-    if tablemode#table#IsHeader(fline) | let fline += 1 | endif
+    if s:IsHTMLComment(fline) | let fline += 1 | endif
-    if getline(fline) =~# 'tmf: '
+    if tablemode#table#IsBorder(fline) | let fline += 1 | endif
-      let exprs = split(matchstr(getline(fline), matchexpr), ';')
+    while s:IsFormulaLine(fline)
-    endif
+      let exprs += split(matchstr(getline(fline), matchexpr), ';')
-  elseif getline('.') =~# 'tmf: ' " We're on the formula line
+      let fline += 1
+    endwhile
+  elseif s:IsFormulaLine('.')
+    let fline = line('.')
     let line = line('.') - 1
-    if tablemode#table#IsHeader(line) | let line -= 1 | endif
+    while s:IsFormulaLine(line) | let fline = line | let line -= 1 | endwhile
+    if s:IsHTMLComment(line) | let line -= 1 | endif
+    if tablemode#table#IsBorder(line) | let line -= 1 | endif
     if tablemode#table#IsRow(line)
-      let exprs = split(matchstr(getline('.'), matchexpr), ';')
+      " let exprs = split(matchstr(getline('.'), matchexpr), ';')
+      while s:IsFormulaLine(fline)
+        let exprs += split(matchstr(getline(fline), matchexpr), ';')
+        let fline += 1
+      endwhile
     endif
   endif
 

autoload/tablemode/table.vim

@@ -1,34 +1,24 @@
-" ==============================  Header ======================================
-" File:          autoload/tablemode/table.vim
-" Description:   Table mode for vim for creating neat tables.
-" Author:        Dhruva Sagar <http://dhruvasagar.com/>
-" License:       MIT (http://www.opensource.org/licenses/MIT)
-" Website:       https://github.com/dhruvasagar/vim-table-mode
-" Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
-"                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
-"
-" Copyright Notice:
-"                Permission is hereby granted to use and distribute this code,
-"                with or without modifications, provided that this copyright
-"                notice is copied with it. Like anything else that's free,
-"                table-mode.vim is provided *as is* and comes with no warranty
-"                of any kind, either expressed or implied. In no event will
-"                the copyright holder be liable for any damamges resulting
-"                from the use of this software.
-" =============================================================================
-
 " Private Functions {{{1
-function! s:HeaderBorderExpr() "{{{2
+function! s:blank(string) "{{{2
+  return a:string =~# '^\s*$'
+endfunction
+
+function! s:BorderExpr() "{{{2
+  let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
+  let corner_corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner_corner')
+  let header_fillchar = tablemode#utils#get_buffer_or_global_option('table_mode_header_fillchar')
   return tablemode#table#StartExpr() .
-        \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
+        \ '[' . corner . corner_corner . ']' .
-        \ '[' . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_align_char . ']*' .
+        \ '[' . escape(g:table_mode_fillchar . header_fillchar . corner . g:table_mode_align_char, '-') . ']\+' .
-        \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
+        \ '[' . corner . corner_corner . ']' .
         \ tablemode#table#EndExpr()
 endfunction
 
-function! s:DefaultHeaderBorder() "{{{2
+function! s:DefaultBorder() "{{{2
   if tablemode#IsActive()
-    return g:table_mode_corner_corner . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_fillchar . g:table_mode_corner_corner
+    let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
+    let corner_corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner_corner')
+    return corner_corner . g:table_mode_fillchar . corner . g:table_mode_fillchar . corner_corner
   else
     return ''
   endif
@@ -44,21 +34,35 @@ function! s:GenerateHeaderBorder(line) "{{{2
     if tablemode#table#IsRow(line - 1) && tablemode#utils#strlen(line_val) < tablemode#utils#strlen(getline(line - 1))
       let line_val = getline(line - 1)
     endif
-    if tablemode#utils#strlen(line_val) <= 1 | return s:DefaultHeaderBorder() | endif
+    if tablemode#utils#strlen(line_val) <= 1 | return s:DefaultBorder() | endif
 
-    let border = substitute(line_val[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator, g:table_mode_corner, 'g')
+    let corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner')
-    let border = substitute(border, '[^' . g:table_mode_corner . ']', g:table_mode_fillchar, 'g')
+    let corner_corner = tablemode#utils#get_buffer_or_global_option('table_mode_corner_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 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:]
@@ -80,18 +84,18 @@ function! s:GenerateHeaderBorder(line) "{{{2
       return border
     endif
   else
-    return s:DefaultHeaderBorder()
+    return s:DefaultBorder()
   endif
 endfunction
 
 " Public Functions {{{1
-function! tablemode#table#sid() "{{{2
+function! tablemode#table#GetCommentStart() "{{{2
-  return maparg('<sid>', 'n')
+  let cstring = &commentstring
-endfunction
+  if tablemode#utils#strlen(cstring) > 0
-nnoremap <sid> <sid>
+    return substitute(split(cstring, '%s')[0], '[^(%)]', '\\\0', 'g')
-
+  else
-function! tablemode#table#scope() "{{{2
+    return ''
-  return s:
+  endif
 endfunction
 
 function! tablemode#table#StartCommentExpr() "{{{2
@@ -103,30 +107,12 @@ function! tablemode#table#StartCommentExpr() "{{{2
   endif
 endfunction
 
-function! tablemode#table#EndCommentExpr() "{{{2
-  let cendexpr = tablemode#table#GetCommentEnd()
-  if tablemode#utils#strlen(cendexpr) > 0
-    return '.*\zs\s\+' . cendexpr . '\s*$'
-  else
-    return ''
-  endif
-endfunction
-
-function! tablemode#table#GetCommentStart() "{{{2
-  let cstring = &commentstring
-  if tablemode#utils#strlen(cstring) > 0
-    return substitute(split(cstring, '%s')[0], '.', '\\\0', 'g')
-  else
-    return ''
-  endif
-endfunction
-
 function! tablemode#table#GetCommentEnd() "{{{2
   let cstring = &commentstring
   if tablemode#utils#strlen(cstring) > 0
     let cst = split(cstring, '%s')
     if len(cst) == 2
-      return substitute(cst[1], '.', '\\\0', 'g')
+      return substitute(cst[1], '[^()]', '\\\0', 'g')
     else
       return ''
     endif
@@ -135,6 +121,15 @@ function! tablemode#table#GetCommentEnd() "{{{2
   endif
 endfunction
 
+function! tablemode#table#EndCommentExpr() "{{{2
+  let cendexpr = tablemode#table#GetCommentEnd()
+  if tablemode#utils#strlen(cendexpr) > 0
+    return '.*\zs\s\+' . cendexpr . '\s*$'
+  else
+    return ''
+  endif
+endfunction
+
 function! tablemode#table#StartExpr() "{{{2
   let cstart = tablemode#table#GetCommentStart()
   if tablemode#utils#strlen(cstart) > 0
@@ -153,25 +148,42 @@ function! tablemode#table#EndExpr() "{{{2
   endif
 endfunction
 
+function! tablemode#table#IsBorder(line) "{{{2
+  return !s:blank(getline(a:line)) && getline(a:line) =~# s:BorderExpr()
+endfunction
+
 function! tablemode#table#IsHeader(line) "{{{2
-  return getline(a:line) =~# s:HeaderBorderExpr()
+  let line = tablemode#utils#line(a:line)
+  " if line <= 0 || line > line('$') | return 0 | endif
+  return tablemode#table#IsRow(line)
+        \ && !tablemode#table#IsRow(line-1)
+        \ && !tablemode#table#IsRow(line-2)
+        \ && !tablemode#table#IsBorder(line-2)
+        \ && tablemode#table#IsBorder(line+1)
 endfunction
 
 function! tablemode#table#IsRow(line) "{{{2
-  return !tablemode#table#IsHeader(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#AddHeaderBorder(line) "{{{2
+function! tablemode#table#IsTable(line) "{{{2
+  return tablemode#table#IsRow(a:line) || tablemode#table#IsBorder(a:line)
+endfunction
+
+function! tablemode#table#AddBorder(line) "{{{2
   call setline(a:line, s:GenerateHeaderBorder(a:line))
 endfunction
 
 function! tablemode#table#Realign(line) "{{{2
+  let current_fm = &foldmethod " save foldmethod to be restored
+  setlocal foldmethod=manual " manual foldmethod while table is being aligned
+
   let line = tablemode#utils#line(a:line)
 
   let lines = []
   let [lnum, blines] = [line, []]
-  while tablemode#table#IsRow(lnum) || tablemode#table#IsHeader(lnum)
+  while tablemode#table#IsTable(lnum)
-    if tablemode#table#IsHeader(lnum)
+    if tablemode#table#IsBorder(lnum)
       call insert(blines, lnum)
       let lnum -= 1
       continue
@@ -181,8 +193,8 @@ function! tablemode#table#Realign(line) "{{{2
   endwhile
 
   let lnum = line + 1
-  while tablemode#table#IsRow(lnum) || tablemode#table#IsHeader(lnum)
+  while tablemode#table#IsTable(lnum)
-    if tablemode#table#IsHeader(lnum)
+    if tablemode#table#IsBorder(lnum)
       call add(blines, lnum)
       let lnum += 1
       continue
@@ -198,6 +210,9 @@ function! tablemode#table#Realign(line) "{{{2
   endfor
 
   for bline in blines
-    call tablemode#table#AddHeaderBorder(bline)
+    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
@@ -51,3 +23,44 @@ endfunction
 function! tablemode#utils#strlen(text)
   return strlen(substitute(a:text, '.', 'x', 'g'))
 endfunction
+
+function! tablemode#utils#StrDisplayWidth(string) "{{{2
+  if exists('*strdisplaywidth')
+    return strdisplaywidth(a:string)
+  else
+    " Implement the tab handling part of strdisplaywidth for vim 7.2 and
+    " earlier - not much that can be done about handling doublewidth
+    " characters.
+    let rv = 0
+    let i = 0
+
+    for char in split(a:string, '\zs')
+      if char == "\t"
+        let rv += &ts - i
+        let i = 0
+      else
+        let rv += 1
+        let i = (i + 1) % &ts
+      endif
+    endfor
+
+    return rv
+  endif
+endfunction
+
+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.3.0
+*table-mode.txt*			Table Mode for easy table formatting
 ===============================================================================
 	Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
-				 VERSION 4.3.0
+                               VERSION 4.7.3
 
 		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.
+	'[|, ]|, {|, }|' to move left | down | up | right cells respectively.
-	You can use |table-mode-map-prefix| option to define the prefix
+	The left | right motions wrap around the table and move to the next
-	mapping to be used before 'hjkl'. The left | right motions wrap around
+	| previous row after the last | first cell in the current row if one
-	the table and move to the next | previous row after the last | first
+	exists.
-	cell in the current row if one exists. 
 
 Manipulation of tables:
 	Tableize provides 3 easy ways to quickly manipulate tables.
@@ -75,6 +74,10 @@ Manipulation of tables:
 	3. Delete Row : Delete an entire table row using
 	|table-mode-delete-row-map|
 
+	4. Insert Column : Insert a table column either before the cursor
+        using |table-mode-insert-column-before-map| or after the cusor using
+	|table-mode-insert-column-after-map|.
+
 Table Formulas:
 	Table Mode now has support for formulas like a spreadsheet. There
 	are 2 ways of defining formulas :
@@ -86,7 +89,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
@@ -104,19 +107,25 @@ Formula Expressions :
 
 		'$n': This matches the table column number 'n'. So the formula
 		would be evaluated for each cell in that column and the result
-		would be placed in it.
+		would be placed in it. You can use negative indice to
+                represent column relative to the last, -1 being the last.
 
 		'$n,m': This matches the table cell n,m (row, column). So in
 		this case the formula would be evaluated and the result will
-		be placed in this cell.
+		be placed in this cell. You can also use negative values to
+                refer to cells relative to the size, -1 being the last (row or
+                column).
 
 	The formula can be a simple mathematical expression involving cells
 	which are also defined by the same format as that of the target cell.
 	Apart from basic mathematical expressions, table mode also provides
-	special functions 'Sum' and 'Average'. Both these functions take a
+	special functions 'Min', 'Max', 'CountE' (number of empty cells),
-	range as input. A range can be of two forms :
+        'CountNE' (number of non-empty cells), 'PercentE' (percent of empty
+        cells), 'PercentNE' (percent of non-empty cells), 'Sum', 'Average',
+        and 'AverageNE' (average over non-empty cells). All these functions
+        take a range as input. A range can be of two forms :
 
-		'n,m': This represents cells in the current column from row
+		'n:m': This represents cells in the current column from row
 		'n' through 'm'. If 'm' is negative it represents 'm' row
 		above the current row (of the target cell).
 
@@ -135,6 +144,7 @@ OPTIONS							*table-mode-options*
 
 Overview:
 	|table-mode-loaded| ............. Disable the plugin.
+	|table-mode-verbose| ............ Notify when Enabled/Disabled.
 	|table-mode-corner| ............. Set corner character.
 	|table-mode-separator| .......... Set separator character.
 	|table-mode-fillchar| ........... Set table fillchar character.
@@ -148,14 +158,48 @@ 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
 
 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: >
@@ -204,12 +248,122 @@ 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
+<
 
 ===============================================================================
 MAPPINGS						*table-mode-mappings*
@@ -221,7 +375,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.
 
@@ -258,6 +412,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.
@@ -268,9 +432,13 @@ MAPPINGS						*table-mode-mappings*
 		would evaluate the formula line and update the table
 		accordingly. This invokes the |TableEvalFormulaLine| command.
 
+
+                                               *table-mode-mappings-sort-column*
+<Leader>ts      Sort a column under the cursor. This invokes |TableSort|
+
 ||              Expands to a header border. You can change this by changing
-                |table-mode-separator| option. You can change the character to 
+                |table-mode-separator| option. You can change the character to
-                be used for te extreme corners of the border by changing
+                be used for the extreme corners of the border by changing
                 |table-mode-corner-corner| option.
 
 ===============================================================================
@@ -295,7 +463,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.
@@ -335,17 +503,25 @@ COMMANDS						*table-mode-commands*
 	This command when invoked from anywhere within the table or directly
 	on the formula line evaluates it and updates the table accordingly.
 
+                                                                  *:TableSort*
+                                                       *table-mode-:TableSort*
+:TableSort[!] [i][u][r][n][x][o]
+        This command sorts column under the cursor and inherits the same flags
+        as the |:sort| command.
+
+        With [!] the order is reversed.
+
 ===============================================================================
 CONTRIBUTING						*table-mode-contributing*
 
 If you want to take a stab at it, by all means, send me a pull request on
-Github (http://github.com/dhruvasagar/table-mode) or get in touch with me
+Github (http://github.com/dhruvasagar/vim-table-mode) or get in touch with me
 directly via e-mail at dhruva 'dot' sagar 'at' gmail.com.
 
 ===============================================================================
 REPORT ISSUES					      *table-mode-report-issues*
 
 If you discover any issues, please report them at
-http://github.com/dhruvasagar/table-mode/issues.
+http://github.com/dhruvasagar/vim-table-mode/issues.
 
  vim:tw=78:ts=8:ft=help:norl:ai:et

ftplugin/markdown_tablemode.vim

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

ftplugin/rst_tablemode.vim

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

plugin/table-mode.vim

@@ -1,22 +1,3 @@
-" =============================================================================
-" File:          plugin/table-mode.vim
-" Description:   Table mode for vim for creating neat tables.
-" Author:        Dhruva Sagar <http://dhruvasagar.com/>
-" License:       MIT (http://www.opensource.org/licenses/MIT)
-" Website:       http://github.com/dhruvasagar/vim-table-mode
-" Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
-"                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
-"
-" Copyright Notice:
-"                Permission is hereby granted to use and distribute this code,
-"                with or without modifications, provided that this copyright
-"                notice is copied with it. Like anything else that's free,
-"                table-mode.vim is provided *as is* and comes with no warranty
-"                of any kind, either expressed or implied. In no event will
-"                the copyright holder be liable for any damamges resulting
-"                from the use of this software.
-" =============================================================================
-
 " Finish if already loaded {{{1
 if exists('g:loaded_table_mode')
   finish
@@ -35,14 +16,44 @@ endfunction
 
 " Set Global Defaults {{{1
 call s:SetGlobalOptDefault('table_mode_corner', '+')
+call s:SetGlobalOptDefault('table_mode_verbose', 1)
 call s:SetGlobalOptDefault('table_mode_separator', '|')
+call s:SetGlobalOptDefault('table_mode_escaped_separator_regex', '\V\C\\\@1<!'.escape(g:table_mode_separator, '\'))
 call s:SetGlobalOptDefault('table_mode_fillchar', '-')
+call s:SetGlobalOptDefault('table_mode_header_fillchar', '-')
 call s:SetGlobalOptDefault('table_mode_map_prefix', '<Leader>t')
 call s:SetGlobalOptDefault('table_mode_toggle_map', 'm')
 call s:SetGlobalOptDefault('table_mode_always_active', 0)
 call s:SetGlobalOptDefault('table_mode_delimiter', ',')
 call s:SetGlobalOptDefault('table_mode_corner_corner', '|')
 call s:SetGlobalOptDefault('table_mode_align_char', ':')
+call s:SetGlobalOptDefault('table_mode_disable_mappings', 0)
+call s:SetGlobalOptDefault('table_mode_disable_tableize_mappings', 0)
+
+call s:SetGlobalOptDefault('table_mode_motion_up_map', '{<Bar>')
+call s:SetGlobalOptDefault('table_mode_motion_down_map', '}<Bar>')
+call s:SetGlobalOptDefault('table_mode_motion_left_map', '[<Bar>')
+call s:SetGlobalOptDefault('table_mode_motion_right_map', ']<Bar>')
+
+call s:SetGlobalOptDefault('table_mode_cell_text_object_a_map', 'a<Bar>')
+call s:SetGlobalOptDefault('table_mode_cell_text_object_i_map', 'i<Bar>')
+
+call s:SetGlobalOptDefault('table_mode_realign_map', g:table_mode_map_prefix.'r')
+call s:SetGlobalOptDefault('table_mode_delete_row_map', g:table_mode_map_prefix.'dd')
+call s:SetGlobalOptDefault('table_mode_delete_column_map', g:table_mode_map_prefix.'dc')
+call s:SetGlobalOptDefault('table_mode_insert_column_before_map', g:table_mode_map_prefix.'iC')
+call s:SetGlobalOptDefault('table_mode_insert_column_after_map', g:table_mode_map_prefix.'ic')
+call s:SetGlobalOptDefault('table_mode_add_formula_map', g:table_mode_map_prefix.'fa')
+call s:SetGlobalOptDefault('table_mode_eval_formula_map', g:table_mode_map_prefix.'fe')
+call s:SetGlobalOptDefault('table_mode_echo_cell_map', g:table_mode_map_prefix.'?')
+call s:SetGlobalOptDefault('table_mode_sort_map', g:table_mode_map_prefix.'s')
+call s:SetGlobalOptDefault('table_mode_tableize_map', g:table_mode_map_prefix.'t')
+call s:SetGlobalOptDefault('table_mode_tableize_d_map', '<Leader>T')
+
+call s:SetGlobalOptDefault('table_mode_syntax', 1)
+call s:SetGlobalOptDefault('table_mode_auto_align', 1)
+call s:SetGlobalOptDefault('table_mode_update_time', 500)
+call s:SetGlobalOptDefault('table_mode_tableize_auto_border', 0)
 
 function! s:TableEchoCell() "{{{1
   if tablemode#table#IsRow('.')
@@ -52,8 +63,7 @@ endfunction
 
 " Define Commands & Mappings {{{1
 if !g:table_mode_always_active "{{{2
-  exec "nnoremap <silent> " . g:table_mode_map_prefix . g:table_mode_toggle_map .
+  exec "nnoremap <silent>" g:table_mode_map_prefix . g:table_mode_toggle_map ":<C-U>call tablemode#Toggle()<CR>"
-       \ " <Esc>:call tablemode#Toggle()<CR>"
   command! -nargs=0 TableModeToggle call tablemode#Toggle()
   command! -nargs=0 TableModeEnable call tablemode#Enable()
   command! -nargs=0 TableModeDisable call tablemode#Disable()
@@ -69,10 +79,15 @@ 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()
 
+" '|' is a special character, we need to map <Bar> instead
+if g:table_mode_separator ==# '|' | let separator_map = '<Bar>' | endif
+execute 'inoremap <silent> <Plug>(table-mode-tableize)' separator_map . '<Esc>:call tablemode#TableizeInsertMode()<CR>a'
+
 nnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR>
 xnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR>
 xnoremap <silent> <Plug>(table-mode-tableize-delimiter) :<C-U>call tablemode#TableizeByDelimiter()<CR>
@@ -86,66 +101,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-row) :<C-U>call tablemode#spreadsheet#DeleteRow()<CR>
-nnoremap <silent> <Plug>(table-mode-delete-column) :call tablemode#spreadsheet#DeleteColumn()<CR>
+nnoremap <silent> <Plug>(table-mode-delete-column) :<C-U>call tablemode#spreadsheet#DeleteColumn()<CR>
+nnoremap <silent> <Plug>(table-mode-insert-column-before) :<C-U>call tablemode#spreadsheet#InsertColumn(0)<CR>
+nnoremap <silent> <Plug>(table-mode-insert-column-after) :<C-U>call tablemode#spreadsheet#InsertColumn(1)<CR>
 
 nnoremap <silent> <Plug>(table-mode-add-formula) :call tablemode#spreadsheet#formula#Add()<CR>
 nnoremap <silent> <Plug>(table-mode-eval-formula) :call tablemode#spreadsheet#formula#EvaluateFormulaLine()<CR>
 
 nnoremap <silent> <Plug>(table-mode-echo-cell) :call <SID>TableEchoCell()<CR>
 
-if !hasmapto('<Plug>(table-mode-tableize)')
+nnoremap <silent> <Plug>(table-mode-sort) :call tablemode#spreadsheet#Sort('')<CR>
-  nmap <Leader>tt <Plug>(table-mode-tableize)
+
-  xmap <Leader>tt <Plug>(table-mode-tableize)
+if !g:table_mode_disable_tableize_mappings
+  if !hasmapto('<Plug>(table-mode-tableize)')
+    exec "nmap" g:table_mode_tableize_map "<Plug>(table-mode-tableize)"
+    exec "xmap" g:table_mode_tableize_map "<Plug>(table-mode-tableize)"
+  endif
+
+  if !hasmapto('<Plug>(table-mode-tableize-delimiter)')
+    exec "xmap" g:table_mode_tableize_d_map "<Plug>(table-mode-tableize-delimiter)"
+  endif
 endif
 
-if !hasmapto('<Plug>(table-mode-tableize-delimiter)')
+augroup TableMode "{{{1
-  xmap <Leader>T <Plug>(table-mode-tableize-delimiter)
+  au!
-endif
-
-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
 
+  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,8 +1,6 @@
 " vim: fdm=indent
 source t/config/options.vim
 
-call vspec#hint({'scope': 'tablemode#align#scope()', 'sid': 'tablemode#align#sid()'})
-
 function! ConvertLines2Dict(lines)
   let lines = []
   for idx in range(len(a:lines))

t/cell.vim

@@ -1,8 +1,6 @@
 " vim: fdm=indent
 source t/config/options.vim
 
-call vspec#hint({'scope': 'tablemode#spreadsheet#cell#scope()', 'sid': 'tablemode#spreadsheet#cell#sid()'})
-
 describe 'cell'
   describe 'API'
     before
@@ -10,7 +8,7 @@ describe 'cell'
       read t/fixtures/sample.txt
     end
 
-    it 'should return the cells'
+    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']
@@ -20,7 +18,17 @@ describe 'cell'
       Expect tablemode#spreadsheet#cell#GetCells(2, 0, 2) == ['test12', 'test22']
     end
 
-    it 'should return the cells in a range'
+    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']]
 
@@ -54,20 +62,19 @@ describe 'cell'
       before
         new
         normal! ggdG
-        call tablemode#Enable()
+        read t/fixtures/sample.txt
-        normal i|test11|test12|
+        call cursor(2, 3)
-|test21|test22|
       end
 
       it 'should move left when not on first column'
-      it 'should move left when not on first column'
+        call cursor(2, 12)
         Expect tablemode#spreadsheet#ColumnNr('.') == 2
         call tablemode#spreadsheet#cell#Motion('h')
         Expect tablemode#spreadsheet#ColumnNr('.') == 1
       end
 
       it 'should move to the previous row last column if it exists when on first column'
-      it 'should move to the previous row last column if it exists when on first column'
+        call cursor(3, 3)
         Expect tablemode#spreadsheet#RowNr('.') == 2
         Expect tablemode#spreadsheet#ColumnNr('.') == 1
         call tablemode#spreadsheet#cell#Motion('h')
@@ -82,7 +89,7 @@ describe 'cell'
       end
 
       it 'should move to the next row first column if it exists when on last column'
-      it 'should move to the next row first column if it exists when on last column'
+        call cursor(2, 12)
         Expect tablemode#spreadsheet#RowNr('.') == 1
         Expect tablemode#spreadsheet#ColumnNr('.') == 2
         call tablemode#spreadsheet#cell#Motion('l')
@@ -95,13 +102,12 @@ describe 'cell'
       before
         new
         normal! ggdG
-        normal! ggdG
+        read t/fixtures/sample.txt
-        call tablemode#Enable()
+        call cursor(2, 3)
-        normal i|test11|test12|
       end
 
       it 'should move a row up unless on first row'
-
+        call cursor(3, 3)
         Expect tablemode#spreadsheet#RowNr('.') == 2
         call tablemode#spreadsheet#cell#Motion('k')
         Expect tablemode#spreadsheet#RowNr('.') == 1

t/config/options.vim

@@ -1,9 +1,37 @@
 let g:table_mode_corner = '+'
 let g:table_mode_separator = '|'
+let g:table_mode_escaped_separator_regex = '\V\C\\\@1<!|'
 let g:table_mode_fillchar = '-'
+let g:table_mode_header_fillchar = '-'
 let g:table_mode_map_prefix = '<Leader>t'
 let g:table_mode_toggle_map = 'm'
 let g:table_mode_always_active = 0
 let g:table_mode_delimiter = ','
 let g:table_mode_corner_corner = '|'
 let g:table_mode_align_char = ':'
+let g:table_mode_disable_mappings = 0
+
+let g:table_mode_motion_up_map = '{<Bar>'
+let g:table_mode_motion_down_map = '}<Bar>'
+let g:table_mode_motion_left_map = '[<Bar>'
+let g:table_mode_motion_right_map = ']<Bar>'
+
+let g:table_mode_cell_text_object_a_map = 'a<Bar>'
+let g:table_mode_cell_text_object_i_map = 'i<Bar>'
+
+let g:table_mode_realign_map = '<Leader>tr'
+let g:table_mode_delete_row_map = '<Leader>tdd'
+let g:table_mode_delete_column_map = '<Leader>tdc'
+let g:table_mode_insert_column_before_map = '<Leader>tiC'
+let g:table_mode_insert_column_after_map = '<Leader>tic'
+let g:table_mode_add_formula_map = '<Leader>tfa'
+let g:table_mode_eval_formula_map = '<Leader>tfe'
+let g:table_mode_echo_cell_map = '<Leader>t?'
+let g:table_mode_sort_map = '<Leader>ts'
+let g:table_mode_tableize_map = '<Leader>tt'
+let g:table_mode_tableize_d_map = '<Leader>T'
+
+let g:table_mode_syntax = 1
+let g:table_mode_auto_align = 1
+let g:table_mode_update_time = 500
+let g:table_mode_tableize_auto_border = 0

t/fixtures/align/unicode_before.txt

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

t/fixtures/big_sample.txt

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

t/fixtures/cell/counts.txt

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

t/fixtures/cell/sample.txt

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

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

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

t/fixtures/table/sample.txt

@@ -0,0 +1,4 @@
+
+| test11 | test12 |
+| test21 | test22 |
+

t/fixtures/table/sample_for_header.txt

@@ -0,0 +1,3 @@
+| test11 | test12 |
+
+| test21 | test22 |

t/fixtures/table/sample_for_header_unicode.txt

@@ -0,0 +1,9 @@
+
+| abc          | 测试长度         | 长测试     |
+
+| 长           | 测试测试测试测试 | 测试测试   |
+
+| 测试测试     | 测试             | 测试测测试 |
+
+| 测试测试测试 | 测试测试         | 测试       |
+

t/fixtures/table/sample_header_realign_after.txt

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

t/fixtures/table/sample_header_realign_before.txt

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

t/fixtures/table/sample_header_realign_unicode_after.txt

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

t/fixtures/table/sample_header_realign_unicode_before.txt

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

t/fixtures/table/sample_realign_after.txt

@@ -0,0 +1,2 @@
+| test11 | test12 |
+| test21 | test22 |

t/fixtures/table/sample_realign_before.txt

@@ -0,0 +1,2 @@
+|test11|test12|
+|test21|test22|

t/fixtures/table/sample_realign_unicode_after.txt

@@ -0,0 +1,4 @@
+| abc          | 测试长度         | 长测试     |
+| 长           | 测试测试测试测试 | 测试测试   |
+| 测试测试     | 测试             | 测试测测试 |
+| 测试测试测试 | 测试测试         | 测试       |

t/fixtures/table/sample_realign_unicode_before.txt

@@ -0,0 +1,4 @@
+|abc|测试长度|长测试|
+|长|测试测试测试测试|测试测试|
+|测试测试|测试|测试测测试|
+|测试测试测试|测试测试|测试|

t/fixtures/table/sample_with_header.txt

@@ -1,4 +1,4 @@
-
+|--------+---------|
 | Title  | Message |
 |--------+---------|
 | test11 | test12  |

t/formula.vim

@@ -1,8 +1,6 @@
 " vim: fdm=indent
 source t/config/options.vim
 
-call vspec#hint({'scope': 'tablemode#spreadsheet#formula#scope()', 'sid': 'tablemode#spreadsheet#formula#sid()'})
-
 describe 'Formulas'
   describe 'Add Formula'
     before
@@ -12,16 +10,16 @@ describe 'Formulas'
 
     it 'should add a formula successfully'
       call cursor(6, 15)
-      call tablemode#spreadsheet#formula#Add("Sum(1:4)")
+      call tablemode#spreadsheet#formula#Add("Sum(1:3)")
       Expect tablemode#spreadsheet#cell#GetCell() == '125.0'
       call cursor(8, 15)
-      Expect getline('.') == '/* tmf: $5,2=Sum(1:4) */'
+      Expect getline('.') == '/* tmf: $4,2=Sum(1:3) */'
 
       call cursor(7, 15)
       call tablemode#spreadsheet#formula#Add("Sum(1:-1)")
       Expect tablemode#spreadsheet#cell#GetCell() == '250.0'
       call cursor(8, 15)
-      Expect getline('.') == '/* tmf: $5,2=Sum(1:4) ; $6,2=Sum(1:-1) */'
+      Expect getline('.') == '/* tmf: $4,2=Sum(1:3); $5,2=Sum(1:-1) */'
     end
   end
 

t/spreadsheet.vim

@@ -1,8 +1,6 @@
 " vim: fdm=indent
 source t/config/options.vim
 
-call vspec#hint({'scope': 'tablemode#spreadsheet#scope()', 'sid': 'tablemode#spreadsheet#sid()'})
-
 describe 'spreadsheet'
   describe 'API'
     before
@@ -25,6 +23,27 @@ describe 'spreadsheet'
       Expect tablemode#spreadsheet#ColumnCount(3) == 2
     end
 
+    it 'should return the column number'
+      call cursor(2,3)
+      Expect tablemode#spreadsheet#ColumnNr('.') == 1
+      call cursor(2,12)
+      Expect tablemode#spreadsheet#ColumnNr('.') == 2
+    end
+
+    it 'should return true when in the first cell'
+      call cursor(2,3)
+      Expect tablemode#spreadsheet#IsFirstCell() to_be_true
+      call cursor(2,12)
+      Expect tablemode#spreadsheet#IsFirstCell() to_be_false
+    end
+
+    it 'should return true when in the last cell'
+      call cursor(2,3)
+      Expect tablemode#spreadsheet#IsLastCell() to_be_false
+      call cursor(2,12)
+      Expect tablemode#spreadsheet#IsLastCell() to_be_true
+    end
+
     it 'should return the line number of the first row'
       Expect tablemode#spreadsheet#GetFirstRow(2) == 2
       Expect tablemode#spreadsheet#GetFirstRow(3) == 2
@@ -34,13 +53,123 @@ describe 'spreadsheet'
       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') == 2.5
+        call cursor(2,7)
+        Expect tablemode#spreadsheet#Average('1:2') == 3.0
+        Expect tablemode#spreadsheet#Average('2,1:2,2') == 3.5
+      end
+
+      it 'should return the min of cell range'
+        call cursor(1,3)
+        Expect tablemode#spreadsheet#Min('1:2') == 1.0
+        Expect tablemode#spreadsheet#Min('1,1:1,2') == 1.0
+        Expect tablemode#spreadsheet#Min('1,1:2,2') == 1.0
+        call cursor(2,7)
+        Expect tablemode#spreadsheet#Min('1:2') == 2.0
+        Expect tablemode#spreadsheet#Min('2,1:2,2') == 3.0
+      end
+
+      it 'should return the max of cell range'
+        call cursor(1,3)
+        Expect tablemode#spreadsheet#Max('1:2') == 3.0
+        Expect tablemode#spreadsheet#Max('1,1:1,2') == 2.0
+        Expect tablemode#spreadsheet#Max('1,1:2,2') == 4.0
+        call cursor(2,7)
+        Expect tablemode#spreadsheet#Max('1:2') == 4.0
+        Expect tablemode#spreadsheet#Max('2,1:2,2') == 4.0
+      end
+    end
+
+    describe 'Count'
+      before
+        new
+        read t/fixtures/cell/counts.txt
+      end
+
+      it 'should return the count of empty cell range'
+        call cursor(1,3)
+        Expect tablemode#spreadsheet#CountE('1:3') == 1
+        Expect tablemode#spreadsheet#CountE('1,1:1,3') == 0
+        Expect tablemode#spreadsheet#CountE('2,1:2,3') == 2
+        Expect tablemode#spreadsheet#CountE('1,1:3,3') == 2
+        call cursor(3,11)
+        Expect tablemode#spreadsheet#CountE('1:3') == 1
+        Expect tablemode#spreadsheet#CountE('3,1:3,3') == 0
+      end
+
+      it 'should return the count of not-empty cell range'
+        call cursor(1,3)
+        Expect tablemode#spreadsheet#CountNE('1:3') == 2
+        Expect tablemode#spreadsheet#CountNE('1,1:1,3') == 3
+        Expect tablemode#spreadsheet#CountNE('2,1:2,3') == 1
+        Expect tablemode#spreadsheet#CountNE('1,1:3,3') == 7
+        call cursor(3,11)
+        Expect tablemode#spreadsheet#CountNE('1:3') == 2
+        Expect tablemode#spreadsheet#CountNE('3,1:3,3') == 3
+      end
+
+      it 'should return the percent count of empty cell range'
+        call cursor(1,3)
+        Expect tablemode#spreadsheet#PercentE('1:3') == 33
+        Expect tablemode#spreadsheet#PercentE('1,1:1,3') == 0
+        Expect tablemode#spreadsheet#PercentE('2,1:2,3') == 66
+        Expect tablemode#spreadsheet#PercentE('1,1:3,3') == 22
+        call cursor(3,11)
+        Expect tablemode#spreadsheet#PercentE('1:3') == 33
+        Expect tablemode#spreadsheet#PercentE('3,1:3,3') == 0
+      end
+
+      it 'should return the percent count of not-empty cell range'
+        call cursor(1,3)
+        Expect tablemode#spreadsheet#PercentNE('1:3') == 66
+        Expect tablemode#spreadsheet#PercentNE('1,1:1,3') == 100
+        Expect tablemode#spreadsheet#PercentNE('2,1:2,3') == 33
+        Expect tablemode#spreadsheet#PercentNE('1,1:3,3') == 77
+        call cursor(3,11)
+        Expect tablemode#spreadsheet#PercentNE('1:3') == 66
+        Expect tablemode#spreadsheet#PercentNE('3,1:3,3') == 100
+      end
+
+      it 'should return the average of not-empty cell range'
+        call cursor(1,3)
+        Expect tablemode#spreadsheet#AverageNE('1:3') == 2.5
+        Expect tablemode#spreadsheet#AverageNE('1,1:1,3') == 2.0
+        Expect tablemode#spreadsheet#AverageNE('2,1:2,3') == 0.0
+        Expect tablemode#spreadsheet#AverageNE('1,1:3,3') == 3.0
+        call cursor(3,11)
+        Expect tablemode#spreadsheet#AverageNE('1:3') == 4.5
+        Expect tablemode#spreadsheet#AverageNE('3,1:3,3') == 5.0
+      end
+    end
   end
 
   describe 'Manipulations'
     before
       new
-      normal i|test11|test12|
+      normal! ggdG
-|test21|test22|
+      read t/fixtures/sample.txt
+      call cursor(2, 3)
     end
 
     it 'should delete a row successfully'
@@ -54,5 +183,159 @@ describe 'spreadsheet'
       call tablemode#spreadsheet#DeleteColumn()
       Expect tablemode#spreadsheet#ColumnCount('.') == 1
     end
+
+    it 'should successfully insert a column before the cursor'
+      Expect tablemode#spreadsheet#ColumnCount('.') == 2
+      call tablemode#spreadsheet#InsertColumn(0)
+      Expect tablemode#spreadsheet#ColumnCount('.') == 3
+      Expect getline('.') == '|  | test11 | test12 |'
+    end
+
+    it 'should successfully insert a column after the cursor'
+      normal! $
+      Expect tablemode#spreadsheet#ColumnCount('.') == 2
+      call tablemode#spreadsheet#InsertColumn(1)
+      Expect tablemode#spreadsheet#ColumnCount('.') == 3
+      Expect getline('.') == '| test11 | test12 |  |'
+    end
+  end
+
+  describe 'Manipulation of tables with headers'
+    before
+      new
+      normal! ggdG
+      let g:table_mode_header_fillchar = '='
+      read t/fixtures/complex_header.txt
+      call cursor(4, 7)
+    end
+
+    it 'should successfully delete a row '
+      Expect tablemode#spreadsheet#RowCount('.') == 5
+      call tablemode#spreadsheet#DeleteRow()
+      Expect tablemode#spreadsheet#RowCount('.') == 4
+      Expect getline(4) == '|     2    | 8        |        b | y        |'
+    end
+
+    it 'should successfully delete a column'
+      Expect tablemode#spreadsheet#ColumnCount('.') == 4
+      call tablemode#spreadsheet#DeleteColumn()
+      Expect tablemode#spreadsheet#ColumnCount('.') == 3
+      Expect getline(4) == '| 9        |        a | z        |'
+    end
+
+    it 'should successfully insert a column before the cursor'
+      Expect tablemode#spreadsheet#ColumnCount('.') == 4
+      call tablemode#spreadsheet#InsertColumn(0)
+      Expect tablemode#spreadsheet#ColumnCount('.') == 5
+      Expect getline(4) == '|  |     1    | 9        |        a | z        |'
+    end
+
+    it 'should successfully insert a column after the cursor'
+      normal! $
+      Expect tablemode#spreadsheet#ColumnCount('.') == 4
+      call tablemode#spreadsheet#InsertColumn(1)
+      Expect tablemode#spreadsheet#ColumnCount('.') == 5
+      Expect getline(4) == '|     1    | 9        |        a | z        |  |'
+    end
+  end
+
+  describe 'Repeated Manipulations'
+    before
+      new
+      normal! ggdG
+      read t/fixtures/big_sample.txt
+      call cursor(2, 3)
+    end
+
+    it 'should delete multiple rows correctly'
+      Expect tablemode#spreadsheet#RowCount('.') == 5
+      .,.+1 call tablemode#spreadsheet#DeleteRow()
+      Expect tablemode#spreadsheet#RowCount('.') == 3
+    end
+
+    it 'should delete multiple columns correctly'
+      Expect tablemode#spreadsheet#ColumnCount('.') == 4
+      .,.+1 call tablemode#spreadsheet#DeleteColumn()
+      Expect tablemode#spreadsheet#ColumnCount('.') == 2
+    end
+
+    it 'should insert multiple columns before the cursor correctly'
+      call cursor(2, 7)
+      Expect tablemode#spreadsheet#ColumnCount('.') == 4
+      execute "normal! 2:\<C-u>call tablemode#spreadsheet#InsertColumn(0)\<CR>"
+      Expect tablemode#spreadsheet#ColumnCount('.') == 6
+      Expect getline('.') == '| 1 |  |  | 9 | a | z |'
+    end
+
+    it 'should insert multiple columns after the cursor correctly'
+      call cursor(2, 7)
+      Expect tablemode#spreadsheet#ColumnCount('.') == 4
+      execute "normal! 2:\<C-u>call tablemode#spreadsheet#InsertColumn(1)\<CR>"
+      Expect tablemode#spreadsheet#ColumnCount('.') == 6
+      Expect getline('.') == '| 1 | 9 |  |  | a | z |'
+    end
+  end
+
+  describe 'Unicode table separators'
+    before
+      new
+      normal! ggdG
+      read t/fixtures/table/sample_realign_unicode_after.txt
+      call cursor(2, 19)
+    end
+
+    it 'should not prevent the deletion of rows'
+      Expect tablemode#spreadsheet#RowCount('.') == 4
+      call tablemode#spreadsheet#DeleteRow()
+      Expect tablemode#spreadsheet#RowCount('.') == 3
+    end
+
+    it 'should not prevent the deletion of columns'
+      Expect tablemode#spreadsheet#ColumnCount('.') == 3
+      call tablemode#spreadsheet#DeleteColumn()
+      Expect tablemode#spreadsheet#ColumnCount('.') == 2
+    end
+
+    it 'should not prevent the insertion of columns before the cursor'
+      Expect tablemode#spreadsheet#ColumnCount('.') == 3
+      call tablemode#spreadsheet#InsertColumn(1)
+      Expect tablemode#spreadsheet#ColumnCount('.') == 4
+    end
+
+    it 'should not prevent the insertion of columns after the cursor'
+      Expect tablemode#spreadsheet#ColumnCount('.') == 3
+      call tablemode#spreadsheet#InsertColumn(1)
+      Expect tablemode#spreadsheet#ColumnCount('.') == 4
+    end
+  end
+
+  describe 'Escaped table separators'
+    before
+      new
+      normal! ggdG
+      read t/fixtures/escaped_seperator.txt
+      call cursor(2, 3)
+    end
+
+    it 'should not prevent the deletion of rows'
+      Expect tablemode#spreadsheet#RowCount('.') == 7
+      call tablemode#spreadsheet#DeleteRow()
+      Expect tablemode#spreadsheet#RowCount('.') == 6
+      Expect getline('.') == '| a separator.      |                         |'
+    end
+
+    it 'should not prevent the deletion of columns'
+      Expect tablemode#spreadsheet#ColumnCount('.') == 2
+      call tablemode#spreadsheet#DeleteColumn()
+      Expect tablemode#spreadsheet#ColumnCount('.') == 1
+      Expect getline('.') == '| It can be escaped by a \. |'
+    end
+
+    it 'should not prevent the insertion of columns'
+      Expect tablemode#spreadsheet#ColumnCount('.') == 2
+      call tablemode#spreadsheet#InsertColumn(1)
+      Expect tablemode#spreadsheet#ColumnCount('.') == 3
+      Expect getline('.') == '| The \| works as   |  | It can be escaped by a \. |'
+    end
   end
 end

t/table.vim

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

t/tablemode.vim

@@ -1,8 +1,6 @@
 " vim: fdm=indent
 source t/config/options.vim
 
-call vspec#hint({'scope': 'tablemode#scope()', 'sid': 'tablemode#sid()'})
-
 describe 'tablemode'
   describe 'Activation'
     describe 'tablemode#Enable()'

t/utils.vim

@@ -1,33 +1,45 @@
 " vim: fdm=indent
 source t/config/options.vim
 
-call vspec#hint({'scope': 'tablemode#utils#scope()', 'sid': 'tablemode#utils#sid()'})
+describe 'utils'
+  describe 'line'
+    it 'should return the current line number'
+      Expect tablemode#utils#line('.') == line('.')
+    end
 
-describe 'line'
+    it 'should return the line number itself if it is a number'
-  it 'should return the current line number'
+      Expect tablemode#utils#line(1) == 1
-    Expect tablemode#utils#line('.') == line('.')
+    end
   end
 
-  it 'should return the line number itself if it is a number'
+  describe 'strip'
-    Expect tablemode#utils#line(1) == 1
+    it 'should strip all initial or trailing whitespace from a string'
-  end
+      let string = ' This is awesome  '
-end
+      Expect tablemode#utils#strip(string) == 'This is awesome'
-
+    end
-describe 'strip'
+  end
-  it 'should strip all initial or trailing whitespace from a string'
+
-    let string = ' This is awesome  '
+  describe 'strlen'
-    Expect tablemode#utils#strip(string) == 'This is awesome'
+    it 'should return the length of a string correctly'
-  end
+      let string = 'this is a test'
-end
+      Expect tablemode#utils#strlen(string) == 14
-
+    end
-describe 'strlen'
+
-  it 'should return the length of a string correctly'
+    it 'should return the length of a unicode string correctly'
-    let string = 'this is a test'
+      let string = '測試 is good.'
-    Expect tablemode#utils#strlen(string) == 14
+      Expect tablemode#utils#strlen(string) == 11
-  end
+    end
-
+  end
-  it 'should return the length of a unicode string correctly'
+
-    let string = '測試 is good.'
+  describe 'strdisplaywidth'
-    Expect tablemode#utils#strlen(string) == 11
+    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