Mercurial > vim
annotate runtime/syntax/2html.vim @ 2642:840c3cadb842
Updated runtime files.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 16 Nov 2010 20:34:40 +0100 |
| parents | 0d3f0e3d289b |
| children | 85c5a72551e2 |
| rev | line source |
|---|---|
| 7 | 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> |
| 2642 | 3 " Last Change: 2010 Sep 04 |
|
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 | 17 |
| 18 " Transform a file into HTML, using the current syntax highlighting. | |
| 19 | |
| 2034 | 20 " this file uses line continuations |
| 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 | 23 set cpo-=C |
| 24 | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
25 let s:end=line('$') |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
26 |
| 1122 | 27 " 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
|
28 if exists("g:html_font") |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
29 let s:htmlfont = "'". g:html_font . "', monospace" |
| 1122 | 30 else |
| 31 let s:htmlfont = "monospace" | |
| 32 endif | |
| 33 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
34 let s:settings = tohtml#GetUserSettings() |
| 2034 | 35 |
| 7 | 36 " When not in gui we can only guess the colors. |
| 37 if has("gui_running") | |
| 38 let s:whatterm = "gui" | |
| 39 else | |
| 40 let s:whatterm = "cterm" | |
| 41 if &t_Co == 8 | |
| 1122 | 42 let s:cterm_color = {0: "#808080", 1: "#ff6060", 2: "#00ff00", 3: "#ffff00", 4: "#8080ff", 5: "#ff40ff", 6: "#00ffff", 7: "#ffffff"} |
| 7 | 43 else |
| 1122 | 44 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"} |
| 45 | |
| 46 " Colors for 88 and 256 come from xterm. | |
| 47 if &t_Co == 88 | |
| 48 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"}) | |
| 49 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"}) | |
| 50 elseif &t_Co == 256 | |
| 51 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"}) | |
| 52 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"}) | |
| 53 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"}) | |
| 54 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"}) | |
| 55 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"}) | |
| 56 endif | |
| 7 | 57 endif |
| 58 endif | |
| 59 | |
| 60 " Return good color specification: in GUI no transformation is done, in | |
| 1122 | 61 " terminal return RGB values of known colors and empty string for unknown |
| 7 | 62 if s:whatterm == "gui" |
| 63 function! s:HtmlColor(color) | |
| 64 return a:color | |
| 65 endfun | |
| 66 else | |
| 67 function! s:HtmlColor(color) | |
| 1122 | 68 if has_key(s:cterm_color, a:color) |
| 69 return s:cterm_color[a:color] | |
| 7 | 70 else |
| 71 return "" | |
| 72 endif | |
| 73 endfun | |
| 74 endif | |
| 75 | |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
76 if !s:settings.use_css |
| 7 | 77 " Return opening HTML tag for given highlight id |
| 78 function! s:HtmlOpening(id) | |
| 79 let a = "" | |
| 80 if synIDattr(a:id, "inverse") | |
| 81 " For inverse, we always must set both colors (and exchange them) | |
| 82 let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm)) | |
| 83 let a = a . '<span style="background-color: ' . ( x != "" ? x : s:fgc ) . '">' | |
| 84 let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm)) | |
| 85 let a = a . '<font color="' . ( x != "" ? x : s:bgc ) . '">' | |
| 86 else | |
| 87 let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm)) | |
| 88 if x != "" | let a = a . '<span style="background-color: ' . x . '">' | endif | |
| 89 let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm)) | |
| 90 if x != "" | let a = a . '<font color="' . x . '">' | endif | |
| 91 endif | |
| 92 if synIDattr(a:id, "bold") | let a = a . "<b>" | endif | |
| 93 if synIDattr(a:id, "italic") | let a = a . "<i>" | endif | |
| 94 if synIDattr(a:id, "underline") | let a = a . "<u>" | endif | |
| 95 return a | |
| 96 endfun | |
| 97 | |
| 98 " Return closing HTML tag for given highlight id | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
99 function! s:HtmlClosing(id) |
| 7 | 100 let a = "" |
| 101 if synIDattr(a:id, "underline") | let a = a . "</u>" | endif | |
| 102 if synIDattr(a:id, "italic") | let a = a . "</i>" | endif | |
| 103 if synIDattr(a:id, "bold") | let a = a . "</b>" | endif | |
| 104 if synIDattr(a:id, "inverse") | |
| 105 let a = a . '</font></span>' | |
| 106 else | |
| 107 let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm)) | |
| 108 if x != "" | let a = a . '</font>' | endif | |
| 109 let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm)) | |
| 110 if x != "" | let a = a . '</span>' | endif | |
| 111 endif | |
| 112 return a | |
| 113 endfun | |
| 114 endif | |
| 115 | |
| 34 | 116 " Return HTML valid characters enclosed in a span of class style_name with |
| 117 " 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
|
118 function! s:HtmlFormat(text, style_name, diff_style_name) |
| 34 | 119 " Replace unprintable characters |
| 120 let formatted = strtrans(a:text) | |
| 121 | |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
122 " 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
|
123 " style name |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
124 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
|
125 |
| 34 | 126 " Replace the reserved html characters |
| 127 let formatted = substitute(substitute(substitute(substitute(substitute(formatted, '&', '\&', 'g'), '<', '\<', 'g'), '>', '\>', 'g'), '"', '\"', 'g'), "\x0c", '<hr class="PAGE-BREAK">', 'g') | |
| 856 | 128 |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
129 " Replace double spaces, leading spaces, and trailing spaces if needed |
| 856 | 130 if ' ' != s:HtmlSpace |
| 34 | 131 let formatted = substitute(formatted, ' ', s:HtmlSpace . s:HtmlSpace, 'g') |
| 837 | 132 let formatted = substitute(formatted, '^ ', s:HtmlSpace, 'g') |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
133 let formatted = substitute(formatted, ' \+$', s:HtmlSpace, 'g') |
| 34 | 134 endif |
| 135 | |
| 136 " 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
|
137 let formatted = '<span class="' . l:style_name . '">' . formatted . '</span>' |
| 34 | 138 |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
139 " 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
|
140 " Add normal groups to the beginning so diff groups can override them. |
| 34 | 141 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
|
142 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
|
143 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
|
144 call add(s:idlist, s:id) |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
145 else |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
146 call insert(s:idlist, s:id) |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
147 endif |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
148 endif |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
149 |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
150 " 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
|
151 " 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
|
152 if a:diff_style_name != "" |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
153 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
|
154 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
|
155 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
|
156 endif |
| 34 | 157 endif |
| 158 | |
| 159 return formatted | |
| 160 endfun | |
| 161 | |
| 7 | 162 " Return CSS style describing given highlight id (can be empty) |
| 163 function! s:CSS1(id) | |
| 164 let a = "" | |
| 165 if synIDattr(a:id, "inverse") | |
| 166 " For inverse, we always must set both colors (and exchange them) | |
| 167 let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm)) | |
| 168 let a = a . "color: " . ( x != "" ? x : s:bgc ) . "; " | |
| 169 let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm)) | |
| 170 let a = a . "background-color: " . ( x != "" ? x : s:fgc ) . "; " | |
| 171 else | |
| 172 let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm)) | |
| 173 if x != "" | let a = a . "color: " . x . "; " | endif | |
| 174 let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm)) | |
| 175 if x != "" | let a = a . "background-color: " . x . "; " | endif | |
| 176 endif | |
| 177 if synIDattr(a:id, "bold") | let a = a . "font-weight: bold; " | endif | |
| 178 if synIDattr(a:id, "italic") | let a = a . "font-style: italic; " | endif | |
| 179 if synIDattr(a:id, "underline") | let a = a . "text-decoration: underline; " | endif | |
| 180 return a | |
| 181 endfun | |
| 182 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
183 if s:settings.dynamic_folds |
| 2034 | 184 " compares two folds as stored in our list of folds |
| 185 " A fold is "less" than another if it starts at an earlier line number, | |
| 186 " or ends at a later line number, ties broken by fold level | |
| 187 function! s:FoldCompare(f1, f2) | |
| 188 if a:f1.firstline != a:f2.firstline | |
| 189 " put it before if it starts earlier | |
| 190 return a:f1.firstline - a:f2.firstline | |
| 191 elseif a:f1.lastline != a:f2.lastline | |
| 192 " put it before if it ends later | |
| 193 return a:f2.lastline - a:f1.lastline | |
| 194 else | |
| 195 " if folds begin and end on the same lines, put lowest fold level first | |
| 196 return a:f1.level - a:f2.level | |
| 197 endif | |
| 198 endfunction | |
| 199 | |
| 200 endif | |
| 201 | |
| 7 | 202 |
| 203 " Set some options to make it work faster. | |
| 204 " Don't report changes for :substitute, there will be many of them. | |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
205 " Don't change other windows; turn off scroll bind temporarily |
| 7 | 206 let s:old_title = &title |
| 207 let s:old_icon = &icon | |
| 208 let s:old_et = &l:et | |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
209 let s:old_bind = &l:scrollbind |
| 7 | 210 let s:old_report = &report |
| 211 let s:old_search = @/ | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
212 let s:old_more = &more |
| 7 | 213 set notitle noicon |
| 214 setlocal et | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
215 set nomore |
| 7 | 216 set report=1000000 |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
217 setlocal noscrollbind |
| 7 | 218 |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
219 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
|
220 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
|
221 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
|
222 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
|
223 else |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
224 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
|
225 endif |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
226 |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
227 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
|
228 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
|
229 endif |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
230 |
| 7 | 231 " Split window to create a buffer with the HTML file. |
| 232 let s:orgbufnr = winbufnr(0) | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
233 let s:origwin_stl = &l:stl |
| 7 | 234 if expand("%") == "" |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
235 exec 'new Untitled.'.(s:settings.use_xhtml ? 'x' : '').'html' |
| 7 | 236 else |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
237 exec 'new %.'.(s:settings.use_xhtml ? 'x' : '').'html' |
| 7 | 238 endif |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
239 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
240 " 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
|
241 let s:old_winheight = winheight(0) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
242 let s:old_winfixheight = &l:winfixheight |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
243 if s:old_winheight > 2 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
244 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
|
245 norm! G |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
246 norm! zt |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
247 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
248 setlocal winfixheight |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
249 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
250 let s:newwin_stl = &l:stl |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
251 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
252 " 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
|
253 let s:old_fdm = &foldmethod |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
254 let s:old_fen = &foldenable |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
255 setlocal foldmethod=manual |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
256 setlocal nofoldenable |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
257 |
| 7 | 258 let s:newwin = winnr() |
| 259 let s:orgwin = bufwinnr(s:orgbufnr) | |
| 260 | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
261 setlocal modifiable |
| 7 | 262 %d |
| 263 let s:old_paste = &paste | |
| 264 set paste | |
| 265 let s:old_magic = &magic | |
| 266 set magic | |
| 267 | |
| 2642 | 268 " set the fileencoding to match the charset we'll be using |
| 269 let &l:fileencoding=s:settings.vim_encoding | |
| 270 | |
| 271 " According to http://www.w3.org/TR/html4/charset.html#doc-char-set, the byte | |
| 272 " order mark is highly recommend on the web when using multibyte encodings. But, | |
| 273 " it is not a good idea to include it on UTF-8 files. Otherwise, let Vim | |
| 274 " determine when it is actually inserted. | |
| 275 if s:settings.vim_encoding == 'utf-8' | |
| 276 setlocal nobomb | |
| 277 else | |
| 278 setlocal bomb | |
| 279 endif | |
| 280 | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
281 let s:lines = [] |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
282 |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
283 if s:settings.use_xhtml |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
284 if s:settings.encoding != "" |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
285 call add(s:lines, "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>") |
| 39 | 286 else |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
287 call add(s:lines, "<?xml version=\"1.0\"?>") |
| 39 | 288 endif |
| 1122 | 289 let s:tag_close = ' />' |
| 7 | 290 else |
| 34 | 291 let s:tag_close = '>' |
| 292 endif | |
| 293 | |
| 294 let s:HtmlSpace = ' ' | |
| 836 | 295 let s:LeadingSpace = ' ' |
| 34 | 296 let s:HtmlEndline = '' |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
297 if s:settings.no_pre |
| 34 | 298 let s:HtmlEndline = '<br' . s:tag_close |
| 1698 | 299 let s:LeadingSpace = ' ' |
| 836 | 300 let s:HtmlSpace = '\' . s:LeadingSpace |
| 7 | 301 endif |
| 302 | |
| 303 " HTML header, with the title and generator ;-). Left free space for the CSS, | |
| 304 " to be filled at the end. | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
305 call extend(s:lines, [ |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
306 \ "<html>", |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
307 \ "<head>"]) |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
308 " include encoding as close to the top as possible, but only if not already |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
309 " contained in XML information (to avoid haggling over content type) |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
310 if s:settings.encoding != "" && !s:settings.use_xhtml |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
311 call add(s:lines, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . s:tag_close) |
| 7 | 312 endif |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
313 call extend(s:lines, [ |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
314 \ ("<title>".expand("%:p:~")."</title>"), |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
315 \ ("<meta name=\"Generator\" content=\"Vim/".v:version/100.".".v:version%100.'"'.s:tag_close), |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
316 \ ("<meta name=\"plugin-version\" content=\"".g:loaded_2html_plugin.'"'.s:tag_close) |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
317 \ ]) |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
318 call add(s:lines, '<meta name="syntax" content="'.s:current_syntax.'"'.s:tag_close) |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
319 call add(s:lines, '<meta name="settings" content="'. |
|
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
320 \ join(filter(keys(s:settings),'s:settings[v:val]'),','). |
|
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
321 \ '"'.s:tag_close) |
| 1122 | 322 |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
323 if s:settings.use_css |
|
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
324 if s:settings.dynamic_folds |
|
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
325 if s:settings.hover_unfold |
| 2034 | 326 " 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
|
327 call extend(s:lines, [ |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
328 \ "<style type=\"text/css\">", |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
329 \ s:settings.use_xhtml ? "" : "<!--", |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
330 \ ".FoldColumn { text-decoration: none; white-space: pre; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
331 \ "", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
332 \ "body * { margin: 0; padding: 0; }", "", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
333 \ ".open-fold > .Folded { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
334 \ ".open-fold > .fulltext { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
335 \ ".closed-fold > .fulltext { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
336 \ ".closed-fold > .Folded { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
337 \ "", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
338 \ ".open-fold > .toggle-open { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
339 \ ".open-fold > .toggle-closed { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
340 \ ".closed-fold > .toggle-open { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
341 \ ".closed-fold > .toggle-closed { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
342 \ "", "", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
343 \ '/* 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
|
344 \ "similar browsers, but it should fail gracefully. */", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
345 \ ".closed-fold:hover > .fulltext { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
346 \ ".closed-fold:hover > .toggle-filler { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
347 \ ".closed-fold:hover > .Folded { display: none; }", |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
348 \ s:settings.use_xhtml ? "" : '-->', |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
349 \ '</style>']) |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
350 " TODO: IE7 doesn't *actually* support XHTML, maybe we should remove this. |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
351 " But if it's served up as tag soup, maybe the following will work, so |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
352 " leave it in for now. |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
353 call extend(s:lines, [ |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
354 \ "<!--[if lt IE 7]><style type=\"text/css\">", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
355 \ ".open-fold .Folded { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
356 \ ".open-fold .fulltext { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
357 \ ".open-fold .toggle-open { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
358 \ ".closed-fold .toggle-closed { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
359 \ "", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
360 \ ".closed-fold .fulltext { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
361 \ ".closed-fold .Folded { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
362 \ ".closed-fold .toggle-open { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
363 \ ".closed-fold .toggle-closed { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
364 \ "</style>", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
365 \ "<![endif]-->", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
366 \]) |
| 2034 | 367 else |
| 368 " 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
|
369 call extend(s:lines, [ |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
370 \ "<style type=\"text/css\">", |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
371 \ s:settings.use_xhtml ? "" :"<!--", |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
372 \ ".FoldColumn { text-decoration: none; white-space: pre; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
373 \ ".open-fold .Folded { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
374 \ ".open-fold .fulltext { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
375 \ ".open-fold .toggle-open { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
376 \ ".closed-fold .toggle-closed { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
377 \ "", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
378 \ ".closed-fold .fulltext { display: none; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
379 \ ".closed-fold .Folded { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
380 \ ".closed-fold .toggle-open { display: inline; }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
381 \ ".closed-fold .toggle-closed { display: none; }", |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
382 \ s:settings.use_xhtml ? "" : '-->', |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
383 \ '</style>' |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
384 \]) |
| 2034 | 385 endif |
| 386 else | |
| 387 " 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
|
388 call extend(s:lines, [ |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
389 \ "<style type=\"text/css\">", |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
390 \ s:settings.use_xhtml ? "" : "<!--", |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
391 \ s:settings.use_xhtml ? "" : '-->', |
|
2321
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 \]) |
| 2034 | 394 endif |
| 7 | 395 endif |
| 2034 | 396 |
| 397 " insert javascript to toggle folds open and closed | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
398 if s:settings.dynamic_folds |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
399 call extend(s:lines, [ |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
400 \ "", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
401 \ "<script type='text/javascript'>", |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
402 \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--", |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
403 \ "function toggleFold(objID)", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
404 \ "{", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
405 \ " var fold;", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
406 \ " fold = document.getElementById(objID);", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
407 \ " if(fold.className == 'closed-fold')", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
408 \ " {", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
409 \ " fold.className = 'open-fold';", |
|
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 \ " else if (fold.className == 'open-fold')", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
412 \ " {", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
413 \ " fold.className = 'closed-fold';", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
414 \ " }", |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
415 \ "}", |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
416 \ s:settings.use_xhtml ? '//]]>' : '-->', |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
417 \ "</script>" |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
418 \]) |
| 2034 | 419 endif |
| 420 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
421 if s:settings.no_pre |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
422 call extend(s:lines, ["</head>", "<body>"]) |
| 7 | 423 else |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
424 call extend(s:lines, ["</head>", "<body>", "<pre>"]) |
| 7 | 425 endif |
| 426 | |
| 427 exe s:orgwin . "wincmd w" | |
| 428 | |
| 429 " List of all id's | |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
430 let s:idlist = [] |
| 7 | 431 |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
432 " set up progress bar in the status line |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
433 if !s:settings.no_progress |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
434 " ProgressBar Indicator |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
435 let s:progressbar={} |
|
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 " Progessbar specific functions |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
438 func! s:ProgressBar(title, max_value, winnr) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
439 let pgb=copy(s:progressbar) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
440 let pgb.title = a:title.' ' |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
441 let pgb.max_value = a:max_value |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
442 let pgb.winnr = a:winnr |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
443 let pgb.cur_value = 0 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
444 let pgb.items = { 'title' : { 'color' : 'Statusline' }, |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
445 \'bar' : { 'color' : 'Statusline' , 'fillcolor' : 'DiffDelete' , 'bg' : 'Statusline' } , |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
446 \'counter' : { 'color' : 'Statusline' } } |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
447 let pgb.last_value = 0 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
448 let pgb.needs_redraw = 0 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
449 " 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
|
450 " unicode in title. |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
451 " |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
452 " Subtract 3 for spacing around the title. |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
453 " Subtract 4 for the percentage display. |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
454 " Subtract 2 for spacing before this. |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
455 " 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
|
456 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
|
457 let pgb.max_len = 0 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
458 set laststatus=2 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
459 return pgb |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
460 endfun |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
461 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
462 " Function: progressbar.calculate_ticks() {{{1 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
463 func! s:progressbar.calculate_ticks(pb_len) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
464 if a:pb_len<=0 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
465 let pb_len = 100 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
466 else |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
467 let pb_len = a:pb_len |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
468 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
469 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
|
470 endfun |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
471 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
472 "Function: progressbar.paint() |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
473 func! s:progressbar.paint() |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
474 " Recalculate widths. |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
475 let max_len = winwidth(self.winnr) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
476 let pb_len = 0 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
477 " 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
|
478 if max_len != self.max_len |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
479 let self.max_len = max_len |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
480 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
481 " Progressbar length |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
482 let pb_len = max_len - self.subtractedlen |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
483 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
484 call self.calculate_ticks(pb_len) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
485 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
486 let self.needs_redraw = 1 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
487 let cur_value = 0 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
488 let self.pb_len = pb_len |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
489 else |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
490 " 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
|
491 " appropriate tick value normally take 0 or 1 comparisons |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
492 let cur_value = self.last_value |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
493 let pb_len = self.pb_len |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
494 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
495 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
496 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
|
497 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
498 " 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
|
499 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
|
500 let cur_value += 1 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
501 endwhile |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
502 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
503 " update progress bar |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
504 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
|
505 let self.needs_redraw = 1 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
506 let self.last_value = cur_value |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
507 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
508 let t_color = self.items.title.color |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
509 let b_fcolor = self.items.bar.fillcolor |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
510 let b_color = self.items.bar.color |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
511 let c_color = self.items.counter.color |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
512 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
513 let stl = "%#".t_color."#%-( ".self.title." %)". |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
514 \"%#".b_color."#". |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
515 \(pb_len>0 ? |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
516 \ ('|%#'.b_fcolor."#%-(".repeat(" ",cur_value)."%)". |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
517 \ '%#'.b_color."#".repeat(" ",pb_len-cur_value)."|"): |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
518 \ ('')). |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
519 \"%=%#".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
|
520 call setwinvar(self.winnr, '&stl', stl) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
521 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
522 endfun |
|
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 func! s:progressbar.incr( ... ) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
525 let self.cur_value += (a:0 ? a:1 : 1) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
526 " 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
|
527 " 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
|
528 " 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
|
529 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
|
530 call self.paint() |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
531 endfun |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
532 " }}} |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
533 if s:settings.dynamic_folds |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
534 " 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
|
535 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
|
536 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
537 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
538 |
| 2034 | 539 " First do some preprocessing for dynamic folding. Do this for the entire file |
| 540 " so we don't accidentally start within a closed fold or something. | |
| 541 let s:allfolds = [] | |
| 542 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
543 if s:settings.dynamic_folds |
| 2034 | 544 let s:lnum = 1 |
| 545 let s:end = line('$') | |
| 546 " save the fold text and set it to the default so we can find fold levels | |
| 547 let s:foldtext_save = &foldtext | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
548 setlocal foldtext& |
| 2034 | 549 |
| 550 " we will set the foldcolumn in the html to the greater of the maximum fold | |
| 551 " level and the current foldcolumn setting | |
| 552 let s:foldcolumn = &foldcolumn | |
| 553 | |
| 554 " 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
|
555 while s:lnum <= s:end |
| 2034 | 556 if foldclosed(s:lnum) == s:lnum |
| 557 " default fold text has '+-' and then a number of dashes equal to fold | |
| 558 " level, so subtract 2 from index of first non-dash after the dashes | |
| 559 " in order to get the fold level of the current fold | |
| 560 let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2 | |
| 561 if s:level+1 > s:foldcolumn | |
| 562 let s:foldcolumn = s:level+1 | |
| 563 endif | |
| 564 " store fold info for later use | |
| 565 let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"} | |
| 566 call add(s:allfolds, s:newfold) | |
| 567 " open the fold so we can find any contained folds | |
| 568 execute s:lnum."foldopen" | |
| 569 else | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
570 if !s:settings.no_progress |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
571 call s:pgb.incr() |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
572 if s:pgb.needs_redraw |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
573 redrawstatus |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
574 let s:pgb.needs_redraw = 0 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
575 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
576 endif |
| 2034 | 577 let s:lnum = s:lnum + 1 |
| 578 endif | |
| 579 endwhile | |
| 580 | |
| 581 " close all folds to get info for originally open folds | |
| 582 silent! %foldclose! | |
| 583 let s:lnum = 1 | |
| 584 | |
| 585 " the originally open folds will be all folds we encounter that aren't | |
| 586 " already in the list of closed folds | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
587 while s:lnum <= s:end |
| 2034 | 588 if foldclosed(s:lnum) == s:lnum |
| 589 " default fold text has '+-' and then a number of dashes equal to fold | |
| 590 " level, so subtract 2 from index of first non-dash after the dashes | |
| 591 " in order to get the fold level of the current fold | |
| 592 let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2 | |
| 593 if s:level+1 > s:foldcolumn | |
| 594 let s:foldcolumn = s:level+1 | |
| 595 endif | |
| 596 let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"} | |
| 597 " only add the fold if we don't already have it | |
| 598 if empty(s:allfolds) || index(s:allfolds, s:newfold) == -1 | |
| 599 let s:newfold.type = "open-fold" | |
| 600 call add(s:allfolds, s:newfold) | |
| 601 endif | |
| 602 " open the fold so we can find any contained folds | |
| 603 execute s:lnum."foldopen" | |
| 604 else | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
605 if !s:settings.no_progress |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
606 call s:pgb.incr() |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
607 if s:pgb.needs_redraw |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
608 redrawstatus |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
609 let s:pgb.needs_redraw = 0 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
610 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
611 endif |
| 2034 | 612 let s:lnum = s:lnum + 1 |
| 613 endif | |
| 614 endwhile | |
| 615 | |
| 616 " sort the folds so that we only ever need to look at the first item in the | |
| 617 " list of folds | |
| 618 call sort(s:allfolds, "s:FoldCompare") | |
| 619 | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
620 let &l:foldtext = s:foldtext_save |
| 2034 | 621 unlet s:foldtext_save |
| 622 | |
| 623 " 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
|
624 silent! %foldclose! |
| 2034 | 625 endif |
| 626 | |
| 627 " Now loop over all lines in the original text to convert to html. | |
| 7 | 628 " 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
|
629 if exists("g:html_start_line") |
| 7 | 630 let s:lnum = html_start_line |
| 631 if s:lnum < 1 || s:lnum > line("$") | |
| 632 let s:lnum = 1 | |
| 633 endif | |
| 634 else | |
| 635 let s:lnum = 1 | |
| 636 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
|
637 if exists("g:html_end_line") |
| 7 | 638 let s:end = html_end_line |
| 639 if s:end < s:lnum || s:end > line("$") | |
| 640 let s:end = line("$") | |
| 641 endif | |
| 642 else | |
| 643 let s:end = line("$") | |
| 644 endif | |
| 645 | |
| 2034 | 646 " stack to keep track of all the folds containing the current line |
| 647 let s:foldstack = [] | |
| 648 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
649 if !s:settings.no_progress |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
650 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
|
651 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
652 |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
653 if s:settings.number_lines |
| 2034 | 654 let s:margin = strlen(s:end) + 1 |
| 655 else | |
| 656 let s:margin = 0 | |
| 657 endif | |
| 658 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
659 if has('folding') && !s:settings.ignore_folding |
| 34 | 660 let s:foldfillchar = &fillchars[matchend(&fillchars, 'fold:')] |
| 661 if s:foldfillchar == '' | |
| 662 let s:foldfillchar = '-' | |
| 29 | 663 endif |
| 34 | 664 endif |
| 665 let s:difffillchar = &fillchars[matchend(&fillchars, 'diff:')] | |
| 666 if s:difffillchar == '' | |
| 667 let s:difffillchar = '-' | |
| 29 | 668 endif |
| 669 | |
| 2034 | 670 let s:foldId = 0 |
| 29 | 671 |
| 7 | 672 while s:lnum <= s:end |
| 673 | |
| 32 | 674 " If there are filler lines for diff mode, show these above the line. |
| 675 let s:filler = diff_filler(s:lnum) | |
| 676 if s:filler > 0 | |
| 677 let s:n = s:filler | |
| 678 while s:n > 0 | |
| 2034 | 679 let s:new = repeat(s:difffillchar, 3) |
| 32 | 680 |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
681 if s:n > 2 && s:n < s:filler && !s:settings.whole_filler |
| 34 | 682 let s:new = s:new . " " . s:filler . " inserted lines " |
| 683 let s:n = 2 | |
| 684 endif | |
| 685 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
686 if !s:settings.no_pre |
| 856 | 687 " HTML line wrapping is off--go ahead and fill to the margin |
| 2034 | 688 let s:new = s:new . repeat(s:difffillchar, &columns - strlen(s:new) - s:margin) |
| 689 else | |
| 690 let s:new = s:new . repeat(s:difffillchar, 3) | |
| 34 | 691 endif |
| 692 | |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
693 let s:new = s:HtmlFormat(s:new, "DiffDelete", "") |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
694 if s:settings.number_lines |
| 2034 | 695 " Indent if line numbering is on; must be after escaping. |
| 696 let s:new = repeat(s:LeadingSpace, s:margin) . s:new | |
| 697 endif | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
698 call add(s:lines, s:new.s:HtmlEndline) |
| 34 | 699 |
| 32 | 700 let s:n = s:n - 1 |
| 701 endwhile | |
| 702 unlet s:n | |
| 703 endif | |
| 704 unlet s:filler | |
| 705 | |
| 706 " Start the line with the line number. | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
707 if s:settings.number_lines |
| 2034 | 708 let s:numcol = repeat(' ', s:margin - 1 - strlen(s:lnum)) . s:lnum . ' ' |
| 32 | 709 else |
| 2034 | 710 let s:numcol = "" |
| 32 | 711 endif |
| 712 | |
| 2034 | 713 let s:new = "" |
| 714 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
715 if has('folding') && !s:settings.ignore_folding && foldclosed(s:lnum) > -1 && !s:settings.dynamic_folds |
| 29 | 716 " |
| 2034 | 717 " This is the beginning of a folded block (with no dynamic folding) |
| 29 | 718 " |
| 2034 | 719 let s:new = s:numcol . foldtextresult(s:lnum) |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
720 if !s:settings.no_pre |
| 34 | 721 " HTML line wrapping is off--go ahead and fill to the margin |
| 722 let s:new = s:new . repeat(s:foldfillchar, &columns - strlen(s:new)) | |
| 29 | 723 endif |
| 856 | 724 |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
725 let s:new = s:HtmlFormat(s:new, "Folded", "") |
| 7 | 726 |
| 856 | 727 " Skip to the end of the fold |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
728 let s:new_lnum = foldclosedend(s:lnum) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
729 |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
730 if !s:settings.no_progress |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
731 call s:pgb.incr(s:new_lnum - s:lnum) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
732 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
733 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
734 let s:lnum = s:new_lnum |
| 29 | 735 |
| 736 else | |
| 737 " | |
| 2034 | 738 " A line that is not folded, or doing dynamic folding. |
| 29 | 739 " |
| 34 | 740 let s:line = getline(s:lnum) |
| 29 | 741 let s:len = strlen(s:line) |
| 742 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
743 if s:settings.dynamic_folds |
| 2034 | 744 " First insert a closing for any open folds that end on this line |
| 745 while !empty(s:foldstack) && get(s:foldstack,0).lastline == s:lnum-1 | |
| 746 let s:new = s:new."</span></span>" | |
| 747 call remove(s:foldstack, 0) | |
| 748 endwhile | |
| 749 | |
| 750 " Now insert an opening any new folds that start on this line | |
| 751 let s:firstfold = 1 | |
| 752 while !empty(s:allfolds) && get(s:allfolds,0).firstline == s:lnum | |
| 753 let s:foldId = s:foldId + 1 | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
754 let s:new .= "<span id='" |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
755 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
|
756 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
|
757 |
| 2034 | 758 |
| 759 " Unless disabled, add a fold column for the opening line of a fold. | |
| 760 " | |
| 761 " Note that dynamic folds require using css so we just use css to take | |
| 762 " care of the leading spaces rather than using in the case of | |
| 763 " html_no_pre to make it easier | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
764 if !s:settings.no_foldcolumn |
| 2034 | 765 " add fold column that can open the new fold |
| 766 if s:allfolds[0].level > 1 && s:firstfold | |
| 767 let s:new = s:new . "<a class='toggle-open FoldColumn' href='javascript:toggleFold(\"fold".s:foldstack[0].id."\")'>" | |
| 768 let s:new = s:new . repeat('|', s:allfolds[0].level - 1) . "</a>" | |
| 769 endif | |
| 770 let s:new = s:new . "<a class='toggle-open FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>+</a>" | |
| 771 let s:new = s:new . "<a class='toggle-open " | |
| 772 " If this is not the last fold we're opening on this line, we need | |
| 773 " to keep the filler spaces hidden if the fold is opened by mouse | |
| 774 " hover. If it is the last fold to open in the line, we shouldn't hide | |
| 775 " them, so don't apply the toggle-filler class. | |
| 776 if get(s:allfolds, 1, {'firstline': 0}).firstline == s:lnum | |
| 777 let s:new = s:new . "toggle-filler " | |
| 778 endif | |
| 779 let s:new = s:new . "FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>" | |
| 780 let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level) . "</a>" | |
| 781 | |
| 782 " add fold column that can close the new fold | |
| 783 let s:new = s:new . "<a class='toggle-closed FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>" | |
| 784 if s:firstfold | |
| 785 let s:new = s:new . repeat('|', s:allfolds[0].level - 1) | |
| 786 endif | |
| 787 let s:new = s:new . "-" | |
| 788 " only add spaces if we aren't opening another fold on the same line | |
| 789 if get(s:allfolds, 1, {'firstline': 0}).firstline != s:lnum | |
| 790 let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level) | |
| 791 endif | |
| 792 let s:new = s:new . "</a>" | |
| 793 let s:firstfold = 0 | |
| 794 endif | |
| 795 | |
| 796 " add fold text, moving the span ending to the next line so collapsing | |
| 797 " of folds works correctly | |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
798 let s:new = s:new . substitute(s:HtmlFormat(s:numcol . foldtextresult(s:lnum), "Folded", ""), '</span>', s:HtmlEndline.'\n\0', '') |
| 2034 | 799 let s:new = s:new . "<span class='fulltext'>" |
| 800 | |
| 801 " open the fold now that we have the fold text to allow retrieval of | |
| 802 " fold text for subsequent folds | |
| 803 execute s:lnum."foldopen" | |
| 804 call insert(s:foldstack, remove(s:allfolds,0)) | |
| 805 let s:foldstack[0].id = s:foldId | |
| 806 endwhile | |
| 807 | |
| 808 " Unless disabled, add a fold column for other lines. | |
| 809 " | |
| 810 " Note that dynamic folds require using css so we just use css to take | |
| 811 " care of the leading spaces rather than using in the case of | |
| 812 " html_no_pre to make it easier | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
813 if !s:settings.no_foldcolumn |
| 2034 | 814 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
|
815 " 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
|
816 " column at all |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
817 if s:foldcolumn > 0 |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
818 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
|
819 endif |
| 2034 | 820 else |
| 821 " add the fold column for folds not on the opening line | |
| 822 if get(s:foldstack, 0).firstline < s:lnum | |
| 823 let s:new = s:new . "<a class='FoldColumn' href='javascript:toggleFold(\"fold".s:foldstack[0].id."\")'>" | |
| 824 let s:new = s:new . repeat('|', s:foldstack[0].level) | |
| 825 let s:new = s:new . repeat(' ', s:foldcolumn - s:foldstack[0].level) . "</a>" | |
| 826 endif | |
| 827 endif | |
| 828 endif | |
| 829 endif | |
| 830 | |
| 831 " Now continue with the unfolded line text | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
832 if s:settings.number_lines |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
833 " 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
|
834 let s:new = s:new . s:HtmlFormat(s:numcol, "lnr", "") |
| 7 | 835 endif |
| 29 | 836 |
| 32 | 837 " Get the diff attribute, if any. |
| 838 let s:diffattr = diff_hlID(s:lnum, 1) | |
| 839 | |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
840 " 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
|
841 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
|
842 |
| 29 | 843 " Loop over each character in the line |
| 844 let s:col = 1 | |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
845 |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
846 " 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
|
847 let s:diff_id = 0 |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
848 let s:diff_id_name = "" |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
849 |
| 34 | 850 while s:col <= s:len || (s:col == 1 && s:diffattr) |
| 29 | 851 let s:startcol = s:col " The start column for processing text |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
852 if !s:settings.ignore_conceal && has('conceal') |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
853 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
|
854 endif |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
855 if !s:settings.ignore_conceal && s:concealinfo[0] |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
856 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
|
857 " 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
|
858 " 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
|
859 " 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
|
860 " characters. |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
861 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
|
862 elseif s:diffattr |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
863 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
|
864 let s:id = synID(s:lnum, s:col, 1) |
| 32 | 865 let s:col = s:col + 1 |
| 866 " Speed loop (it's small - that's the trick) | |
| 867 " 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
|
868 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
|
869 \ && 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
|
870 \ let s:col = s:col + 1 | |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
871 \ endwhile |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
872 if s:len < &columns && !s:settings.no_pre |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
873 " 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
|
874 " line to the full width. |
| 2034 | 875 let s:line = s:line . repeat(' ', &columns - virtcol([s:lnum, s:len]) - s:margin) |
| 856 | 876 let s:len = &columns |
| 877 endif | |
| 32 | 878 else |
| 879 let s:id = synID(s:lnum, s:col, 1) | |
| 880 let s:col = s:col + 1 | |
| 881 " Speed loop (it's small - that's the trick) | |
| 882 " Go along till we find a change in synID | |
| 883 while s:col <= s:len && s:id == synID(s:lnum, s:col, 1) | let s:col = s:col + 1 | endwhile | |
| 884 endif | |
| 29 | 885 |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
886 if s:settings.ignore_conceal || !s:concealinfo[0] |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
887 " Expand tabs |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
888 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
|
889 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
|
890 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
|
891 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
|
892 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
|
893 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
|
894 let s:i = &ts |
| 2034 | 895 else |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
896 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
|
897 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
|
898 else |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
899 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
|
900 endif |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
901 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
|
902 let s:i = &ts - (s:vcol % &ts) |
| 2034 | 903 endif |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
904 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
|
905 else |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
906 let s:i = &ts - ((s:idx + s:startcol - 1) % &ts) |
| 2034 | 907 endif |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
908 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
|
909 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
|
910 endwhile |
| 34 | 911 |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
912 " 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
|
913 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
|
914 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
|
915 if s:diff_id |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
916 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
|
917 endif |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
918 else |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
919 " 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
|
920 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
|
921 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
|
922 endif |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
923 |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
924 " 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
|
925 " 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
|
926 if strlen(s:expandedtab) > 0 |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
927 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
|
928 endif |
| 29 | 929 endwhile |
| 930 endif | |
| 7 | 931 |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2334
diff
changeset
|
932 call extend(s:lines, split(s:new.s:HtmlEndline, '\n', 1)) |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
933 if !s:settings.no_progress && s:pgb.needs_redraw |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
934 redrawstatus |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
935 let s:pgb.needs_redraw = 0 |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
936 endif |
| 7 | 937 let s:lnum = s:lnum + 1 |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
938 |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
939 if !s:settings.no_progress |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
940 call s:pgb.incr() |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
941 endif |
| 7 | 942 endwhile |
| 1122 | 943 |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
944 if s:settings.dynamic_folds |
| 2034 | 945 " finish off any open folds |
| 946 while !empty(s:foldstack) | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
947 let s:lines[-1].="</span></span>" |
| 2034 | 948 call remove(s:foldstack, 0) |
| 949 endwhile | |
| 950 | |
| 951 " add fold column to the style list if not already there | |
| 952 let s:id = hlID('FoldColumn') | |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
953 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
|
954 call insert(s:idlist, s:id) |
| 2034 | 955 endif |
| 956 endif | |
| 957 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
958 if s:settings.no_pre |
|
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
959 if !s:settings.use_css |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
960 " Close off the font tag that encapsulates the whole <body> |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
961 call extend(s:lines, ["</font>", "</body>", "</html>"]) |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
962 else |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
963 call extend(s:lines, ["</body>", "</html>"]) |
|
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
964 endif |
| 7 | 965 else |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
966 call extend(s:lines, ["</pre>", "</body>", "</html>"]) |
| 7 | 967 endif |
| 968 | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
969 exe s:newwin . "wincmd w" |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
970 call setline(1, s:lines) |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
971 unlet s:lines |
| 7 | 972 |
| 973 " Now, when we finally know which, we define the colors and styles | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
974 if s:settings.use_css |
| 7 | 975 1;/<style type="text/+1 |
| 976 endif | |
| 977 | |
| 978 " Find out the background and foreground color. | |
| 979 let s:fgc = s:HtmlColor(synIDattr(hlID("Normal"), "fg#", s:whatterm)) | |
| 980 let s:bgc = s:HtmlColor(synIDattr(hlID("Normal"), "bg#", s:whatterm)) | |
| 981 if s:fgc == "" | |
| 982 let s:fgc = ( &background == "dark" ? "#ffffff" : "#000000" ) | |
| 983 endif | |
| 984 if s:bgc == "" | |
| 985 let s:bgc = ( &background == "dark" ? "#000000" : "#ffffff" ) | |
| 986 endif | |
| 987 | |
| 988 " Normal/global attributes | |
| 989 " For Netscape 4, set <body> attributes too, though, strictly speaking, it's | |
| 990 " incorrect. | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
991 if s:settings.use_css |
|
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
992 if s:settings.no_pre |
| 1122 | 993 execute "normal! A\nbody { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: ". s:htmlfont ."; }\e" |
| 7 | 994 else |
| 1122 | 995 execute "normal! A\npre { font-family: ". s:htmlfont ."; color: " . s:fgc . "; background-color: " . s:bgc . "; }\e" |
| 7 | 996 yank |
| 997 put | |
| 998 execute "normal! ^cwbody\e" | |
| 999 endif | |
| 1000 else | |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
1001 execute '%s:<body>:<body bgcolor="' . s:bgc . '" text="' . s:fgc . '">\r<font face="'. s:htmlfont .'">' |
| 7 | 1002 endif |
| 1003 | |
| 1004 " Line numbering attributes | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1005 if s:settings.number_lines |
|
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1006 if s:settings.use_css |
| 7 | 1007 execute "normal! A\n.lnr { " . s:CSS1(hlID("LineNr")) . "}\e" |
| 1008 else | |
| 837 | 1009 execute '%s+^<span class="lnr">\([^<]*\)</span>+' . s:HtmlOpening(hlID("LineNr")) . '\1' . s:HtmlClosing(hlID("LineNr")) . '+g' |
| 7 | 1010 endif |
| 1011 endif | |
| 1012 | |
| 1013 " Gather attributes for all other classes | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1014 if !s:settings.no_progress && !empty(s:idlist) |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1015 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
|
1016 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1017 while !empty(s:idlist) |
| 7 | 1018 let s:attr = "" |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1019 let s:id = remove(s:idlist, 0) |
| 7 | 1020 let s:attr = s:CSS1(s:id) |
| 1021 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
|
1022 |
| 7 | 1023 " If the class has some attributes, export the style, otherwise DELETE all |
| 1024 " its occurences to make the HTML shorter | |
| 1025 if s:attr != "" | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1026 if s:settings.use_css |
| 7 | 1027 execute "normal! A\n." . s:id_name . " { " . s:attr . "}" |
| 1028 else | |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
1029 " 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
|
1030 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
|
1031 " 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
|
1032 " 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
|
1033 " 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
|
1034 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 | 1035 endif |
| 1036 else | |
| 1122 | 1037 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
|
1038 execute '%s+<span class="' . s:id_name . ' \(Diff\%(Add\|Change\|Delete\|Text\)\)">\([^<]*\)</span>+<span class="\1">\2</span>+ge' |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1039 if s:settings.use_css |
|
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
1040 1;/<\/style>/-2 |
| 7 | 1041 endif |
| 1042 endif | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1043 |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1044 if !s:settings.no_progress |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1045 call s:pgb.incr() |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1046 if s:pgb.needs_redraw |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1047 redrawstatus |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1048 let s:pgb.needs_redraw = 0 |
|
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
1049 " TODO: sleep here to show the progress bar, but only if total time spent |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
1050 " so far on this step is < 1 second? Too slow for batch runs like the test |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
1051 " suite to sleep all the time. Maybe there's no good reason to sleep at |
|
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
1052 " all. |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1053 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1054 endif |
| 7 | 1055 endwhile |
| 1056 | |
| 1057 " Add hyperlinks | |
| 39 | 1058 %s+\(https\=://\S\{-}\)\(\([.,;:}]\=\(\s\|$\)\)\|[\\"'<>]\|>\|<\|"\)+<a href="\1">\1</a>\2+ge |
| 7 | 1059 |
| 1060 " The DTD | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1061 if s:settings.use_xhtml |
|
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1062 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\">" |
|
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1063 elseif s:settings.use_css && !s:settings.no_pre |
|
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1064 exe "normal! gg0i<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n" |
| 1122 | 1065 else |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1066 exe "normal! gg0i<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" |
| 39 | 1067 endif |
| 1068 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1069 if s:settings.use_xhtml |
| 39 | 1070 exe "normal! gg/<html/e\na xmlns=\"http://www.w3.org/1999/xhtml\"\e" |
| 7 | 1071 endif |
| 1072 | |
| 1073 " Cleanup | |
| 1074 %s:\s\+$::e | |
| 1075 | |
| 1076 " Restore old settings | |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
1077 let &l:foldenable = s:old_fen |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1078 let &l:foldmethod = s:old_fdm |
| 7 | 1079 let &report = s:old_report |
| 1080 let &title = s:old_title | |
| 1081 let &icon = s:old_icon | |
| 1082 let &paste = s:old_paste | |
| 1083 let &magic = s:old_magic | |
| 1084 let @/ = s:old_search | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1085 let &more = s:old_more |
| 7 | 1086 exe s:orgwin . "wincmd w" |
| 2642 | 1087 let &l:stl = s:origwin_stl |
| 7 | 1088 let &l:et = s:old_et |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
1089 let &l:scrollbind = s:old_bind |
| 7 | 1090 exe s:newwin . "wincmd w" |
| 2642 | 1091 let &l:stl = s:newwin_stl |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1092 exec 'resize' s:old_winheight |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1093 let &l:winfixheight = s:old_winfixheight |
| 7 | 1094 |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1095 let &ls=s:ls |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1096 |
| 7 | 1097 " Save a little bit of memory (worth doing?) |
| 1122 | 1098 unlet s:htmlfont |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
1099 unlet s:old_et s:old_paste s:old_icon s:old_report s:old_title s:old_search |
|
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
1100 unlet s:old_magic s:old_more s:old_fdm s:old_fen s:old_winheight |
|
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
1101 unlet s:whatterm s:idlist s:lnum s:end s:margin s:fgc s:bgc s:old_winfixheight |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1102 unlet! s:col s:id s:attr s:len s:line s:new s:expandedtab s:concealinfo |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
1103 unlet! s:orgwin s:newwin s:orgbufnr s:idx s:i s:offset s:ls s:origwin_stl |
|
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
1104 unlet! s:newwin_stl s:current_syntax |
| 170 | 1105 if !v:profiling |
| 1106 delfunc s:HtmlColor | |
| 1107 delfunc s:HtmlFormat | |
| 1108 delfunc s:CSS1 | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1109 if !s:settings.use_css |
| 170 | 1110 delfunc s:HtmlOpening |
| 1111 delfunc s:HtmlClosing | |
| 1112 endif | |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1113 if s:settings.dynamic_folds |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1114 delfunc s:FoldCompare |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1115 endif |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1116 |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1117 if !s:settings.no_progress |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1118 delfunc s:ProgressBar |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1119 delfunc s:progressbar.paint |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1120 delfunc s:progressbar.incr |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1121 unlet s:pgb s:progressbar |
|
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1122 endif |
| 7 | 1123 endif |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1124 |
|
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
1125 unlet! s:new_lnum s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace |
|
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
1126 unlet! s:LeadingSpace s:HtmlEndline s:firstfold s:foldcolumn |
|
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
1127 unlet s:foldstack s:allfolds s:foldId s:numcol s:settings |
| 2034 | 1128 |
| 1129 let &cpo = s:cpo_sav | |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1130 unlet! s:cpo_sav |
| 2034 | 1131 |
|
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
1132 " Make sure any patches will probably use consistent indent |
|
2334
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
1133 " vim: ts=8 sw=2 sts=2 noet |