vim: runtime/syntax/2html.vim annotate

annotate runtime/syntax/2html.vim @ 2432:80229a724a11 vim73

Updated runtime files. :TOhtml improvements by Benjamin Fritz.

author	Bram Moolenaar <bram@vim.org>
date	Thu, 29 Jul 2010 20:43:36 +0200
parents	e7751177126b
children	a29075150aee

rev	line source
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1 " Vim syntax support file
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	2 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	3 " Last Change: 2010 Jul 28
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	4 "
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	5 " Additional contributors:
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	6 "
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	7 " Original by Bram Moolenaar <Bram@vim.org>
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	8 " Modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	9 " XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	10 " Made w3 compliant by Edd Barrett <vext01@gmail.com>
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	11 " Added html_font. Edd Barrett <vext01@gmail.com>
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	12 " Progress bar based off code from "progressbar widget" plugin by
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	13 " Andreas Politz, heavily modified:
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	14 " http://www.vim.org/scripts/script.php?script_id=2006
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	15 "
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	16 " See Mercurial change logs for more!
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	17
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	18 " Transform a file into HTML, using the current syntax highlighting.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	19
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	20 " this file uses line continuations
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	21 let s:cpo_sav = &cpo
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	22 let s:ls = &ls
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	23 set cpo-=C
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	24
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	25 " Number lines when explicitely requested or when `number' is set
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	26 if exists("g:html_number_lines")
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	27 let s:numblines = html_number_lines
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	28 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	29 let s:numblines = &number
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	30 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	31
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	32 let s:end=line('$')
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	33 " default to using the progress bar
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	34 if exists("g:html_no_progress")
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	35 let s:html_no_progress = g:html_no_progress
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	36 else
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	37 let s:html_no_progress = 0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	38 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	39
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	40 " Font
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	41 if exists("g:html_font")
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	42 let s:htmlfont = "'". html_font . "', monospace"
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	43 else
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	44 let s:htmlfont = "monospace"
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	45 endif
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	46
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	47 " do any option overrides that are needed for current user settings
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	48 let s:old_html_settings = tohtml#OverrideUserSettings()
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	49
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	50 " When not in gui we can only guess the colors.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	51 if has("gui_running")
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	52 let s:whatterm = "gui"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	53 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	54 let s:whatterm = "cterm"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	55 if &t_Co == 8
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	56 let s:cterm_color = {0: "#808080", 1: "#ff6060", 2: "#00ff00", 3: "#ffff00", 4: "#8080ff", 5: "#ff40ff", 6: "#00ffff", 7: "#ffffff"}
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	57 else
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	58 let s:cterm_color = {0: "#000000", 1: "#c00000", 2: "#008000", 3: "#804000", 4: "#0000c0", 5: "#c000c0", 6: "#008080", 7: "#c0c0c0", 8: "#808080", 9: "#ff6060", 10: "#00ff00", 11: "#ffff00", 12: "#8080ff", 13: "#ff40ff", 14: "#00ffff", 15: "#ffffff"}
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	59
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	60 " Colors for 88 and 256 come from xterm.
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	61 if &t_Co == 88
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	62 call extend(s:cterm_color, {16: "#000000", 17: "#00008b", 18: "#0000cd", 19: "#0000ff", 20: "#008b00", 21: "#008b8b", 22: "#008bcd", 23: "#008bff", 24: "#00cd00", 25: "#00cd8b", 26: "#00cdcd", 27: "#00cdff", 28: "#00ff00", 29: "#00ff8b", 30: "#00ffcd", 31: "#00ffff", 32: "#8b0000", 33: "#8b008b", 34: "#8b00cd", 35: "#8b00ff", 36: "#8b8b00", 37: "#8b8b8b", 38: "#8b8bcd", 39: "#8b8bff", 40: "#8bcd00", 41: "#8bcd8b", 42: "#8bcdcd", 43: "#8bcdff", 44: "#8bff00", 45: "#8bff8b", 46: "#8bffcd", 47: "#8bffff", 48: "#cd0000", 49: "#cd008b", 50: "#cd00cd", 51: "#cd00ff", 52: "#cd8b00", 53: "#cd8b8b", 54: "#cd8bcd", 55: "#cd8bff", 56: "#cdcd00", 57: "#cdcd8b", 58: "#cdcdcd", 59: "#cdcdff", 60: "#cdff00", 61: "#cdff8b", 62: "#cdffcd", 63: "#cdffff", 64: "#ff0000"})
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	63 call extend(s:cterm_color, {65: "#ff008b", 66: "#ff00cd", 67: "#ff00ff", 68: "#ff8b00", 69: "#ff8b8b", 70: "#ff8bcd", 71: "#ff8bff", 72: "#ffcd00", 73: "#ffcd8b", 74: "#ffcdcd", 75: "#ffcdff", 76: "#ffff00", 77: "#ffff8b", 78: "#ffffcd", 79: "#ffffff", 80: "#2e2e2e", 81: "#5c5c5c", 82: "#737373", 83: "#8b8b8b", 84: "#a2a2a2", 85: "#b9b9b9", 86: "#d0d0d0", 87: "#e7e7e7"})
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	64 elseif &t_Co == 256
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	65 call extend(s:cterm_color, {16: "#000000", 17: "#00005f", 18: "#000087", 19: "#0000af", 20: "#0000d7", 21: "#0000ff", 22: "#005f00", 23: "#005f5f", 24: "#005f87", 25: "#005faf", 26: "#005fd7", 27: "#005fff", 28: "#008700", 29: "#00875f", 30: "#008787", 31: "#0087af", 32: "#0087d7", 33: "#0087ff", 34: "#00af00", 35: "#00af5f", 36: "#00af87", 37: "#00afaf", 38: "#00afd7", 39: "#00afff", 40: "#00d700", 41: "#00d75f", 42: "#00d787", 43: "#00d7af", 44: "#00d7d7", 45: "#00d7ff", 46: "#00ff00", 47: "#00ff5f", 48: "#00ff87", 49: "#00ffaf", 50: "#00ffd7", 51: "#00ffff", 52: "#5f0000", 53: "#5f005f", 54: "#5f0087", 55: "#5f00af", 56: "#5f00d7", 57: "#5f00ff", 58: "#5f5f00", 59: "#5f5f5f", 60: "#5f5f87", 61: "#5f5faf", 62: "#5f5fd7", 63: "#5f5fff", 64: "#5f8700"})
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	66 call extend(s:cterm_color, {65: "#5f875f", 66: "#5f8787", 67: "#5f87af", 68: "#5f87d7", 69: "#5f87ff", 70: "#5faf00", 71: "#5faf5f", 72: "#5faf87", 73: "#5fafaf", 74: "#5fafd7", 75: "#5fafff", 76: "#5fd700", 77: "#5fd75f", 78: "#5fd787", 79: "#5fd7af", 80: "#5fd7d7", 81: "#5fd7ff", 82: "#5fff00", 83: "#5fff5f", 84: "#5fff87", 85: "#5fffaf", 86: "#5fffd7", 87: "#5fffff", 88: "#870000", 89: "#87005f", 90: "#870087", 91: "#8700af", 92: "#8700d7", 93: "#8700ff", 94: "#875f00", 95: "#875f5f", 96: "#875f87", 97: "#875faf", 98: "#875fd7", 99: "#875fff", 100: "#878700", 101: "#87875f", 102: "#878787", 103: "#8787af", 104: "#8787d7", 105: "#8787ff", 106: "#87af00", 107: "#87af5f", 108: "#87af87", 109: "#87afaf", 110: "#87afd7", 111: "#87afff", 112: "#87d700"})
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	67 call extend(s:cterm_color, {113: "#87d75f", 114: "#87d787", 115: "#87d7af", 116: "#87d7d7", 117: "#87d7ff", 118: "#87ff00", 119: "#87ff5f", 120: "#87ff87", 121: "#87ffaf", 122: "#87ffd7", 123: "#87ffff", 124: "#af0000", 125: "#af005f", 126: "#af0087", 127: "#af00af", 128: "#af00d7", 129: "#af00ff", 130: "#af5f00", 131: "#af5f5f", 132: "#af5f87", 133: "#af5faf", 134: "#af5fd7", 135: "#af5fff", 136: "#af8700", 137: "#af875f", 138: "#af8787", 139: "#af87af", 140: "#af87d7", 141: "#af87ff", 142: "#afaf00", 143: "#afaf5f", 144: "#afaf87", 145: "#afafaf", 146: "#afafd7", 147: "#afafff", 148: "#afd700", 149: "#afd75f", 150: "#afd787", 151: "#afd7af", 152: "#afd7d7", 153: "#afd7ff", 154: "#afff00", 155: "#afff5f", 156: "#afff87", 157: "#afffaf", 158: "#afffd7"})
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	68 call extend(s:cterm_color, {159: "#afffff", 160: "#d70000", 161: "#d7005f", 162: "#d70087", 163: "#d700af", 164: "#d700d7", 165: "#d700ff", 166: "#d75f00", 167: "#d75f5f", 168: "#d75f87", 169: "#d75faf", 170: "#d75fd7", 171: "#d75fff", 172: "#d78700", 173: "#d7875f", 174: "#d78787", 175: "#d787af", 176: "#d787d7", 177: "#d787ff", 178: "#d7af00", 179: "#d7af5f", 180: "#d7af87", 181: "#d7afaf", 182: "#d7afd7", 183: "#d7afff", 184: "#d7d700", 185: "#d7d75f", 186: "#d7d787", 187: "#d7d7af", 188: "#d7d7d7", 189: "#d7d7ff", 190: "#d7ff00", 191: "#d7ff5f", 192: "#d7ff87", 193: "#d7ffaf", 194: "#d7ffd7", 195: "#d7ffff", 196: "#ff0000", 197: "#ff005f", 198: "#ff0087", 199: "#ff00af", 200: "#ff00d7", 201: "#ff00ff", 202: "#ff5f00", 203: "#ff5f5f", 204: "#ff5f87"})
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	69 call extend(s:cterm_color, {205: "#ff5faf", 206: "#ff5fd7", 207: "#ff5fff", 208: "#ff8700", 209: "#ff875f", 210: "#ff8787", 211: "#ff87af", 212: "#ff87d7", 213: "#ff87ff", 214: "#ffaf00", 215: "#ffaf5f", 216: "#ffaf87", 217: "#ffafaf", 218: "#ffafd7", 219: "#ffafff", 220: "#ffd700", 221: "#ffd75f", 222: "#ffd787", 223: "#ffd7af", 224: "#ffd7d7", 225: "#ffd7ff", 226: "#ffff00", 227: "#ffff5f", 228: "#ffff87", 229: "#ffffaf", 230: "#ffffd7", 231: "#ffffff", 232: "#080808", 233: "#121212", 234: "#1c1c1c", 235: "#262626", 236: "#303030", 237: "#3a3a3a", 238: "#444444", 239: "#4e4e4e", 240: "#585858", 241: "#626262", 242: "#6c6c6c", 243: "#767676", 244: "#808080", 245: "#8a8a8a", 246: "#949494", 247: "#9e9e9e", 248: "#a8a8a8", 249: "#b2b2b2", 250: "#bcbcbc", 251: "#c6c6c6", 252: "#d0d0d0", 253: "#dadada", 254: "#e4e4e4", 255: "#eeeeee"})
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	70 endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	71 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	72 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	73
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	74 " Return good color specification: in GUI no transformation is done, in
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	75 " terminal return RGB values of known colors and empty string for unknown
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	76 if s:whatterm == "gui"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	77 function! s:HtmlColor(color)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	78 return a:color
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	79 endfun
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	80 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	81 function! s:HtmlColor(color)
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	82 if has_key(s:cterm_color, a:color)
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	83 return s:cterm_color[a:color]
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	84 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	85 return ""
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	86 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	87 endfun
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	88 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	89
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	90 if !exists("g:html_use_css")
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	91 " Return opening HTML tag for given highlight id
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	92 function! s:HtmlOpening(id)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	93 let a = ""
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	94 if synIDattr(a:id, "inverse")
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	95 " For inverse, we always must set both colors (and exchange them)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	96 let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	97 let a = a . '<span style="background-color: ' . ( x != "" ? x : s:fgc ) . '">'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	98 let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	99 let a = a . '<font color="' . ( x != "" ? x : s:bgc ) . '">'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	100 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	101 let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	102 if x != "" \| let a = a . '<span style="background-color: ' . x . '">' \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	103 let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	104 if x != "" \| let a = a . '<font color="' . x . '">' \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	105 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	106 if synIDattr(a:id, "bold") \| let a = a . "<b>" \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	107 if synIDattr(a:id, "italic") \| let a = a . "<i>" \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	108 if synIDattr(a:id, "underline") \| let a = a . "<u>" \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	109 return a
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	110 endfun
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	111
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	112 " Return closing HTML tag for given highlight id
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	113 function! s:HtmlClosing(id)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	114 let a = ""
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	115 if synIDattr(a:id, "underline") \| let a = a . "</u>" \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	116 if synIDattr(a:id, "italic") \| let a = a . "</i>" \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	117 if synIDattr(a:id, "bold") \| let a = a . "</b>" \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	118 if synIDattr(a:id, "inverse")
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	119 let a = a . '</font></span>'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	120 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	121 let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	122 if x != "" \| let a = a . '</font>' \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	123 let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	124 if x != "" \| let a = a . '</span>' \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	125 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	126 return a
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	127 endfun
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	128 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	129
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	130 " Return HTML valid characters enclosed in a span of class style_name with
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	131 " unprintable characters expanded and double spaces replaced as necessary.
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	132 function! s:HtmlFormat(text, style_name, diff_style_name)
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	133 " Replace unprintable characters
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	134 let formatted = strtrans(a:text)
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	135
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	136 " separate the two classes by a space to apply them both if there is a diff
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	137 " style name
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	138 let l:style_name = a:style_name . (a:diff_style_name == '' ? '' : ' ') . a:diff_style_name
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	139
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	140 " Replace the reserved html characters
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	141 let formatted = substitute(substitute(substitute(substitute(substitute(formatted, '&', '\&', 'g'), '<', '\<', 'g'), '>', '\>', 'g'), '"', '\"', 'g'), "\x0c", '<hr class="PAGE-BREAK">', 'g')
856 8cd729851562 updated for version 7.0g vimboss parents: 837 diff changeset	142
837 6bb1fa855dc9 updated for version 7.0e03 vimboss parents: 836 diff changeset	143 " Replace double spaces and leading spaces
856 8cd729851562 updated for version 7.0g vimboss parents: 837 diff changeset	144 if ' ' != s:HtmlSpace
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	145 let formatted = substitute(formatted, ' ', s:HtmlSpace . s:HtmlSpace, 'g')
837 6bb1fa855dc9 updated for version 7.0e03 vimboss parents: 836 diff changeset	146 let formatted = substitute(formatted, '^ ', s:HtmlSpace, 'g')
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	147 endif
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	148
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	149 " Enclose in a span of class style_name
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	150 let formatted = '<span class="' . l:style_name . '">' . formatted . '</span>'
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	151
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	152 " Add the class to class list if it's not there yet.
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	153 " Add normal groups to the beginning so diff groups can override them.
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	154 let s:id = hlID(a:style_name)
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	155 if index(s:idlist, s:id ) == -1
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	156 if a:style_name =~ 'Diff\%(Add\\|Change\\|Delete\\|Text\)'
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	157 call add(s:idlist, s:id)
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	158 else
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	159 call insert(s:idlist, s:id)
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	160 endif
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	161 endif
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	162
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	163 " Add the diff highlight class to class list if used and it's not there yet.
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	164 " Add diff groups to the end so they override the other highlighting.
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	165 if a:diff_style_name != ""
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	166 let s:diff_id = hlID(a:diff_style_name)
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	167 if index(s:idlist, s:diff_id) == -1
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	168 call add(s:idlist, s:diff_id)
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	169 endif
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	170 endif
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	171
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	172 return formatted
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	173 endfun
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	174
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	175 " Return CSS style describing given highlight id (can be empty)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	176 function! s:CSS1(id)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	177 let a = ""
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	178 if synIDattr(a:id, "inverse")
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	179 " For inverse, we always must set both colors (and exchange them)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	180 let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	181 let a = a . "color: " . ( x != "" ? x : s:bgc ) . "; "
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	182 let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	183 let a = a . "background-color: " . ( x != "" ? x : s:fgc ) . "; "
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	184 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	185 let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	186 if x != "" \| let a = a . "color: " . x . "; " \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	187 let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	188 if x != "" \| let a = a . "background-color: " . x . "; " \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	189 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	190 if synIDattr(a:id, "bold") \| let a = a . "font-weight: bold; " \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	191 if synIDattr(a:id, "italic") \| let a = a . "font-style: italic; " \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	192 if synIDattr(a:id, "underline") \| let a = a . "text-decoration: underline; " \| endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	193 return a
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	194 endfun
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	195
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	196 if exists("g:html_dynamic_folds")
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	197 " compares two folds as stored in our list of folds
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	198 " A fold is "less" than another if it starts at an earlier line number,
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	199 " or ends at a later line number, ties broken by fold level
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	200 function! s:FoldCompare(f1, f2)
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	201 if a:f1.firstline != a:f2.firstline
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	202 " put it before if it starts earlier
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	203 return a:f1.firstline - a:f2.firstline
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	204 elseif a:f1.lastline != a:f2.lastline
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	205 " put it before if it ends later
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	206 return a:f2.lastline - a:f1.lastline
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	207 else
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	208 " if folds begin and end on the same lines, put lowest fold level first
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	209 return a:f1.level - a:f2.level
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	210 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	211 endfunction
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	212
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	213 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	214
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	215 " Figure out proper MIME charset from the 'encoding' option.
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	216 if exists("g:html_use_encoding")
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	217 let s:html_encoding = g:html_use_encoding
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	218 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	219 let s:vim_encoding = &encoding
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	220 if s:vim_encoding =~ '^8bit\\|^2byte'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	221 let s:vim_encoding = substitute(s:vim_encoding, '^8bit-\\|^2byte-', '', '')
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	222 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	223 if s:vim_encoding == 'latin1'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	224 let s:html_encoding = 'iso-8859-1'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	225 elseif s:vim_encoding =~ "^cp12"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	226 let s:html_encoding = substitute(s:vim_encoding, 'cp', 'windows-', '')
1621 82b5078be2dd updated for version 7.2a vimboss parents: 1122 diff changeset	227 elseif s:vim_encoding == 'sjis' \|\| s:vim_encoding == 'cp932'
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	228 let s:html_encoding = 'Shift_JIS'
1621 82b5078be2dd updated for version 7.2a vimboss parents: 1122 diff changeset	229 elseif s:vim_encoding == 'big5' \|\| s:vim_encoding == 'cp950'
575 f1d46f948241 updated for version 7.0163 vimboss parents: 572 diff changeset	230 let s:html_encoding = "Big5"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	231 elseif s:vim_encoding == 'euc-cn'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	232 let s:html_encoding = 'GB_2312-80'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	233 elseif s:vim_encoding == 'euc-tw'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	234 let s:html_encoding = ""
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	235 elseif s:vim_encoding =~ '^euc\\|^iso\\|^koi'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	236 let s:html_encoding = substitute(s:vim_encoding, '.*', '\U\0', '')
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	237 elseif s:vim_encoding == 'cp949'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	238 let s:html_encoding = 'KS_C_5601-1987'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	239 elseif s:vim_encoding == 'cp936'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	240 let s:html_encoding = 'GBK'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	241 elseif s:vim_encoding =~ '^ucs\\|^utf'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	242 let s:html_encoding = 'UTF-8'
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	243 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	244 let s:html_encoding = ""
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	245 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	246 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	247
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	248
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	249 " Set some options to make it work faster.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	250 " Don't report changes for :substitute, there will be many of them.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	251 let s:old_title = &title
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	252 let s:old_icon = &icon
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	253 let s:old_et = &l:et
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	254 let s:old_report = &report
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	255 let s:old_search = @/
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	256 let s:old_more = &more
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	257 set notitle noicon
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	258 setlocal et
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	259 set nomore
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	260 set report=1000000
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	261
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	262 if exists(':ownsyntax') && exists('w:current_syntax')
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	263 let s:current_syntax = w:current_syntax
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	264 elseif exists('b:current_syntax')
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	265 let s:current_syntax = b:current_syntax
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	266 else
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	267 let s:current_syntax = 'none'
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	268 endif
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	269
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	270 if s:current_syntax == ''
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	271 let s:current_syntax = 'none'
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	272 endif
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	273
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	274 " Split window to create a buffer with the HTML file.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	275 let s:orgbufnr = winbufnr(0)
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	276 let s:origwin_stl = &l:stl
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	277 if expand("%") == ""
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	278 new Untitled.html
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	279 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	280 new %.html
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	281 endif
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	282
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	283 " Resize the new window to very small in order to make it draw faster
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	284 let s:old_winheight = winheight(0)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	285 let s:old_winfixheight = &l:winfixheight
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	286 if s:old_winheight > 2
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	287 resize 1 " leave enough room to view one line at a time
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	288 norm! G
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	289 norm! zt
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	290 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	291 setlocal winfixheight
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	292
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	293 let s:newwin_stl = &l:stl
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	294
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	295 " on the new window, set the least time-consuming fold method
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	296 let s:old_fdm = &foldmethod
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	297 setlocal foldmethod=manual
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	298
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	299 let s:newwin = winnr()
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	300 let s:orgwin = bufwinnr(s:orgbufnr)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	301
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	302 setlocal modifiable
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	303 %d
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	304 let s:old_paste = &paste
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	305 set paste
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	306 let s:old_magic = &magic
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	307 set magic
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	308
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	309 let s:lines = []
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	310
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	311 if exists("g:use_xhtml")
39 410fa1a31baf updated for version 7.0023 vimboss parents: 34 diff changeset	312 if s:html_encoding != ""
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	313 call add(s:lines, "<?xml version=\"1.0\" encoding=\"" . s:html_encoding . "\"?>")
39 410fa1a31baf updated for version 7.0023 vimboss parents: 34 diff changeset	314 else
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	315 call add(s:lines, "<?xml version=\"1.0\"?>")
39 410fa1a31baf updated for version 7.0023 vimboss parents: 34 diff changeset	316 endif
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	317 let s:tag_close = ' />'
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	318 else
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	319 let s:tag_close = '>'
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	320 endif
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	321
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	322 " Cache html_no_pre in case we have to turn it on for non-css mode
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	323 if exists("g:html_no_pre")
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	324 let s:old_html_no_pre = g:html_no_pre
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	325 endif
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	326
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	327 if !exists("g:html_use_css")
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	328 " Can't put font tags in <pre>
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	329 let g:html_no_pre=1
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	330 endif
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	331
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	332 let s:HtmlSpace = ' '
836 5a7843c57316 updated for version 7.0e02 vimboss parents: 575 diff changeset	333 let s:LeadingSpace = ' '
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	334 let s:HtmlEndline = ''
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	335 if exists("g:html_no_pre")
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	336 let s:HtmlEndline = '<br' . s:tag_close
1698 f4f8014d516e updated for version 7.2c-000 vimboss parents: 1621 diff changeset	337 let s:LeadingSpace = ' '
836 5a7843c57316 updated for version 7.0e02 vimboss parents: 575 diff changeset	338 let s:HtmlSpace = '\' . s:LeadingSpace
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	339 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	340
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	341 " HTML header, with the title and generator ;-). Left free space for the CSS,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	342 " to be filled at the end.
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	343 call extend(s:lines, [
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	344 \"<html>",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	345 \"<head>",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	346 \("<title>".expand("%:p:~")."</title>"),
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	347 \("<meta name=\"Generator\" content=\"Vim/".v:version/100.".".v:version%100.'"'.s:tag_close),
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	348 \("<meta name=\"plugin-version\" content=\"".g:loaded_2html_plugin.'"'.s:tag_close),
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	349 \])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	350 if s:html_encoding != ""
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	351 call add(s:lines, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:html_encoding . '"' . s:tag_close)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	352 endif
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	353 call add(s:lines, '<meta name="syntax" content="'.s:current_syntax.'"'.s:tag_close)
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	354
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	355 if exists("g:html_use_css")
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	356 if exists("g:html_dynamic_folds")
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	357 if exists("g:html_hover_unfold")
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	358 " if we are doing hover_unfold, use css 2 with css 1 fallback for IE6
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	359 call extend(s:lines, [
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	360 \ "<style type=\"text/css\">",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	361 \ "<!--",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	362 \ ".FoldColumn { text-decoration: none; white-space: pre; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	363 \ "",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	364 \ "body * { margin: 0; padding: 0; }", "",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	365 \ ".open-fold > .Folded { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	366 \ ".open-fold > .fulltext { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	367 \ ".closed-fold > .fulltext { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	368 \ ".closed-fold > .Folded { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	369 \ "",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	370 \ ".open-fold > .toggle-open { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	371 \ ".open-fold > .toggle-closed { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	372 \ ".closed-fold > .toggle-open { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	373 \ ".closed-fold > .toggle-closed { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	374 \ "", "",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	375 \ '/* opening a fold while hovering won''t be supported by IE6 and other',
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	376 \ "similar browsers, but it should fail gracefully. */",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	377 \ ".closed-fold:hover > .fulltext { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	378 \ ".closed-fold:hover > .toggle-filler { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	379 \ ".closed-fold:hover > .Folded { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	380 \ '-->',
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	381 \ '<style>',
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	382 \ "<!--[if lt IE 7]><style type=\"text/css\">",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	383 \ ".open-fold .Folded { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	384 \ ".open-fold .fulltext { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	385 \ ".open-fold .toggle-open { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	386 \ ".closed-fold .toggle-closed { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	387 \ "",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	388 \ ".closed-fold .fulltext { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	389 \ ".closed-fold .Folded { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	390 \ ".closed-fold .toggle-open { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	391 \ ".closed-fold .toggle-closed { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	392 \ "</style>",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	393 \ "<![endif]-->",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	394 \])
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	395 else
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	396 " if we aren't doing hover_unfold, use CSS 1 only
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	397 call extend(s:lines, [
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	398 \ "<style type=\"text/css\">",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	399 \ "<!--",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	400 \ ".FoldColumn { text-decoration: none; white-space: pre; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	401 \ ".open-fold .Folded { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	402 \ ".open-fold .fulltext { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	403 \ ".open-fold .toggle-open { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	404 \ ".closed-fold .toggle-closed { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	405 \ "",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	406 \ ".closed-fold .fulltext { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	407 \ ".closed-fold .Folded { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	408 \ ".closed-fold .toggle-open { display: inline; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	409 \ ".closed-fold .toggle-closed { display: none; }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	410 \ '-->',
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	411 \ '</style>'
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	412 \])
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	413 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	414 else
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	415 " if we aren't doing any dynamic folding, no need for any special rules
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	416 call extend(s:lines, [
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	417 \ "<style type=\"text/css\">",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	418 \ "<!--",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	419 \ '-->',
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	420 \ "</style>",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	421 \])
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	422 endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	423 endif
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	424
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	425 " insert javascript to toggle folds open and closed
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	426 if exists("g:html_dynamic_folds")
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	427 call extend(s:lines, [
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	428 \ "",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	429 \ "<script type='text/javascript'>",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	430 \ "<!--",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	431 \ "function toggleFold(objID)",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	432 \ "{",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	433 \ " var fold;",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	434 \ " fold = document.getElementById(objID);",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	435 \ " if(fold.className == 'closed-fold')",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	436 \ " {",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	437 \ " fold.className = 'open-fold';",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	438 \ " }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	439 \ " else if (fold.className == 'open-fold')",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	440 \ " {",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	441 \ " fold.className = 'closed-fold';",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	442 \ " }",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	443 \ "}",
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	444 \ '-->',
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	445 \ "</script>"
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	446 \])
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	447 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	448
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	449 if exists("g:html_no_pre")
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	450 call extend(s:lines, ["</head>", "<body>"])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	451 else
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	452 call extend(s:lines, ["</head>", "<body>", "<pre>"])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	453 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	454
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	455 exe s:orgwin . "wincmd w"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	456
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	457 " List of all id's
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	458 let s:idlist = []
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	459
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	460 " set up progress bar in the status line
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	461 if !s:html_no_progress && has("statusline")
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	462 " ProgressBar Indicator
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	463 let s:progressbar={}
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	464
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	465 " Progessbar specific functions
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	466 func! s:ProgressBar(title, max_value, winnr)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	467 let pgb=copy(s:progressbar)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	468 let pgb.title = a:title.' '
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	469 let pgb.max_value = a:max_value
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	470 let pgb.winnr = a:winnr
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	471 let pgb.cur_value = 0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	472 let pgb.items = { 'title' : { 'color' : 'Statusline' },
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	473 \'bar' : { 'color' : 'Statusline' , 'fillcolor' : 'DiffDelete' , 'bg' : 'Statusline' } ,
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	474 \'counter' : { 'color' : 'Statusline' } }
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	475 let pgb.last_value = 0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	476 let pgb.needs_redraw = 0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	477 " Note that you must use len(split) instead of len() if you want to use
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	478 " unicode in title.
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	479 "
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	480 " Subtract 3 for spacing around the title.
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	481 " Subtract 4 for the percentage display.
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	482 " Subtract 2 for spacing before this.
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	483 " Subtract 2 more for the '\|' on either side of the progress bar
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	484 let pgb.subtractedlen=len(split(pgb.title, '\zs'))+3+4+2+2
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	485 let pgb.max_len = 0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	486 set laststatus=2
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	487 return pgb
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	488 endfun
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	489
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	490 " Function: progressbar.calculate_ticks() {{{1
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	491 func! s:progressbar.calculate_ticks(pb_len)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	492 if a:pb_len<=0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	493 let pb_len = 100
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	494 else
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	495 let pb_len = a:pb_len
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	496 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	497 let self.progress_ticks = map(range(pb_len+1), "v:val * self.max_value / pb_len")
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	498 endfun
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	499
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	500 "Function: progressbar.paint()
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	501 func! s:progressbar.paint()
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	502 " Recalculate widths.
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	503 let max_len = winwidth(self.winnr)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	504 let pb_len = 0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	505 " always true on first call because of initial value of self.max_len
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	506 if max_len != self.max_len
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	507 let self.max_len = max_len
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	508
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	509 " Progressbar length
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	510 let pb_len = max_len - self.subtractedlen
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	511
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	512 call self.calculate_ticks(pb_len)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	513
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	514 let self.needs_redraw = 1
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	515 let cur_value = 0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	516 let self.pb_len = pb_len
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	517 else
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	518 " start searching at the last found index to make the search for the
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	519 " appropriate tick value normally take 0 or 1 comparisons
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	520 let cur_value = self.last_value
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	521 let pb_len = self.pb_len
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	522 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	523
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	524 let cur_val_max = pb_len > 0 ? pb_len : 100
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	525
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	526 " find the current progress bar position based on precalculated thresholds
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	527 while cur_value < cur_val_max && self.cur_value > self.progress_ticks[cur_value]
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	528 let cur_value += 1
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	529 endwhile
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	530
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	531 " update progress bar
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	532 if self.last_value != cur_value \|\| self.needs_redraw \|\| self.cur_value == self.max_value
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	533 let self.needs_redraw = 1
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	534 let self.last_value = cur_value
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	535
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	536 let t_color = self.items.title.color
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	537 let b_fcolor = self.items.bar.fillcolor
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	538 let b_color = self.items.bar.color
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	539 let c_color = self.items.counter.color
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	540
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	541 let stl = "%#".t_color."#%-( ".self.title." %)".
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	542 \"%#".b_color."#".
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	543 \(pb_len>0 ?
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	544 \ ('\|%#'.b_fcolor."#%-(".repeat(" ",cur_value)."%)".
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	545 \ '%#'.b_color."#".repeat(" ",pb_len-cur_value)."\|"):
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	546 \ ('')).
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	547 \"%=%#".c_color."#%( ".printf("%3.d ",100*self.cur_value/self.max_value)."%% %)"
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	548 call setwinvar(self.winnr, '&stl', stl)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	549 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	550 endfun
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	551
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	552 func! s:progressbar.incr( ... )
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	553 let self.cur_value += (a:0 ? a:1 : 1)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	554 " if we were making a general-purpose progress bar, we'd need to limit to a
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	555 " lower limit as well, but since we always increment with a positive value
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	556 " in this script, we only need limit the upper value
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	557 let self.cur_value = (self.cur_value > self.max_value ? self.max_value : self.cur_value)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	558 call self.paint()
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	559 endfun
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	560 " }}}
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	561 if exists("g:html_dynamic_folds")
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	562 " to process folds we make two passes through each line
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	563 let s:pgb = s:ProgressBar("Processing folds:", line('$')*2, s:orgwin)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	564 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	565 else
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	566 let s:html_no_progress=1
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	567 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	568
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	569 " First do some preprocessing for dynamic folding. Do this for the entire file
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	570 " so we don't accidentally start within a closed fold or something.
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	571 let s:allfolds = []
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	572
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	573 if exists("g:html_dynamic_folds")
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	574 let s:lnum = 1
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	575 let s:end = line('$')
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	576 " save the fold text and set it to the default so we can find fold levels
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	577 let s:foldtext_save = &foldtext
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	578 setlocal foldtext&
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	579
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	580 " we will set the foldcolumn in the html to the greater of the maximum fold
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	581 " level and the current foldcolumn setting
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	582 let s:foldcolumn = &foldcolumn
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	583
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	584 " get all info needed to describe currently closed folds
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	585 while s:lnum <= s:end
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	586 if foldclosed(s:lnum) == s:lnum
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	587 " default fold text has '+-' and then a number of dashes equal to fold
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	588 " level, so subtract 2 from index of first non-dash after the dashes
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	589 " in order to get the fold level of the current fold
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	590 let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	591 if s:level+1 > s:foldcolumn
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	592 let s:foldcolumn = s:level+1
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	593 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	594 " store fold info for later use
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	595 let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"}
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	596 call add(s:allfolds, s:newfold)
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	597 " open the fold so we can find any contained folds
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	598 execute s:lnum."foldopen"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	599 else
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	600 if !s:html_no_progress
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	601 call s:pgb.incr()
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	602 if s:pgb.needs_redraw
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	603 redrawstatus
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	604 let s:pgb.needs_redraw = 0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	605 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	606 endif
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	607 let s:lnum = s:lnum + 1
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	608 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	609 endwhile
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	610
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	611 " close all folds to get info for originally open folds
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	612 silent! %foldclose!
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	613 let s:lnum = 1
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	614
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	615 " the originally open folds will be all folds we encounter that aren't
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	616 " already in the list of closed folds
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	617 while s:lnum <= s:end
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	618 if foldclosed(s:lnum) == s:lnum
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	619 " default fold text has '+-' and then a number of dashes equal to fold
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	620 " level, so subtract 2 from index of first non-dash after the dashes
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	621 " in order to get the fold level of the current fold
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	622 let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	623 if s:level+1 > s:foldcolumn
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	624 let s:foldcolumn = s:level+1
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	625 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	626 let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"}
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	627 " only add the fold if we don't already have it
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	628 if empty(s:allfolds) \|\| index(s:allfolds, s:newfold) == -1
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	629 let s:newfold.type = "open-fold"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	630 call add(s:allfolds, s:newfold)
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	631 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	632 " open the fold so we can find any contained folds
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	633 execute s:lnum."foldopen"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	634 else
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	635 if !s:html_no_progress
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	636 call s:pgb.incr()
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	637 if s:pgb.needs_redraw
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	638 redrawstatus
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	639 let s:pgb.needs_redraw = 0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	640 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	641 endif
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	642 let s:lnum = s:lnum + 1
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	643 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	644 endwhile
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	645
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	646 " sort the folds so that we only ever need to look at the first item in the
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	647 " list of folds
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	648 call sort(s:allfolds, "s:FoldCompare")
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	649
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	650 let &l:foldtext = s:foldtext_save
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	651 unlet s:foldtext_save
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	652
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	653 " close all folds again so we can get the fold text as we go
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	654 silent! %foldclose!
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	655 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	656
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	657 " Now loop over all lines in the original text to convert to html.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	658 " Use html_start_line and html_end_line if they are set.
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	659 if exists("g:html_start_line")
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	660 let s:lnum = html_start_line
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	661 if s:lnum < 1 \|\| s:lnum > line("$")
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	662 let s:lnum = 1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	663 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	664 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	665 let s:lnum = 1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	666 endif
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	667 if exists("g:html_end_line")
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	668 let s:end = html_end_line
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	669 if s:end < s:lnum \|\| s:end > line("$")
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	670 let s:end = line("$")
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	671 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	672 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	673 let s:end = line("$")
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	674 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	675
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	676 " stack to keep track of all the folds containing the current line
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	677 let s:foldstack = []
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	678
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	679 if !s:html_no_progress
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	680 let s:pgb = s:ProgressBar("Processing lines:", s:end - s:lnum + 1, s:orgwin)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	681 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	682
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	683 if s:numblines
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	684 let s:margin = strlen(s:end) + 1
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	685 else
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	686 let s:margin = 0
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	687 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	688
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	689 if has('folding') && !exists('g:html_ignore_folding')
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	690 let s:foldfillchar = &fillchars[matchend(&fillchars, 'fold:')]
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	691 if s:foldfillchar == ''
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	692 let s:foldfillchar = '-'
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	693 endif
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	694 endif
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	695 let s:difffillchar = &fillchars[matchend(&fillchars, 'diff:')]
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	696 if s:difffillchar == ''
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	697 let s:difffillchar = '-'
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	698 endif
ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	699
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	700 let s:foldId = 0
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	701
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	702 while s:lnum <= s:end
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	703
32 41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	704 " If there are filler lines for diff mode, show these above the line.
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	705 let s:filler = diff_filler(s:lnum)
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	706 if s:filler > 0
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	707 let s:n = s:filler
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	708 while s:n > 0
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	709 let s:new = repeat(s:difffillchar, 3)
32 41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	710
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	711 if s:n > 2 && s:n < s:filler && !exists("g:html_whole_filler")
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	712 let s:new = s:new . " " . s:filler . " inserted lines "
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	713 let s:n = 2
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	714 endif
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	715
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	716 if !exists("g:html_no_pre")
856 8cd729851562 updated for version 7.0g vimboss parents: 837 diff changeset	717 " HTML line wrapping is off--go ahead and fill to the margin
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	718 let s:new = s:new . repeat(s:difffillchar, &columns - strlen(s:new) - s:margin)
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	719 else
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	720 let s:new = s:new . repeat(s:difffillchar, 3)
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	721 endif
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	722
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	723 let s:new = s:HtmlFormat(s:new, "DiffDelete", "")
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	724 if s:numblines
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	725 " Indent if line numbering is on; must be after escaping.
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	726 let s:new = repeat(s:LeadingSpace, s:margin) . s:new
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	727 endif
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	728 call add(s:lines, s:new.s:HtmlEndline)
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	729
32 41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	730 let s:n = s:n - 1
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	731 endwhile
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	732 unlet s:n
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	733 endif
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	734 unlet s:filler
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	735
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	736 " Start the line with the line number.
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	737 if s:numblines
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	738 let s:numcol = repeat(' ', s:margin - 1 - strlen(s:lnum)) . s:lnum . ' '
32 41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	739 else
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	740 let s:numcol = ""
32 41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	741 endif
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	742
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	743 let s:new = ""
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	744
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	745 if has('folding') && !exists('g:html_ignore_folding') && foldclosed(s:lnum) > -1 && !exists('g:html_dynamic_folds')
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	746 "
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	747 " This is the beginning of a folded block (with no dynamic folding)
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	748 "
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	749 let s:new = s:numcol . foldtextresult(s:lnum)
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	750 if !exists("g:html_no_pre")
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	751 " HTML line wrapping is off--go ahead and fill to the margin
7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	752 let s:new = s:new . repeat(s:foldfillchar, &columns - strlen(s:new))
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	753 endif
856 8cd729851562 updated for version 7.0g vimboss parents: 837 diff changeset	754
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	755 let s:new = s:HtmlFormat(s:new, "Folded", "")
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	756
856 8cd729851562 updated for version 7.0g vimboss parents: 837 diff changeset	757 " Skip to the end of the fold
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	758 let s:new_lnum = foldclosedend(s:lnum)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	759
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	760 if !s:html_no_progress
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	761 call s:pgb.incr(s:new_lnum - s:lnum)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	762 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	763
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	764 let s:lnum = s:new_lnum
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	765
ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	766 else
ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	767 "
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	768 " A line that is not folded, or doing dynamic folding.
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	769 "
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	770 let s:line = getline(s:lnum)
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	771 let s:len = strlen(s:line)
ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	772
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	773 if exists("g:html_dynamic_folds")
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	774 " First insert a closing for any open folds that end on this line
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	775 while !empty(s:foldstack) && get(s:foldstack,0).lastline == s:lnum-1
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	776 let s:new = s:new."</span></span>"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	777 call remove(s:foldstack, 0)
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	778 endwhile
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	779
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	780 " Now insert an opening any new folds that start on this line
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	781 let s:firstfold = 1
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	782 while !empty(s:allfolds) && get(s:allfolds,0).firstline == s:lnum
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	783 let s:foldId = s:foldId + 1
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	784 let s:new .= "<span id='"
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	785 let s:new .= (exists('g:html_diff_win_num') ? "win".g:html_diff_win_num : "")
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	786 let s:new .= "fold".s:foldId."' class='".s:allfolds[0].type."'>"
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	787
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	788
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	789 " Unless disabled, add a fold column for the opening line of a fold.
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	790 "
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	791 " Note that dynamic folds require using css so we just use css to take
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	792 " care of the leading spaces rather than using   in the case of
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	793 " html_no_pre to make it easier
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	794 if !exists("g:html_no_foldcolumn")
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	795 " add fold column that can open the new fold
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	796 if s:allfolds[0].level > 1 && s:firstfold
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	797 let s:new = s:new . "<a class='toggle-open FoldColumn' href='javascript:toggleFold(\"fold".s:foldstack[0].id."\")'>"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	798 let s:new = s:new . repeat('\|', s:allfolds[0].level - 1) . "</a>"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	799 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	800 let s:new = s:new . "<a class='toggle-open FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>+</a>"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	801 let s:new = s:new . "<a class='toggle-open "
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	802 " If this is not the last fold we're opening on this line, we need
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	803 " to keep the filler spaces hidden if the fold is opened by mouse
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	804 " hover. If it is the last fold to open in the line, we shouldn't hide
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	805 " them, so don't apply the toggle-filler class.
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	806 if get(s:allfolds, 1, {'firstline': 0}).firstline == s:lnum
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	807 let s:new = s:new . "toggle-filler "
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	808 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	809 let s:new = s:new . "FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	810 let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level) . "</a>"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	811
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	812 " add fold column that can close the new fold
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	813 let s:new = s:new . "<a class='toggle-closed FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	814 if s:firstfold
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	815 let s:new = s:new . repeat('\|', s:allfolds[0].level - 1)
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	816 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	817 let s:new = s:new . "-"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	818 " only add spaces if we aren't opening another fold on the same line
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	819 if get(s:allfolds, 1, {'firstline': 0}).firstline != s:lnum
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	820 let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level)
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	821 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	822 let s:new = s:new . "</a>"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	823 let s:firstfold = 0
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	824 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	825
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	826 " add fold text, moving the span ending to the next line so collapsing
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	827 " of folds works correctly
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	828 let s:new = s:new . substitute(s:HtmlFormat(s:numcol . foldtextresult(s:lnum), "Folded", ""), '</span>', s:HtmlEndline.'\n\0', '')
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	829 let s:new = s:new . "<span class='fulltext'>"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	830
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	831 " open the fold now that we have the fold text to allow retrieval of
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	832 " fold text for subsequent folds
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	833 execute s:lnum."foldopen"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	834 call insert(s:foldstack, remove(s:allfolds,0))
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	835 let s:foldstack[0].id = s:foldId
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	836 endwhile
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	837
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	838 " Unless disabled, add a fold column for other lines.
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	839 "
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	840 " Note that dynamic folds require using css so we just use css to take
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	841 " care of the leading spaces rather than using   in the case of
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	842 " html_no_pre to make it easier
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	843 if !exists("g:html_no_foldcolumn")
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	844 if empty(s:foldstack)
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	845 " add the empty foldcolumn for unfolded lines if there is a fold
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	846 " column at all
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	847 if s:foldcolumn > 0
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	848 let s:new = s:new . s:HtmlFormat(repeat(' ', s:foldcolumn), "FoldColumn", "")
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	849 endif
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	850 else
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	851 " add the fold column for folds not on the opening line
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	852 if get(s:foldstack, 0).firstline < s:lnum
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	853 let s:new = s:new . "<a class='FoldColumn' href='javascript:toggleFold(\"fold".s:foldstack[0].id."\")'>"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	854 let s:new = s:new . repeat('\|', s:foldstack[0].level)
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	855 let s:new = s:new . repeat(' ', s:foldcolumn - s:foldstack[0].level) . "</a>"
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	856 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	857 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	858 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	859 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	860
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	861 " Now continue with the unfolded line text
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	862 if s:numblines
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	863 " TODO: why not use the real highlight name here?
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	864 let s:new = s:new . s:HtmlFormat(s:numcol, "lnr", "")
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	865 endif
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	866
32 41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	867 " Get the diff attribute, if any.
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	868 let s:diffattr = diff_hlID(s:lnum, 1)
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	869
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	870 " initialize conceal info to act like not concealed, just in case
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	871 let s:concealinfo = [0, '']
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	872
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	873 " Loop over each character in the line
ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	874 let s:col = 1
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	875
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	876 " most of the time we won't use the diff_id, initialize to zero
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	877 let s:diff_id = 0
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	878 let s:diff_id_name = ""
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	879
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	880 while s:col <= s:len \|\| (s:col == 1 && s:diffattr)
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	881 let s:startcol = s:col " The start column for processing text
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	882 if !exists('g:html_ignore_conceal') && has('conceal')
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	883 let s:concealinfo = synconcealed(s:lnum, s:col)
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	884 endif
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	885 if !exists('g:html_ignore_conceal') && s:concealinfo[0]
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	886 let s:col = s:col + 1
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	887 " Speed loop (it's small - that's the trick)
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	888 " Go along till we find a change in the match sequence number (ending
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	889 " the specific concealed region) or until there are no more concealed
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	890 " characters.
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	891 while s:col <= s:len && s:concealinfo == synconcealed(s:lnum, s:col) \| let s:col = s:col + 1 \| endwhile
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	892 elseif s:diffattr
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	893 let s:diff_id = diff_hlID(s:lnum, s:col)
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	894 let s:id = synID(s:lnum, s:col, 1)
32 41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	895 let s:col = s:col + 1
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	896 " Speed loop (it's small - that's the trick)
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	897 " Go along till we find a change in hlID
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	898 while s:col <= s:len && s:id == synID(s:lnum, s:col, 1)
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	899 \ && s:diff_id == diff_hlID(s:lnum, s:col) \|
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	900 \ let s:col = s:col + 1 \|
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	901 \ endwhile
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	902 if s:len < &columns && !exists("g:html_no_pre")
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	903 " Add spaces at the end of the raw text line to extend the changed
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	904 " line to the full width.
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	905 let s:line = s:line . repeat(' ', &columns - virtcol([s:lnum, s:len]) - s:margin)
856 8cd729851562 updated for version 7.0g vimboss parents: 837 diff changeset	906 let s:len = &columns
8cd729851562 updated for version 7.0g vimboss parents: 837 diff changeset	907 endif
32 41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	908 else
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	909 let s:id = synID(s:lnum, s:col, 1)
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	910 let s:col = s:col + 1
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	911 " Speed loop (it's small - that's the trick)
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	912 " Go along till we find a change in synID
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	913 while s:col <= s:len && s:id == synID(s:lnum, s:col, 1) \| let s:col = s:col + 1 \| endwhile
41f9fd58cf13 updated for version 7.0019 vimboss parents: 29 diff changeset	914 endif
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	915
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	916 if exists('g:html_ignore_conceal') \|\| !s:concealinfo[0]
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	917 " Expand tabs
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	918 let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol)
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	919 let s:offset = 0
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	920 let s:idx = stridx(s:expandedtab, "\t")
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	921 while s:idx >= 0
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	922 if has("multi_byte_encoding")
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	923 if s:startcol + s:idx == 1
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	924 let s:i = &ts
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	925 else
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	926 if s:idx == 0
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	927 let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:idx + s:offset) . 'c')
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	928 else
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	929 let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c')
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	930 endif
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	931 let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)])
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	932 let s:i = &ts - (s:vcol % &ts)
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	933 endif
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	934 let s:offset -= s:i - 1
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	935 else
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	936 let s:i = &ts - ((s:idx + s:startcol - 1) % &ts)
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	937 endif
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	938 let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	939 let s:idx = stridx(s:expandedtab, "\t")
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	940 endwhile
34 7f788cd27415 updated for version 7.0020 vimboss parents: 32 diff changeset	941
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	942 " get the highlight group name to use
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	943 let s:id = synIDtrans(s:id)
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	944 let s:id_name = synIDattr(s:id, "name", s:whatterm)
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	945 if s:diff_id
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	946 let s:diff_id_name = synIDattr(s:diff_id, "name", s:whatterm)
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	947 endif
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	948 else
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	949 " use Conceal highlighting for concealed text
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	950 let s:id_name = 'Conceal'
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	951 let s:expandedtab = s:concealinfo[1]
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	952 endif
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	953
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	954 " Output the text with the same synID, with class set to {s:id_name},
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	955 " unless it has been concealed completely.
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	956 if strlen(s:expandedtab) > 0
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	957 let s:new = s:new . s:HtmlFormat(s:expandedtab, s:id_name, s:diff_id_name)
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	958 endif
29 ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	959 endwhile
ac33b7c03fac updated for version 7.0018 vimboss parents: 7 diff changeset	960 endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	961
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	962 call extend(s:lines, split(s:new.s:HtmlEndline, '\n', 1))
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	963 if !s:html_no_progress && s:pgb.needs_redraw
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	964 redrawstatus
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	965 let s:pgb.needs_redraw = 0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	966 endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	967 let s:lnum = s:lnum + 1
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	968
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	969 if !s:html_no_progress
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	970 call s:pgb.incr()
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	971 endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	972 endwhile
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	973
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	974 if exists("g:html_dynamic_folds")
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	975 " finish off any open folds
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	976 while !empty(s:foldstack)
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	977 let s:lines[-1].="</span></span>"
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	978 call remove(s:foldstack, 0)
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	979 endwhile
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	980
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	981 " add fold column to the style list if not already there
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	982 let s:id = hlID('FoldColumn')
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	983 if index(s:idlist, s:id) == -1
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	984 call insert(s:idlist, s:id)
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	985 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	986 endif
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	987
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	988 if exists("g:html_no_pre")
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	989 if !exists("g:html_use_css")
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	990 " Close off the font tag that encapsulates the whole <body>
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	991 call extend(s:lines, ["</font></body>", "</html>"])
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	992 else
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	993 call extend(s:lines, ["</body>", "</html>"])
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	994 endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	995 else
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	996 call extend(s:lines, ["</pre>", "</body>", "</html>"])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	997 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	998
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	999 exe s:newwin . "wincmd w"
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1000 call setline(1, s:lines)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1001 unlet s:lines
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1002
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1003 " Now, when we finally know which, we define the colors and styles
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1004 if exists("g:html_use_css")
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1005 1;/<style type="text/+1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1006 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1007
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1008 " Find out the background and foreground color.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1009 let s:fgc = s:HtmlColor(synIDattr(hlID("Normal"), "fg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1010 let s:bgc = s:HtmlColor(synIDattr(hlID("Normal"), "bg#", s:whatterm))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1011 if s:fgc == ""
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1012 let s:fgc = ( &background == "dark" ? "#ffffff" : "#000000" )
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1013 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1014 if s:bgc == ""
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1015 let s:bgc = ( &background == "dark" ? "#000000" : "#ffffff" )
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1016 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1017
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1018 " Normal/global attributes
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1019 " For Netscape 4, set <body> attributes too, though, strictly speaking, it's
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1020 " incorrect.
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1021 if exists("g:html_use_css")
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	1022 if exists("g:html_no_pre")
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1023 execute "normal! A\nbody { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: ". s:htmlfont ."; }\e"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1024 else
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1025 execute "normal! A\npre { font-family: ". s:htmlfont ."; color: " . s:fgc . "; background-color: " . s:bgc . "; }\e"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1026 yank
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1027 put
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1028 execute "normal! ^cwbody\e"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1029 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1030 else
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	1031 execute '%s:<body>:<body bgcolor="' . s:bgc . '" text="' . s:fgc . '"><font face="'. s:htmlfont .'">'
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1032 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1033
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1034 " Line numbering attributes
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1035 if s:numblines
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1036 if exists("g:html_use_css")
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1037 execute "normal! A\n.lnr { " . s:CSS1(hlID("LineNr")) . "}\e"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1038 else
837 6bb1fa855dc9 updated for version 7.0e03 vimboss parents: 836 diff changeset	1039 execute '%s+^<span class="lnr">$[^<]*$</span>+' . s:HtmlOpening(hlID("LineNr")) . '\1' . s:HtmlClosing(hlID("LineNr")) . '+g'
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1040 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1041 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1042
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1043 " Gather attributes for all other classes
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1044 if !s:html_no_progress && !empty(s:idlist)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1045 let s:pgb = s:ProgressBar("Processing classes:", len(s:idlist),s:newwin)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1046 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1047 while !empty(s:idlist)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1048 let s:attr = ""
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1049 let s:id = remove(s:idlist, 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1050 let s:attr = s:CSS1(s:id)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1051 let s:id_name = synIDattr(s:id, "name", s:whatterm)
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1052
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1053 " If the class has some attributes, export the style, otherwise DELETE all
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1054 " its occurences to make the HTML shorter
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1055 if s:attr != ""
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1056 if exists("g:html_use_css")
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1057 execute "normal! A\n." . s:id_name . " { " . s:attr . "}"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1058 else
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	1059 " replace spans of just this class name with non-CSS style markup
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	1060 execute '%s+<span class="' . s:id_name . '">$[^<]*$</span>+' . s:HtmlOpening(s:id) . '\1' . s:HtmlClosing(s:id) . '+ge'
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	1061 " Replace spans of this class name AND a diff class with non-CSS style
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	1062 " markup surrounding a span of just the diff class. The diff class will
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	1063 " be handled later because we know that information is at the end.
80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	1064 execute '%s+<span class="' . s:id_name . ' $Diff\%(Add\\|Change\\|Delete\\|Text$\)">$[^<]*$</span>+' . s:HtmlOpening(s:id) . '<span class="\1">\2</span>' . s:HtmlClosing(s:id) . '+ge'
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1065 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1066 else
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1067 execute '%s+<span class="' . s:id_name . '">$[^<]*$</span>+\1+ge'
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	1068 execute '%s+<span class="' . s:id_name . ' $Diff\%(Add\\|Change\\|Delete\\|Text$\)">$[^<]*$</span>+<span class="\1">\2</span>+ge'
2334 3c9324c0800e Improved :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2321 diff changeset	1069 if exists("g:html_use_css")
2432 80229a724a11 Updated runtime files. :TOhtml improvements by Benjamin Fritz. Bram Moolenaar <bram@vim.org> parents: 2401 diff changeset	1070 1;/<\/style>/-2
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1071 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1072 endif
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1073
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1074 if !s:html_no_progress
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1075 call s:pgb.incr()
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1076 if s:pgb.needs_redraw
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1077 redrawstatus
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1078 let s:pgb.needs_redraw = 0
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1079 sleep 50m
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1080 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1081 endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1082 endwhile
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1083
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1084 " Add hyperlinks
39 410fa1a31baf updated for version 7.0023 vimboss parents: 34 diff changeset	1085 %s+$https\=://\S\{-}$$\([.,;:}]\=\(\s\\|$$\)\\|[\\"'<>]\\|>\\|<\\|"\)+<a href="\1">\1</a>\2+ge
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1086
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1087 " The DTD
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	1088 if exists("g:use_xhtml")
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1089 exe "normal! gg$a\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\e"
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1090 else
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1091 exe "normal! gg0i<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n\e"
39 410fa1a31baf updated for version 7.0023 vimboss parents: 34 diff changeset	1092 endif
410fa1a31baf updated for version 7.0023 vimboss parents: 34 diff changeset	1093
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	1094 if exists("g:use_xhtml")
39 410fa1a31baf updated for version 7.0023 vimboss parents: 34 diff changeset	1095 exe "normal! gg/<html/e\na xmlns=\"http://www.w3.org/1999/xhtml\"\e"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1096 endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1097
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1098 " Cleanup
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1099 %s:\s\+$::e
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1100
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1101 " Restore old settings
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1102 let &l:foldmethod = s:old_fdm
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1103 let &report = s:old_report
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1104 let &title = s:old_title
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1105 let &icon = s:old_icon
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1106 let &paste = s:old_paste
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1107 let &magic = s:old_magic
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1108 let @/ = s:old_search
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1109 let &more = s:old_more
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1110 exe s:orgwin . "wincmd w"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1111 let &l:et = s:old_et
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1112 exe s:newwin . "wincmd w"
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1113 exec 'resize' s:old_winheight
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1114 let &l:winfixheight = s:old_winfixheight
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1115
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1116 " Reset old <pre> settings
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1117 if exists("s:old_html_no_pre")
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1118 let g:html_no_pre = s:old_html_no_pre
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1119 unlet s:old_html_no_pre
2304 a59e6ac5ed28 When the buffer is in diff mode, have :TOhtml create HTML to show the diff Bram Moolenaar <bram@vim.org> parents: 2034 diff changeset	1120 elseif exists("g:html_no_pre")
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1121 unlet g:html_no_pre
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1122 endif
2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1123
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1124 call setwinvar(s:orgwin,'&stl', s:origwin_stl)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1125 call setwinvar(s:newwin,'&stl', s:newwin_stl)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1126 let &ls=s:ls
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1127
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1128 " Save a little bit of memory (worth doing?)
1122 2ad54fcf37e3 updated for version 7.1a vimboss parents: 856 diff changeset	1129 unlet s:htmlfont
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1130 unlet s:old_et s:old_paste s:old_icon s:old_report s:old_title s:old_search s:old_magic s:old_more s:old_fdm s:old_winheight s:old_winfixheight
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1131 unlet s:whatterm s:idlist s:lnum s:end s:margin s:fgc s:bgc
2401 e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	1132 unlet! s:col s:id s:attr s:len s:line s:new s:expandedtab s:numblines s:concealinfo
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2334 diff changeset	1133 unlet! s:orgwin s:newwin s:orgbufnr s:idx s:i s:offset s:ls s:origwin_stl s:newwin_stl s:current_syntax
170 8c60f65311fa updated for version 7.0052 vimboss parents: 39 diff changeset	1134 if !v:profiling
8c60f65311fa updated for version 7.0052 vimboss parents: 39 diff changeset	1135 delfunc s:HtmlColor
8c60f65311fa updated for version 7.0052 vimboss parents: 39 diff changeset	1136 delfunc s:HtmlFormat
8c60f65311fa updated for version 7.0052 vimboss parents: 39 diff changeset	1137 delfunc s:CSS1
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1138 if !exists("g:html_use_css")
170 8c60f65311fa updated for version 7.0052 vimboss parents: 39 diff changeset	1139 delfunc s:HtmlOpening
8c60f65311fa updated for version 7.0052 vimboss parents: 39 diff changeset	1140 delfunc s:HtmlClosing
8c60f65311fa updated for version 7.0052 vimboss parents: 39 diff changeset	1141 endif
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1142 if exists("g:html_dynamic_folds")
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1143 delfunc s:FoldCompare
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1144 endif
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1145
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1146 if !s:html_no_progress
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1147 delfunc s:ProgressBar
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1148 delfunc s:progressbar.paint
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1149 delfunc s:progressbar.incr
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1150 unlet s:pgb s:progressbar
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1151 endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1152 endif
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1153
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1154 unlet! s:new_lnum s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace s:LeadingSpace s:HtmlEndline s:firstfold s:foldcolumn
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	1155 unlet s:foldstack s:allfolds s:foldId s:numcol
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	1156
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1157 unlet! s:html_no_progress
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	1158
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1159 call tohtml#RestoreUserSettings(s:old_html_settings)
1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1160 unlet s:old_html_settings
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	1161
7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	1162 let &cpo = s:cpo_sav
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1163 unlet! s:cpo_sav
2034 7bc41231fbc7 Update runtime files. Bram Moolenaar <bram@zimbu.org> parents: 1698 diff changeset	1164
2321 1902913f2049 Improved version of 2html.vim. Bram Moolenaar <bram@vim.org> parents: 2304 diff changeset	1165 " Make sure any patches will probably use consistent indent
2334 3c9324c0800e Improved :TOhtml. (Benjamin Fritz) Bram Moolenaar <bram@vim.org> parents: 2321 diff changeset	1166 " vim: ts=8 sw=2 sts=2 noet

Mercurial > vim

annotate runtime/syntax/2html.vim @ 2432:80229a724a11 vim73