vim: runtime/syntax/2html.vim comparison

comparison runtime/syntax/2html.vim @ 2681:85c5a72551e2

Updated runtime files.

author	Bram Moolenaar <bram@vim.org>
date	Sat, 08 Jan 2011 16:06:37 +0100
parents	840c3cadb842
children	0877b8d6370e

comparison

equal deleted inserted replaced

-:27621abffed2
+:85c5a72551e2
 " Vim syntax support file
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2010 Sep 04
+" Last Change: 2011 Jan 06
 "
 " Additional contributors:
 "
 "             Original by Bram Moolenaar <Bram@vim.org>
 "             Modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " separate the two classes by a space to apply them both if there is a diff
 " style name
 let l:style_name = a:style_name . (a:diff_style_name == '' ? '' : ' ') . a:diff_style_name
 " Replace the reserved html characters
-let formatted = substitute(substitute(substitute(substitute(substitute(formatted, '&', '\&amp;', 'g'), '<', '\&lt;', 'g'), '>', '\&gt;', 'g'), '"', '\&quot;', 'g'), "\x0c", '<hr class="PAGE-BREAK">', 'g')
+let formatted = substitute(formatted, '&', '\&amp;',  'g')
+let formatted = substitute(formatted, '<', '\&lt;',   'g')
+let formatted = substitute(formatted, '>', '\&gt;',   'g')
+let formatted = substitute(formatted, '"', '\&quot;', 'g')
+" TODO: Use &apos; for "'"?
+" Replace a "form feed" character with HTML to do a page break
+let formatted = substitute(formatted, "\x0c", '<hr class="PAGE-BREAK">', 'g')
+" Mangle modelines so Vim doesn't try to use HTML text as a modeline if
+" editing this file in the future
+let formatted = substitute(formatted, '\v(\s+%(vim?|ex)):', '\1\&#0058;', 'g')
 " Replace double spaces, leading spaces, and trailing spaces if needed
 if ' ' != s:HtmlSpace
 let formatted = substitute(formatted, '  ', s:HtmlSpace . s:HtmlSpace, 'g')
 let formatted = substitute(formatted, '^ ', s:HtmlSpace, 'g')
 if foldclosed(s:lnum) == s:lnum
 " default fold text has '+-' and then a number of dashes equal to fold
 " level, so subtract 2 from index of first non-dash after the dashes
 " in order to get the fold level of the current fold
 let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2
-if s:level+1 > s:foldcolumn
-	let s:foldcolumn = s:level+1
-endif
 " store fold info for later use
 let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"}
 call add(s:allfolds, s:newfold)
 " open the fold so we can find any contained folds
 execute s:lnum."foldopen"
 if foldclosed(s:lnum) == s:lnum
 " default fold text has '+-' and then a number of dashes equal to fold
 " level, so subtract 2 from index of first non-dash after the dashes
 " in order to get the fold level of the current fold
 let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2
-if s:level+1 > s:foldcolumn
-	let s:foldcolumn = s:level+1
-endif
 let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"}
 " only add the fold if we don't already have it
 if empty(s:allfolds) || index(s:allfolds, s:newfold) == -1
 	let s:newfold.type = "open-fold"
 	call add(s:allfolds, s:newfold)
 let &l:foldtext = s:foldtext_save
 unlet s:foldtext_save
 " close all folds again so we can get the fold text as we go
 silent! %foldclose!
+for afold in s:allfolds
+let removed = 0
+if exists("g:html_start_line") && exists("g:html_end_line")
+if afold.firstline < g:html_start_line
+	if afold.lastline < g:html_end_line && afold.lastline > g:html_start_line
+	  " if a fold starts before the range to convert but stops within the
+	  " range, we need to include it. Make it start on the first converted
+	  " line.
+	  let afold.firstline = g:html_start_line
+	else
+	  " if the fold lies outside the range or the start and stop enclose
+	  " the entire range, don't bother parsing it
+	  call remove(s:allfolds, index(s:allfolds, afold))
+	  let removed = 1
+	endif
+elseif afold.firstline > g:html_end_line
+	" If the entire fold lies outside the range we need to remove it.
+	call remove(s:allfolds, index(s:allfolds, afold))
+	let removed = 1
+endif
+elseif exists("g:html_start_line")
+if afold.firstline < g:html_start_line
+	" if there is no last line, but there is a first line, the end of the
+	" fold will always lie within the region of interest, so keep it
+	let afold.firstline = g:html_start_line
+endif
+elseif exists("g:html_end_line")
+" if there is no first line we default to the first line in the buffer so
+" the fold start will always be included if the fold itself is included.
+" If however the entire fold lies outside the range we need to remove it.
+if afold.firstline > g:html_end_line
+	call remove(s:allfolds, index(s:allfolds, afold))
+	let removed = 1
+endif
+endif
+if !removed
+if afold.level+1 > s:foldcolumn
+	let s:foldcolumn = afold.level+1
+endif
+endif
+endfor
 endif
 " Now loop over all lines in the original text to convert to html.
 " Use html_start_line and html_end_line if they are set.
 if exists("g:html_start_line")
 if s:difffillchar == ''
 let s:difffillchar = '-'
 endif
 let s:foldId = 0
