y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
This commit is contained in:
Alexey Radkov 2014-05-04 15:25:38 +04:00
commit 411d8da0a4
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
autoload/vimwiki/tbl.vim
View File

@ -235,13 +235,13 @@ function! s:get_rows(lnum) "{{{
return upper_rows + lower_rows return upper_rows + lower_rows
endfunction "}}} endfunction "}}}
function! s:get_cell_max_lens(lnum) "{{{ function! s:get_cell_max_lens(lnum, ...) "{{{
let max_lens = {} let max_lens = {}
for [lnum, row] in s:get_rows(a:lnum) for [lnum, row] in s:get_rows(a:lnum)
if s:is_separator(row) if s:is_separator(row)
continue continue
endif endif
let cells = vimwiki#tbl#get_cells(row) let cells = a:0 > 1 ? a:1[lnum - a:2] : vimwiki#tbl#get_cells(row)
for idx in range(len(cells)) for idx in range(len(cells))
let value = cells[idx] let value = cells[idx]
if has_key(max_lens, idx) if has_key(max_lens, idx)
@ -255,17 +255,23 @@ function! s:get_cell_max_lens(lnum) "{{{
endfunction "}}} endfunction "}}}
function! s:get_aligned_rows(lnum, col1, col2) "{{{ function! s:get_aligned_rows(lnum, col1, col2) "{{{
let max_lens = s:get_cell_max_lens(a:lnum) let rows = s:get_rows(a:lnum)
let rows = [] let startlnum = rows[0][0]
for [lnum, row] in s:get_rows(a:lnum) let cells = []
for [lnum, row] in rows
call add(cells, vimwiki#tbl#get_cells(row))
endfor
let max_lens = s:get_cell_max_lens(a:lnum, cells, startlnum)
let result = []
for [lnum, row] in rows
if s:is_separator(row) if s:is_separator(row)
let new_row = s:fmt_sep(max_lens, a:col1, a:col2) let new_row = s:fmt_sep(max_lens, a:col1, a:col2)
else else
let new_row = s:fmt_row(row, max_lens, a:col1, a:col2) let new_row = s:fmt_row(cells[lnum - startlnum], max_lens, a:col1, a:col2)
endif endif
call add(rows, [lnum, new_row]) call add(result, [lnum, new_row])
endfor endfor
return rows return result
endfunction "}}} endfunction "}}}
" Number of the current column. Starts from 0. " Number of the current column. Starts from 0.
@ -303,20 +309,19 @@ function! s:fmt_cell(cell, max_len) "{{{
return cell return cell
endfunction "}}} endfunction "}}}
function! s:fmt_row(line, max_lens, col1, col2) "{{{ function! s:fmt_row(cells, max_lens, col1, col2) "{{{
let new_line = s:rxSep() let new_line = s:rxSep()
let cells = vimwiki#tbl#get_cells(a:line) for idx in range(len(a:cells))
for idx in range(len(cells))
if idx == a:col1 if idx == a:col1
let idx = a:col2 let idx = a:col2
elseif idx == a:col2 elseif idx == a:col2
let idx = a:col1 let idx = a:col1
endif endif
let value = cells[idx] let value = a:cells[idx]
let new_line .= s:fmt_cell(value, a:max_lens[idx]).s:rxSep() let new_line .= s:fmt_cell(value, a:max_lens[idx]).s:rxSep()
endfor endfor
let idx = len(cells) let idx = len(a:cells)
while idx < len(a:max_lens) while idx < len(a:max_lens)
let new_line .= s:fmt_cell('', a:max_lens[idx]).s:rxSep() let new_line .= s:fmt_cell('', a:max_lens[idx]).s:rxSep()
let idx += 1 let idx += 1