Improved :TOhtml. (Benjamin Fritz)

This commit is contained in:
Bram Moolenaar
2010-07-18 14:07:22 +02:00
parent 85363abfb1
commit 7c86f4cca3
3 changed files with 42 additions and 42 deletions

View File

@ -1,14 +1,14 @@
" Vim autoload file for the tohtml plugin. " Vim autoload file for the tohtml plugin.
" Maintainer: Ben Fritz <fritzophrenic@gmail.com> " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
" Last Change: 2010 Jul 15 " Last Change: 2010 July 16
" "
" Additional contributors: " Additional contributors:
" "
" Original by Bram Moolenaar <Bram@vim.org> " Original by Bram Moolenaar <Bram@vim.org>
" Diff2HTML() added by Christian Brabandt <cb@256bit.org> " Diff2HTML() added by Christian Brabandt <cb@256bit.org>
" "
" See Mercurial change logs for more! " See Mercurial change logs for more!
" this file uses line continuations " this file uses line continuations
let s:cpo_sav = &cpo let s:cpo_sav = &cpo
set cpo-=C set cpo-=C
@ -142,27 +142,27 @@ func! tohtml#Diff2HTML(win_list, buf_list)
" if dynamic folding is active. " if dynamic folding is active.
if exists("g:html_dynamic_folds") if exists("g:html_dynamic_folds")
call append(style_start, [ call append(style_start, [
\ "<script type='text/javascript'>", \ "<script type='text/javascript'>",
\ " <!--", \ " <!--",
\ " function toggleFold(objID)", \ " function toggleFold(objID)",
\ " {", \ " {",
\ " for (win_num = 1; win_num <= 2; win_num++)", \ " for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)",
\ " {", \ " {",
\ " var fold;", \ " var fold;",
\ ' fold = document.getElementById("win"+win_num+objID);', \ ' fold = document.getElementById("win"+win_num+objID);',
\ " if(fold.className == 'closed-fold')", \ " if(fold.className == 'closed-fold')",
\ " {", \ " {",
\ " fold.className = 'open-fold';", \ " fold.className = 'open-fold';",
\ " }", \ " }",
\ " else if (fold.className == 'open-fold')", \ " else if (fold.className == 'open-fold')",
\ " {", \ " {",
\ " fold.className = 'closed-fold';", \ " fold.className = 'closed-fold';",
\ " }", \ " }",
\ " }", \ " }",
\ " }", \ " }",
\ " -->", \ " -->",
\ "</script>" \ "</script>"
\ ]) \ ])
endif endif
" Insert styles from all the generated html documents and additional styles " Insert styles from all the generated html documents and additional styles
@ -172,16 +172,16 @@ func! tohtml#Diff2HTML(win_list, buf_list)
" is pretty useless for really long lines. " is pretty useless for really long lines.
if exists("g:html_use_css") if exists("g:html_use_css")
call append(style_start, [ call append(style_start, [
\ '<style type="text/css">']+ \ '<style type="text/css">']+
\ style+[ \ style+[
\ '<!--', \ '<!--',
\ 'table { table-layout: fixed; }', \ 'table { table-layout: fixed; }',
\ 'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }', \ 'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }',
\ 'th, td { width: '.printf("%.1f",100.0/len(a:win_list)).'%; }', \ 'th, td { width: '.printf("%.1f",100.0/len(a:win_list)).'%; }',
\ 'td div { overflow: auto; }', \ 'td div { overflow: auto; }',
\ '-->', \ '-->',
\ '</style>' \ '</style>'
\ ]) \ ])
endif endif
endif endif
endfunc endfunc
@ -239,4 +239,4 @@ let &cpo = s:cpo_sav
unlet s:cpo_sav unlet s:cpo_sav
" Make sure any patches will probably use consistent indent " Make sure any patches will probably use consistent indent
" vim: sw=2 sts=2 et " vim: ts=8 sw=2 sts=2 noet

View File

@ -1,6 +1,6 @@
" Vim plugin for converting a syntax highlighted file to HTML. " Vim plugin for converting a syntax highlighted file to HTML.
" Maintainer: Ben Fritz <fritzophrenic@gmail.com> " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
" Last Change: 2010 Jul 15 " Last Change: 2010 Jul 16
" "
" The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and " The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and
" $VIMRUNTIME/syntax/2html.vim " $VIMRUNTIME/syntax/2html.vim
@ -14,4 +14,4 @@ if !&cp && !exists(":TOhtml") && has("user_commands")
endif endif
" Make sure any patches will probably use consistent indent " Make sure any patches will probably use consistent indent
" vim: ts=2 sw=2 sts=2 et " vim: ts=8 sw=2 sts=2 noet

View File

@ -1,6 +1,6 @@
" Vim syntax support file " Vim syntax support file
" Maintainer: Ben Fritz <fritzophrenic@gmail.com> " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
" Last Change: 2010 July 15 " Last Change: 2010 July 16
" "
" Additional contributors: " Additional contributors:
" "
@ -990,7 +990,7 @@ while !empty(s:idlist)
endif endif
else else
execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+\1+ge' execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+\1+ge'
if exists("s:html_use_css") if exists("g:html_use_css")
1;/<style type="text/+1 1;/<style type="text/+1
endif endif
endif endif
@ -1088,4 +1088,4 @@ let &cpo = s:cpo_sav
unlet! s:cpo_sav unlet! s:cpo_sav
" Make sure any patches will probably use consistent indent " Make sure any patches will probably use consistent indent
" vim: noet sw=2 sts=2 " vim: ts=8 sw=2 sts=2 noet