+if !s:settings.expand_tabs
+" If keeping tabs, add them to printable characters so we keep them when
+" formatting text (strtrans() doesn't replace printable chars)
+let s:old_isprint = &isprint
+setlocal isprint+=9
+endif
 while s:lnum <= s:end
 " If there are filler lines for diff mode, show these above the line.
 let s:filler = diff_filler(s:lnum)
 while !empty(s:foldstack) && get(s:foldstack,0).lastline == s:lnum-1
 	let s:new = s:new."</span></span>"
 	call remove(s:foldstack, 0)
 endwhile
-" Now insert an opening any new folds that start on this line
+" Now insert an opening for any new folds that start on this line
 let s:firstfold = 1
 while !empty(s:allfolds) && get(s:allfolds,0).firstline == s:lnum
 	let s:foldId = s:foldId + 1
 	let s:new .= "<span id='"
 	let s:new .= (exists('g:html_diff_win_num') ? "win".g:html_diff_win_num : "")
 	" Go along till we find a change in synID
 	while s:col <= s:len && s:id == synID(s:lnum, s:col, 1) | let s:col = s:col + 1 | endwhile
 endif
 if s:settings.ignore_conceal || !s:concealinfo[0]
-	" Expand tabs
+	" Expand tabs if needed
 	let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol)
-	let s:offset = 0
+	if s:settings.expand_tabs
-	let s:idx = stridx(s:expandedtab, "\t")
+	  let s:offset = 0
-	while s:idx >= 0
+	  let s:idx = stridx(s:expandedtab, "\t")
-	  if has("multi_byte_encoding")
+	  while s:idx >= 0
-	    if s:startcol + s:idx == 1
+	    if has("multi_byte_encoding")
-	      let s:i = &ts
+	      if s:startcol + s:idx == 1
+		let s:i = &ts
+	      else
+		if s:idx == 0
+		  let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:idx + s:offset) . 'c')
+		else
+		  let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c')
+		endif
+		let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)])
+		let s:i = &ts - (s:vcol % &ts)
+	      endif
+	      let s:offset -= s:i - 1
 	    else
-	      if s:idx == 0
+	      let s:i = &ts - ((s:idx + s:startcol - 1) % &ts)
-		let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:idx + s:offset) . 'c')
-	      else
-		let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c')
-	      endif
-	      let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)])
-	      let s:i = &ts - (s:vcol % &ts)
 	    endif
-	    let s:offset -= s:i - 1
+	    let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
-	  else
+	    let s:idx = stridx(s:expandedtab, "\t")
-	    let s:i = &ts - ((s:idx + s:startcol - 1) % &ts)
+	  endwhile
-	  endif
+	end
-	  let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
-	  let s:idx = stridx(s:expandedtab, "\t")
-	endwhile
 	" get the highlight group name to use
 	let s:id = synIDtrans(s:id)
 	let s:id_name = synIDattr(s:id, "name", s:whatterm)
 	if s:diff_id
 endif
 " Cleanup
 %s:\s\+$::e
-" Restore old settings
+" Restore old settings (new window first)
 let &l:foldenable = s:old_fen
 let &l:foldmethod = s:old_fdm
 let &report = s:old_report
 let &title = s:old_title
 let &icon = s:old_icon
 let &paste = s:old_paste
 let &magic = s:old_magic
 let @/ = s:old_search
 let &more = s:old_more
+" switch to original window to restore those settings
 exe s:orgwin . "wincmd w"
+if !s:settings.expand_tabs
+let &l:isprint = s:old_isprint
+endif
 let &l:stl = s:origwin_stl
 let &l:et = s:old_et
 let &l:scrollbind = s:old_bind
+" and back to the new window again to end there
 exe s:newwin . "wincmd w"
 let &l:stl = s:newwin_stl
 exec 'resize' s:old_winheight
 let &l:winfixheight = s:old_winfixheight
 let &ls=s:ls
 " Save a little bit of memory (worth doing?)
 unlet s:htmlfont
 unlet s:old_et s:old_paste s:old_icon s:old_report s:old_title s:old_search
 unlet s:old_magic s:old_more s:old_fdm s:old_fen s:old_winheight
+unlet! s:old_isprint
 unlet s:whatterm s:idlist s:lnum s:end s:margin s:fgc s:bgc s:old_winfixheight
 unlet! s:col s:id s:attr s:len s:line s:new s:expandedtab s:concealinfo
 unlet! s:orgwin s:newwin s:orgbufnr s:idx s:i s:offset s:ls s:origwin_stl
 unlet! s:newwin_stl s:current_syntax
 if !v:profiling

Mercurial > vim

comparison runtime/syntax/2html.vim @ 2681:85c5a72551e2