+"
+" See Mercurial change logs for more!
" Transform a file into HTML, using the current syntax highlighting.
@@ -22,8 +27,8 @@
" Font
if exists("g:html_font")
- let s:htmlfont = html_font . ", monospace"
+ let s:htmlfont = "'". html_font . "', monospace"
else
let s:htmlfont = "monospace"
endif
@@ -26,38 +31,7 @@
else
let s:htmlfont = "monospace"
endif
-" make copies of the user-defined settings that we may overrule
-if exists("g:html_dynamic_folds")
- let s:html_dynamic_folds = 1
-endif
-if exists("g:html_hover_unfold")
- let s:html_hover_unfold = 1
-endif
-if exists("g:html_use_css")
- let s:html_use_css = 1
-endif
-
-" hover opening implies dynamic folding
-if exists("s:html_hover_unfold")
- let s:html_dynamic_folds = 1
-endif
-
-" dynamic folding with no foldcolumn implies hover opens
-if exists("s:html_dynamic_folds") && exists("g:html_no_foldcolumn")
- let s:html_hover_unfold = 1
-endif
-
-" ignore folding overrides dynamic folding
-if exists("g:html_ignore_folding") && exists("s:html_dynamic_folds")
- unlet s:html_dynamic_folds
-endif
-
-" dynamic folding implies css
-if exists("s:html_dynamic_folds")
- let s:html_use_css = 1
-endif
-
" When not in gui we can only guess the colors.
if has("gui_running")
let s:whatterm = "gui"
@@ -98,7 +72,7 @@
endfun
endif
-if !exists("s:html_use_css")
+if !exists("g:html_use_css")
" Return opening HTML tag for given highlight id
function! s:HtmlOpening(id)
let a = ""
@@ -186,7 +160,7 @@
return a
endfun
-if exists("s:html_dynamic_folds")
+if exists("g:html_dynamic_folds")
" compares two folds as stored in our list of folds
" A fold is "less" than another if it starts at an earlier line number,
@@ -284,7 +258,7 @@
let s:old_html_no_pre = html_no_pre
endif
-if !exists("s:html_use_css")
+if !exists("g:html_use_css")
" Can't put font tags in
let html_no_pre=1
endif
@@ -307,8 +281,8 @@
exe "normal! a\n\n\n"
exe "normal! a\n\n"
exe "normal! a\n"
+ \ "\n".
+ \ "\n"
else
" if we aren't doing hover_unfold, use CSS 1 only
exe "normal! a\n"
+ \ ".FoldColumn { text-decoration: none; white-space: pre; }\n\n".
+ \ ".open-fold .Folded { display: none; }\n".
+ \ ".open-fold .fulltext { display: inline; }\n".
+ \ ".open-fold .toggle-open { display: none; }\n".
+ \ ".closed-fold .toggle-closed { display: inline; }\n".
+ \ "\n".
+ \ ".closed-fold .fulltext { display: none; }\n".
+ \ ".closed-fold .Folded { display: inline; }\n".
+ \ ".closed-fold .toggle-open { display: inline; }\n".
+ \ ".closed-fold .toggle-closed { display: none; }\n".
+ \ "-->\n\n"
endif
else
" if we aren't doing any dynamic folding, no need for any special rules
@@ -366,5 +340,5 @@
endif
" insert javascript to toggle folds open and closed
-if exists("s:html_dynamic_folds")
+if exists("g:html_dynamic_folds")
exe "normal! a\n".
@@ -370,21 +344,21 @@
exe "normal! a\n".
- \ "\n\e"
+ \ "\n\e"
endif
if exists("g:html_no_pre")
@@ -402,7 +376,7 @@
" so we don't accidentally start within a closed fold or something.
let s:allfolds = []
-if exists("s:html_dynamic_folds")
+if exists("g:html_dynamic_folds")
let s:lnum = 1
let s:end = line('$')
" save the fold text and set it to the default so we can find fold levels
@@ -421,7 +395,7 @@
" 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
+ 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"}
@@ -446,8 +420,8 @@
" 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
+ 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
@@ -450,9 +424,9 @@
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 s:newfold.type = "open-fold"
+ call add(s:allfolds, s:newfold)
endif
" open the fold so we can find any contained folds
execute s:lnum."foldopen"
@@ -523,8 +497,8 @@
let s:new = repeat(s:difffillchar, 3)
if s:n > 2 && s:n < s:filler && !exists("g:html_whole_filler")
- let s:new = s:new . " " . s:filler . " inserted lines "
- let s:n = 2
+ let s:new = s:new . " " . s:filler . " inserted lines "
+ let s:n = 2
endif
if !exists("g:html_no_pre")
@@ -528,6 +502,6 @@
endif
if !exists("g:html_no_pre")
- " HTML line wrapping is off--go ahead and fill to the margin
- let s:new = s:new . repeat(s:difffillchar, &columns - strlen(s:new) - s:margin)
+ " HTML line wrapping is off--go ahead and fill to the margin
+ let s:new = s:new . repeat(s:difffillchar, &columns - strlen(s:new) - s:margin)
else
@@ -533,6 +507,6 @@
else
- let s:new = s:new . repeat(s:difffillchar, 3)
+ let s:new = s:new . repeat(s:difffillchar, 3)
endif
let s:new = s:HtmlFormat(s:new, "DiffDelete")
if s:numblines
@@ -535,9 +509,9 @@
endif
let s:new = s:HtmlFormat(s:new, "DiffDelete")
if s:numblines
- " Indent if line numbering is on; must be after escaping.
- let s:new = repeat(s:LeadingSpace, s:margin) . s:new
+ " Indent if line numbering is on; must be after escaping.
+ let s:new = repeat(s:LeadingSpace, s:margin) . s:new
endif
exe s:newwin . "wincmd w"
exe "normal! a" . s:new . s:HtmlEndline . "\n\e"
@@ -558,7 +532,7 @@
let s:new = ""
- if has('folding') && !exists('g:html_ignore_folding') && foldclosed(s:lnum) > -1 && !exists('s:html_dynamic_folds')
+ if has('folding') && !exists('g:html_ignore_folding') && foldclosed(s:lnum) > -1 && !exists('g:html_dynamic_folds')
"
" This is the beginning of a folded block (with no dynamic folding)
"
@@ -580,6 +554,6 @@
let s:line = getline(s:lnum)
let s:len = strlen(s:line)
- if exists("s:html_dynamic_folds")
+ if exists("g:html_dynamic_folds")
" First insert a closing for any open folds that end on this line
while !empty(s:foldstack) && get(s:foldstack,0).lastline == s:lnum-1
@@ -584,9 +558,9 @@
" First insert a closing for any open folds that end on this line
while !empty(s:foldstack) && get(s:foldstack,0).lastline == s:lnum-1
- let s:new = s:new.""
- call remove(s:foldstack, 0)
+ let s:new = s:new.""
+ call remove(s:foldstack, 0)
endwhile
" Now insert an opening any new folds that start on this line
let s:firstfold = 1
while !empty(s:allfolds) && get(s:allfolds,0).firstline == s:lnum
@@ -588,8 +562,10 @@
endwhile
" Now insert an opening 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 = s:new . ""
+ let s:foldId = s:foldId + 1
+ let s:new .= ""
@@ -595,24 +571,24 @@
- " Unless disabled, add a fold column for the opening line of a fold.
- "
- " Note that dynamic folds require using css so we just use css to take
- " care of the leading spaces rather than using in the case of
- " html_no_pre to make it easier
- if !exists("g:html_no_foldcolumn")
- " add fold column that can open the new fold
- if s:allfolds[0].level > 1 && s:firstfold
- let s:new = s:new . ""
- let s:new = s:new . repeat('|', s:allfolds[0].level - 1) . ""
- endif
- let s:new = s:new . "+"
- let s:new = s:new . ""
- let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level) . ""
+ " Unless disabled, add a fold column for the opening line of a fold.
+ "
+ " Note that dynamic folds require using css so we just use css to take
+ " care of the leading spaces rather than using in the case of
+ " html_no_pre to make it easier
+ if !exists("g:html_no_foldcolumn")
+ " add fold column that can open the new fold
+ if s:allfolds[0].level > 1 && s:firstfold
+ let s:new = s:new . ""
+ let s:new = s:new . repeat('|', s:allfolds[0].level - 1) . ""
+ endif
+ let s:new = s:new . "+"
+ let s:new = s:new . ""
+ let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level) . ""
@@ -618,15 +594,15 @@
- " add fold column that can close the new fold
- let s:new = s:new . ""
- if s:firstfold
- let s:new = s:new . repeat('|', s:allfolds[0].level - 1)
- endif
- let s:new = s:new . "-"
- " only add spaces if we aren't opening another fold on the same line
- if get(s:allfolds, 1, {'firstline': 0}).firstline != s:lnum
- let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level)
- endif
- let s:new = s:new . ""
- let s:firstfold = 0
- endif
+ " add fold column that can close the new fold
+ let s:new = s:new . ""
+ if s:firstfold
+ let s:new = s:new . repeat('|', s:allfolds[0].level - 1)
+ endif
+ let s:new = s:new . "-"
+ " only add spaces if we aren't opening another fold on the same line
+ if get(s:allfolds, 1, {'firstline': 0}).firstline != s:lnum
+ let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level)
+ endif
+ let s:new = s:new . ""
+ let s:firstfold = 0
+ endif
@@ -632,6 +608,6 @@
- " add fold text, moving the span ending to the next line so collapsing
- " of folds works correctly
- let s:new = s:new . substitute(s:HtmlFormat(s:numcol . foldtextresult(s:lnum), "Folded"), '', s:HtmlEndline.'\r\0', '')
- let s:new = s:new . ""
+ " add fold text, moving the span ending to the next line so collapsing
+ " of folds works correctly
+ let s:new = s:new . substitute(s:HtmlFormat(s:numcol . foldtextresult(s:lnum), "Folded"), '', s:HtmlEndline.'\r\0', '')
+ let s:new = s:new . ""
@@ -637,9 +613,9 @@
- " open the fold now that we have the fold text to allow retrieval of
- " fold text for subsequent folds
- execute s:lnum."foldopen"
- call insert(s:foldstack, remove(s:allfolds,0))
- let s:foldstack[0].id = s:foldId
+ " open the fold now that we have the fold text to allow retrieval of
+ " fold text for subsequent folds
+ execute s:lnum."foldopen"
+ call insert(s:foldstack, remove(s:allfolds,0))
+ let s:foldstack[0].id = s:foldId
endwhile
" Unless disabled, add a fold column for other lines.
@@ -648,17 +624,17 @@
" care of the leading spaces rather than using in the case of
" html_no_pre to make it easier
if !exists("g:html_no_foldcolumn")
- if empty(s:foldstack)
- " add the empty foldcolumn for unfolded lines
- let s:new = s:new . s:HtmlFormat(repeat(' ', s:foldcolumn), "FoldColumn")
- else
- " add the fold column for folds not on the opening line
- if get(s:foldstack, 0).firstline < s:lnum
- let s:new = s:new . ""
- let s:new = s:new . repeat('|', s:foldstack[0].level)
- let s:new = s:new . repeat(' ', s:foldcolumn - s:foldstack[0].level) . ""
- endif
- endif
+ if empty(s:foldstack)
+ " add the empty foldcolumn for unfolded lines
+ let s:new = s:new . s:HtmlFormat(repeat(' ', s:foldcolumn), "FoldColumn")
+ else
+ " add the fold column for folds not on the opening line
+ if get(s:foldstack, 0).firstline < s:lnum
+ let s:new = s:new . ""
+ let s:new = s:new . repeat('|', s:foldstack[0].level)
+ let s:new = s:new . repeat(' ', s:foldcolumn - s:foldstack[0].level) . ""
+ endif
+ endif
endif
endif
@@ -675,14 +651,14 @@
while s:col <= s:len || (s:col == 1 && s:diffattr)
let s:startcol = s:col " The start column for processing text
if s:diffattr
- let s:id = diff_hlID(s:lnum, s:col)
- let s:col = s:col + 1
- " Speed loop (it's small - that's the trick)
- " Go along till we find a change in hlID
- while s:col <= s:len && s:id == diff_hlID(s:lnum, s:col) | let s:col = s:col + 1 | endwhile
- if s:len < &columns && !exists("g:html_no_pre")
- " Add spaces at the end to mark the changed line.
- let s:line = s:line . repeat(' ', &columns - virtcol([s:lnum, s:len]) - s:margin)
- let s:len = &columns
- endif
+ let s:id = diff_hlID(s:lnum, s:col)
+ let s:col = s:col + 1
+ " Speed loop (it's small - that's the trick)
+ " Go along till we find a change in hlID
+ while s:col <= s:len && s:id == diff_hlID(s:lnum, s:col) | let s:col = s:col + 1 | endwhile
+ if s:len < &columns && !exists("g:html_no_pre")
+ " Add spaces at the end to mark the changed line.
+ let s:line = s:line . repeat(' ', &columns - virtcol([s:lnum, s:len]) - s:margin)
+ let s:len = &columns
+ endif
else
@@ -688,9 +664,9 @@
else
- let s:id = synID(s:lnum, s:col, 1)
- let s:col = s:col + 1
- " Speed loop (it's small - that's the trick)
- " 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
+ let s:id = synID(s:lnum, s:col, 1)
+ let s:col = s:col + 1
+ " Speed loop (it's small - that's the trick)
+ " 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
" Expand tabs
@@ -698,24 +674,24 @@
let s:offset = 0
let s:idx = stridx(s:expandedtab, "\t")
while s:idx >= 0
- if has("multi_byte_encoding")
- 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
- let s:i = &ts - ((s:idx + s:startcol - 1) % &ts)
- endif
- let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
- let s:idx = stridx(s:expandedtab, "\t")
+ if has("multi_byte_encoding")
+ 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
+ let s:i = &ts - ((s:idx + s:startcol - 1) % &ts)
+ endif
+ let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
+ let s:idx = stridx(s:expandedtab, "\t")
endwhile
" Output the text with the same synID, with class set to {s:id_name}
@@ -733,7 +709,7 @@
" Finish with the last line
exe s:newwin . "wincmd w"
-if exists("s:html_dynamic_folds")
+if exists("g:html_dynamic_folds")
" finish off any open folds
while !empty(s:foldstack)
exe "normal! a"
@@ -748,7 +724,7 @@
endif
" Close off the font tag that encapsulates the whole
-if !exists("s:html_use_css")
+if !exists("g:html_use_css")
exe "normal! a\e"
endif
@@ -760,7 +736,7 @@
" Now, when we finally know which, we define the colors and styles
-if exists("s:html_use_css")
+if exists("g:html_use_css")
1;/