Added syntax for matching tables

Altered border generation code to incorporate true display width of
characters, hence generate more accurate borders.

.travis.yml

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

CHANGELOG.md

@@ -1,4 +1,21 @@
 # Change Log
+## Version 4.4.1
+* Added syntax for matching tables
+
+## Version 4.4.0
+* Minor bug fixes
+* Added feature to allow using negative indices within formulas to access rows,
+  columns relative to the last, -1 being the last.
+
+## Version 4.3.0
+* Refactored some more
+* Fixed issue #19, hiphens in the table broke alignment
+* Added feature #26, you can now define column alignments in the table header
+
+## Version 4.2.0
+* Refactored cells logic out to autoload/tablemode/spreadsheet/cell.vim
+* Refactored formula logic out to autoload/tablemode/spreadsheet/formula.vim
+
 ## Version 4.1.0
 * Fixed bad references within plugin
 * Added fixtures
@@ -7,7 +24,7 @@
 * Major refactoring of the codebase.
 * Improved modular tests.
 * Fixed long standing unicode character alignment issue.
-* Moved to providing <Plug> mappings rather than configuration based mappings
+* Moved to providing \<Plug\> mappings rather than configuration based mappings
   which can be more easily overriden by end user.
 
 ## Version 3.3.2

README.md

@@ -1,4 +1,4 @@
-# VIM Table Mode v4.1.0 [![Build Status](https://travis-ci.org/dhruvasagar/vim-table-mode.png?branch=master)](https://travis-ci.org/dhruvasagar/vim-table-mode)
+# VIM Table Mode v4.4.1 [![Build Status](https://travis-ci.org/dhruvasagar/vim-table-mode.png?branch=master)](https://travis-ci.org/dhruvasagar/vim-table-mode)
 
 An awesome automatic table creator & formatter allowing one to create neat
 tables as you type.
@@ -48,6 +48,10 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
    per buffer basis and so it does not cause any unusual behavior unless it is
    enabled explicitly. Please read `:h table-mode` for further information.
 
+   You can also define in a table header border how it's content should be
+   aligned, whether right or left by using a `:` character defined by
+   `g:table_mode_align_char` option.
+
 - **Format existing content into a table** :
 
    Table Mode wouldn't justify it's name if it didn't allow formatting
@@ -133,11 +137,13 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
 
       - `$n`: This matches the table column number `n`. So the `formula` would
         be evaluated for each cell in that column and the result would be placed
-        in it.
+        in it. You can use negative indice to represent column relative to the
+        last, -1 being the last.
 
       - `$n,m`: This matches the table cell n,m (row, column). So in this case
         the formula would be evaluated and the result will be placed in this
-        cell.
+        cell. You can also use negative values to refer to cells relative to
+        the size, -1 being the last (row or column).
 
   - The `formula` can be a simple mathematical expression involving cells
     which are also defined by the same format as that of the target cell.  You
@@ -145,7 +151,7 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
     mode also provides 2 special functions `Sum` and `Average`. Both these
     functions take a range as input. A range can be of two forms :
 
-      - `r1,r2`: This represents cells in the current column from row `r1`
+      - `r1:r2`: This represents cells in the current column from row `r1`
         through `r2`. If `r2` is negative it represents `r2` rows above the
         current row (of the target cell).
 

autoload/tablemode.vim

@@ -4,7 +4,6 @@
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       https://github.com/dhruvasagar/vim-table-mode
-" Version:       4.1.0
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
 "
@@ -33,13 +32,6 @@ function! s:SetBufferOptDefault(opt, val) "{{{2
   endif
 endfunction
 
-function! s:IsTableModeActive() "{{{2
-  if g:table_mode_always_active | return 1 | endif
-
-  call s:SetBufferOptDefault('table_mode_active', 0)
-  return b:table_mode_active
-endfunction
-
 function! s:ToggleMapping() "{{{2
   if exists('b:table_mode_active') && b:table_mode_active
     call s:SetBufferOptDefault('table_mode_separator_map', g:table_mode_separator)
@@ -59,13 +51,13 @@ function! s:SetActive(bool) "{{{2
 endfunction
 
 function! s:ConvertDelimiterToSeparator(line, ...) "{{{2
-  let gflag = 'g'
-  if &gdefault | let gflag = 'gg' | endif
+  let old_gdefault = &gdefault
+  set nogdefault
 
   let delim = g:table_mode_delimiter
   if a:0 | let delim = a:1 | endif
   if delim ==# ','
