Updated docs

We now have support for center alignment, simply add a header border
with the `g:table_mode_align_char` as both the first and the last
character so it would look something like `+:.....:+` to center align
the column values.

.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.1.2
+  - 2.2.0
 script: rake ci

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## Version 4.6.4
+* Added support for center aligning columns
+
+## Version 4.6.3
+* Fixed tablemode#spreadsheet#LineNr()
+* Fixed tablemode#spreadsheet#cell#SetCell()
+
+## Version 4.6.2
+* Added custom User autocmd event for tablemode activation (enabled /
+  disabled)
+* Adding better header support for pandoc, headers can now have a different
+  fillchar configured with `g:table_mode_header_fillchar`
+
+## Version 4.6.1
+* Minor bug fixes
+
+## Version 4.6.0
+* Added better table header support. The first line of the table if separated
+  by a table border will be considered as the header. This also means that it
+  will not be considered / included when evaluating table formulas and that
+  the first line after the header would be considered the first line of the
+  table.
+
 ## Version 4.5.0
 * Refactored toggled mappings
 * Table Syntax now gets toggled with Table Mode

Gemfile

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

README.md

@@ -1,4 +1,4 @@
-# VIM Table Mode v4.6.0 [![Build Status](https://travis-ci.org/dhruvasagar/vim-table-mode.png?branch=master)](https://travis-ci.org/dhruvasagar/vim-table-mode)
+# VIM Table Mode v4.6.4 [![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.
@@ -25,8 +25,8 @@ There are several ways to do this
 $ cd ~/.vim
 $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-mode
    ```
-3. Copy autoload/todomode.vim, plugin/todo-mode.vim, doc/todo-mode.txt to
+3. Copy all files under autoload/, plugin/, doc/ to respective
-   respective ~/.vim/autoload/, ~/.vim/plugin and ~/.vim/doc under UNIX or 
+   ~/.vim/autoload/, ~/.vim/plugin and ~/.vim/doc under UNIX or
    vimfiles/autoload/, vimfiles/plugin/ and vimfiles/doc under WINDOWS and
    restart VIM
 
@@ -49,7 +49,7 @@ $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-m
    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
+   aligned, whether center, right or left by using a `:` character defined by
    `g:table_mode_align_char` option.
 
 - **Format existing content into a table** :

autoload/tablemode.vim

@@ -5,15 +5,15 @@ function! s:SetBufferOptDefault(opt, val) "{{{2
   endif
 endfunction
 
-function! s:Map(map, to, mode)
+function! s:Map(map, to, mode) "{{{2
-  if !hasmapto(a:map, a:mode)
+  if !empty(a:to) && !hasmapto(a:map, a:mode)
     for l:mode in split(a:mode, '.\zs')
       execute l:mode . 'map <buffer>' a:to a:map
     endfor
   endif
 endfunction
 
-function! s:UnMap(map, mode)
+function! s:UnMap(map, mode) "{{{2
   if !empty(maparg(a:map, a:mode))
     for mode in split(a:mode, '.\zs')
       execute l:mode . 'unmap <buffer>' a:map
@@ -29,33 +29,38 @@ function! s:ToggleMapping() "{{{2
   if !g:table_mode_disable_mappings
     if tablemode#IsActive()
       call s:Map('<Plug>(table-mode-tableize)', separator_map, 'i')
-      call s:Map('<Plug>(table-mode-motion-up)', '{<Bar>', 'n')
+      call s:Map('<Plug>(table-mode-motion-up)', g:table_mode_motion_up_map, 'n')
-      call s:Map('<Plug>(table-mode-motion-down)', '}<Bar>', 'n')
+      call s:Map('<Plug>(table-mode-motion-down)', g:table_mode_motion_down_map, 'n')
-      call s:Map('<Plug>(table-mode-motion-left)', '[<Bar>', 'n')
+      call s:Map('<Plug>(table-mode-motion-left)', g:table_mode_motion_left_map, 'n')
-      call s:Map('<Plug>(table-mode-motion-right)', ']<Bar>', 'n')
+      call s:Map('<Plug>(table-mode-motion-right)', g:table_mode_motion_right_map, 'n')
 
-      call s:Map('<Plug>(table-mode-cell-text-object-a)', 'a<Bar>', 'ox')
+      call s:Map('<Plug>(table-mode-cell-text-object-a)', g:table_mode_cell_text_object_a_map, 'ox')
-      call s:Map('<Plug>(table-mode-cell-text-object-i)', 'i<Bar>', 'ox')
+      call s:Map('<Plug>(table-mode-cell-text-object-i)', g:table_mode_cell_text_object_i_map, 'ox')
 
-      call s:Map('<Plug>(table-mode-realign)', '<Leader>tr', 'n')
+      call s:Map('<Plug>(table-mode-realign)', g:table_mode_realign_map, 'n')
-      call s:Map('<Plug>(table-mode-delete-row)', '<Leader>tdd', 'n')
+      call s:Map('<Plug>(table-mode-delete-row)', g:table_mode_delete_row_map, 'n')
-      call s:Map('<Plug>(table-mode-delete-column)', '<Leader>tdc', 'n')
+      call s:Map('<Plug>(table-mode-delete-column)', g:table_mode_delete_column_map, 'n')
-      call s:Map('<Plug>(table-mode-add-formula)', '<Leader>tfa', 'n')
+      call s:Map('<Plug>(table-mode-add-formula)', g:table_mode_add_formula_map, 'n')
-      call s:Map('<Plug>(table-mode-eval-formula)', '<Leader>tfe', 'n')
+      call s:Map('<Plug>(table-mode-eval-formula)', g:table_mode_eval_formula_map, 'n')
-      call s:Map('<Plug>(table-mode-echo-cell)', '<Leader>t?', 'n')
+      call s:Map('<Plug>(table-mode-echo-cell)', g:table_mode_echo_cell_map, 'n')
+      call s:Map('<Plug>(table-mode-sort)', g:table_mode_sort_map, 'n')
     else
       call s:UnMap(separator_map, 'i')
-      call s:UnMap('{<Bar>', 'n')
+      call s:UnMap(g:table_mode_motion_up_map, 'n')
-      call s:UnMap('}<Bar>', 'n')
+      call s:UnMap(g:table_mode_motion_down_map, 'n')
-      call s:UnMap('[<Bar>', 'n')
+      call s:UnMap(g:table_mode_motion_left_map, 'n')
-      call s:UnMap(']<Bar>', 'n')
+      call s:UnMap(g:table_mode_motion_right_map, 'n')
-      call s:UnMap('a<Bar>', 'o')
+
-      call s:UnMap('i<Bar>', 'o')
+      call s:UnMap(g:table_mode_cell_text_object_a_map, 'ox')
-      call s:UnMap('<Leader>tdd', 'n')
+      call s:UnMap(g:table_mode_cell_text_object_i_map, 'ox')
-      call s:UnMap('<Leader>tdc', 'n')
+
-      call s:UnMap('<Leader>tfa', 'n')
+      call s:UnMap(g:table_mode_realign_map, 'n')
-      call s:UnMap('<Leader>tfe', 'n')
+      call s:UnMap(g:table_mode_delete_row_map, 'n')
-      call s:UnMap('<Leader>t?', 'n')
+      call s:UnMap(g:table_mode_delete_column_map, 'n')
+      call s:UnMap(g:table_mode_add_formula_map, 'n')
+      call s:UnMap(g:table_mode_eval_formula_map, 'n')
+      call s:UnMap(g:table_mode_echo_cell_map, 'n')
+      call s:UnMap(g:table_mode_sort_map, 'n')
     endif
   endif
 endfunction
@@ -92,6 +97,11 @@ function! s:SetActive(bool) "{{{2
   let b:table_mode_active = a:bool
   call s:ToggleSyntax()
   call s:ToggleMapping()
+  if tablemode#IsActive()
+    doautocmd User TableModeEnabled
+  else
+    doautocmd User TableModeDisabled
+  endif
 endfunction
 
 function! s:ConvertDelimiterToSeparator(line, ...) "{{{2

autoload/tablemode/align.vim

@@ -13,7 +13,7 @@ function! s:Padding(string, length, where) "{{{3
   elseif a:where =~# 'r'
     return repeat(" ", gap_length) . a:string
   elseif a:where =~# 'c'
-    let right = spaces / 2
+    let right = gap_length / 2
     let left = right + (right * 2 != gap_length)
     return repeat(" ", left) . a:string . repeat(" ", right)
   endif
@@ -64,14 +64,19 @@ function! tablemode#align#Split(string, delim)
 endfunction
 
 function! tablemode#align#alignments(lnum, ncols) "{{{2
+  let achr = g:table_mode_align_char
   let alignments = []
   if tablemode#table#IsBorder(a:lnum+1)
     let hcols = tablemode#align#Split(getline(a:lnum+1), '[' . g:table_mode_corner . g:table_mode_corner_corner . ']')
     for idx in range(len(hcols))
       " Right align if header
       call add(alignments, 'l')
-      if hcols[idx] =~# g:table_mode_align_char . '$' | let alignments[idx] = 'r' | endif
+      if hcols[idx] =~# achr . '[^'.achr.']\+' . achr
-      if hcols[idx] !~# '[^0-9\.]' | let alignments[idx] = 'r' | endif
+        let alignments[idx] = 'c'
+      elseif hcols[idx] =~# achr . '$'
+        let alignments[idx] = 'r'
+      endif
+      " if hcols[idx] !~# '[^0-9\.]' | let alignments[idx] = 'r' | endif
     endfor
   end
   return alignments

autoload/tablemode/logger.vim

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

autoload/tablemode/spreadsheet.vim

@@ -56,15 +56,15 @@ function! tablemode#spreadsheet#MoveToLastRow() "{{{2
   endif
 endfunction
 
-function! tablemode#spreadsheet#LineNr(row) "{{{2
+function! tablemode#spreadsheet#LineNr(line, row) "{{{2
-  if tablemode#table#IsRow('.')
+  if tablemode#table#IsRow(a:line)
-    let line = tablemode#spreadsheet#GetFirstRow('.')
+    let line = tablemode#spreadsheet#GetFirstRow(a:line)
     let row_nr = 0
 
     while tablemode#table#IsRow(line + 1) || tablemode#table#IsBorder(line + 1)
       if tablemode#table#IsRow(line)
         let row_nr += 1
-        if row ==# row_nr | break | endif
+        if a:row ==# row_nr | break | endif
       endif
       let line += 1
     endwhile
@@ -179,3 +179,11 @@ function! tablemode#spreadsheet#Average(range, ...) abort "{{{2
   call insert(args, a:range)
   return s:Average(call('tablemode#spreadsheet#cell#GetCellRange', args))
 endfunction
+
+function! tablemode#spreadsheet#Sort(bang, ...) "{{{2
+  let opts = a:0 ? a:1 : ''
+  let bang = a:bang ? '!' : ''
+  let [firstRow, lastRow] = [tablemode#spreadsheet#GetFirstRow('.'), tablemode#spreadsheet#GetLastRow('.')]
+  call tablemode#spreadsheet#MoveToStartOfCell()
+  exec ':'.firstRow.','.lastRow . 'sort'.bang opts '/.*\%'.col('.').'v/'
+endfunction

autoload/tablemode/spreadsheet/cell.vim

@@ -173,7 +173,7 @@ function! tablemode#spreadsheet#cell#SetCell(val, ...) "{{{2
   if colm < 0 | let colm = tablemode#spreadsheet#ColumnCount(line) + colm + 1 | endif
 
   if tablemode#table#IsRow(line)
-    let line = tablemode#utils#line(line) + (row - tablemode#spreadsheet#RowNr(line)) * 1
+    let line = tablemode#spreadsheet#LineNr(line, row)
     let line_val = getline(line)
     let cstartexpr = tablemode#table#StartCommentExpr()
     let values = split(getline(line)[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator)

autoload/tablemode/table.vim

@@ -1,13 +1,13 @@
 " Private Functions {{{1
-function! s:HeaderBorderExpr() "{{{2
+function! s:BorderExpr() "{{{2
   return tablemode#table#StartExpr() .
         \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
-        \ '[' . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_align_char . ']*' .
+        \ '[' . escape(g:table_mode_fillchar . g:table_mode_header_fillchar . g:table_mode_corner . g:table_mode_align_char, '-') . ']\+' .
         \ '[' . g:table_mode_corner . g:table_mode_corner_corner . ']' .
         \ tablemode#table#EndExpr()
 endfunction
 
-function! s:DefaultHeaderBorder() "{{{2
+function! s:DefaultBorder() "{{{2
   if tablemode#IsActive()
     return g:table_mode_corner_corner . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_fillchar . g:table_mode_corner_corner
   else
@@ -25,11 +25,15 @@ function! s:GenerateHeaderBorder(line) "{{{2
     if tablemode#table#IsRow(line - 1) && tablemode#utils#strlen(line_val) < tablemode#utils#strlen(getline(line - 1))
       let line_val = getline(line - 1)
     endif
-    if tablemode#utils#strlen(line_val) <= 1 | return s:DefaultHeaderBorder() | endif
+    if tablemode#utils#strlen(line_val) <= 1 | return s:DefaultBorder() | endif
 
     let border = substitute(line_val[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator, g:table_mode_corner, 'g')
     " To accurately deal with unicode double width characters
-    let fill_columns = map(split(border, g:table_mode_corner),  'repeat(g:table_mode_fillchar, tablemode#utils#StrDisplayWidth(v:val))')
+    if tablemode#table#IsHeader(line - 1)
+      let fill_columns = map(split(border, g:table_mode_corner),  'repeat(g:table_mode_header_fillchar, tablemode#utils#StrDisplayWidth(v:val))')
+    else
+      let fill_columns = map(split(border, g:table_mode_corner),  'repeat(g:table_mode_fillchar, tablemode#utils#StrDisplayWidth(v:val))')
+    endif
     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, '')
 
@@ -41,7 +45,10 @@ function! s:GenerateHeaderBorder(line) "{{{2
 
       for idx in range(len(hcols))
         if hcols[idx] =~# g:table_mode_align_char
-          if hcols[idx] =~# g:table_mode_align_char . '$'
+          " center align
+          if hcols[idx] =~# g:table_mode_align_char . '[^'.g:table_mode_align_char.']\+' . g:table_mode_align_char
+            let gcols[idx] = g:table_mode_align_char . gcols[idx][1:-2] . g:table_mode_align_char
+          elseif hcols[idx] =~# g:table_mode_align_char . '$'
             let gcols[idx] = gcols[idx][:-2] . g:table_mode_align_char
           else
             let gcols[idx] = g:table_mode_align_char . gcols[idx][1:]
@@ -63,7 +70,7 @@ function! s:GenerateHeaderBorder(line) "{{{2
       return border
     endif
   else
-    return s:DefaultHeaderBorder()
+    return s:DefaultBorder()
   endif
 endfunction
 
@@ -128,12 +135,17 @@ function! tablemode#table#EndExpr() "{{{2
 endfunction
 
 function! tablemode#table#IsBorder(line) "{{{2
-  return getline(a:line) =~# s:HeaderBorderExpr()
+  return !empty(getline(a:line)) && getline(a:line) =~# s:BorderExpr()
 endfunction
 
 function! tablemode#table#IsHeader(line) "{{{2
   let line = tablemode#utils#line(a:line)
-  return tablemode#table#IsBorder(line+1) && !tablemode#table#IsRow(line-1) && !tablemode#table#IsRow(line-2)
+  " if line <= 0 || line > line('$') | return 0 | endif
+  return tablemode#table#IsRow(line)
+        \ && !tablemode#table#IsRow(line-1)
+        \ && !tablemode#table#IsRow(line-2)
+        \ && !tablemode#table#IsBorder(line-2)
+        \ && tablemode#table#IsBorder(line+1)
 endfunction
 
 function! tablemode#table#IsRow(line) "{{{2

doc/table-mode.txt

@@ -1,7 +1,7 @@
-*table-mode.txt*		Table Mode for easy table formatting. v4.5.0
+*table-mode.txt*			Table Mode for easy table formatting
 ===============================================================================
 	Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
-				 VERSION 4.6.0
+				 VERSION 4.6.4
 
 		Author: Dhruva Sagar <http://dhruvasagar.com/>
 		License: MIT <http://opensource.org/licenses/MIT/>
@@ -151,6 +151,23 @@ Overview:
                                         can be added to the table header
                                         border to control alignment of that
                                         column.
+        |table-mode-motion-up-map| ...... Set the table motion up mapping
+        |table-mode-motion-down-map| .... Set the table motion down mapping
+        |table-mode-motion-left-map| .... Set the table motion left mapping
+        |table-mode-motion-right-map| ... Set the table motion right mapping
+        |table-mode-cell-text-object-a-map|
+                                        Set the 'a' cell text object
+                                        mapping
+        |table-mode-cell-text-object-i-map|
+                                        Set the 'i' cell text object
+                                        mapping
+        |table-mode-realign-map| ........ Set the realign mapping
+        |table-mode-delete-row-map| ..... Set the delete row mapping
+        |table-mode-delete-column-map| .. Set the delete column mapping
+        |table-mode-add-formula-map| .... Set the add formula mapping
+        |table-mode-eval-formula-map| ... Set the eval formula mapping
+        |table-mode-echo-cell-map| ...... Set the echo cell mapping
+        |table-mode-sort-map| ........... Set the table sort mapping
 
 g:loaded_table_mode					*table-mode-loaded*
 	Use this option to disable the plugin: >
@@ -213,9 +230,67 @@ g:table_mode_align_char                                  *table-mode-align-char*
         alignments for columns in the table header border. >
                 let g:table_mode_align_char = ':'
 <
-g:table_mode_disable_mappings                     table-mode-disable-mappings
+g:table_mode_disable_mappings                      *table-mode-disable-mappings*
-        Set this to true to disable all mappings.
+        Set this to true to disable all mappings. >
                 let g:table_mode_disable_mappings = 1
+<
+g:table_mode_motion_up_map                            *table-mode-motion-up-map*
+        Set this to configure the mapping to move up a cell vertically. >
+                let g:table_mode_motion_up_map = '{<Bar>'
+<
+g:table_mode_motion_down_map                        *table-mode-motion-down-map*
+        Set this to configure the mapping to move down a cell vertically. >
+                let g:table_mode_motion_down_map = '}<Bar>'
+>
+g:table_mode_motion_left_map                        *table-mode-motion-left-map*
+        Set this to configure the mapping to move to the left cell. >
+                let g:table_mode_motion_left_map = '[<Bar>'
+>
+g:table_mode_motion_right_map                      *table-mode-motion-right-map*
+        Set this to configure the mapping to move to the right cell. >
+                let g:table_mode_motion_right_map = ']<Bar>'
+>
+g:table_mode_cell_text_object_a_map          *table-mode-cell-text-object-a-map*
+        Set this to configure the mapping to define the text object for around
+        cell object. >
+                let g:table_mode_cell_text_object_a_map = 'a<Bar>'
+>
+g:table_mode_cell_text_object_i_map           *table-mode-cell-text-object-i-map*
+        Set this to configure the mapping to define the text object for inner
+        cell object. >
+                let g:table_mode_cell_text_object_i_map = 'i<Bar>'
+>
+g:table_mode_realign_map                                *table-mode-realign-map*
+        Set this to configure the mapping for table realign. >
+                let g:table_mode_realign_map = '<Leader>tr'
+>
+g:table_mode_delete_row_map                          *table-mode-delete-row-map*
+        Set this to configure the mapping for deleting a table row. >
+                let g:table_mode_delete_row_map = '<Leader>tdd'
+>
+g:table_mode_delete_column_map                    *table-mode-delete-column-map*
+        Set this to configure the mapping for deleting a table column. >
+                let g:table_mode_delete_column_map = '<Leader>tdc'
+>
+g:table_mode_add_formula_map                        *table-mode-add-formula-map*
+        Set this to configure the mapping for adding a formula for a table
+        cell. >
+                let g:table_mode_add_formula_map = '<Leader>tfa'
+>
+g:table_mode_eval_formula_map                      *table-mode-eval-formula-map*
+        Set this to configure the mapping for evaluating the formula line. >
+                let g:table_mode_eval_formula_map = '<Leader>tfe'
+>
+g:table_mode_echo_cell_map                            *table-mode-echo-cell-map*
+        Set this to configure the mapping for echoing the tablemode
+        representation of the current cell. >
+                let g:table_mode_echo_cell_map = '<Leader>t?'
+>
+g:table_mode_sort_map                                      *table-mode-sort-map*
+        Set this to configure the mapping for sorting the table mode by
+        current column. >
+                let g:table_mode_sort_map = '<Leader>ts'
+>
 
 ===============================================================================
 MAPPINGS						*table-mode-mappings*

plugin/table-mode.vim

@@ -16,8 +16,10 @@ endfunction
 
 " Set Global Defaults {{{1
 call s:SetGlobalOptDefault('table_mode_corner', '+')
+call s:SetGlobalOptDefault('table_mode_verbose', 0)
 call s:SetGlobalOptDefault('table_mode_separator', '|')
 call s:SetGlobalOptDefault('table_mode_fillchar', '-')
+call s:SetGlobalOptDefault('table_mode_header_fillchar', '-')
 call s:SetGlobalOptDefault('table_mode_map_prefix', '<Leader>t')
 call s:SetGlobalOptDefault('table_mode_toggle_map', 'm')
 call s:SetGlobalOptDefault('table_mode_always_active', 0)
@@ -26,6 +28,22 @@ call s:SetGlobalOptDefault('table_mode_corner_corner', '|')
 call s:SetGlobalOptDefault('table_mode_align_char', ':')
 call s:SetGlobalOptDefault('table_mode_disable_mappings', 0)
 
+call s:SetGlobalOptDefault('table_mode_motion_up_map', '{<Bar>')
+call s:SetGlobalOptDefault('table_mode_motion_down_map', '}<Bar>')
+call s:SetGlobalOptDefault('table_mode_motion_left_map', '[<Bar>')
+call s:SetGlobalOptDefault('table_mode_motion_right_map', ']<Bar>')
+
+call s:SetGlobalOptDefault('table_mode_cell_text_object_a_map', 'a<Bar>')
+call s:SetGlobalOptDefault('table_mode_cell_text_object_i_map', 'i<Bar>')
+
+call s:SetGlobalOptDefault('table_mode_realign_map', '<Leader>tr')
+call s:SetGlobalOptDefault('table_mode_delete_row_map', '<Leader>tdd')
+call s:SetGlobalOptDefault('table_mode_delete_column_map', '<Leader>tdc')
+call s:SetGlobalOptDefault('table_mode_add_formula_map', '<Leader>tfa')
+call s:SetGlobalOptDefault('table_mode_eval_formula_map', '<Leader>tfe')
+call s:SetGlobalOptDefault('table_mode_echo_cell_map', '<Leader>t?')
+call s:SetGlobalOptDefault('table_mode_sort_map', '<Leader>ts')
+
 function! s:TableEchoCell() "{{{1
   if tablemode#table#IsRow('.')
     echomsg '$' . tablemode#spreadsheet#RowNr('.') . ',' . tablemode#spreadsheet#ColumnNr('.')
@@ -57,6 +75,7 @@ endif
 " }}}2
 
 command! -nargs=? -range Tableize <line1>,<line2>call tablemode#TableizeRange(<q-args>)
+command! -nargs=? -bang TableSort call tablemode#spreadsheet#Sort(<bang>0, <q-args>)
 command! TableAddFormula call tablemode#spreadsheet#formula#Add()
 command! TableModeRealign call tablemode#table#Realign('.')
 command! TableEvalFormulaLine call tablemode#spreadsheet#formula#EvaluateFormulaLine()
@@ -89,15 +108,23 @@ nnoremap <silent> <Plug>(table-mode-eval-formula) :call tablemode#spreadsheet#fo
 
 nnoremap <silent> <Plug>(table-mode-echo-cell) :call <SID>TableEchoCell()<CR>
 
+nnoremap <silent> <Plug>(table-mode-sort) :call tablemode#spreadsheet#Sort()<CR>
+
 if !hasmapto('<Plug>(table-mode-tableize)')
-  nmap <Leader>tt <Plug>(table-mode-tableize)
+  exec "nmap " . g:table_mode_map_prefix . "t <Plug>(table-mode-tableize)"
-  xmap <Leader>tt <Plug>(table-mode-tableize)
+  exec "xmap " . g:table_mode_map_prefix . "t <Plug>(table-mode-tableize)"
 endif
 
 if !hasmapto('<Plug>(table-mode-tableize-delimiter)')
   xmap <Leader>T <Plug>(table-mode-tableize-delimiter)
 endif
 
+augroup TableMode "{{{1
+  au!
+
+  autocmd User TableModeEnabled call tablemode#logger#log('Table Mode Enabled')
+  autocmd User TableModeDisabled call tablemode#logger#log('Table Mode Disabled')
+augroup END
 " Avoiding side effects {{{1
 let &cpo = s:save_cpo
 

t/config/options.vim

@@ -1,6 +1,7 @@
 let g:table_mode_corner = '+'
 let g:table_mode_separator = '|'
 let g:table_mode_fillchar = '-'
+let g:table_mode_header_fillchar = '-'
 let g:table_mode_map_prefix = '<Leader>t'
 let g:table_mode_toggle_map = 'm'
 let g:table_mode_always_active = 0
@@ -8,3 +9,19 @@ let g:table_mode_delimiter = ','
 let g:table_mode_corner_corner = '|'
 let g:table_mode_align_char = ':'
 let g:table_mode_disable_mappings = 0
+
+let g:table_mode_motion_up_map = '{<Bar>'
+let g:table_mode_motion_down_map = '}<Bar>'
+let g:table_mode_motion_left_map = '[<Bar>'
+let g:table_mode_motion_right_map = ']<Bar>'
+
+let g:table_mode_cell_text_object_a_map = 'a<Bar>'
+let g:table_mode_cell_text_object_i_map = 'i<Bar>'
+
+let g:table_mode_realign_map = '<Leader>tr'
+let g:table_mode_delete_row_map = '<Leader>tdd'
+let g:table_mode_delete_column_map = '<Leader>tdc'
+let g:table_mode_add_formula_map = '<Leader>tfa'
+let g:table_mode_eval_formula_map = '<Leader>tfe'
+let g:table_mode_echo_cell_map = '<Leader>t?'
+let g:table_mode_sort_map = '<Leader>ts'

t/fixtures/table/sample_header_realign_after.txt

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

t/fixtures/table/sample_header_realign_before.txt

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

t/fixtures/table/sample_header_realign_unicode_after.txt

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

t/fixtures/table/sample_header_realign_unicode_before.txt

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