Mercurial > vim
annotate runtime/autoload/tohtml.vim @ 22820:d05319bbf63b v8.2.1958
patch 8.2.1958: build failure with timers
Commit: https://github.com/vim/vim/commit/b885b435d126d34475714e39ec1125bd4e1c77c6
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 5 19:34:41 2020 +0100
patch 8.2.1958: build failure with timers
Problem: Build failure with timers.
Solution: Add missing change.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 05 Nov 2020 19:45:03 +0100 |
parents | cb3163d590a1 |
children | 11b656e74444 |
rev | line source |
---|---|
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1 " Vim autoload file for the tohtml plugin. |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
2 " Maintainer: Ben Fritz <fritzophrenic@gmail.com> |
18639 | 3 " Last Change: 2019 Aug 16 |
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: |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
6 " |
2334
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
7 " Original by Bram Moolenaar <Bram@vim.org> |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
8 " Diff2HTML() added by Christian Brabandt <cb@256bit.org> |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
9 " |
2334
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
10 " See Mercurial change logs for more! |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
11 |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
12 " this file uses line continuations |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
13 let s:cpo_sav = &cpo |
3713 | 14 set cpo&vim |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
15 |
2642 | 16 " Automatically find charsets from all encodings supported natively by Vim. With |
17 " the 8bit- and 2byte- prefixes, Vim can actually support more encodings than | |
18 " this. Let the user specify these however since they won't be supported on | |
2788 | 19 " every system. |
2642 | 20 " |
21 " Note, not all of Vim's supported encodings have a charset to use. | |
22 " | |
23 " Names in this list are from: | |
24 " http://www.iana.org/assignments/character-sets | |
25 " g:tohtml#encoding_to_charset: {{{ | |
26 let g:tohtml#encoding_to_charset = { | |
27 \ 'latin1' : 'ISO-8859-1', | |
28 \ 'iso-8859-2' : 'ISO-8859-2', | |
29 \ 'iso-8859-3' : 'ISO-8859-3', | |
30 \ 'iso-8859-4' : 'ISO-8859-4', | |
31 \ 'iso-8859-5' : 'ISO-8859-5', | |
32 \ 'iso-8859-6' : 'ISO-8859-6', | |
33 \ 'iso-8859-7' : 'ISO-8859-7', | |
34 \ 'iso-8859-8' : 'ISO-8859-8', | |
35 \ 'iso-8859-9' : 'ISO-8859-9', | |
36 \ 'iso-8859-10' : '', | |
37 \ 'iso-8859-13' : 'ISO-8859-13', | |
38 \ 'iso-8859-14' : '', | |
39 \ 'iso-8859-15' : 'ISO-8859-15', | |
40 \ 'koi8-r' : 'KOI8-R', | |
41 \ 'koi8-u' : 'KOI8-U', | |
42 \ 'macroman' : 'macintosh', | |
43 \ 'cp437' : '', | |
44 \ 'cp775' : '', | |
45 \ 'cp850' : '', | |
46 \ 'cp852' : '', | |
47 \ 'cp855' : '', | |
48 \ 'cp857' : '', | |
49 \ 'cp860' : '', | |
50 \ 'cp861' : '', | |
51 \ 'cp862' : '', | |
52 \ 'cp863' : '', | |
53 \ 'cp865' : '', | |
54 \ 'cp866' : 'IBM866', | |
55 \ 'cp869' : '', | |
56 \ 'cp874' : '', | |
57 \ 'cp1250' : 'windows-1250', | |
58 \ 'cp1251' : 'windows-1251', | |
59 \ 'cp1253' : 'windows-1253', | |
60 \ 'cp1254' : 'windows-1254', | |
61 \ 'cp1255' : 'windows-1255', | |
62 \ 'cp1256' : 'windows-1256', | |
63 \ 'cp1257' : 'windows-1257', | |
64 \ 'cp1258' : 'windows-1258', | |
65 \ 'euc-jp' : 'EUC-JP', | |
66 \ 'sjis' : 'Shift_JIS', | |
67 \ 'cp932' : 'Shift_JIS', | |
68 \ 'cp949' : '', | |
69 \ 'euc-kr' : 'EUC-KR', | |
70 \ 'cp936' : 'GBK', | |
71 \ 'euc-cn' : 'GB2312', | |
72 \ 'big5' : 'Big5', | |
73 \ 'cp950' : 'Big5', | |
74 \ 'utf-8' : 'UTF-8', | |
75 \ 'ucs-2' : 'UTF-8', | |
76 \ 'ucs-2le' : 'UTF-8', | |
77 \ 'utf-16' : 'UTF-8', | |
78 \ 'utf-16le' : 'UTF-8', | |
79 \ 'ucs-4' : 'UTF-8', | |
80 \ 'ucs-4le' : 'UTF-8', | |
81 \ } | |
82 lockvar g:tohtml#encoding_to_charset | |
83 " Notes: | |
84 " 1. All UCS/UTF are converted to UTF-8 because it is much better supported | |
85 " 2. Any blank spaces are there because Vim supports it but at least one major | |
86 " web browser does not according to http://wiki.whatwg.org/wiki/Web_Encodings. | |
87 " }}} | |
88 | |
89 " Only automatically find encodings supported natively by Vim, let the user | |
90 " specify the encoding if it's not natively supported. This function is only | |
91 " used when the user specifies the charset, they better know what they are | |
92 " doing! | |
93 " | |
94 " Names in this list are from: | |
95 " http://www.iana.org/assignments/character-sets | |
96 " g:tohtml#charset_to_encoding: {{{ | |
97 let g:tohtml#charset_to_encoding = { | |
98 \ 'iso_8859-1:1987' : 'latin1', | |
99 \ 'iso-ir-100' : 'latin1', | |
100 \ 'iso_8859-1' : 'latin1', | |
101 \ 'iso-8859-1' : 'latin1', | |
102 \ 'latin1' : 'latin1', | |
103 \ 'l1' : 'latin1', | |
104 \ 'ibm819' : 'latin1', | |
105 \ 'cp819' : 'latin1', | |
106 \ 'csisolatin1' : 'latin1', | |
107 \ 'iso_8859-2:1987' : 'iso-8859-2', | |
108 \ 'iso-ir-101' : 'iso-8859-2', | |
109 \ 'iso_8859-2' : 'iso-8859-2', | |
110 \ 'iso-8859-2' : 'iso-8859-2', | |
111 \ 'latin2' : 'iso-8859-2', | |
112 \ 'l2' : 'iso-8859-2', | |
113 \ 'csisolatin2' : 'iso-8859-2', | |
114 \ 'iso_8859-3:1988' : 'iso-8859-3', | |
115 \ 'iso-ir-109' : 'iso-8859-3', | |
116 \ 'iso_8859-3' : 'iso-8859-3', | |
117 \ 'iso-8859-3' : 'iso-8859-3', | |
118 \ 'latin3' : 'iso-8859-3', | |
119 \ 'l3' : 'iso-8859-3', | |
120 \ 'csisolatin3' : 'iso-8859-3', | |
121 \ 'iso_8859-4:1988' : 'iso-8859-4', | |
122 \ 'iso-ir-110' : 'iso-8859-4', | |
123 \ 'iso_8859-4' : 'iso-8859-4', | |
124 \ 'iso-8859-4' : 'iso-8859-4', | |
125 \ 'latin4' : 'iso-8859-4', | |
126 \ 'l4' : 'iso-8859-4', | |
127 \ 'csisolatin4' : 'iso-8859-4', | |
128 \ 'iso_8859-5:1988' : 'iso-8859-5', | |
129 \ 'iso-ir-144' : 'iso-8859-5', | |
130 \ 'iso_8859-5' : 'iso-8859-5', | |
131 \ 'iso-8859-5' : 'iso-8859-5', | |
132 \ 'cyrillic' : 'iso-8859-5', | |
133 \ 'csisolatincyrillic' : 'iso-8859-5', | |
134 \ 'iso_8859-6:1987' : 'iso-8859-6', | |
135 \ 'iso-ir-127' : 'iso-8859-6', | |
136 \ 'iso_8859-6' : 'iso-8859-6', | |
137 \ 'iso-8859-6' : 'iso-8859-6', | |
138 \ 'ecma-114' : 'iso-8859-6', | |
139 \ 'asmo-708' : 'iso-8859-6', | |
140 \ 'arabic' : 'iso-8859-6', | |
141 \ 'csisolatinarabic' : 'iso-8859-6', | |
142 \ 'iso_8859-7:1987' : 'iso-8859-7', | |
143 \ 'iso-ir-126' : 'iso-8859-7', | |
144 \ 'iso_8859-7' : 'iso-8859-7', | |
145 \ 'iso-8859-7' : 'iso-8859-7', | |
146 \ 'elot_928' : 'iso-8859-7', | |
147 \ 'ecma-118' : 'iso-8859-7', | |
148 \ 'greek' : 'iso-8859-7', | |
149 \ 'greek8' : 'iso-8859-7', | |
150 \ 'csisolatingreek' : 'iso-8859-7', | |
151 \ 'iso_8859-8:1988' : 'iso-8859-8', | |
152 \ 'iso-ir-138' : 'iso-8859-8', | |
153 \ 'iso_8859-8' : 'iso-8859-8', | |
154 \ 'iso-8859-8' : 'iso-8859-8', | |
155 \ 'hebrew' : 'iso-8859-8', | |
156 \ 'csisolatinhebrew' : 'iso-8859-8', | |
157 \ 'iso_8859-9:1989' : 'iso-8859-9', | |
158 \ 'iso-ir-148' : 'iso-8859-9', | |
159 \ 'iso_8859-9' : 'iso-8859-9', | |
160 \ 'iso-8859-9' : 'iso-8859-9', | |
161 \ 'latin5' : 'iso-8859-9', | |
162 \ 'l5' : 'iso-8859-9', | |
163 \ 'csisolatin5' : 'iso-8859-9', | |
164 \ 'iso-8859-10' : 'iso-8859-10', | |
165 \ 'iso-ir-157' : 'iso-8859-10', | |
166 \ 'l6' : 'iso-8859-10', | |
167 \ 'iso_8859-10:1992' : 'iso-8859-10', | |
168 \ 'csisolatin6' : 'iso-8859-10', | |
169 \ 'latin6' : 'iso-8859-10', | |
170 \ 'iso-8859-13' : 'iso-8859-13', | |
171 \ 'iso-8859-14' : 'iso-8859-14', | |
172 \ 'iso-ir-199' : 'iso-8859-14', | |
173 \ 'iso_8859-14:1998' : 'iso-8859-14', | |
174 \ 'iso_8859-14' : 'iso-8859-14', | |
175 \ 'latin8' : 'iso-8859-14', | |
176 \ 'iso-celtic' : 'iso-8859-14', | |
177 \ 'l8' : 'iso-8859-14', | |
178 \ 'iso-8859-15' : 'iso-8859-15', | |
179 \ 'iso_8859-15' : 'iso-8859-15', | |
180 \ 'latin-9' : 'iso-8859-15', | |
181 \ 'koi8-r' : 'koi8-r', | |
182 \ 'cskoi8r' : 'koi8-r', | |
183 \ 'koi8-u' : 'koi8-u', | |
184 \ 'macintosh' : 'macroman', | |
185 \ 'mac' : 'macroman', | |
186 \ 'csmacintosh' : 'macroman', | |
187 \ 'ibm437' : 'cp437', | |
188 \ 'cp437' : 'cp437', | |
189 \ '437' : 'cp437', | |
190 \ 'cspc8codepage437' : 'cp437', | |
191 \ 'ibm775' : 'cp775', | |
192 \ 'cp775' : 'cp775', | |
193 \ 'cspc775baltic' : 'cp775', | |
194 \ 'ibm850' : 'cp850', | |
195 \ 'cp850' : 'cp850', | |
196 \ '850' : 'cp850', | |
197 \ 'cspc850multilingual' : 'cp850', | |
198 \ 'ibm852' : 'cp852', | |
199 \ 'cp852' : 'cp852', | |
200 \ '852' : 'cp852', | |
201 \ 'cspcp852' : 'cp852', | |
202 \ 'ibm855' : 'cp855', | |
203 \ 'cp855' : 'cp855', | |
204 \ '855' : 'cp855', | |
205 \ 'csibm855' : 'cp855', | |
206 \ 'ibm857' : 'cp857', | |
207 \ 'cp857' : 'cp857', | |
208 \ '857' : 'cp857', | |
209 \ 'csibm857' : 'cp857', | |
210 \ 'ibm860' : 'cp860', | |
211 \ 'cp860' : 'cp860', | |
212 \ '860' : 'cp860', | |
213 \ 'csibm860' : 'cp860', | |
214 \ 'ibm861' : 'cp861', | |
215 \ 'cp861' : 'cp861', | |
216 \ '861' : 'cp861', | |
217 \ 'cp-is' : 'cp861', | |
218 \ 'csibm861' : 'cp861', | |
219 \ 'ibm862' : 'cp862', | |
220 \ 'cp862' : 'cp862', | |
221 \ '862' : 'cp862', | |
222 \ 'cspc862latinhebrew' : 'cp862', | |
223 \ 'ibm863' : 'cp863', | |
224 \ 'cp863' : 'cp863', | |
225 \ '863' : 'cp863', | |
226 \ 'csibm863' : 'cp863', | |
227 \ 'ibm865' : 'cp865', | |
228 \ 'cp865' : 'cp865', | |
229 \ '865' : 'cp865', | |
230 \ 'csibm865' : 'cp865', | |
231 \ 'ibm866' : 'cp866', | |
232 \ 'cp866' : 'cp866', | |
233 \ '866' : 'cp866', | |
234 \ 'csibm866' : 'cp866', | |
235 \ 'ibm869' : 'cp869', | |
236 \ 'cp869' : 'cp869', | |
237 \ '869' : 'cp869', | |
238 \ 'cp-gr' : 'cp869', | |
239 \ 'csibm869' : 'cp869', | |
240 \ 'windows-1250' : 'cp1250', | |
241 \ 'windows-1251' : 'cp1251', | |
242 \ 'windows-1253' : 'cp1253', | |
243 \ 'windows-1254' : 'cp1254', | |
244 \ 'windows-1255' : 'cp1255', | |
245 \ 'windows-1256' : 'cp1256', | |
246 \ 'windows-1257' : 'cp1257', | |
247 \ 'windows-1258' : 'cp1258', | |
248 \ 'extended_unix_code_packed_format_for_japanese' : 'euc-jp', | |
249 \ 'cseucpkdfmtjapanese' : 'euc-jp', | |
250 \ 'euc-jp' : 'euc-jp', | |
251 \ 'shift_jis' : 'sjis', | |
252 \ 'ms_kanji' : 'sjis', | |
253 \ 'sjis' : 'sjis', | |
254 \ 'csshiftjis' : 'sjis', | |
255 \ 'ibm-thai' : 'cp874', | |
256 \ 'csibmthai' : 'cp874', | |
257 \ 'ks_c_5601-1987' : 'cp949', | |
258 \ 'iso-ir-149' : 'cp949', | |
259 \ 'ks_c_5601-1989' : 'cp949', | |
260 \ 'ksc_5601' : 'cp949', | |
261 \ 'korean' : 'cp949', | |
262 \ 'csksc56011987' : 'cp949', | |
263 \ 'euc-kr' : 'euc-kr', | |
264 \ 'cseuckr' : 'euc-kr', | |
265 \ 'gbk' : 'cp936', | |
266 \ 'cp936' : 'cp936', | |
267 \ 'ms936' : 'cp936', | |
268 \ 'windows-936' : 'cp936', | |
269 \ 'gb_2312-80' : 'euc-cn', | |
270 \ 'iso-ir-58' : 'euc-cn', | |
271 \ 'chinese' : 'euc-cn', | |
272 \ 'csiso58gb231280' : 'euc-cn', | |
273 \ 'big5' : 'big5', | |
274 \ 'csbig5' : 'big5', | |
275 \ 'utf-8' : 'utf-8', | |
276 \ 'iso-10646-ucs-2' : 'ucs-2', | |
277 \ 'csunicode' : 'ucs-2', | |
278 \ 'utf-16' : 'utf-16', | |
279 \ 'utf-16be' : 'utf-16', | |
280 \ 'utf-16le' : 'utf-16le', | |
281 \ 'utf-32' : 'ucs-4', | |
282 \ 'utf-32be' : 'ucs-4', | |
283 \ 'utf-32le' : 'ucs-4le', | |
284 \ 'iso-10646-ucs-4' : 'ucs-4', | |
285 \ 'csucs4' : 'ucs-4' | |
286 \ } | |
287 lockvar g:tohtml#charset_to_encoding | |
288 "}}} | |
289 | |
290 func! tohtml#Convert2HTML(line1, line2) "{{{ | |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
291 let s:settings = tohtml#GetUserSettings() |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
292 |
2642 | 293 if !&diff || s:settings.diff_one_file "{{{ |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
294 if a:line2 >= a:line1 |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
295 let g:html_start_line = a:line1 |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
296 let g:html_end_line = a:line2 |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
297 else |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
298 let g:html_start_line = a:line2 |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
299 let g:html_end_line = a:line1 |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
300 endif |
2642 | 301 runtime syntax/2html.vim "}}} |
302 else "{{{ | |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
303 let win_list = [] |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
304 let buf_list = [] |
7176
30042ddff503
commit https://github.com/vim/vim/commit/60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d
Christian Brabandt <cb@256bit.org>
parents:
5003
diff
changeset
|
305 windo if &diff | call add(win_list, winbufnr(0)) | endif |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
306 let s:settings.whole_filler = 1 |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
307 let g:html_diff_win_num = 0 |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
308 for window in win_list |
2642 | 309 " switch to the next buffer to convert |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
310 exe ":" . bufwinnr(window) . "wincmd w" |
2642 | 311 |
312 " figure out whether current charset and encoding will work, if not | |
313 " default to UTF-8 | |
314 if !exists('g:html_use_encoding') && | |
2788 | 315 \ (((&l:fileencoding=='' || (&l:buftype!='' && &l:buftype!=?'help')) |
316 \ && &encoding!=?s:settings.vim_encoding) | |
317 \ || &l:fileencoding!='' && &l:fileencoding!=?s:settings.vim_encoding) | |
2642 | 318 echohl WarningMsg |
319 echomsg "TOhtml: mismatched file encodings in Diff buffers, using UTF-8" | |
320 echohl None | |
321 let s:settings.vim_encoding = 'utf-8' | |
322 let s:settings.encoding = 'UTF-8' | |
323 endif | |
324 | |
325 " set up for diff-mode conversion | |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
326 let g:html_start_line = 1 |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
327 let g:html_end_line = line('$') |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
328 let g:html_diff_win_num += 1 |
2642 | 329 |
330 " convert this file | |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
331 runtime syntax/2html.vim |
2642 | 332 |
333 " remember the HTML buffer for later combination | |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
334 call add(buf_list, bufnr('%')) |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
335 endfor |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
336 unlet g:html_diff_win_num |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
337 call tohtml#Diff2HTML(win_list, buf_list) |
2642 | 338 endif "}}} |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
339 |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
340 unlet g:html_start_line |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
341 unlet g:html_end_line |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
342 unlet s:settings |
2642 | 343 endfunc "}}} |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
344 |
2642 | 345 func! tohtml#Diff2HTML(win_list, buf_list) "{{{ |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
346 let xml_line = "" |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
347 let tag_close = '>' |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
348 |
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
349 let s:old_paste = &paste |
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
350 set paste |
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
351 let s:old_magic = &magic |
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
352 set magic |
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
353 |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
354 if s:settings.use_xhtml |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
355 if s:settings.encoding != "" |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
356 let xml_line = "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>" |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
357 else |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
358 let xml_line = "<?xml version=\"1.0\"?>" |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
359 endif |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
360 let tag_close = ' />' |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
361 endif |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
362 |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
363 let style = [s:settings.use_xhtml ? "" : '-->'] |
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
364 let body_line = '' |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
365 |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
366 let html = [] |
18639 | 367 let s:html5 = 0 |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
368 if s:settings.use_xhtml |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
369 call add(html, xml_line) |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
370 endif |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
371 if s:settings.use_xhtml |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
372 call add(html, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">") |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
373 call add(html, '<html xmlns="http://www.w3.org/1999/xhtml">') |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
374 elseif s:settings.use_css && !s:settings.no_pre |
18639 | 375 call add(html, "<!DOCTYPE html>") |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
376 call add(html, '<html>') |
18639 | 377 let s:html5 = 1 |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
378 else |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
379 call add(html, '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"') |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
380 call add(html, ' "http://www.w3.org/TR/html4/loose.dtd">') |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
381 call add(html, '<html>') |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
382 endif |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
383 call add(html, '<head>') |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
384 |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
385 " include encoding as close to the top as possible, but only if not already |
2642 | 386 " contained in XML information |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
387 if s:settings.encoding != "" && !s:settings.use_xhtml |
18639 | 388 if s:html5 |
389 call add(html, '<meta charset="' . s:settings.encoding . '"' . tag_close) | |
390 else | |
391 call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . tag_close) | |
392 endif | |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
393 endif |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
394 |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
395 call add(html, '<title>diff</title>') |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
396 call add(html, '<meta name="Generator" content="Vim/'.v:version/100.'.'.v:version%100.'"'.tag_close) |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
397 call add(html, '<meta name="plugin-version" content="'.g:loaded_2html_plugin.'"'.tag_close) |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
398 call add(html, '<meta name="settings" content="'. |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
399 \ join(filter(keys(s:settings),'s:settings[v:val]'),','). |
3713 | 400 \ ',prevent_copy='.s:settings.prevent_copy. |
18639 | 401 \ ',use_input_for_pc='.s:settings.use_input_for_pc. |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
402 \ '"'.tag_close) |
3713 | 403 call add(html, '<meta name="colorscheme" content="'. |
404 \ (exists('g:colors_name') | |
405 \ ? g:colors_name | |
406 \ : 'none'). '"'.tag_close) | |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
407 |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
408 call add(html, '</head>') |
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
409 let body_line_num = len(html) |
18639 | 410 call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>') |
411 call add(html, "<table ".(s:settings.use_css? "" : "border='1' width='100%' ")."id='vimCodeElement".s:settings.id_suffix."'>") | |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
412 |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
413 call add(html, '<tr>') |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
414 for buf in a:win_list |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
415 call add(html, '<th>'.bufname(buf).'</th>') |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
416 endfor |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
417 call add(html, '</tr><tr>') |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
418 |
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
419 let diff_style_start = 0 |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
420 let insert_index = 0 |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
421 |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
422 for buf in a:buf_list |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
423 let temp = [] |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
424 exe bufwinnr(buf) . 'wincmd w' |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
425 |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
426 " If text is folded because of user foldmethod settings, etc. we don't want |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
427 " to act on everything in a fold by mistake. |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
428 setlocal nofoldenable |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
429 |
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
430 " When not using CSS or when using xhtml, the <body> line can be important. |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
431 " Assume it will be the same for all buffers and grab it from the first |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
432 " buffer. Similarly, need to grab the body end line as well. |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
433 if body_line == '' |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
434 1 |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
435 call search('<body') |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
436 let body_line = getline('.') |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
437 $ |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
438 call search('</body>', 'b') |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
439 let s:body_end_line = getline('.') |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
440 endif |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
441 |
2642 | 442 " Grab the style information. Some of this will be duplicated so only insert |
443 " it if it's not already there. {{{ | |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
444 1 |
18639 | 445 let style_start = search('^<style\( type="text/css"\)\?>') |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
446 1 |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
447 let style_end = search('^</style>') |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
448 if style_start > 0 && style_end > 0 |
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
449 let buf_styles = getline(style_start + 1, style_end - 1) |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
450 for a_style in buf_styles |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
451 if index(style, a_style) == -1 |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
452 if diff_style_start == 0 |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
453 if a_style =~ '\<Diff\(Change\|Text\|Add\|Delete\)' |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
454 let diff_style_start = len(style)-1 |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
455 endif |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
456 endif |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
457 call insert(style, a_style, insert_index) |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
458 let insert_index += 1 |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
459 endif |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
460 endfor |
2642 | 461 endif " }}} |
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
462 |
2642 | 463 " everything new will get added before the diff styles so diff highlight |
464 " properly overrides normal highlight | |
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
465 if diff_style_start != 0 |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
466 let insert_index = diff_style_start |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
467 endif |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
468 |
3713 | 469 " Delete those parts that are not needed so we can include the rest into the |
470 " resulting table. | |
471 1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_ | |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
472 $ |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
473 ?</body>?,$d_ |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
474 let temp = getline(1,'$') |
3713 | 475 " clean out id on the main content container because we already set it on |
476 " the table | |
5003
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
477 let temp[0] = substitute(temp[0], " id='vimCodeElement[^']*'", "", "") |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
478 " undo deletion of start and end part |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
479 " so we can later save the file as valid html |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
480 " TODO: restore using grabbed lines if undolevel is 1? |
3713 | 481 normal! 2u |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
482 if s:settings.use_css |
18639 | 483 call add(html, '<td><div>') |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
484 elseif s:settings.use_xhtml |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
485 call add(html, '<td nowrap="nowrap" valign="top"><div>') |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
486 else |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
487 call add(html, '<td nowrap valign="top"><div>') |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
488 endif |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
489 let html += temp |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
490 call add(html, '</div></td>') |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
491 |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
492 " Close this buffer |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
493 " TODO: the comment above says we're going to allow saving the file |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
494 " later...but here we discard it? |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
495 quit! |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
496 endfor |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
497 |
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
498 let html[body_line_num] = body_line |
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
499 |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
500 call add(html, '</tr>') |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
501 call add(html, '</table>') |
2432
80229a724a11
Updated runtime files. :TOhtml improvements by Benjamin Fritz.
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
502 call add(html, s:body_end_line) |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
503 call add(html, '</html>') |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
504 |
4681
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
505 " The generated HTML is admittedly ugly and takes a LONG time to fold. |
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
506 " Make sure the user doesn't do syntax folding when loading a generated file, |
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
507 " using a modeline. |
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
508 call add(html, '<!-- vim: set foldmethod=manual : -->') |
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
509 |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
510 let i = 1 |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
511 let name = "Diff" . (s:settings.use_xhtml ? ".xhtml" : ".html") |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
512 " Find an unused file name if current file name is already in use |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
513 while filereadable(name) |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
514 let name = substitute(name, '\d*\.x\?html$', '', '') . i . '.' . fnamemodify(copy(name), ":t:e") |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
515 let i += 1 |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
516 endwhile |
18639 | 517 |
518 let s:ei_sav = &eventignore | |
519 set eventignore+=FileType | |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
520 exe "topleft new " . name |
18639 | 521 let &eventignore=s:ei_sav |
522 unlet s:ei_sav | |
523 | |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
524 setlocal modifiable |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
525 |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
526 " just in case some user autocmd creates content in the new buffer, make sure |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
527 " it is empty before proceeding |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
528 %d |
2642 | 529 |
530 " set the fileencoding to match the charset we'll be using | |
531 let &l:fileencoding=s:settings.vim_encoding | |
532 | |
533 " According to http://www.w3.org/TR/html4/charset.html#doc-char-set, the byte | |
534 " order mark is highly recommend on the web when using multibyte encodings. But, | |
535 " it is not a good idea to include it on UTF-8 files. Otherwise, let Vim | |
536 " determine when it is actually inserted. | |
537 if s:settings.vim_encoding == 'utf-8' | |
538 setlocal nobomb | |
539 else | |
540 setlocal bomb | |
541 endif | |
542 | |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
543 call append(0, html) |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
544 |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
545 if len(style) > 0 |
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
546 1 |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
547 let style_start = search('^</head>')-1 |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
548 |
3713 | 549 " add required javascript in reverse order so we can just call append again |
550 " and again without adjusting {{{ | |
551 | |
18639 | 552 let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids |
15033 | 553 |
554 " insert script closing tag if needed | |
555 if s:uses_script | |
556 call append(style_start, [ | |
557 \ '', | |
558 \ s:settings.use_xhtml ? '//]]>' : '-->', | |
559 \ "</script>" | |
560 \ ]) | |
561 endif | |
3713 | 562 |
4681
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
563 " insert javascript to get IDs from line numbers, and to open a fold before |
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
564 " jumping to any lines contained therein |
15033 | 565 if s:settings.line_ids |
566 call append(style_start, [ | |
567 \ " /* Always jump to new location even if the line was hidden inside a fold, or", | |
568 \ " * we corrected the raw number to a line ID.", | |
569 \ " */", | |
570 \ " if (lineElem) {", | |
571 \ " lineElem.scrollIntoView(true);", | |
572 \ " }", | |
573 \ " return true;", | |
574 \ "}", | |
575 \ "if ('onhashchange' in window) {", | |
576 \ " window.onhashchange = JumpToLine;", | |
577 \ "}" | |
578 \ ]) | |
579 | |
580 if s:settings.dynamic_folds | |
581 call append(style_start, [ | |
582 \ "", | |
583 \ " /* navigate upwards in the DOM tree to open all folds containing the line */", | |
584 \ " var node = lineElem;", | |
585 \ " while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')", | |
586 \ " {", | |
587 \ " if (node.className == 'closed-fold')", | |
588 \ " {", | |
589 \ " /* toggle open the fold ID (remove window ID) */", | |
590 \ " toggleFold(node.id.substr(4));", | |
591 \ " }", | |
592 \ " node = node.parentNode;", | |
593 \ " }", | |
594 \ ]) | |
595 endif | |
596 endif | |
597 | |
598 if s:settings.line_ids | |
4681
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
599 call append(style_start, [ |
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
600 \ "", |
15033 | 601 \ "/* function to open any folds containing a jumped-to line before jumping to it */", |
602 \ "function JumpToLine()", | |
603 \ "{", | |
604 \ " var lineNum;", | |
605 \ " lineNum = window.location.hash;", | |
606 \ " lineNum = lineNum.substr(1); /* strip off '#' */", | |
607 \ "", | |
608 \ " if (lineNum.indexOf('L') == -1) {", | |
609 \ " lineNum = 'L'+lineNum;", | |
4681
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
610 \ " }", |
15033 | 611 \ " if (lineNum.indexOf('W') == -1) {", |
612 \ " lineNum = 'W1'+lineNum;", | |
613 \ " }", | |
614 \ " var lineElem = document.getElementById(lineNum);" | |
4681
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
615 \ ]) |
2eb30f341e8d
Updated runtime files and translations.
Bram Moolenaar <bram@vim.org>
parents:
3713
diff
changeset
|
616 endif |
3713 | 617 |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
618 " Insert javascript to toggle matching folds open and closed in all windows, |
3713 | 619 " if dynamic folding is active. |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
620 if s:settings.dynamic_folds |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
621 call append(style_start, [ |
2334
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
622 \ " function toggleFold(objID)", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
623 \ " {", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
624 \ " for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
625 \ " {", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
626 \ " var fold;", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
627 \ ' fold = document.getElementById("win"+win_num+objID);', |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
628 \ " if(fold.className == 'closed-fold')", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
629 \ " {", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
630 \ " fold.className = 'open-fold';", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
631 \ " }", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
632 \ " else if (fold.className == 'open-fold')", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
633 \ " {", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
634 \ " fold.className = 'closed-fold';", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
635 \ " }", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
636 \ " }", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
637 \ " }", |
3c9324c0800e
Improved :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2321
diff
changeset
|
638 \ ]) |
3713 | 639 endif |
640 | |
15033 | 641 if s:uses_script |
18639 | 642 " insert script tag if needed |
15033 | 643 call append(style_start, [ |
18639 | 644 \ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">", |
15033 | 645 \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"]) |
646 endif | |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
647 |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
648 " Insert styles from all the generated html documents and additional styles |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
649 " for the table-based layout of the side-by-side diff. The diff should take |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
650 " up the full browser window (but not more), and be static in size, |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
651 " horizontally scrollable when the lines are too long. Otherwise, the diff |
2642 | 652 " is pretty useless for really long lines. {{{ |
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.use_css |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
654 call append(style_start, |
18639 | 655 \ ['<style' . (s:html5 ? '' : 'type="text/css"') . '>']+ |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
656 \ style+ |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
657 \ [ s:settings.use_xhtml ? '' : '<!--', |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
658 \ 'table { table-layout: fixed; }', |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
659 \ 'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }', |
18639 | 660 \ 'table, td, th { border: 1px solid; }', |
661 \ 'td { vertical-align: top; }', | |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
662 \ 'th, td { width: '.printf("%.1f",100.0/len(a:win_list)).'%; }', |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
663 \ 'td div { overflow: auto; }', |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
664 \ s:settings.use_xhtml ? '' : '-->', |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
665 \ '</style>' |
2642 | 666 \]) |
667 endif "}}} | |
2304
a59e6ac5ed28
When the buffer is in diff mode, have :TOhtml create HTML to show the diff
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
668 endif |
2546
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
669 |
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
670 let &paste = s:old_paste |
0d3f0e3d289b
Updates for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2508
diff
changeset
|
671 let &magic = s:old_magic |
2642 | 672 endfunc "}}} |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
673 |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
674 " Gets a single user option and sets it in the passed-in Dict, or gives it the |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
675 " default value if the option doesn't actually exist. |
2642 | 676 func! tohtml#GetOption(settings, option, default) "{{{ |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
677 if exists('g:html_'.a:option) |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
678 let a:settings[a:option] = g:html_{a:option} |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
679 else |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
680 let a:settings[a:option] = a:default |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
681 endif |
2642 | 682 endfunc "}}} |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
683 |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
684 " returns a Dict containing the values of all user options for 2html, including |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
685 " default values for those not given an explicit value by the user. Discards the |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
686 " html_ prefix of the option for nicer looking code. |
2642 | 687 func! tohtml#GetUserSettings() "{{{ |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
688 if exists('s:settings') |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
689 " just restore the known options if we've already retrieved them |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
690 return s:settings |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
691 else |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
692 " otherwise figure out which options are set |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
693 let user_settings = {} |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
694 |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
695 " Define the correct option if the old option name exists and we haven't |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
696 " already defined the correct one. Maybe I'll put out a warnig message about |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
697 " this sometime and remove the old option entirely at some even later time, |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
698 " but for now just silently accept the old option. |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
699 if exists('g:use_xhtml') && !exists("g:html_use_xhtml") |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
700 let g:html_use_xhtml = g:use_xhtml |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
701 endif |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
702 |
2642 | 703 " get current option settings with appropriate defaults {{{ |
18639 | 704 call tohtml#GetOption(user_settings, 'no_progress', !has("statusline") ) |
705 call tohtml#GetOption(user_settings, 'diff_one_file', 0 ) | |
706 call tohtml#GetOption(user_settings, 'number_lines', &number ) | |
707 call tohtml#GetOption(user_settings, 'pre_wrap', &wrap ) | |
708 call tohtml#GetOption(user_settings, 'use_css', 1 ) | |
709 call tohtml#GetOption(user_settings, 'ignore_conceal', 0 ) | |
710 call tohtml#GetOption(user_settings, 'ignore_folding', 0 ) | |
711 call tohtml#GetOption(user_settings, 'dynamic_folds', 0 ) | |
712 call tohtml#GetOption(user_settings, 'no_foldcolumn', user_settings.ignore_folding) | |
713 call tohtml#GetOption(user_settings, 'hover_unfold', 0 ) | |
714 call tohtml#GetOption(user_settings, 'no_pre', 0 ) | |
715 call tohtml#GetOption(user_settings, 'no_invalid', 0 ) | |
716 call tohtml#GetOption(user_settings, 'whole_filler', 0 ) | |
717 call tohtml#GetOption(user_settings, 'use_xhtml', 0 ) | |
718 call tohtml#GetOption(user_settings, 'line_ids', user_settings.number_lines ) | |
719 call tohtml#GetOption(user_settings, 'use_input_for_pc', 'fallback') | |
2642 | 720 " }}} |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
721 |
2642 | 722 " override those settings that need it {{{ |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
723 |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
724 " hover opening implies dynamic folding |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
725 if user_settings.hover_unfold |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
726 let user_settings.dynamic_folds = 1 |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
727 endif |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
728 |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
729 " ignore folding overrides dynamic folding |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
730 if user_settings.ignore_folding && user_settings.dynamic_folds |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
731 let user_settings.dynamic_folds = 0 |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
732 let user_settings.hover_unfold = 0 |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
733 endif |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
734 |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
735 " dynamic folding with no foldcolumn implies hover opens |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
736 if user_settings.dynamic_folds && user_settings.no_foldcolumn |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
737 let user_settings.hover_unfold = 1 |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
738 endif |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
739 |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
740 " dynamic folding implies css |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
741 if user_settings.dynamic_folds |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
742 let user_settings.use_css = 1 |
3713 | 743 else |
744 let user_settings.no_foldcolumn = 1 " won't do anything but for consistency and for the test suite | |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
745 endif |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
746 |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
747 " if we're not using CSS we cannot use a pre section because <font> tags |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
748 " aren't allowed inside a <pre> block |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
749 if !user_settings.use_css |
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
750 let user_settings.no_pre = 1 |
2788 | 751 endif |
752 | |
753 " pre_wrap doesn't do anything if not using pre or not using CSS | |
754 if user_settings.no_pre || !user_settings.use_css | |
755 let user_settings.pre_wrap=0 | |
756 endif | |
757 "}}} | |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
758 |
2681 | 759 " set up expand_tabs option after all the overrides so we know the |
760 " appropriate defaults {{{ | |
761 if user_settings.no_pre == 0 | |
762 call tohtml#GetOption(user_settings, | |
763 \ 'expand_tabs', | |
15033 | 764 \ &expandtab || &ts != 8 || &vts != '' || user_settings.number_lines || |
2681 | 765 \ (user_settings.dynamic_folds && !user_settings.no_foldcolumn)) |
766 else | |
767 let user_settings.expand_tabs = 1 | |
768 endif | |
769 " }}} | |
770 | |
3713 | 771 " textual options |
2642 | 772 if exists("g:html_use_encoding") "{{{ |
773 " user specified the desired MIME charset, figure out proper | |
774 " 'fileencoding' from it or warn the user if we cannot | |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
775 let user_settings.encoding = g:html_use_encoding |
2642 | 776 let user_settings.vim_encoding = tohtml#EncodingFromCharset(g:html_use_encoding) |
777 if user_settings.vim_encoding == '' | |
778 echohl WarningMsg | |
779 echomsg "TOhtml: file encoding for" | |
780 \ g:html_use_encoding | |
781 \ "unknown, please set 'fileencoding'" | |
782 echohl None | |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
783 endif |
2642 | 784 else |
785 " Figure out proper MIME charset from 'fileencoding' if possible | |
2788 | 786 if &l:fileencoding != '' |
787 " If the buffer is not a "normal" type, the 'fileencoding' value may not | |
788 " be trusted; since the buffer should not be written the fileencoding is | |
789 " not intended to be used. | |
790 if &l:buftype=='' || &l:buftype==?'help' | |
791 let user_settings.vim_encoding = &l:fileencoding | |
792 call tohtml#CharsetFromEncoding(user_settings) | |
793 else | |
794 let user_settings.encoding = '' " trigger detection using &encoding | |
795 endif | |
2642 | 796 endif |
797 | |
798 " else from 'encoding' if possible | |
799 if &l:fileencoding == '' || user_settings.encoding == '' | |
800 let user_settings.vim_encoding = &encoding | |
801 call tohtml#CharsetFromEncoding(user_settings) | |
802 endif | |
803 | |
804 " else default to UTF-8 and warn user | |
805 if user_settings.encoding == '' | |
806 let user_settings.vim_encoding = 'utf-8' | |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
807 let user_settings.encoding = 'UTF-8' |
2642 | 808 echohl WarningMsg |
809 echomsg "TOhtml: couldn't determine MIME charset, using UTF-8" | |
810 echohl None | |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
811 endif |
2642 | 812 endif "}}} |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
813 |
3713 | 814 " Default to making nothing uncopyable, because we default to |
815 " not-standards way of doing things, and also because Microsoft Word and | |
816 " others paste the <input> elements anyway. | |
817 " | |
818 " html_prevent_copy only has an effect when using CSS. | |
819 " | |
820 " All options: | |
821 " f - fold column | |
822 " n - line numbers (also within fold text) | |
823 " t - fold text | |
824 " d - diff filler | |
825 " c - concealed text (reserved future) | |
826 " l - listchars (reserved possible future) | |
827 " s - signs (reserved possible future) | |
828 " | |
829 " Normal text is always selectable. | |
830 let user_settings.prevent_copy = "" | |
831 if user_settings.use_css | |
832 if exists("g:html_prevent_copy") | |
833 if user_settings.dynamic_folds && !user_settings.no_foldcolumn && g:html_prevent_copy =~# 'f' | |
834 let user_settings.prevent_copy .= 'f' | |
835 endif | |
836 if user_settings.number_lines && g:html_prevent_copy =~# 'n' | |
837 let user_settings.prevent_copy .= 'n' | |
838 endif | |
839 if &diff && g:html_prevent_copy =~# 'd' | |
840 let user_settings.prevent_copy .= 'd' | |
841 endif | |
842 if !user_settings.ignore_folding && g:html_prevent_copy =~# 't' | |
843 let user_settings.prevent_copy .= 't' | |
844 endif | |
845 else | |
846 let user_settings.prevent_copy = "" | |
847 endif | |
848 endif | |
849 if empty(user_settings.prevent_copy) | |
850 let user_settings.no_invalid = 0 | |
851 endif | |
852 | |
18639 | 853 " enforce valid values for use_input_for_pc |
854 if user_settings.use_input_for_pc !~# 'fallback\|none\|all' | |
855 let user_settings.use_input_for_pc = 'fallback' | |
856 echohl WarningMsg | |
857 echomsg '2html: "' . g:html_use_input_for_pc . '" is not valid for g:html_use_input_for_pc' | |
858 echomsg '2html: defaulting to "' . user_settings.use_input_for_pc . '"' | |
859 echohl None | |
860 sleep 3 | |
861 endif | |
862 | |
5003
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
863 if exists('g:html_id_expr') |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
864 let user_settings.id_suffix = eval(g:html_id_expr) |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
865 if user_settings.id_suffix !~ '^[-_:.A-Za-z0-9]*$' |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
866 echohl WarningMsg |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
867 echomsg '2html: g:html_id_expr evaluated to invalid string for HTML id attributes' |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
868 echomsg '2html: Omitting user-specified suffix' |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
869 echohl None |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
870 sleep 3 |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
871 let user_settings.id_suffix="" |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
872 endif |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
873 else |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
874 let user_settings.id_suffix="" |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
875 endif |
ad6996a23e3e
Updated runtime files. New version of TOhtml plugin.
Bram Moolenaar <bram@vim.org>
parents:
4681
diff
changeset
|
876 |
2508
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
877 " TODO: font |
7e008c174cc3
Updates for :TOhtml. (Ben Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2496
diff
changeset
|
878 |
2496
a29075150aee
Improve handling of user settings in :TOhtml. Default to generating CSS.
Bram Moolenaar <bram@vim.org>
parents:
2432
diff
changeset
|
879 return user_settings |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
880 endif |
2642 | 881 endfunc "}}} |
882 | |
883 " get the proper HTML charset name from a Vim encoding option. | |
884 function! tohtml#CharsetFromEncoding(settings) "{{{ | |
885 let l:vim_encoding = a:settings.vim_encoding | |
886 if exists('g:html_charset_override') && has_key(g:html_charset_override, l:vim_encoding) | |
887 let a:settings.encoding = g:html_charset_override[l:vim_encoding] | |
888 else | |
889 if l:vim_encoding =~ '^8bit\|^2byte' | |
890 " 8bit- and 2byte- prefixes are to indicate encodings available on the | |
891 " system that Vim will convert with iconv(), look up just the encoding name, | |
892 " not Vim's prefix. | |
893 let l:vim_encoding = substitute(l:vim_encoding, '^8bit-\|^2byte-', '', '') | |
894 endif | |
895 if has_key(g:tohtml#encoding_to_charset, l:vim_encoding) | |
896 let a:settings.encoding = g:tohtml#encoding_to_charset[l:vim_encoding] | |
897 else | |
898 let a:settings.encoding = "" | |
899 endif | |
900 endif | |
901 if a:settings.encoding != "" | |
902 let l:vim_encoding = tohtml#EncodingFromCharset(a:settings.encoding) | |
903 if l:vim_encoding != "" | |
904 " if the Vim encoding to HTML encoding conversion is set up (by default or | |
905 " by the user) to convert to a different encoding, we need to also change | |
906 " the Vim encoding of the new buffer | |
907 let a:settings.vim_encoding = l:vim_encoding | |
908 endif | |
909 endif | |
910 endfun "}}} | |
911 | |
912 " Get the proper Vim encoding option setting from an HTML charset name. | |
913 function! tohtml#EncodingFromCharset(encoding) "{{{ | |
914 if exists('g:html_encoding_override') && has_key(g:html_encoding_override, a:encoding) | |
915 return g:html_encoding_override[a:encoding] | |
916 elseif has_key(g:tohtml#charset_to_encoding, tolower(a:encoding)) | |
917 return g:tohtml#charset_to_encoding[tolower(a:encoding)] | |
918 else | |
919 return "" | |
920 endif | |
921 endfun "}}} | |
2321
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
922 |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
923 let &cpo = s:cpo_sav |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
924 unlet s:cpo_sav |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
925 |
1902913f2049
Improved version of 2html.vim.
Bram Moolenaar <bram@vim.org>
parents:
2304
diff
changeset
|
926 " Make sure any patches will probably use consistent indent |
2642 | 927 " vim: ts=8 sw=2 sts=2 noet fdm=marker |