X-Git-Url: http://pileus.org/git/?p=vpaste;a=blobdiff_plain;f=2html.patch;h=0eaf9c5b4e17ad26e752546b071bb48783cd17ed;hp=ef65e226cc0d0ec1e2a6708645ab291ea496e83a;hb=HEAD;hpb=28972a6521ef9cd17f5dc6877a19ae66ed475c32 diff --git a/2html.patch b/2html.patch index ef65e22..0eaf9c5 100644 --- a/2html.patch +++ b/2html.patch @@ -1,42 +1,96 @@ ---- /home/andy/.vim/syntax/2html.vim 2009-10-10 15:32:39.000000000 +0000 -+++ /usr/share/vim/vim72/syntax/2html.vim 2009-06-16 06:24:31.000000000 +0000 -@@ -192,6 +192,7 @@ - let s:old_report = &report +--- /usr/share/vim/vim73/syntax/2html.vim 2010-08-28 18:59:26.000000000 +0000 ++++ /home/andy/.vim/syntax/2html.vim 2010-08-31 04:34:00.000000000 +0000 +@@ -33,6 +33,13 @@ + + let s:settings = tohtml#GetUserSettings() + ++" Whitespace ++if &wrap ++ let s:whitespace = "white-space: pre-wrap; " ++else ++ let s:whitespace = "" ++endif ++ + " When not in gui we can only guess the colors. + if has("gui_running") + let s:whatterm = "gui" +@@ -211,7 +218,6 @@ let s:old_search = @/ + let s:old_more = &more set notitle noicon -+setlocal et +-setlocal et + set nomore set report=1000000 + setlocal noscrollbind +@@ -298,7 +304,7 @@ + call add(s:lines, "".expand("%:p:~").""), ++ \ ("".&titlestring.""), + \ ("", ""]) + else +- call extend(s:lines, ["", "", "
"])
++  call extend(s:lines, ["", "
"])
+ endif
+ 
+ exe s:orgwin . "wincmd w"
+@@ -873,6 +879,7 @@
+       if s:settings.ignore_conceal || !s:concealinfo[0]
+ 	" Expand tabs
+ 	let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol)
++	if &expandtab
+ 	let s:offset = 0
+ 	let s:idx = stridx(s:expandedtab, "\t")
+ 	while s:idx >= 0
+@@ -895,6 +902,9 @@
+ 	  let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
+ 	  let s:idx = stridx(s:expandedtab, "\t")
+ 	endwhile
++	else
++	  setlocal isprint+=9
++	end
+ 
+ 	" get the highlight group name to use
+ 	let s:id = synIDtrans(s:id)
+@@ -945,12 +955,12 @@
+ if s:settings.no_pre
+   if !s:settings.use_css
+     " Close off the font tag that encapsulates the whole 
+-    call extend(s:lines, ["", "", ""])
++    call extend(s:lines, [""])
+   else
+-    call extend(s:lines, ["", ""])
++    call extend(s:lines, [""])
+   endif
+ else
+-  call extend(s:lines, ["
", "", ""])
++  call extend(s:lines, ["
"]) + endif - " Split window to create a buffer with the HTML file. -@@ -244,7 +245,7 @@ - " HTML header, with the title and generator ;-). Left free space for the CSS, - " to be filled at the end. - exe "normal! a\n\e" --exe "normal! a\n" . &titlestring . "\n\e" -+exe "normal! a\n" . expand("%:p:~") . "\n\e" - exe "normal! a= 0 -- let i = &ts - ((idx + s:startcol - 1) % &ts) -- let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', i), '') -- let idx = stridx(s:expandedtab, "\t") -- endwhile -- else -- setlocal isprint+=9 -- endif -+ let idx = stridx(s:expandedtab, "\t") -+ while idx >= 0 -+ let i = &ts - ((idx + s:startcol - 1) % &ts) -+ let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', i), '') -+ let idx = stridx(s:expandedtab, "\t") -+ endwhile +-call setwinvar(s:orgwin,'&stl', s:origwin_stl) +-call setwinvar(s:newwin,'&stl', s:newwin_stl) ++"call setwinvar(s:orgwin,'&stl', s:origwin_stl) ++"call setwinvar(s:newwin,'&stl', s:newwin_stl) + let &ls=s:ls - " Output the text with the same synID, with class set to {s:id_name} - let s:id = synIDtrans(s:id) + " Save a little bit of memory (worth doing?)