-    silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs,\\ze[^\'\"]*[\'\"]/__COMMA__/" . gflag
+    silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs,\\ze[^\'\"]*[\'\"]/__COMMA__/g"
   endif
 
   let [cstart, cend] = [tablemode#table#GetCommentStart(), tablemode#table#GetCommentEnd()]
@@ -75,11 +67,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
@@ -98,28 +92,35 @@ function! tablemode#scope() "{{{2
   return s:
 endfunction
 
+function! tablemode#IsActive() "{{{2
+  if g:table_mode_always_active | return 1 | endif
+
+  call s:SetBufferOptDefault('table_mode_active', 0)
+  return b:table_mode_active
+endfunction
+
 function! tablemode#TableizeInsertMode() "{{{2
-  if s:IsTableModeActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator)
-    call tablemode#table#AddHeaderBorder('.')
+  if tablemode#IsActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator)
+    call tablemode#table#AddBorder('.')
     normal! A
-  elseif s:IsTableModeActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
+  elseif tablemode#IsActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator)
     let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g'))
     let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*'))
-    call tablemode#table#TableRealign('.')
+    call tablemode#table#Realign('.')
     normal! 0
     call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
   endif
 endfunction
 
-function! tablemode#TableModeEnable() "{{{2
+function! tablemode#Enable() "{{{2
   call s:SetActive(1)
 endfunction
 
-function! tablemode#TableModeDisable() "{{{2
+function! tablemode#Disable() "{{{2
   call s:SetActive(0)
 endfunction
 
-function! tablemode#TableModeToggle() "{{{2
+function! tablemode#Toggle() "{{{2
   if g:table_mode_always_active
     return 1
   endif
@@ -136,7 +137,7 @@ function! tablemode#TableizeRange(...) range "{{{2
     let lnum += 1
   endwhile
 
-  call tablemode#table#TableRealign(lnum - 1)
+  call tablemode#table#Realign(lnum - 1)
 endfunction
 
 function! tablemode#TableizeByDelimiter() "{{{2

autoload/tablemode/align.vim

@@ -4,7 +4,6 @@
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       https://github.com/dhruvasagar/vim-table-mode
-" Version:       4.1.0
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
 "
@@ -20,32 +19,6 @@
 
 " Borrowed from Tabular
 " Private Functions {{{1
-" Return the number of bytes in a string after expanding tabs to spaces.  {{{2
-" This expansion is done based on the current value of 'tabstop'
-if exists('*strdisplaywidth')
-  " Needs vim 7.3
-  let s:Strlen = function("strdisplaywidth")
-else
-  function! s:Strlen(string)
-    " Implement the tab handling part of strdisplaywidth for vim 7.2 and
-    " earlier - not much that can be done about handling doublewidth
-    " characters.
-    let rv = 0
-    let i = 0
-
-    for char in split(a:string, '\zs')
-      if char == "\t"
-        let rv += &ts - i
-        let i = 0
-      else
-        let rv += 1
-        let i = (i + 1) % &ts
-      endif
-    endfor
-
-    return rv
-  endfunction
-endif
 " function! s:StripTrailingSpaces(string) - Remove all trailing spaces {{{2
 " from a string.
 function! s:StripTrailingSpaces(string)
@@ -53,7 +26,7 @@ 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'
@@ -65,11 +38,21 @@ function! s:Padding(string, length, where) "{{{3
   endif
 endfunction
 
-" function! s:Split() - Split a string into fields and delimiters {{{2
+" 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
 " All even numbered elements are non-delimiters (including zero)
-function! s:Split(string, delim)
+function! tablemode#align#Split(string, delim)
   let rv = []
   let beg = 0
 
@@ -108,59 +91,65 @@ function! s:Split(string, delim)
   return rv
 endfunction
 
-" Public Functions {{{1
-function! tablemode#align#sid() "{{{2
-  return maparg('<sid>', 'n')
-endfunction
-nnoremap <sid> <sid>
-
-function! tablemode#align#scope() "{{{2
-  return s:
+function! tablemode#align#alignments(lnum, ncols) "{{{2
+  let alignments = []
+  if tablemode#table#IsBorder(a:lnum+1)
+    let hcols = tablemode#align#Split(getline(a:lnum+1), '[' . g:table_mode_corner . g:table_mode_corner_corner . ']')
+    for idx in range(len(hcols))
+      " Right align if header
+      call add(alignments, 'l')
+      if hcols[idx] =~# g:table_mode_align_char . '$' | let alignments[idx] = 'r' | endif
+      if hcols[idx] !~# '[^0-9\.]' | let alignments[idx] = 'r' | endif
+    endfor
+  end
+  return alignments
 endfunction
 
 function! tablemode#align#Align(lines) "{{{2
-  let lines = map(a:lines, 's:Split(v:val, g:table_mode_separator)')
+  let lines = map(a:lines, 'map(v:val, "v:key =~# \"text\" ? tablemode#align#Split(v:val, g:table_mode_separator) : v:val")')
 
   for line in lines
-    if len(line) <= 1 | continue | endif
+    let stext = line.text
+    if len(stext) <= 1 | continue | endif
 
-    if line[0] !~ tablemode#table#StartExpr()
-      let line[0] = s:StripTrailingSpaces(line[0])
+    if stext[0] !~ tablemode#table#StartExpr()
+      let stext[0] = s:StripTrailingSpaces(stext[0])
     endif
-    if len(line) >= 2
-      for i in range(1, len(line)-1)
-        let line[i] = tablemode#utils#strip(line[i])
+    if len(stext) >= 2
+      for i in range(1, len(stext)-1)
+        let stext[i] = tablemode#utils#strip(stext[i])
       endfor
     endif
   endfor
 
   let maxes = []
   for line in lines
-    if len(line) <= 1 | continue | endif
-    for i in range(len(line))
+    let stext = line.text
+    if len(stext) <= 1 | continue | endif
+    for i in range(len(stext))
       if i == len(maxes)
-        let maxes += [ s:Strlen(line[i]) ]
+        let maxes += [ tablemode#utils#StrDisplayWidth(stext[i]) ]
       else
-        let maxes[i] = max([ maxes[i], s:Strlen(line[i]) ])
+        let maxes[i] = max([ maxes[i], tablemode#utils#StrDisplayWidth(stext[i]) ])
       endif
     endfor
   endfor
 
+  let alignments = tablemode#align#alignments(lines[0].lnum, len(lines[0].text))
+
   for idx in range(len(lines))
-    let line = lines[idx]
+    let tlnum = lines[idx].lnum
+    let tline = lines[idx].text
 
-    if len(line) <= 1 | continue | endif
-    for i in range(len(line))
-      if line[i] !~# '[^0-9\.]'
-        let field = s:Padding(line[i], maxes[i], 'r')
-      else
-        let field = s:Padding(line[i], maxes[i], 'l')
-      endif
-
-      let line[i] = field . (i == 0 || i == len(line) ? '' : ' ')
+    if len(tline) <= 1 | continue | endif
+    for jdx in range(len(tline))
+      " Dealing with the header being the first line
+      if jdx >= len(alignments) | call add(alignments, 'l') | endif
+      let field = s:Padding(tline[jdx], maxes[jdx], alignments[jdx])
+      let tline[jdx] = field . (jdx == 0 || jdx == len(tline) ? '' : ' ')
     endfor
 
-    let lines[idx] = s:StripTrailingSpaces(join(line, ''))
+    let lines[idx].text = s:StripTrailingSpaces(join(tline, ''))
   endfor
 
   return lines

autoload/tablemode/spreadsheet.vim

@@ -4,7 +4,6 @@
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       https://github.com/dhruvasagar/vim-table-mode
-" Version:       4.1.0
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
 "
@@ -37,42 +36,6 @@ function! s:Average(list) "{{{2
   return s:Sum(a:list)/len(a:list)
 endfunction
 
-" function! s:ParseRange(range, ...) {{{2
-" range: A string representing range of cells.
-"        - Can be row1:row2 for values in the current columns in those rows.
-"        - Can be row1,col1:row2,col2 for range between row1,col1 till
-"          row2,col2.
-function! s:ParseRange(range, ...)
-  if a:0 < 1
-    let default_col = tablemode#spreadsheet#ColumnNr('.')
-  elseif a:0 < 2
-    let default_col = a:1
-  endif
-
-  if type(a:range) != type('')
-    let range = string(a:range)
-  else
-    let range = a:range
-  endif
-
-  let [rowcol1, rowcol2] = split(range, ':')
-  let [rcs1, rcs2] = [map(split(rowcol1, ','), 'str2nr(v:val)'), map(split(rowcol2, ','), 'str2nr(v:val)')]
-
-  if len(rcs1) == 2
-    let [row1, col1] = rcs1
-  else
-    let [row1, col1] = [rcs1[0], default_col]
-  endif
-
-  if len(rcs2) == 2
-    let [row2, col2] = rcs2
-  else
-    let [row2, col2] = [rcs2[0], default_col]
-  endif
-
-  return [row1, col1, row2, col2]
-endfunction
-
 " Public Functions {{{1
 function! tablemode#spreadsheet#sid() "{{{2
   return maparg('<sid>', 'n')
@@ -84,50 +47,50 @@ function! tablemode#spreadsheet#scope() "{{{2
 endfunction
 
 function! tablemode#spreadsheet#GetFirstRow(line) "{{{2
-  if tablemode#table#IsATableRow(a:line)
+  if tablemode#table#IsRow(a:line)
     let line = tablemode#utils#line(a:line)
 
-    while tablemode#table#IsATableRow(line - 1) || tablemode#table#IsATableHeader(line - 1)
+    while tablemode#table#IsRow(line - 1) || tablemode#table#IsBorder(line - 1)
       let line -= 1
     endwhile
-    if tablemode#table#IsATableHeader(line) | let line += 1 | endif
+    if tablemode#table#IsBorder(line) | let line += 1 | endif
 
     return line
   endif
 endfunction
 
 function! tablemode#spreadsheet#MoveToFirstRow() "{{{2
-  if tablemode#table#IsATableRow('.')
+  if tablemode#table#IsRow('.')
     call cursor(tablemode#spreadsheet#GetFirstRow('.'), col('.'))
   endif
 endfunction
 
 function! tablemode#spreadsheet#GetLastRow(line) "{{{2
-  if tablemode#table#IsATableRow(a:line)
+  if tablemode#table#IsRow(a:line)
     let line = tablemode#utils#line(a:line)
 
-    while tablemode#table#IsATableRow(line + 1) || tablemode#table#IsATableHeader(line + 1)
+    while tablemode#table#IsRow(line + 1) || tablemode#table#IsBorder(line + 1)
       let line += 1
     endwhile
-    if tablemode#table#IsATableHeader(line) | let line -= 1 | endif
+    if tablemode#table#IsBorder(line) | let line -= 1 | endif
 
     return line
   endif
 endfunction
 
 function! tablemode#spreadsheet#MoveToLastRow() "{{{2
-  if tablemode#table#IsATableRow('.')
+  if tablemode#table#IsRow('.')
     call cursor(tablemode#spreadsheet#GetLastRow('.'), col('.'))
   endif
 endfunction
 
 function! tablemode#spreadsheet#LineNr(row) "{{{2
-  if tablemode#table#IsATableRow('.')
+  if tablemode#table#IsRow('.')
     let line = tablemode#spreadsheet#GetFirstRow('.')
     let row_nr = 0
 
-    while tablemode#table#IsATableRow(line + 1) || tablemode#table#IsATableHeader(line + 1)
-      if tablemode#table#IsATableRow(line)
+    while tablemode#table#IsRow(line + 1) || tablemode#table#IsBorder(line + 1)
+      if tablemode#table#IsRow(line)
         let row_nr += 1
         if row ==# row_nr | break | endif
       endif
@@ -142,8 +105,8 @@ function! tablemode#spreadsheet#RowNr(line) "{{{2
   let line = tablemode#utils#line(a:line)
 
   let rowNr = 0
-  while tablemode#table#IsATableRow(line) || tablemode#table#IsATableHeader(line)
-    if tablemode#table#IsATableRow(line) | let rowNr += 1 | endif
+  while tablemode#table#IsRow(line) || tablemode#table#IsBorder(line)
+    if tablemode#table#IsRow(line) | let rowNr += 1 | endif
     let line -= 1
   endwhile
 
@@ -154,14 +117,14 @@ function! tablemode#spreadsheet#RowCount(line) "{{{2
   let line = tablemode#utils#line(a:line)
 
   let [tline, totalRowCount] = [line, 0]
-  while tablemode#table#IsATableRow(tline) || tablemode#table#IsATableHeader(tline)
-    if tablemode#table#IsATableRow(tline) | let totalRowCount += 1 | endif
+  while tablemode#table#IsRow(tline) || tablemode#table#IsBorder(tline)
+    if tablemode#table#IsRow(tline) | let totalRowCount += 1 | endif
     let tline -= 1
   endwhile
 
   let tline = line + 1
-  while tablemode#table#IsATableRow(tline) || tablemode#table#IsATableHeader(tline)
-    if tablemode#table#IsATableRow(tline) | let totalRowCount += 1 | endif
+  while tablemode#table#IsRow(tline) || tablemode#table#IsBorder(tline)
+    if tablemode#table#IsRow(tline) | let totalRowCount += 1 | endif
     let tline += 1
   endwhile
 
@@ -203,143 +166,34 @@ function! tablemode#spreadsheet#MoveToStartOfCell() "{{{2
   endif
 endfunction
 
-function! tablemode#spreadsheet#GetLastRow(line) "{{{2
-  if tablemode#table#IsATableRow(a:line)
-    let line = tablemode#utils#line(a:line)
-
-    while tablemode#table#IsATableRow(line + 1) || tablemode#table#IsATableHeader(line + 1)
-      let line += 1
-    endwhile
-    if tablemode#table#IsATableHeader(line) | let line -= 1 | endif
-
-    return line
-  endif
-endfunction
-
 function! tablemode#spreadsheet#GetFirstRow(line) "{{{2
-  if tablemode#table#IsATableRow(a:line)
+  if tablemode#table#IsRow(a:line)
     let line = tablemode#utils#line(a:line)
 
-    while tablemode#table#IsATableRow(line - 1) || tablemode#table#IsATableHeader(line - 1)
+    while tablemode#table#IsRow(line - 1) || tablemode#table#IsBorder(line - 1)
       let line -= 1
     endwhile
-    if tablemode#table#IsATableHeader(line) | let line += 1 | endif
+    if tablemode#table#IsBorder(line) | let line += 1 | endif
 
     return line
   endif
 endfunction
 
-" function! tablemode#spreadsheet#GetCells() - Function to get values of cells in a table {{{2
-" tablemode#spreadsheet#GetCells(row) - Get values of all cells in a row as a List.
-" tablemode#spreadsheet#GetCells(0, col) - Get values of all cells in a column as a List.
-" tablemode#spreadsheet#GetCells(row, col) - Get the value of table cell by given row, col.
-function! tablemode#spreadsheet#GetCells(line, ...) abort "{{{2
-  let line = tablemode#utils#line(a:line)
+function! tablemode#spreadsheet#GetLastRow(line) "{{{2
+  if tablemode#table#IsRow(a:line)
+    let line = tablemode#utils#line(a:line)
 
-  if tablemode#table#IsATableRow(line)
-    if a:0 < 1
-      let [row, colm] = [line, 0]
-    elseif a:0 < 2
-      let [row, colm] = [a:1, 0]
-    elseif a:0 < 3
-      let [row, colm] = a:000
-    endif
+    while tablemode#table#IsRow(line + 1) || tablemode#table#IsBorder(line + 1)
+      let line += 1
+    endwhile
+    if tablemode#table#IsBorder(line) | let line -= 1 | endif
 
-    let first_row = tablemode#spreadsheet#GetFirstRow(line)
-    if row == 0
-      let values = []
-      let line = first_row
-      while tablemode#table#IsATableRow(line) || tablemode#table#IsATableHeader(line)
-        if tablemode#table#IsATableRow(line)
-          let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
-          call add(values, tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, '')))
-        endif
-        let line += 1
-      endwhile
-      return values
-    else
-      let row_nr = 0
-      let line = first_row
-      while tablemode#table#IsATableRow(line) || tablemode#table#IsATableHeader(line)
-        if tablemode#table#IsATableRow(line)
-          let row_nr += 1
-          if row ==# row_nr | break | endif
-        endif
-        let line += 1
-      endwhile
-
-      let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
-      if colm == 0
-        return map(split(row_line, g:table_mode_separator), 'tablemode#utils#strip(v:val)')
-      else
-        let split_line = split(row_line, g:table_mode_separator)
-        return tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, ''))
-      endif
-    endif
-  endif
-endfunction
-
-function! tablemode#spreadsheet#GetCell(...) "{{{2
-  if a:0 == 0
-    let [row, colm] = [tablemode#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
-  elseif a:0 == 2
-    let [row, colm] = [a:1, a:2]
-  endif
-
-  return tablemode#spreadsheet#GetCells('.', row, col)
-endfunction
-
-function! tablemode#spreadsheet#GetRow(row, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
-  return tablemode#spreadsheet#GetCells(line, a:row)
-endfunction
-
-function! tablemode#spreadsheet#GetRowColumn(col, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
-  let row = tablemode#RowNr('.')
-  return tablemode#spreadsheet#GetCells(line, row, a:col)
-endfunction
-
-function! tablemode#spreadsheet#GetColumn(col, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
-  return tablemode#spreadsheet#GetCells(line, 0, a:col)
-endfunction
-
-function! tablemode#spreadsheet#GetColumnRow(row, ...) abort "{{{2
-  let line = a:0 < 1 ? '.' : a:1
-  let col = tablemode#spreadsheet#ColumnNr('.')
-  return tablemode#spreadsheet#GetCells(line, a:row, col)
-endfunction
-
-function! tablemode#spreadsheet#SetCell(val, ...) "{{{2
-  if a:0 == 0
-    let [line, row, colm] = ['.', tablemode#spreadsheet#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
-  elseif a:0 == 2
-    let [line, row, colm] = ['.', a:1, a:2]
-  elseif a:0 == 3
-    let [line, row, colm] = a:000
-  endif
-
-  if tablemode#table#IsATableRow(line)
-    let line = tablemode#utils#line(line) + (row - tablemode#spreadsheet#RowNr(line)) * 1
-    let line_val = getline(line)
-    let cstartexpr = tablemode#table#StartCommentExpr()
-    let values = split(getline(line)[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator)
-    if len(values) < colm | return | endif
-    let values[colm-1] = a:val
-    let line_value = g:table_mode_separator . join(values, g:table_mode_separator) . g:table_mode_separator
-    if tablemode#utils#strlen(cstartexpr) > 0 && line_val =~# cstartexpr
-      let sce = matchstr(line_val, tablemode#table#StartCommentExpr())
-      let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
-      let line_value = sce . line_value . ece
-    endif
-    call setline(line, line_value)
-    call tablemode#table#TableRealign(line)
+    return line
   endif
 endfunction
 
 function! tablemode#spreadsheet#DeleteColumn() "{{{2
-  if tablemode#table#IsATableRow('.')
+  if tablemode#table#IsRow('.')
     for i in range(v:count1)
       call tablemode#spreadsheet#MoveToStartOfCell()
       call tablemode#spreadsheet#MoveToFirstRow()
@@ -348,201 +202,35 @@ function! tablemode#spreadsheet#DeleteColumn() "{{{2
       normal! d
     endfor
 
-    call tablemode#table#TableRealign('.')
+    call tablemode#table#Realign('.')
   endif
 endfunction
 
 function! tablemode#spreadsheet#DeleteRow() "{{{2
-  if tablemode#table#IsATableRow('.')
+  if tablemode#table#IsRow('.')
     for i in range(v:count1)
-      if tablemode#table#IsATableRow('.')
+      if tablemode#table#IsRow('.')
         normal! dd
       endif
 
-      if !tablemode#table#IsATableRow('.')
+      if !tablemode#table#IsRow('.')
         normal! k
       endif
     endfor
 
-    call tablemode#table#TableRealign('.')
+    call tablemode#table#Realign('.')
   endif
 endfunction
 
-function! tablemode#spreadsheet#GetCellRange(range, ...) abort "{{{2
-  if a:0 < 1
-    let [line, colm] = ['.', tablemode#spreadsheet#ColumnNr('.')]
-  elseif a:0 < 2
-    let [line, colm] = [a:1, tablemode#spreadsheet#ColumnNr('.')]
-  elseif a:0 < 3
-    let [line, colm] = [a:1, a:2]
-  else
-    call tablemode#utils#throw('Invalid Range')
-  endif
-
-  let values = []
-
-  if tablemode#table#IsATableRow(line)
-    let [row1, col1, row2, col2] = s:ParseRange(a:range, colm)
-
-    if row1 == row2
-      if col1 == col2
-        call add(values, tablemode#spreadsheet#GetCells(line, row1, col1))
-      else
-        let values = tablemode#spreadsheet#GetRow(row1, line)[(col1-1):(col2-1)]
-      endif
-    else
-      if col1 == col2
-        let values = tablemode#spreadsheet#GetColumn(col1, line)[(row1-1):(row2-1)]
-      else
-        let tcol = col1
-        while tcol <= col2
-          call add(values, tablemode#spreadsheet#GetColumn(tcol, line)[(row1-1):(row2-1)])
-          let tcol += 1
-        endwhile
-      endif
-    endif
-  endif
-
-  return values
-endfunction
-
 function! tablemode#spreadsheet#Sum(range, ...) abort "{{{2
   let args = copy(a:000)
   call insert(args, a:range)
-  return s:Sum(call('tablemode#spreadsheet#GetCellRange', args))
+  return s:Sum(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 
 function! tablemode#spreadsheet#Average(range, ...) abort "{{{2
   let args = copy(a:000)
   call insert(args, a:range)
-  return s:Average(call('tablemode#spreadsheet#GetCellRange', args))
+  return s:Average(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
 
-function! tablemode#spreadsheet#AddFormula() "{{{2
-  let fr = input('f=')
-  let row = tablemode#spreadsheet#RowNr('.')
-  let colm = tablemode#spreadsheet#ColumnNr('.')
-  let indent = indent('.')
-  let indent_str = repeat(' ', indent)
-
-  if fr !=# ''
-    let fr = '$' . row . ',' . colm . '=' . fr
-    let fline = tablemode#spreadsheet#GetLastRow('.') + 1
-    if tablemode#table#IsATableHeader(fline) | let fline += 1 | endif
-    let cursor_pos = [line('.'), col('.')]
-    if getline(fline) =~# 'tmf: '
-      " Comment line correctly
-      let line_val = getline(fline)
-      let line_expr = line_val[match(line_val, tablemode#table#StartCommentExpr()):match(line_val, tablemode#table#EndCommentExpr())]
-      let sce = matchstr(line_val, tablemode#table#StartCommentExpr() . '\zs')
-      let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
-      call setline(fline, sce . line_expr . '; ' . fr . ece)
-    else
-      let cstring = &commentstring
-      let [cmss, cmse] = ['', '']
-      if len(cstring) > 0
-        let cms = split(cstring, '%s')
-        if len(cms) == 2
-          let [cmss, cmse] = cms
-        else
-          let [cmss, cmse] = [cms[0], '']
-        endif
-      endif
-      let fr = indent_str . cmss . ' tmf: ' . fr . ' ' . cmse
-      call append(fline-1, fr)
-      call cursor(cursor_pos)
-    endif
-    call tablemode#spreadsheet#EvaluateFormulaLine()
-  endif
-endfunction
-
-function! tablemode#spreadsheet#EvaluateExpr(expr, line) abort "{{{2
-  let line = tablemode#utils#line(a:line)
-  let [target, expr] = map(split(a:expr, '='), 'tablemode#utils#strip(v:val)')
-  let cell = substitute(target, '\$', '', '')
-  if cell =~# ','
-    let [row, colm] = map(split(cell, ','), 'str2nr(v:val)')
-  else
-    let [row, colm] = [0, str2nr(cell)]
-  endif
-
-  if expr =~# 'Sum(.*)'
-    let expr = substitute(expr, 'Sum(\([^)]*\))', 'tablemode#spreadsheet#Sum("\1",'.line.','.colm.')', 'g')
-  endif
-
-  if expr =~# 'Average(.*)'
-    let expr = substitute(expr, 'Average(\([^)]*\))', 'tablemode#spreadsheet#Average("\1",'.line.','.colm.')', 'g')
-  endif
-
-  if expr =~# '\$\d\+,\d\+'
-    let expr = substitute(expr, '\$\(\d\+\),\(\d\+\)',
-          \ '\=str2float(tablemode#spreadsheet#GetCells(line, submatch(1), submatch(2)))', 'g')
-  endif
-
-  if cell =~# ','
-    if expr =~# '\$'
-      let expr = substitute(expr, '\$\(\d\+\)',
-          \ '\=str2float(tablemode#spreadsheet#GetCells(line, row, submatch(1)))', 'g')
-    endif
-    call tablemode#spreadsheet#SetCell(eval(expr), line, row, colm)
-  else
-    let [row, line] = [1, tablemode#spreadsheet#GetFirstRow(line)]
-    while tablemode#table#IsATableRow(line)
-      let texpr = expr
-      if expr =~# '\$'
-        let texpr = substitute(texpr, '\$\(\d\+\)',
-              \ '\=str2float(tablemode#spreadsheet#GetCells(line, row, submatch(1)))', 'g')
-      endif
-
-      call tablemode#spreadsheet#SetCell(eval(texpr), line, row, colm)
-      let row += 1
-      let line += 1
-    endwhile
-  endif
-endfunction
-
-function! tablemode#spreadsheet#EvaluateFormulaLine() abort "{{{2
-  let exprs = []
-  let cstring = &commentstring
-  let matchexpr = ''
-  if len(cstring) > 0
-    let cms = split(cstring, '%s')
-    if len(cms) == 2
-      let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*\ze' . escape(cms[1], '/*') . '\s*$'
-    else
-      let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*$'
-    endif
-  else
-    let matchexpr = '^\s* tmf: \zs.*$'
-  endif
-  if tablemode#table#IsATableRow('.') " We're inside the table
-    let line = tablemode#spreadsheet#GetLastRow('.')
-    let fline = line + 1
-    if tablemode#table#IsATableHeader(fline) | let fline += 1 | endif
-    if getline(fline) =~# 'tmf: '
-      let exprs = split(matchstr(getline(fline), matchexpr), ';')
-    endif
-  elseif getline('.') =~# 'tmf: ' " We're on the formula line
-    let line = line('.') - 1
-    if tablemode#table#IsATableHeader(line) | let line -= 1 | endif
-    if tablemode#table#IsATableRow(line)
-      let exprs = split(matchstr(getline('.'), matchexpr), ';')
-    endif
-  endif
-
-  for expr in exprs
-    call tablemode#spreadsheet#EvaluateExpr(expr, line)
-  endfor
-endfunction
-
-function! tablemode#spreadsheet#CellTextObject(inner) "{{{2
-  if tablemode#table#IsATableRow('.')
-    call tablemode#spreadsheet#MoveToStartOfCell()
-    if a:inner
-      normal! v
-      call search('[^' . g:table_mode_separator . ']\ze\s*' . g:table_mode_separator)
-    else
-      execute 'normal! vf' . g:table_mode_separator . 'l'
-    endif
-  endif
-endfunction

autoload/tablemode/spreadsheet/cell.vim

@@ -0,0 +1,285 @@
+" ==============================  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.
+"        - Can be row1:row2 for values in the current columns in those rows.
+"        - Can be row1,col1:row2,col2 for range between row1,col1 till
+"          row2,col2.
+function! s:ParseRange(range, ...)
+  if a:0 < 1
+    let default_col = tablemode#spreadsheet#ColumnNr('.')
+  elseif a:0 < 2
+    let default_col = a:1
+  endif
+
+  if type(a:range) != type('')
+    let range = string(a:range)
+  else
+    let range = a:range
+  endif
+
+  let [rowcol1, rowcol2] = split(range, ':')
+  let [rcs1, rcs2] = [map(split(rowcol1, ','), 'str2nr(v:val)'), map(split(rowcol2, ','), 'str2nr(v:val)')]
+
+  if len(rcs1) == 2
+    let [row1, col1] = rcs1
+  else
+    let [row1, col1] = [rcs1[0], default_col]
+  endif
+
+  if len(rcs2) == 2
+    let [row2, col2] = rcs2
+  else
+    let [row2, col2] = [rcs2[0], default_col]
+  endif
+
+  return [row1, col1, row2, col2]
+endfunction
+
+
+" Public Functions {{{1
+function! tablemode#spreadsheet#cell#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.
+" tablemode#spreadsheet#GetCells(row, col) - Get the value of table cell by given row, col.
+function! tablemode#spreadsheet#cell#GetCells(line, ...) abort
+  let line = tablemode#utils#line(a:line)
+
+  if tablemode#table#IsRow(line)
+    if a:0 < 1
+      let [row, colm] = [line, 0]
+    elseif a:0 < 2
+      let [row, colm] = [a:1, 0]
+    elseif a:0 < 3
+      let [row, colm] = a:000
+    endif
+
+    let first_row = tablemode#spreadsheet#GetFirstRow(line)
+    let last_row = tablemode#spreadsheet#GetLastRow(line)
+    if row == 0
+      let values = []
+      let line = first_row
+      while tablemode#table#IsRow(line) || tablemode#table#IsBorder(line)
+        if tablemode#table#IsRow(line)
+          let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
+          call add(values, tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, '')))
+        endif
+        let line += 1
+      endwhile
+      return values
+    else
+      let row_nr = 0
+      let row_diff = row > 0 ? 1 : -1
+      let line = row > 0 ? first_row : last_row
+      while tablemode#table#IsRow(line) || tablemode#table#IsBorder(line)
+        if tablemode#table#IsRow(line)
+          let row_nr += row_diff
+          if row ==# row_nr | break | endif
+        endif
+        let line += row_diff
+      endwhile
+
+      let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
+      if colm == 0
+        return map(split(row_line, g:table_mode_separator), 'tablemode#utils#strip(v:val)')
+      else
+        let split_line = split(row_line, g:table_mode_separator)
+        return tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, ''))
+      endif
+    endif
+  endif
+endfunction
+
+function! tablemode#spreadsheet#cell#GetCell(...) "{{{2
+  if a:0 == 0
+    let [row, colm] = [tablemode#spreadsheet#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
+  elseif a:0 == 2
+    let [row, colm] = [a:1, a:2]
+  endif
+
+  return tablemode#spreadsheet#cell#GetCells('.', row, colm)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetRow(row, ...) abort "{{{2
+  let line = a:0 ? a:1 : '.'
+  return tablemode#spreadsheet#cell#GetCells(line, a:row)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetRowColumn(col, ...) abort "{{{2
+  let line = a:0 ? a:1 : '.'
+  let row = tablemode#spreadsheet#RowNr('.')
+  return tablemode#spreadsheet#cell#GetCells(line, row, a:col)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetColumn(col, ...) abort "{{{2
+  let line = a:0 ? a:1 : '.'
+  return tablemode#spreadsheet#cell#GetCells(line, 0, a:col)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetColumnRow(row, ...) abort "{{{2
+  let line = a:0 ? a:1 : '.'
+  let col = tablemode#spreadsheet#ColumnNr('.')
+  return tablemode#spreadsheet#cell#GetCells(line, a:row, col)
+endfunction
+
+function! tablemode#spreadsheet#cell#GetCellRange(range, ...) abort "{{{2
+  if a:0 < 1
+    let [line, colm] = ['.', tablemode#spreadsheet#ColumnNr('.')]
+  elseif a:0 < 2
+    let [line, colm] = [a:1, tablemode#spreadsheet#ColumnNr('.')]
+  elseif a:0 < 3
+    let [line, colm] = [a:1, a:2]
+  else
+    call tablemode#utils#throw('Invalid Range')
+  endif
+
+  let values = []
+
+  if tablemode#table#IsRow(line)
+    let [row1, col1, row2, col2] = s:ParseRange(a:range, colm)
+
+    if row1 == row2
+      if col1 == col2
+        call add(values, tablemode#spreadsheet#cell#GetCells(line, row1, col1))
+      else
+        let values = tablemode#spreadsheet#cell#GetRow(row1, line)[(col1-1):(col2-1)]
+      endif
+    else
+      if col1 == col2
+        let values = tablemode#spreadsheet#cell#GetColumn(col1, line)[(row1-1):(row2-1)]
+      else
+        let tcol = col1
+        while tcol <= col2
+          call add(values, tablemode#spreadsheet#cell#GetColumn(tcol, line)[(row1-1):(row2-1)])
+          let tcol += 1
+        endwhile
+      endif
+    endif
+  endif
+
+  return values
+endfunction
+
+function! tablemode#spreadsheet#cell#SetCell(val, ...) "{{{2
+  if a:0 == 0
+    let [line, row, colm] = ['.', tablemode#spreadsheet#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
+  elseif a:0 == 2
+    let [line, row, colm] = ['.', a:1, a:2]
+  elseif a:0 == 3
+    let [line, row, colm] = a:000
+  endif
+
+  " Account for negative values to reference from relatively from the last
+  if row < 0 | let row = tablemode#spreadsheet#RowCount(line) + row + 1 | endif
+  if colm < 0 | let colm = tablemode#spreadsheet#ColumnCount(line) + colm + 1 | endif
+
+  if tablemode#table#IsRow(line)
+    let line = tablemode#utils#line(line) + (row - tablemode#spreadsheet#RowNr(line)) * 1
+    let line_val = getline(line)
+    let cstartexpr = tablemode#table#StartCommentExpr()
+    let values = split(getline(line)[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator)
+    if len(values) < colm | return | endif
+    let values[colm-1] = a:val
+    let line_value = g:table_mode_separator . join(values, g:table_mode_separator) . g:table_mode_separator
+    if tablemode#utils#strlen(cstartexpr) > 0 && line_val =~# cstartexpr
+      let sce = matchstr(line_val, tablemode#table#StartCommentExpr())
+      let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
+      let line_value = sce . line_value . ece
+    endif
+    call setline(line, line_value)
+    call tablemode#table#Realign(line)
+  endif
+endfunction
+function! tablemode#spreadsheet#cell#TextObject(inner) "{{{2
+  if tablemode#table#IsRow('.')
+    call tablemode#spreadsheet#MoveToStartOfCell()
+    if a:inner
+      normal! v
+      call search('[^' . g:table_mode_separator . ']\ze\s*' . g:table_mode_separator)
+    else
+      execute 'normal! vf' . g:table_mode_separator . 'l'
+    endif
+  endif
+endfunction
+function! tablemode#spreadsheet#cell#Motion(direction, ...) "{{{2
+  let l:count = a:0 ? a:1 : v:count1
+  if tablemode#table#IsRow('.')
+    for ii in range(l:count)
+      if a:direction ==# 'l'
+        if tablemode#spreadsheet#IsLastCell()
+          if !tablemode#table#IsRow(line('.') + 1) && (tablemode#table#IsBorder(line('.') + 1) && !tablemode#table#IsRow(line('.') + 2))
+            return
+          endif
+          call tablemode#spreadsheet#cell#Motion('j', 1)
+          normal! 0
+        endif
+
+        " If line starts with g:table_mode_separator
+        if getline('.')[col('.')-1] ==# g:table_mode_separator
+          normal! 2l
+        else
+          execute 'normal! f' . g:table_mode_separator . '2l'
+        endif
+      elseif a:direction ==# 'h'
+        if tablemode#spreadsheet#IsFirstCell()
+          if !tablemode#table#IsRow(line('.') - 1) && (tablemode#table#IsBorder(line('.') - 1) && !tablemode#table#IsRow(line('.') - 2))
+            return
+          endif
+          call tablemode#spreadsheet#cell#Motion('k', 1)
+          normal! $
+        endif
+
+        " If line ends with g:table_mode_separator
+        if getline('.')[col('.')-1] ==# g:table_mode_separator
+          execute 'normal! F' . g:table_mode_separator . '2l'
+        else
+          execute 'normal! 2F' . g:table_mode_separator . '2l'
+        endif
+      elseif a:direction ==# 'j'
+        if tablemode#table#IsRow(line('.') + 1)
+          " execute 'normal! ' . 1 . 'j'
+          normal! j
+        elseif tablemode#table#IsBorder(line('.') + 1) && tablemode#table#IsRow(line('.') + 2)
+          " execute 'normal! ' . 2 . 'j'
+          normal! 2j
+        endif
+      elseif a:direction ==# 'k'
+        if tablemode#table#IsRow(line('.') - 1)
+          " execute 'normal! ' . 1 . 'k'
+          normal! k
+        elseif tablemode#table#IsBorder(line('.') - 1) && tablemode#table#IsRow(line('.') - 2)
+          " execute 'normal! ' . (1 + 1) . 'k'
+          normal! 2k
+        endif
+      endif
+    endfor
+  endif
+endfunction
+
+" vim: sw=2 sts=2 fdl=0 fdm=marker

autoload/tablemode/spreadsheet/formula.vim

@@ -0,0 +1,147 @@
+" ==============================  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
+
+" 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('.')
+  let colm = tablemode#spreadsheet#ColumnNr('.')
+  let indent = indent('.')
+  let indent_str = repeat(' ', indent)
+
+  if fr !=# ''
+    let fr = '$' . row . ',' . colm . '=' . fr
+    let fline = tablemode#spreadsheet#GetLastRow('.') + 1
+    if tablemode#table#IsBorder(fline) | let fline += 1 | endif
+    let cursor_pos = [line('.'), col('.')]
+    if getline(fline) =~# 'tmf: '
+      " Comment line correctly
+      let line_val = getline(fline)
+      let line_expr = line_val[match(line_val, tablemode#table#StartCommentExpr()):match(line_val, tablemode#table#EndCommentExpr())]
+      let sce = matchstr(line_val, tablemode#table#StartCommentExpr() . '\zs')
+      let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
+      call setline(fline, sce . line_expr . '; ' . fr . ece)
+    else
+      let cstring = &commentstring
+      let [cmss, cmse] = ['', '']
+      if len(cstring) > 0
+        let cms = split(cstring, '%s')
+        if len(cms) == 2
+          let [cmss, cmse] = cms
+        else
+          let [cmss, cmse] = [cms[0], '']
+        endif
+      endif
+      let fr = indent_str . cmss . ' tmf: ' . fr . ' ' . cmse
+      call append(fline-1, fr)
+      call cursor(cursor_pos)
+    endif
+    call tablemode#spreadsheet#formula#EvaluateFormulaLine()
+  endif
+endfunction
+
+function! tablemode#spreadsheet#formula#EvaluateExpr(expr, line) abort "{{{2
+  let line = tablemode#utils#line(a:line)
+  let [target, expr] = map(split(a:expr, '='), 'tablemode#utils#strip(v:val)')
+  let cell = substitute(target, '\$', '', '')
+  if cell =~# ','
+    let [row, colm] = map(split(cell, ','), 'str2nr(v:val)')
+  else
+    let [row, colm] = [0, str2nr(cell)]
+  endif
+
+  if expr =~# 'Sum(.*)'
+    let expr = substitute(expr, 'Sum(\([^)]*\))', 'tablemode#spreadsheet#Sum("\1",'.line.','.colm.')', 'g')
+  endif
+
+  if expr =~# 'Average(.*)'
+    let expr = substitute(expr, 'Average(\([^)]*\))', 'tablemode#spreadsheet#Average("\1",'.line.','.colm.')', 'g')
+  endif
+
+  if expr =~# '\$\d\+,\d\+'
+    let expr = substitute(expr, '\$\(\d\+\),\(\d\+\)',
+          \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, submatch(1), submatch(2)))', 'g')
+  endif
+
+  if cell =~# ','
+    if expr =~# '\$'
+      let expr = substitute(expr, '\$\(\d\+\)',
+          \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, row, submatch(1)))', 'g')
+    endif
+    call tablemode#spreadsheet#cell#SetCell(eval(expr), line, row, colm)
+  else
+    let [row, line] = [1, tablemode#spreadsheet#GetFirstRow(line)]
+    while tablemode#table#IsRow(line)
+      let texpr = expr
+      if expr =~# '\$'
+        let texpr = substitute(texpr, '\$\(\d\+\)',
+              \ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, row, submatch(1)))', 'g')
+      endif
+
+      call tablemode#spreadsheet#cell#SetCell(eval(texpr), line, row, colm)
+      let row += 1
+      let line += 1
+    endwhile
+  endif
+endfunction
+
+function! tablemode#spreadsheet#formula#EvaluateFormulaLine() abort "{{{2
+  let exprs = []
+  let cstring = &commentstring
+  let matchexpr = ''
+  if len(cstring) > 0
+    let cms = split(cstring, '%s')
+    if len(cms) == 2
+      let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*\ze' . escape(cms[1], '/*') . '\s*$'
+    else
+      let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*$'
+    endif
+  else
+    let matchexpr = '^\s* tmf: \zs.*$'
+  endif
+  if tablemode#table#IsRow('.') " We're inside the table
+    let line = tablemode#spreadsheet#GetLastRow('.')
+    let fline = line + 1
+    if tablemode#table#IsBorder(fline) | let fline += 1 | endif
+    if getline(fline) =~# 'tmf: '
+      let exprs = split(matchstr(getline(fline), matchexpr), ';')
+    endif
+  elseif getline('.') =~# 'tmf: ' " We're on the formula line
+    let line = line('.') - 1
+    if tablemode#table#IsBorder(line) | let line -= 1 | endif
+    if tablemode#table#IsRow(line)
+      let exprs = split(matchstr(getline('.'), matchexpr), ';')
+    endif
+  endif
+
+  for expr in exprs
+    call tablemode#spreadsheet#formula#EvaluateExpr(expr, line)
+  endfor
+endfunction

autoload/tablemode/table.vim

@@ -4,7 +4,6 @@
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       https://github.com/dhruvasagar/vim-table-mode
-" Version:       4.1.0
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
 "
@@ -22,13 +21,13 @@
 function! s:HeaderBorderExpr() "{{{2
   return tablemode#table#StartExpr() .
         \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
-        \ '[' . g:table_mode_fillchar . g:table_mode_corner . ']*' .
+        \ '[' . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_align_char . ']*' .
         \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
         \ tablemode#table#EndExpr()
 endfunction
 
 function! s:DefaultHeaderBorder() "{{{2
-  if s:IsTableModeActive()
+  if tablemode#IsActive()
     return g:table_mode_corner_corner . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_fillchar . g:table_mode_corner_corner
   else
     return ''
@@ -37,19 +36,40 @@ endfunction
 
 function! s:GenerateHeaderBorder(line) "{{{2
   let line = tablemode#utils#line(a:line)
-  if tablemode#table#IsATableRow(line - 1) || tablemode#table#IsATableRow(line + 1)
+  if tablemode#table#IsRow(line - 1) || tablemode#table#IsRow(line + 1)
     let line_val = ''
-    if tablemode#table#IsATableRow(line + 1)
+    if tablemode#table#IsRow(line + 1)
       let line_val = getline(line + 1)
     endif
-    if tablemode#table#IsATableRow(line - 1) && tablemode#utils#strlen(line_val) < tablemode#utils#strlen(getline(line - 1))
+    if tablemode#table#IsRow(line - 1) && tablemode#utils#strlen(line_val) < tablemode#utils#strlen(getline(line - 1))
       let line_val = getline(line - 1)
     endif
     if tablemode#utils#strlen(line_val) <= 1 | return s:DefaultHeaderBorder() | endif
+
     let border = substitute(line_val[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator, g:table_mode_corner, 'g')
-    let border = substitute(border, '[^' . g:table_mode_corner . ']', g:table_mode_fillchar, 'g')
+    " To accurately deal with unicode double width characters
+    let fill_columns = map(split(border, g:table_mode_corner),  'repeat(g:table_mode_fillchar, tablemode#utils#StrDisplayWidth(v:val))')
+    let border = g:table_mode_corner . join(fill_columns, g:table_mode_corner) . g:table_mode_corner
     let border = substitute(border, '^' . g:table_mode_corner . '\(.*\)' . g:table_mode_corner . '$', g:table_mode_corner_corner . '\1' . g:table_mode_corner_corner, '')
 
+    " Incorporate header alignment chars
+    if getline(line) =~# g:table_mode_align_char
+      let pat = '[' . g:table_mode_corner_corner . g:table_mode_corner . ']'
+      let hcols = tablemode#align#Split(getline(line), pat)
+      let gcols = tablemode#align#Split(border, pat)
+
+      for idx in range(len(hcols))
+        if hcols[idx] =~# g:table_mode_align_char
+          if hcols[idx] =~# g:table_mode_align_char . '$'
+            let gcols[idx] = gcols[idx][:-2] . g:table_mode_align_char
+          else
+            let gcols[idx] = g:table_mode_align_char . gcols[idx][1:]
+          endif
+        endif
+      endfor
+      let border = join(gcols, '')
+    endif
+
     let cstartexpr = tablemode#table#StartCommentExpr()
     if tablemode#utils#strlen(cstartexpr) > 0 && getline(line) =~# cstartexpr
       let sce = matchstr(line_val, tablemode#table#StartCommentExpr())
@@ -76,24 +96,6 @@ function! tablemode#table#scope() "{{{2
   return s:
 endfunction
 
-function! tablemode#table#StartCommentExpr() "{{{2
-  let cstartexpr = tablemode#table#GetCommentStart()
-  if tablemode#utils#strlen(cstartexpr) > 0
-    return '^\s*' . cstartexpr . '\s*'
-  else
-    return ''
-  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
@@ -103,6 +105,15 @@ function! tablemode#table#GetCommentStart() "{{{2
   endif
 endfunction
 
+function! tablemode#table#StartCommentExpr() "{{{2
+  let cstartexpr = tablemode#table#GetCommentStart()
+  if tablemode#utils#strlen(cstartexpr) > 0
+    return '^\s*' . cstartexpr . '\s*'
+  else
+    return ''
+  endif
+endfunction
+
 function! tablemode#table#GetCommentEnd() "{{{2
   let cstring = &commentstring
   if tablemode#utils#strlen(cstring) > 0
@@ -117,6 +128,15 @@ function! tablemode#table#GetCommentEnd() "{{{2
   endif
 endfunction
 
+function! tablemode#table#EndCommentExpr() "{{{2
+  let cendexpr = tablemode#table#GetCommentEnd()
+  if tablemode#utils#strlen(cendexpr) > 0
+    return '.*\zs\s\+' . cendexpr . '\s*$'
+  else
+    return ''
+  endif
+endfunction
+
 function! tablemode#table#StartExpr() "{{{2
   let cstart = tablemode#table#GetCommentStart()
   if tablemode#utils#strlen(cstart) > 0
@@ -135,109 +155,56 @@ function! tablemode#table#EndExpr() "{{{2
   endif
 endfunction
 
-function! tablemode#table#IsATableRow(line) "{{{2
-  return getline(a:line) =~# (tablemode#table#StartExpr() . g:table_mode_separator . '[^' .
-        \ g:table_mode_fillchar . ']*[^' . g:table_mode_corner . ']*$')
-endfunction
-
-function! tablemode#table#IsATableHeader(line) "{{{2
+function! tablemode#table#IsBorder(line) "{{{2
   return getline(a:line) =~# s:HeaderBorderExpr()
 endfunction
 
-function! tablemode#table#AddHeaderBorder(line) "{{{2
+function! tablemode#table#IsHeader(line) "{{{2
+  let line = tablemode#utils#line(a:line)
+  return tablemode#table#IsBorder(line+1) && !tablemode#table#IsRow(line-1) && !tablemode#table#IsRow(line-2)
+endfunction
+
+function! tablemode#table#IsRow(line) "{{{2
+  return !tablemode#table#IsBorder(a:line) && getline(a:line) =~# (tablemode#table#StartExpr() . g:table_mode_separator)
+endfunction
+
+function! tablemode#table#AddBorder(line) "{{{2
   call setline(a:line, s:GenerateHeaderBorder(a:line))
 endfunction
 
-function! tablemode#table#TableRealign(line) "{{{2
+function! tablemode#table#Realign(line) "{{{2
   let line = tablemode#utils#line(a:line)
 
-  let [lnums, lines] = [[], []]
-  let [tline, blines] = [line, []]
-  while tablemode#table#IsATableRow(tline) || tablemode#table#IsATableHeader(tline)
-    if tablemode#table#IsATableHeader(tline)
-      call insert(blines, tline)
-      let tline -= 1
+  let lines = []
+  let [lnum, blines] = [line, []]
+  while tablemode#table#IsRow(lnum) || tablemode#table#IsBorder(lnum)
+    if tablemode#table#IsBorder(lnum)
+      call insert(blines, lnum)
+      let lnum -= 1
       continue
     endif
-    call insert(lnums, tline)
-    call insert(lines, getline(tline))
-    let tline -= 1
+    call insert(lines, {'lnum': lnum, 'text': getline(lnum)})
+    let lnum -= 1
   endwhile
 
-  let tline = line + 1
-
-  while tablemode#table#IsATableRow(tline) || tablemode#table#IsATableHeader(tline)
-    if tablemode#table#IsATableHeader(tline)
-      call insert(blines, tline)
-      let tline += 1
+  let lnum = line + 1
+  while tablemode#table#IsRow(lnum) || tablemode#table#IsBorder(lnum)
+    if tablemode#table#IsBorder(lnum)
+      call add(blines, lnum)
+      let lnum += 1
       continue
     endif
-    call add(lnums, tline)
-    call add(lines, getline(tline))
-    let tline += 1
+    call add(lines, {'lnum': lnum, 'text': getline(lnum)})
+    let lnum += 1
   endwhile
 
   let lines = tablemode#align#Align(lines)
 
-  for lnum in lnums
-    let index = index(lnums, lnum)
-    call setline(lnum, lines[index])
+  for aline in lines
+    call setline(aline.lnum, aline.text)
   endfor
 
   for bline in blines
-    call tablemode#table#AddHeaderBorder(bline)
+    call tablemode#table#AddBorder(bline)
   endfor
 endfunction
-
-function! tablemode#table#TableMotion(direction, ...) "{{{2
-  let l:count = a:0 ? a:1 : v:count1
-  if tablemode#table#IsATableRow('.')
-    for ii in range(l:count)
-      if a:direction ==# 'l'
-        if tablemode#spreadsheet#IsLastCell()
-          if !tablemode#table#IsATableRow(line('.') + 1) || (tablemode#table#IsATableHeader(line('.') + 1) && !tablemode#table#IsATableRow(line('.') + 2 * 1))
-            return
-          endif
-          call tablemode#table#TableMotion('j', 1)
-          normal! 0
-        endif
-
-        " If line starts with g:table_mode_separator
-        if getline('.')[col('.')-1] ==# g:table_mode_separator
-          normal! 2l
-        else
-          execute 'normal! f' . g:table_mode_separator . '2l'
-        endif
-      elseif a:direction ==# 'h'
-        if tablemode#spreadsheet#IsFirstCell()
-          if !tablemode#table#IsATableRow(line('.') - 1) || (tablemode#table#IsATableHeader(line('.') - 1) && !tablemode#table#IsATableRow(line('.') - 2 * 1))
-            return
-          endif
-          call tablemode#table#TableMotion('k', 1)
-          normal! $
-        endif
-
-        " If line ends with g:table_mode_separator
-        if getline('.')[col('.')-1] ==# g:table_mode_separator
-          execute 'normal! F' . g:table_mode_separator . '2l'
-        else
-          execute 'normal! 2F' . g:table_mode_separator . '2l'
-        endif
-      elseif a:direction ==# 'j'
-        if tablemode#table#IsATableRow(line('.') + 1)
-          execute 'normal! ' . 1 . 'j'
-        elseif tablemode#table#IsATableHeader(line('.') + 1) && tablemode#table#IsATableRow(line('.') + 2)
-          execute 'normal! ' . (1 + 1) . 'j'
-        endif
-      elseif a:direction ==# 'k'
-        if tablemode#table#IsATableRow(line('.') - 1)
-          execute 'normal! ' . 1 . 'k'
-        elseif tablemode#table#IsATableHeader(line('.') - 1) && tablemode#table#IsATableRow(line('.') - 2)
-          execute 'normal! ' . (1 + 1) . 'k'
-        endif
-      endif
-    endfor
-  endif
-endfunction
-
-" vim: sw=2 sts=2 fdl=0 fdm=marker

autoload/tablemode/utils.vim

@@ -4,7 +4,6 @@
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       https://github.com/dhruvasagar/vim-table-mode
-" Version:       4.1.0
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
 "
@@ -52,3 +51,27 @@ endfunction
 function! tablemode#utils#strlen(text)
   return strlen(substitute(a:text, '.', 'x', 'g'))
 endfunction
+
+function! tablemode#utils#StrDisplayWidth(string) "{{{2
+  if exists('*strdisplaywidth')
+    return strdisplaywidth(a:string)
+  else
+    " Implement the tab handling part of strdisplaywidth for vim 7.2 and
+    " earlier - not much that can be done about handling doublewidth
+    " characters.
+    let rv = 0
+    let i = 0
+
+    for char in split(a:string, '\zs')
+      if char == "\t"
+        let rv += &ts - i
+        let i = 0
+      else
+        let rv += 1
+        let i = (i + 1) % &ts
+      endif
+    endfor
+
+    return rv
+  endif
+endfunction

doc/table-mode.txt

@@ -1,7 +1,7 @@
-*table-mode.txt*		Table Mode for easy table formatting. v4.1.0
+*table-mode.txt*		Table Mode for easy table formatting. v4.4.1
 ===============================================================================
 	Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
-				 VERSION 4.1.0
+				 VERSION 4.4.1
 
 		Author: Dhruva Sagar <http://dhruvasagar.com/>
 		License: MIT <http://opensource.org/licenses/MIT/>
@@ -34,6 +34,11 @@ Create Table on the fly:
 	each additional separator you add, it aligns the table properly,
 	without having to do anything else.
 
+        Table Mode now supports gfm style tables and allows to define column
+        alignments with the aid of placing ':' (configured using
+        |g:table_mode_align_char|) on the table header border appropriately to
+        align content left or right.
+
 	The table mode is disabled by default and you can enter table mode
 	using |table-mode-toggle-map| or you can also enable it permanently
 	using |table-mode-always-active| if you wish though not recommended.
@@ -99,11 +104,14 @@ Formula Expressions :
 
 		'$n': This matches the table column number 'n'. So the formula
 		would be evaluated for each cell in that column and the result
-		would be placed in it.
+		would be placed in it. You can use negative indice to
+                represent column relative to the last, -1 being the last.
 
 		'$n,m': This matches the table cell n,m (row, column). So in
 		this case the formula would be evaluated and the result will
-		be placed in this cell.
+		be placed in this cell. You can also use negative values to
+                refer to cells relative to the size, -1 being the last (row or
+                column).
 
 	The formula can be a simple mathematical expression involving cells
 	which are also defined by the same format as that of the target cell.
@@ -111,7 +119,7 @@ Formula Expressions :
 	special functions 'Sum' and 'Average'. Both these functions take a
 	range as input. A range can be of two forms :
 
-		'n,m': This represents cells in the current column from row
+		'n:m': This represents cells in the current column from row
 		'n' through 'm'. If 'm' is negative it represents 'm' row
 		above the current row (of the target cell).
 
@@ -139,6 +147,10 @@ Overview:
 	|table-mode-delimiter| .......... Set the delimiter for Tableize.
         |table-mode-corner-corner| ...... Set the character to be used for
                                         extreme corners of the table border.
+        |table-mode-align-char|.......... Set the alignment character which
+                                        can be added to the table header
+                                        border to control alignment of that
+                                        column.
 
 g:loaded_table_mode					*table-mode-loaded*
 	Use this option to disable the plugin: >
@@ -196,6 +208,11 @@ g:table_mode_corner_corner                           *table-mode-corner-corner*
         corners of the table border. >
                 let g:table_mode_corner_corner = '|'
 <
+g:table_mode_align_char                                  *table-mode-align-char*
+        Use this option to define the character to be used for defining
+        alignments for columns in the table header border. >
+                let g:table_mode_align_char = ':'
+<
 
 ===============================================================================
 MAPPINGS						*table-mode-mappings*

plugin/table-mode.vim

@@ -4,7 +4,6 @@
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       http://github.com/dhruvasagar/vim-table-mode
-" Version:       3.3.3
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope.
 "
@@ -43,20 +42,38 @@ 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', ':')
 
 function! s:TableEchoCell() "{{{1
-  if tablemode#table#IsATableRow('.')
+  if tablemode#table#IsRow('.')
     echomsg '$' . tablemode#spreadsheet#RowNr('.') . ',' . tablemode#spreadsheet#ColumnNr('.')
   endif
 endfunction
 
+function! s:EnableTableSyntax() "{{{1
+  syntax match Table /^\s*|.\+|\s*$/ contains=TableBorder,TableSeparator,TableColumnAlign containedin=ALL
+  syntax match TableSeparator /|/ contained
+  syntax match TableColumnAlign /:/ contained
+  syntax match TableBorder /[\-+]\+/ contained
+endfunction
+
+augroup TableMode
+  au!
+
+  autocmd Syntax * call <SID>EnableTableSyntax()
+augroup END
+
+hi! link TableBorder Delimiter
+hi! link TableSeparator Delimiter
+hi! link TableColumnAlign Type
+
 " Define Commands & Mappings {{{1
 if !g:table_mode_always_active "{{{2
   exec "nnoremap <silent> " . g:table_mode_map_prefix . g:table_mode_toggle_map .
-       \ " <Esc>:call tablemode#TableModeToggle()<CR>"
-  command! -nargs=0 TableModeToggle call tablemode#TableModeToggle()
-  command! -nargs=0 TableModeEnable call tablemode#TableModeEnable()
-  command! -nargs=0 TableModeDisable call tablemode#TableModeDisable()
+       \ " <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()
 else
   let table_mode_separator_map = g:table_mode_separator
   " '|' is a special character, we need to map <Bar> instead
@@ -68,30 +85,30 @@ else
 endif
 " }}}2
 
-command! -nargs=? -range Tableize <line1>,<line2>call tablemode#table#TableizeRange(<q-args>)
-command! TableAddFormula call tablemode#spreadsheet#AddFormula()
-command! TableModeRealign call tablemode#spreadsheet#TableRealign('.')
-command! TableEvalFormulaLine call tablemode#spreadsheet#EvaluateFormulaLine()
+command! -nargs=? -range Tableize <line1>,<line2>call tablemode#TableizeRange(<q-args>)
+command! TableAddFormula call tablemode#spreadsheet#formula#Add()
+command! TableModeRealign call tablemode#table#Realign('.')
+command! TableEvalFormulaLine call tablemode#spreadsheet#formula#EvaluateFormulaLine()
 
 nnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR>
 xnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR>
 xnoremap <silent> <Plug>(table-mode-tableize-delimiter) :<C-U>call tablemode#TableizeByDelimiter()<CR>
 
-nnoremap <silent> <Plug>(table-mode-realign) :call tablemode#table#TableRealign('.')<CR>
+nnoremap <silent> <Plug>(table-mode-realign) :call tablemode#table#Realign('.')<CR>
 
-nnoremap <silent> <Plug>(table-mode-motion-up) :<C-U>call tablemode#table#TableMotion('k')<CR>
-nnoremap <silent> <Plug>(table-mode-motion-down) :<C-U>call tablemode#table#TableMotion('j')<CR>
-nnoremap <silent> <Plug>(table-mode-motion-left) :<C-U>call tablemode#table#TableMotion('h')<CR>
-nnoremap <silent> <Plug>(table-mode-motion-right) :<C-U>call tablemode#table#TableMotion('l')<CR>
+nnoremap <silent> <Plug>(table-mode-motion-up) :<C-U>call tablemode#spreadsheet#cell#Motion('k')<CR>
+nnoremap <silent> <Plug>(table-mode-motion-down) :<C-U>call tablemode#spreadsheet#cell#Motion('j')<CR>
+nnoremap <silent> <Plug>(table-mode-motion-left) :<C-U>call tablemode#spreadsheet#cell#Motion('h')<CR>
+nnoremap <silent> <Plug>(table-mode-motion-right) :<C-U>call tablemode#spreadsheet#cell#Motion('l')<CR>
 
-onoremap <silent> <Plug>(table-mode-cell-text-object-a) :<C-U>call tablemode#spreadsheet#CellTextObject(0)<CR>
-onoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spreadsheet#CellTextObject(1)<CR>
+onoremap <silent> <Plug>(table-mode-cell-text-object-a) :<C-U>call tablemode#spreadsheet#cell#TextObject(0)<CR>
+onoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spreadsheet#cell#TextObject(1)<CR>
 
 nnoremap <silent> <Plug>(table-mode-delete-row) :call tablemode#spreadsheet#DeleteRow()<CR>
 nnoremap <silent> <Plug>(table-mode-delete-column) :call tablemode#spreadsheet#DeleteColumn()<CR>
 
-nnoremap <silent> <Plug>(table-mode-add-formula) :call tablemode#spreadsheet#AddFormula()<CR>
-nnoremap <silent> <Plug>(table-mode-eval-formula) :call tablemode#spreadsheet#EvaluateFormulaLine()<CR>
+nnoremap <silent> <Plug>(table-mode-add-formula) :call tablemode#spreadsheet#formula#Add()<CR>
+nnoremap <silent> <Plug>(table-mode-eval-formula) :call tablemode#spreadsheet#formula#EvaluateFormulaLine()<CR>
 
 nnoremap <silent> <Plug>(table-mode-echo-cell) :call <SID>TableEchoCell()<CR>
 

t/align.vim

@@ -1,14 +1,22 @@
 " vim: fdm=indent
-source t/config.vim
+source t/config/options.vim
 
 call vspec#hint({'scope': 'tablemode#align#scope()', 'sid': 'tablemode#align#sid()'})
 
+function! ConvertLines2Dict(lines)
+  let lines = []
+  for idx in range(len(a:lines))
+    call insert(lines, {"lnum": idx+1, "text": a:lines[idx]})
+  endfor
+  return lines
+endfunction
+
 describe 'Align'
   it 'should align table content correctly'
-    Expect tablemode#align#Align(readfile('t/fixtures/align/simple_before.txt')) == readfile('t/fixtures/align/simple_after.txt')
+    Expect tablemode#align#Align(ConvertLines2Dict(readfile('t/fixtures/align/simple_before.txt'))) == ConvertLines2Dict(readfile('t/fixtures/align/simple_after.txt'))
   end
 
   it 'should align table content with unicode characters correctly'
-    Expect tablemode#align#Align(readfile('t/fixtures/align/unicode_before.txt')) == readfile('t/fixtures/align/unicode_after.txt')
+    Expect tablemode#align#Align(ConvertLines2Dict(readfile('t/fixtures/align/unicode_before.txt'))) == ConvertLines2Dict(readfile('t/fixtures/align/unicode_after.txt'))
   end
 end

t/cell.vim

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

t/config/options.vim

@@ -6,3 +6,4 @@ 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 = ':'

t/fixtures/cell/sample.txt

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

t/fixtures/formula/formula.txt

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

t/fixtures/formula/sample.txt

@@ -0,0 +1,7 @@
+| Item     | Cost |
+|----------+------|
+| Bread    |   20 |
+| Tomatoes |    5 |
+| Pasta    |  100 |
+| Total    |      |
+| Test     |      |

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 @@
+| Title | Message |
+|------:+--------:|
+|    t1 |    msg1 |
+|    t2 |    msg2 |

t/fixtures/table/sample_header_realign_before.txt

@@ -0,0 +1,4 @@
+| Title | Message |
+|------:+--------:|
+| t1    | msg1    |
+| 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

@@ -0,0 +1,7 @@
+|--------+---------|
+| Title  | Message |
+|--------+---------|
+| test11 | test12  |
+| test21 | test22  |
+|--------+---------|
+

t/formula.vim

@@ -0,0 +1,41 @@
+" vim: fdm=indent
+source t/config/options.vim
+
+call vspec#hint({'scope': 'tablemode#spreadsheet#formula#scope()', 'sid': 'tablemode#spreadsheet#formula#sid()'})
+
+describe 'Formulas'
+  describe 'Add Formula'
+    before
+      new
+      read t/fixtures/formula/sample.txt
+    end
+
+    it 'should add a formula successfully'
+      call cursor(6, 15)
+      call tablemode#spreadsheet#formula#Add("Sum(1:4)")
+      Expect tablemode#spreadsheet#cell#GetCell() == '125.0'
+      call cursor(8, 15)
+      Expect getline('.') == '/* tmf: $5,2=Sum(1:4) */'
+
+      call cursor(7, 15)
+      call tablemode#spreadsheet#formula#Add("Sum(1:-1)")
+      Expect tablemode#spreadsheet#cell#GetCell() == '250.0'
+      call cursor(8, 15)
+      Expect getline('.') == '/* tmf: $5,2=Sum(1:4) ; $6,2=Sum(1:-1) */'
+    end
+  end
+
+  describe 'Evaluate Formula'
+    before
+      new
+      read t/fixtures/formula/formula.txt
+    end
+
+    it 'should evaluate the formula successfull'
+      call cursor(6, 15)
+      call tablemode#spreadsheet#formula#EvaluateFormulaLine()
+      Expect &modified == 1
+      Expect tablemode#spreadsheet#cell#GetCell() == '125.0'
+    end
+  end
+end

t/spreadsheet.vim

@@ -1,5 +1,5 @@
 " vim: fdm=indent
-source t/config.vim
+source t/config/options.vim
 
 call vspec#hint({'scope': 'tablemode#spreadsheet#scope()', 'sid': 'tablemode#spreadsheet#sid()'})
 
@@ -25,6 +25,27 @@ describe 'spreadsheet'
       Expect tablemode#spreadsheet#ColumnCount(3) == 2
     end
 
+    it 'should return the column number'
+      call cursor(2,3)
+      Expect tablemode#spreadsheet#ColumnNr('.') == 1
+      call cursor(2,12)
+      Expect tablemode#spreadsheet#ColumnNr('.') == 2
+    end
+
+    it 'should return true when in the first cell'
+      call cursor(2,3)
+      Expect tablemode#spreadsheet#IsFirstCell() to_be_true
+      call cursor(2,12)
+      Expect tablemode#spreadsheet#IsFirstCell() to_be_false
+    end
+
+    it 'should return true when in the last cell'
+      call cursor(2,3)
+      Expect tablemode#spreadsheet#IsLastCell() to_be_false
+      call cursor(2,12)
+      Expect tablemode#spreadsheet#IsLastCell() to_be_true
+    end
+
     it 'should return the line number of the first row'
       Expect tablemode#spreadsheet#GetFirstRow(2) == 2
       Expect tablemode#spreadsheet#GetFirstRow(3) == 2
@@ -35,48 +56,39 @@ describe 'spreadsheet'
       Expect tablemode#spreadsheet#GetLastRow(3) == 3
     end
 
-    it 'should return the cells'
-      Expect tablemode#spreadsheet#GetCells(2, 1, 1) ==# 'test11'
-      " Get Rows
-      Expect tablemode#spreadsheet#GetCells(2, 1) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#GetCells(2, 2) == ['test21', 'test22']
-      " Get Columns
-      Expect tablemode#spreadsheet#GetCells(2, 0, 1) == ['test11', 'test21']
-      Expect tablemode#spreadsheet#GetCells(2, 0, 2) == ['test12', 'test22']
-    end
+    describe 'Math'
+      before
+        new
+        read t/fixtures/cell/sample.txt
+      end
 
-    it 'should return the cells in a range'
-      " Entire table as range
-      Expect tablemode#spreadsheet#GetCellRange('1,1:2,2', 2, 1) == [['test11', 'test21'], ['test12', 'test22']]
+      it 'should return the sum of cell range'
+        call cursor(1,3)
+        Expect tablemode#spreadsheet#Sum('1:2') == 4.0
+        Expect tablemode#spreadsheet#Sum('1,1:1,2') == 3.0
+        Expect tablemode#spreadsheet#Sum('1,1:2,2') == 10.0
+        call cursor(2,7)
+        Expect tablemode#spreadsheet#Sum('1:2') == 6.0
+        Expect tablemode#spreadsheet#Sum('2,1:2,2') == 7.0
+      end
 
-      " Get Rows given different seed lines and columns
-      Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 2, 1) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 2, 2) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 3, 1) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 3, 2) == ['test11', 'test12']
-      Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 2, 1) == ['test21', 'test22']
-      Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 2, 2) == ['test21', 'test22']
-      Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 3, 1) == ['test21', 'test22']
-      Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 3, 2) == ['test21', 'test22']
-
-      " Get Columns given different seed lines and column
-      Expect tablemode#spreadsheet#GetCellRange('1:2', 2, 1) == ['test11', 'test21']
-      Expect tablemode#spreadsheet#GetCellRange('1:2', 2, 2) == ['test12', 'test22']
-      Expect tablemode#spreadsheet#GetCellRange('1:2', 3, 1) == ['test11', 'test21']
-      Expect tablemode#spreadsheet#GetCellRange('1:2', 3, 2) == ['test12', 'test22']
-
-      " Get Column given negative values in range for representing rows from
-      " the end, -1 being the second last row.
-      Expect tablemode#spreadsheet#GetCellRange('1:-1', 2, 1) == ['test11']
-      Expect tablemode#spreadsheet#GetCellRange('1:-1', 3, 1) == ['test11']
-      Expect tablemode#spreadsheet#GetCellRange('1:-1', 2, 2) == ['test12']
-      Expect tablemode#spreadsheet#GetCellRange('1:-1', 3, 2) == ['test12']
+      it 'should return the average of cell range'
+        call cursor(1,3)
+        Expect tablemode#spreadsheet#Average('1:2') == 2.0
+        Expect tablemode#spreadsheet#Average('1,1:1,2') == 1.5
+        Expect tablemode#spreadsheet#Average('1,1:2,2') == 5.0
+        call cursor(2,7)
+        Expect tablemode#spreadsheet#Average('1:2') == 3.0
+        Expect tablemode#spreadsheet#Average('2,1:2,2') == 3.5
+      end
     end
   end
 
   describe 'Manipulations'
     before
       new
+      normal! ggdG
+      call tablemode#Enable()
       normal i|test11|test12|
 |test21|test22|
       call cursor(1, 3)

t/table.vim

@@ -1,119 +1,162 @@
 " vim: fdm=indent
-source t/config.vim
+source t/config/options.vim
 
 call vspec#hint({'scope': 'tablemode#table#scope()', 'sid': 'tablemode#table#sid()'})
 
 describe 'table'
-  describe 'API'
+  describe 'IsRow'
     before
       new
-      read t/fixtures/sample.txt
+      normal! ggdG
+      read t/fixtures/table/sample.txt
     end
 
-    it 'should return true when inside a table'
-      Expect tablemode#table#IsATableRow(2) to_be_true
+    it 'should be true when on a table row'
+      Expect tablemode#table#IsRow(2) to_be_true
+      Expect tablemode#table#IsRow(3) to_be_true
     end
 
-    it 'should return false when outside a table'
-      Expect tablemode#table#IsATableRow(4) to_be_false
+    it 'should be false when not on a table row'
+      Expect tablemode#table#IsRow(1) to_be_false
+      Expect tablemode#table#IsRow(4) to_be_false
     end
   end
 
-  describe 'Tableize'
+  describe 'IsBorder'
     before
       new
-      read t/fixtures/tableize.txt
+      normal! ggdG
+      read t/fixtures/table/sample_with_header.txt
     end
 
-    it 'should tableize with default delimiter'
-      :2,3call tablemode#TableizeRange('')
-      Expect tablemode#table#IsATableRow(2) to_be_true
-      Expect tablemode#spreadsheet#RowCount(2) == 2
-      Expect tablemode#spreadsheet#ColumnCount(2) == 3
+    it 'should be true on a table border'
+      Expect tablemode#table#IsBorder(1) to_be_true
+      Expect tablemode#table#IsBorder(3) to_be_true
+      Expect tablemode#table#IsBorder(6) to_be_true
     end
 
-    it 'should tableize with given delimiter'
-      :2,3call tablemode#TableizeRange('/;')
-      Expect tablemode#table#IsATableRow(2) to_be_true
-      Expect tablemode#spreadsheet#RowCount(2) == 2
-      Expect tablemode#spreadsheet#ColumnCount(2) == 2
+    it 'should be false when not on a table border'
+      Expect tablemode#table#IsBorder(2) to_be_false
+      Expect tablemode#table#IsBorder(4) to_be_false
+      Expect tablemode#table#IsBorder(5) to_be_false
     end
   end
 
-  describe 'Motions'
-    describe 'left or right'
+  describe 'IsHeader'
+    before
+      new
+      normal! ggdG
+      read t/fixtures/table/sample_with_header.txt
+    end
+
+    it 'should be true on the table header'
+      Expect tablemode#table#IsHeader(2) to_be_true
+    end
+
+    it 'should be false anywhere else'
+      Expect tablemode#table#IsHeader(1) to_be_false
+      Expect tablemode#table#IsHeader(4) to_be_false
+      Expect tablemode#table#IsHeader(5) to_be_false
+      Expect tablemode#table#IsHeader(6) to_be_false
+      Expect tablemode#table#IsHeader(7) to_be_false
+    end
+  end
+
+  describe 'AddBorder'
+    before
+      new
+      normal! ggdG
+      read t/fixtures/table/sample_for_header.txt
+    end
+
+    it 'should add border to line'
+      call tablemode#table#AddBorder(2)
+      Expect tablemode#table#IsHeader(1) to_be_true
+      Expect tablemode#table#IsBorder(2) to_be_true
+    end
+
+    describe 'for unicode'
       before
         new
         normal! ggdG
-        call tablemode#TableModeEnable()
-        normal i|test11|test12|
-|test21|test22|
+        read t/fixtures/table/sample_for_header_unicode.txt
       end
 
-
-      it 'should move left when not on first column'
-        call cursor(1, 12)
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-        call tablemode#table#TableMotion('h')
+      it 'should add border to line'
+        call tablemode#table#AddBorder(1)
+        call tablemode#table#AddBorder(3)
+        call tablemode#table#AddBorder(5)
+        call tablemode#table#AddBorder(7)
+        call tablemode#table#AddBorder(9)
+
+        Expect tablemode#table#IsBorder(1) to_be_true
+        Expect tablemode#utils#StrDisplayWidth(getline(1)) == tablemode#utils#StrDisplayWidth(getline(2))
+        Expect tablemode#table#IsBorder(3) to_be_true
+        Expect tablemode#utils#StrDisplayWidth(getline(3)) == tablemode#utils#StrDisplayWidth(getline(4))
+        Expect tablemode#table#IsBorder(5) to_be_true
+        Expect tablemode#utils#StrDisplayWidth(getline(5)) == tablemode#utils#StrDisplayWidth(getline(6))
+        Expect tablemode#table#IsBorder(7) to_be_true
+        Expect tablemode#utils#StrDisplayWidth(getline(7)) == tablemode#utils#StrDisplayWidth(getline(8))
+        Expect tablemode#table#IsBorder(9) to_be_true
+        Expect tablemode#utils#StrDisplayWidth(getline(9)) == tablemode#utils#StrDisplayWidth(getline(8))
+      end
+    end
+  end
+
+  describe 'Realign'
+    describe 'without header alignments'
+      describe 'for simple'
+        before
+          new
+          normal! ggdG
+          read t/fixtures/table/sample_realign_before.txt
+        end
+
+        it 'should be aligned properly'
+          call tablemode#table#Realign(1)
+          Expect getline(1,'$') == readfile('t/fixtures/table/sample_realign_after.txt')
+        end
       end
 
-
-      it 'should move to the previous row last column if it exists when on first column'
-        call cursor(2, 3)
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-        call tablemode#table#TableMotion('h')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+      describe 'for unicode'
+        before
+          new
+          normal! ggdG
+          read t/fixtures/table/sample_realign_unicode_before.txt
+        end
 
-
-      it 'should move right when not on last column'
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-        call tablemode#table#TableMotion('l')
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-      end
-
-      it 'should move to the next row first column if it exists when on last column'
-        call cursor(1, 12)
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-        call tablemode#table#TableMotion('l')
-        Expect tablemode#spreadsheet#RowNr('.') == 2
+        it 'should be aligned properly'
+          call tablemode#table#Realign(1)
+          Expect getline(1,'$') == readfile('t/fixtures/table/sample_realign_unicode_after.txt')
+        end
       end
     end
 
-
-    describe 'up or down'
-      before
-        new
-        normal! ggdG
-        call tablemode#TableModeEnable()
-        normal i|test11|test12|
+    describe 'with header alignments'
+      describe 'for simple'
+        before
+          new
+          normal! ggdG
+          read t/fixtures/table/sample_header_realign_before.txt
+        end
+
+        it 'should be aligned properly'
+          call tablemode#table#Realign(1)
+          Expect getline(1,'$') == readfile('t/fixtures/table/sample_header_realign_after.txt')
+        end
       end
 
-      end
-
-      it 'should move a row up unless on first row'
-        call cursor(2, 3)
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        call tablemode#table#TableMotion('k')
+      describe 'for unicode'
+        before
+          new
+          normal! ggdG
+          read t/fixtures/table/sample_header_realign_unicode_before.txt
+        end
 
-      end
-
-      it 'should remain on first row when trying to move up'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#table#TableMotion('k')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-      end
-
-      it 'should move a row down unless on last row'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#table#TableMotion('j')
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-      end
-
-      it 'should remain on last row when trying to move down'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
+        it 'should be aligned properly'
+          call tablemode#table#Realign(1)
+          Expect getline(1,'$') == readfile('t/fixtures/table/sample_header_realign_unicode_after.txt')
+        end
       end
     end
   end

t/tablemode.vim

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

t/utils.vim

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