Version 1.0

* NEW: Issue 41: Table cell and column text objects. See `vimwiki-text-objects`.
* NEW: Issue 42: Commands to move table columns left and right. See `:VimwikiTableMoveColumnLeft` and `:VimwikiTableMoveColumnRight`.
* NEW: Issue 44: `<S-Tab>` should move cursor to the previous table cell.
* NEW: Issue 45: It should be possible to indent tables. Indented tables are centered in html.
* NEW: Issue 46: Do not htmlize some wiki pages (blacklist). New placeholder is added: `%nohtml`. See `vimwiki-nohtml`.
* FIX: Issue 47: Lists aren't HTMLized properly.
* FIX: Issue 48: With autochdir it is impossible to have path_html such as `d:\vimwiki\html\`
* FIX: Issue 49: Table is not HTMLized properly at the end of wiki page.
* FIX: Issue 50: Inline formatting is not performed in table cells.
* FIX: Issue 51: Cannot insert '-' (minus) into table cells of the first column.
* FIX: Issue 52: Table cell width is incorrect when double wide characters are used (ie. Chinese). Check `g:vimwiki_CJK_length`.
* NEW: Issue 53: Wiki markup can not nested. (Use links and inline markup in Headers).
* NEW: Issue 54: Highlight for placeholders.
* NEW: Issue 56: Directory indexes. See `g:vimwiki_dir_link` option and `:VimwikiGenerateLinks` command.
* NEW: Issue 58: Html new lines with `<br />`. Could be inserted with `<S-CR>` in insert mode.
* FIX: Issue 59: List item's text can't be started from `*`.
* NEW: Issue 60: Links inside completed gtd-items.
* NEW: Issue 61: Headers numbering. See `g:vimwiki_html_header_numbering` and `g:vimwiki_html_header_numbering_sym` options.
* FIX: Issue 63: Table cannot have leading empty cells in html.
* FIX: Issue 65: Table separator is not htmlized right if on top of the table.
* FIX: Issue 66: Table empty cells are very small in html.
* FIX: Issue 67: Wrong html conversion of multilined list item with bold text on the start of next line.
* FIX: Issue 68: auto-indent problem with langmap.
* FIX: Issue 73: Link navigation by Tab. "Escaped" wiki-word should be skipped for navigation with `<tab>`.
* FIX: Issue 75: `code` syntax doesn't display correctly in toc.
* FIX: Issue 77: Diary index only showing link to today's diary entry file for extensions other than '.wiki'.
* FIX: Issue 79: Further calendar.vim integration -- add sign to calendar date if it has corresponding diary page.
* FIX: Issue 80: Debian Lenny GUI Vim 7.2 has problems with toggling inner todo list items.
* FIX: Issue 81: Don't convert `WikiWord` as a link in html when `let g:vimwiki_camel_case = 0`

syntax/vimwiki.vim

@@ -1,7 +1,7 @@
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
 " Vimwiki syntax file
 " Author: Maxim Kim <habamax@gmail.com>
 " Home: http://code.google.com/p/vimwiki/
-" vim:tw=79:
 
 " Quit if syntax file is already loaded
 if version < 600
@@ -14,17 +14,18 @@ endif
 if VimwikiGet('maxhi')
   " Every WikiWord is nonexistent
   if g:vimwiki_camel_case
-    execute 'syntax match VimwikiNoExistsWord /\%(^\|[^!]\)\@<='.g:vimwiki_word1.'/'
+    execute 'syntax match VimwikiNoExistsLink /'.g:vimwiki_rxWikiWord.'/'
   endif
-  execute 'syntax match VimwikiNoExistsWord /'.g:vimwiki_word2.'/'
-  execute 'syntax match VimwikiNoExistsWord /'.g:vimwiki_word3.'/'
+  execute 'syntax match VimwikiNoExistsLink /'.g:vimwiki_rxWikiLink1.'/'
+  execute 'syntax match VimwikiNoExistsLink /'.g:vimwiki_rxWikiLink2.'/'
   " till we find them in vimwiki's path
-  call vimwiki#WikiHighlightWords()
+  call vimwiki#WikiHighlightLinks()
 else
   " A WikiWord (unqualifiedWikiName)
-  execute 'syntax match VimwikiWord /\%(^\|[^!]\)\@<=\<'.g:vimwiki_word1.'\>/'
+  execute 'syntax match VimwikiLink /\<'.g:vimwiki_rxWikiWord.'\>/'
   " A [[bracketed wiki word]]
-  execute 'syntax match VimwikiWord /'.g:vimwiki_word2.'/'
+  execute 'syntax match VimwikiLink /'.g:vimwiki_rxWikiLink1.'/'
+  execute 'syntax match VimwikiLink /'.g:vimwiki_rxWikiLink2.'/'
 endif
 
 execute 'syntax match VimwikiLink `'.g:vimwiki_rxWeblink.'`'
@@ -41,8 +42,8 @@ execute 'runtime! syntax/vimwiki_'.VimwikiGet('syntax').'.vim'
 " Tables
 " execute 'syntax match VimwikiTable /'.g:vimwiki_rxTable.'/'
 syntax match VimwikiTableRow /\s*|.\+|\s*/
-      \ transparent contains=VimwikiCellSeparator,VimwikiWord,
-      \ VimwikiNoExistsWord,VimwikiEmoticons,VimwikiTodo,
+      \ transparent contains=VimwikiCellSeparator,VimwikiLink,
+      \ VimwikiNoExistsLink,VimwikiEmoticons,VimwikiTodo,
       \ VimwikiBold,VimwikiItalic,VimwikiBoldItalic,VimwikiItalicBold,
       \ VimwikiDelText,VimwikiSuperScript,VimwikiSubScript,VimwikiCode
 syntax match VimwikiCellSeparator
@@ -79,11 +80,21 @@ execute 'syntax region VimwikiPre start=/'.g:vimwiki_rxPreStart.
 syntax match VimwikiCheckBox /\[.\?\]/
 if g:vimwiki_hl_cb_checked
   execute 'syntax match VimwikiCheckBoxDone /'.
-        \ g:vimwiki_rxListBullet.'\s*\['.g:vimwiki_listsyms[4].'\].*$/'
+        \ g:vimwiki_rxListBullet.'\s*\['.g:vimwiki_listsyms[4].'\].*$/'.
+        \ ' contains=VimwikiNoExistsLink,VimwikiLink'
   execute 'syntax match VimwikiCheckBoxDone /'.
-        \ g:vimwiki_rxListNumber.'\s*\['.g:vimwiki_listsyms[4].'\].*$/'
+        \ g:vimwiki_rxListNumber.'\s*\['.g:vimwiki_listsyms[4].'\].*$/'.
+        \ ' contains=VimwikiNoExistsLink,VimwikiLink'
 endif
 
+" placeholders
+syntax match VimwikiPlaceholder /^\s*%toc\%(\s.*\)\?$/
+syntax match VimwikiPlaceholder /^\s*%nohtml\s*$/
+
+" html tags
+syntax match VimwikiHTMLtag '<br\s*/\?>'
+syntax match VimwikiHTMLtag '<hr\s*/\?>'
+
 syntax region VimwikiComment start='<!--' end='-->'
 
 if !vimwiki#hl_exists("VimwikiHeader1")
@@ -116,10 +127,9 @@ hi def VimwikiBoldItalic term=bold cterm=bold gui=bold,italic
 hi def link VimwikiItalicBold VimwikiBoldItalic
 
 hi def link VimwikiCode PreProc
-hi def link VimwikiWord Underlined
-hi def link VimwikiNoExistsWord Error
+hi def link VimwikiNoExistsLink Error
 
-hi def link VimwikiPre SpecialComment
+hi def link VimwikiPre PreProc
 hi def link VimwikiLink Underlined
 hi def link VimwikiList Function
 hi def link VimwikiCheckBox VimwikiList
@@ -132,6 +142,8 @@ hi def link VimwikiTodo Todo
 hi def link VimwikiComment Comment
 
 hi def link VimwikiCellSeparator SpecialKey
+hi def link VimwikiPlaceholder SpecialKey
+hi def link VimwikiHTMLtag SpecialKey
 "}}}
 
 let b:current_syntax="vimwiki"

syntax/vimwiki_default.vim

@@ -1,14 +1,14 @@
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
 " Vimwiki syntax file
 " Default syntax
 " Author: Maxim Kim <habamax@gmail.com>
 " Home: http://code.google.com/p/vimwiki/
-" vim:tw=78:
 
 " text: *strong*
 " let g:vimwiki_rxBold = '\*[^*]\+\*'
 let g:vimwiki_rxBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'\*'.
-      \'\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`]\)'.
+      \'\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)'.
       \'\*'.
       \'\%([[:punct:]]\|\s\|$\)\@='
 
