Version 0.9.2c: * FIX: Regression bug. Export to HTML of [[link|desc]] is wrong.

This commit is contained in:
Maxim Kim 2009-05-09 00:00:00 +00:00 committed by Able Scraper
parent 0dfdf146e2
commit 052ef8d4e1

View File

@ -2,7 +2,7 @@
UseVimball UseVimball
finish finish
doc\vimwiki.txt [[[1 doc\vimwiki.txt [[[1
1073 1076
*vimwiki.txt* A Personal Wiki for Vim *vimwiki.txt* A Personal Wiki for Vim
__ __ ______ __ __ ______ __ __ ______ ~ __ __ ______ __ __ ______ __ __ ______ ~
@ -13,7 +13,7 @@ doc\vimwiki.txt [[[1
\ `\___/ /\_____\\ \_\\ \_\ `\___x___/ /\_____\\ \_\ \_\ /\_____\~ \ `\___/ /\_____\\ \_\\ \_\ `\___x___/ /\_____\\ \_\ \_\ /\_____\~
`\/__/ \/_____/ \/_/ \/_/'\/__//__/ \/_____/ \/_/\/_/ \/_____/~ `\/__/ \/_____/ \/_/ \/_/'\/__//__/ \/_____/ \/_/\/_/ \/_____/~
Version: 0.9.3 ~ Version: 0.9.2c ~
============================================================================== ==============================================================================
CONTENTS *vimwiki-contents* CONTENTS *vimwiki-contents*
@ -842,6 +842,9 @@ Vim plugins website: http://www.vim.org/scripts/script.php?script_id=2226
============================================================================== ==============================================================================
11. Changelog *vimwiki-changelog* 11. Changelog *vimwiki-changelog*
0.9.2c
* [fix] Regression: Export HTML link error with [[Link|Text]].
0.9.2b 0.9.2b
* [fix] Installation on Linux doesn't work. (Dos line endings in Vimball * [fix] Installation on Linux doesn't work. (Dos line endings in Vimball
archive file). archive file).
@ -1356,7 +1359,7 @@ let g:vimwiki_rxPre1 = '^\s\+[^[:blank:]*#].*$'
let g:vimwiki_rxPreStart = '<pre>' let g:vimwiki_rxPreStart = '<pre>'
let g:vimwiki_rxPreEnd = '<\/pre>' let g:vimwiki_rxPreEnd = '<\/pre>'
autoload\vimwiki_html.vim [[[1 autoload\vimwiki_html.vim [[[1
889 894
" Vimwiki autoload plugin file " Vimwiki autoload plugin file
" Export to HTML " Export to HTML
" Author: Maxim Kim <habamax@gmail.com> " Author: Maxim Kim <habamax@gmail.com>
@ -1922,6 +1925,7 @@ function! s:make_internal_link(entag) "{{{
" Make <a href="link">This is a link</a> " Make <a href="link">This is a link</a>
" from [[link|This is a link]] " from [[link|This is a link]]
" TODO: rename function -- it makes not only internal links. " TODO: rename function -- it makes not only internal links.
" TODO: refactor it.
let line = '' let line = ''
let link_parts = split(a:entag, "|", 1) let link_parts = split(a:entag, "|", 1)
@ -1937,7 +1941,11 @@ function! s:make_internal_link(entag) "{{{
let line = '<a href="'.link_parts[0].'"><img src="'.link_parts[1]. let line = '<a href="'.link_parts[0].'"><img src="'.link_parts[1].
\ '" style="'.style.'" /></a>' \ '" style="'.style.'" /></a>'
elseif len(link_parts) < 3 elseif len(link_parts) < 3
let line = '<a href="'.link_parts[0].'">'.link_parts[1].'</a>' if s:is_non_wiki_link(link_parts[0])
let line = '<a href="'.link_parts[0].'">'.link_parts[1].'</a>'
else
let line = '<a href="'.link_parts[0].'.html">'.link_parts[1].'</a>'
endif
elseif s:is_img_link(link_parts[0]) elseif s:is_img_link(link_parts[0])
let line = '<img src="'.link_parts[0].'" alt="'. let line = '<img src="'.link_parts[0].'" alt="'.
\ link_parts[1].'" style="'.style.'" />' \ link_parts[1].'" style="'.style.'" />'