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

Escape only '"' in links

Browse Source 
Fix #467
Ref #474
This commit is contained in:
EinfachToll 2018-04-16 20:40:18 +02:00
parent 7036561446
commit cdc37162a9
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
autoload/vimwiki/html.vim
View File

@ -134,13 +134,11 @@ function! s:safe_html_preformatted(line) "{{{
return line return line
endfunction "}}} endfunction "}}}
function! s:safe_html_anchor(string) "{{{
let string = substitute(a:string, '"', '\"', 'g') function! s:escape_html_attribute(string)
let string = substitute(string, "'", '\'', 'g') return substitute(a:string, '"', '\"', 'g')
let string = substitute(string, '/', '\/', 'g') endfunction
let string = substitute(string, '\t', ' ', 'g') " 	 doesn't work
return string
endfunction "}}}
function! s:safe_html_line(line) "{{{ function! s:safe_html_line(line) "{{{
" escape & < > when producing HTML text " escape & < > when producing HTML text
@ -288,7 +286,7 @@ endfunction "}}}
function! s:tag_strong(value, header_ids) "{{{ function! s:tag_strong(value, header_ids) "{{{
let text = s:mid(a:value, 1) let text = s:mid(a:value, 1)
let id = s:safe_html_anchor(text) let id = s:escape_html_attribute(text)
let complete_id = '' let complete_id = ''
for l in range(6) for l in range(6)
if a:header_ids[l][0] != '' if a:header_ids[l][0] != ''
@ -299,7 +297,7 @@ function! s:tag_strong(value, header_ids) "{{{
let complete_id = complete_id[:-2] let complete_id = complete_id[:-2]
endif endif
let complete_id .= '-'.id let complete_id .= '-'.id
return '<span id="'.s:safe_html_anchor(complete_id).'"></span><strong id="' return '<span id="'.s:escape_html_attribute(complete_id).'"></span><strong id="'
\ .id.'">'.text.'</strong>' \ .id.'">'.text.'</strong>'
endfunction "}}} endfunction "}}}
@ -313,11 +311,11 @@ function! s:tag_tags(value, header_ids) "{{{
if a:header_ids[5][0] == '' if a:header_ids[5][0] == ''
let complete_id = complete_id[:-2] let complete_id = complete_id[:-2]
endif endif
let complete_id = s:safe_html_anchor(complete_id) let complete_id = s:escape_html_attribute(complete_id)
let result = [] let result = []
for tag in split(a:value, ':') for tag in split(a:value, ':')
let id = s:safe_html_anchor(tag) let id = s:escape_html_attribute(tag)
call add(result, '<span id="'.complete_id.'-'.id.'"></span><span class="tag" id="' call add(result, '<span id="'.complete_id.'-'.id.'"></span><span class="tag" id="'
\ .id.'">'.tag.'</span>') \ .id.'">'.tag.'</span>')
endfor endfor
@ -369,7 +367,7 @@ endfunction
"}}} "}}}
function! vimwiki#html#linkify_link(src, descr) "{{{ function! vimwiki#html#linkify_link(src, descr) "{{{
let src_str = ' href="'.s:safe_html_anchor(a:src).'"' let src_str = ' href="'.s:escape_html_attribute(a:src).'"'
let descr = substitute(a:descr,'^\s*\(.*\)\s*$','\1','') let descr = substitute(a:descr,'^\s*\(.*\)\s*$','\1','')
let descr = (descr == "" ? a:src : descr) let descr = (descr == "" ? a:src : descr)
let descr_str = (descr =~# vimwiki#vars#get_global('rxWikiIncl') let descr_str = (descr =~# vimwiki#vars#get_global('rxWikiIncl')
@ -450,8 +448,8 @@ function! s:tag_wikilink(value) "{{{
" external file links are always absolute " external file links are always absolute
let html_link = link_infos.filename let html_link = link_infos.filename
elseif link_infos.scheme ==# 'local' elseif link_infos.scheme ==# 'local'
let html_link = vimwiki#path#relpath(fnamemodify(s:current_html_file, let html_link = vimwiki#path#relpath(fnamemodify(s:current_html_file, ':h'),
\ ':h'), link_infos.filename) \ link_infos.filename)
elseif link_infos.scheme =~# '\mwiki\d\+\|diary' elseif link_infos.scheme =~# '\mwiki\d\+\|diary'
" wiki links are always relative to the current file " wiki links are always relative to the current file
let html_link = vimwiki#path#relpath( let html_link = vimwiki#path#relpath(
@ -471,7 +469,7 @@ function! s:tag_wikilink(value) "{{{
let line = html_link let line = html_link
endif endif
let line =vimwiki#html#linkify_link(line, descr) let line = vimwiki#html#linkify_link(line, descr)
return line return line
endfunction "}}} endfunction "}}}
"}}} "}}}
@ -1025,7 +1023,7 @@ function! s:process_tag_h(line, id) "{{{
let h_text = vimwiki#u#trim(matchstr(line, vimwiki#vars#get_syntaxlocal('rxHeader'))) let h_text = vimwiki#u#trim(matchstr(line, vimwiki#vars#get_syntaxlocal('rxHeader')))
let h_number = '' let h_number = ''
let h_complete_id = '' let h_complete_id = ''
let h_id = s:safe_html_anchor(h_text) let h_id = s:escape_html_attribute(h_text)
let centered = (a:line =~# '^\s') let centered = (a:line =~# '^\s')
if h_text !=# vimwiki#vars#get_global('toc_header') if h_text !=# vimwiki#vars#get_global('toc_header')
@ -1054,7 +1052,7 @@ function! s:process_tag_h(line, id) "{{{
endif endif
let h_text = num.' '.h_text let h_text = num.' '.h_text
endif endif
let h_complete_id = s:safe_html_anchor(h_complete_id) let h_complete_id = s:escape_html_attribute(h_complete_id)
let h_part = '<div id="'.h_complete_id.'"><h'.h_level.' id="'.h_id.'"' let h_part = '<div id="'.h_complete_id.'"><h'.h_level.' id="'.h_id.'"'
else else