@@ -16,20 +16,20 @@ let g:vimwiki_rxBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
 " let g:vimwiki_rxItalic = '_[^_]\+_'
 let g:vimwiki_rxItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'_'.
-      \'\%([^_`[:space:]][^_`]*[^_`[:space:]]\|[^_`]\)'.
+      \'\%([^_`[:space:]][^_`]*[^_`[:space:]]\|[^_`[:space:]]\)'.
       \'_'.
       \'\%([[:punct:]]\|\s\|$\)\@='
 
 " text: *_bold italic_* or _*italic bold*_
 let g:vimwiki_rxBoldItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'\*_'.
-      \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`]\)'.
+      \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`[:space:]]\)'.
       \'_\*'.
       \'\%([[:punct:]]\|\s\|$\)\@='
 
 let g:vimwiki_rxItalicBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'_\*'.
-      \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`]\)'.
+      \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`[:space:]]\)'.
       \'\*_'.
       \'\%([[:punct:]]\|\s\|$\)\@='
 

syntax/vimwiki_media.vim

@@ -1,8 +1,8 @@
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
 " Vimwiki syntax file
 " MediaWiki syntax
 " Author: Maxim Kim <habamax@gmail.com>
 " Home: http://code.google.com/p/vimwiki/
-" vim:tw=78:
 
 " text: '''strong'''
 let g:vimwiki_rxBold = "'''[^']\\+'''"