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

Added date placeholder. (#360)

Browse Source 
* added date placeholder.

* made today the default.
This commit is contained in:
Yuchen Pei 2017-07-08 15:04:54 -04:00 committed by EinfachToll
parent 8cdc1c1538
commit 28177c33e3
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
autoload/vimwiki/html.vim
View File

@ -209,6 +209,19 @@ function! s:save_vimwiki_buffer() "{{{
endif endif
endfunction "}}} endfunction "}}}
" get date.
function! s:process_date(placeholders, default_date) "{{{
if !empty(a:placeholders)
for [placeholder, row, idx] in a:placeholders
let [type, param] = placeholder
if type ==# 'date' && !empty(param)
return param
endif
endfor
endif
return a:default_date
endfunction "}}}
" get title. " get title.
function! s:process_title(placeholders, default_title) "{{{ function! s:process_title(placeholders, default_title) "{{{
if !empty(a:placeholders) if !empty(a:placeholders)
@ -1205,6 +1218,15 @@ function! s:parse_line(line, state) " {{{
endif endif
endif endif
" date -- placeholder
if !processed
if line =~# '^\s*%date'
let processed = 1
let param = matchstr(line, '^\s*%date\s\zs.*')
let state.placeholder = ['date', param]
endif
endif
" html template -- placeholder "{{{ " html template -- placeholder "{{{
if !processed if !processed
if line =~# '^\s*%template' if line =~# '^\s*%template'
@ -1483,11 +1505,13 @@ function! s:convert_file(path_html, wikifile) "{{{
call extend(ldest, lines) call extend(ldest, lines)
let title = s:process_title(placeholders, fnamemodify(a:wikifile, ":t:r")) let title = s:process_title(placeholders, fnamemodify(a:wikifile, ":t:r"))
let date = s:process_date(placeholders, strftime('%Y-%m-%d'))
let html_lines = s:get_html_template(template_name) let html_lines = s:get_html_template(template_name)
" processing template variables (refactor to a function) " processing template variables (refactor to a function)
call map(html_lines, 'substitute(v:val, "%title%", "'. title .'", "g")') call map(html_lines, 'substitute(v:val, "%title%", "'. title .'", "g")')
call map(html_lines, 'substitute(v:val, "%date%", "'. date .'", "g")')
call map(html_lines, 'substitute(v:val, "%root_path%", "'. call map(html_lines, 'substitute(v:val, "%root_path%", "'.
\ s:root_path(VimwikiGet('subdir')) .'", "g")') \ s:root_path(VimwikiGet('subdir')) .'", "g")')

1
syntax/vimwiki.vim
View File

@ -460,6 +460,7 @@ execute 'syntax region VimwikiMath start=/'.g:vimwiki_rxMathStart.
" placeholders " placeholders
syntax match VimwikiPlaceholder /^\s*%nohtml\s*$/ syntax match VimwikiPlaceholder /^\s*%nohtml\s*$/
syntax match VimwikiPlaceholder /^\s*%title\%(\s.*\)\?$/ contains=VimwikiPlaceholderParam syntax match VimwikiPlaceholder /^\s*%title\%(\s.*\)\?$/ contains=VimwikiPlaceholderParam
syntax match VimwikiPlaceholder /^\s*%date\%(\s.*\)\?$/ contains=VimwikiPlaceholderParam
syntax match VimwikiPlaceholder /^\s*%template\%(\s.*\)\?$/ contains=VimwikiPlaceholderParam syntax match VimwikiPlaceholder /^\s*%template\%(\s.*\)\?$/ contains=VimwikiPlaceholderParam
syntax match VimwikiPlaceholderParam /\s.*/ contained syntax match VimwikiPlaceholderParam /\s.*/ contained