diff --git a/runtime/autoload/tohtml.vim b/runtime/autoload/tohtml.vim --- a/runtime/autoload/tohtml.vim +++ b/runtime/autoload/tohtml.vim @@ -1,6 +1,6 @@ " Vim autoload file for the tohtml plugin. " Maintainer: Ben Fritz -" Last Change: 2010 July 16 +" Last Change: 2010 July 24 " " Additional contributors: " @@ -64,6 +64,7 @@ call add(html, '') call add(html, 'diff') call add(html, '') + call add(html, '') " TODO: copy or move encoding logic from 2html.vim so generated markup can " validate without warnings about encoding diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.3b. Last change: 2010 May 14 +*eval.txt* For Vim version 7.3b. Last change: 2010 Jul 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5550,6 +5550,16 @@ Example (echoes the name of the syntax item under the cursor): > :echo synIDattr(synID(line("."), col("."), 1), "name") < + +synconcealed({lnum}, {col}) *synconcealed()* + The result is a List. The first item in the list is 0 if the + character at the position {lnum} and {col} is not part of a + concealable region, 1 if it is. The second item in the list is + a string. If the first item is 1, the second item contains the + text which will be displayed in place of the concealed text, + depending on the current setting of 'conceallevel'. + + synIDattr({synID}, {what} [, {mode}]) *synIDattr()* The result is a String, which is the {what} attribute of syntax ID {synID}. This can be used to obtain information diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.3b. Last change: 2010 Jul 23 +*syntax.txt* For Vim version 7.3b. Last change: 2010 Jul 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -424,8 +424,14 @@ shorter and valid HTML 4 file), use: > :let g:html_use_css = 1 -Closed folds are put in the HTML as they are displayed. If you don't want -this, use the |zR| command before invoking 2html, or use: > +Concealed text is removed from the HTML and replaced with the appropriate +character from |syn-cchar| or 'listchars' depending on the current value of +'conceallevel'. If you always want to display all text in your document, +either set 'conceallevel' to before invoking 2html, or use: > + :let g:html_ignore_conceal = 1 + +Similarly, closed folds are put in the HTML as they are displayed. If you +don't want this, use the |zR| command before invoking 2html, or use: > :let g:html_ignore_folding = 1 You may want to generate HTML that includes all the data within the folds, and diff --git a/runtime/plugin/tohtml.vim b/runtime/plugin/tohtml.vim --- a/runtime/plugin/tohtml.vim +++ b/runtime/plugin/tohtml.vim @@ -1,7 +1,7 @@ " Vim plugin for converting a syntax highlighted file to HTML. " Maintainer: Ben Fritz -" Last Change: 2010 Jul 16 +" Last Change: 2010 July 24 " " The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and " $VIMRUNTIME/syntax/2html.vim @@ -4,7 +4,12 @@ " " The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and " $VIMRUNTIME/syntax/2html.vim +if exists('g:loaded_2html_plugin') + finish +endif +let g:loaded_2html_plugin = 'vim7.3_v1' + " Define the :TOhtml command when: " - 'compatible' is not set " - this plugin was not already loaded diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim --- a/runtime/syntax/2html.vim +++ b/runtime/syntax/2html.vim @@ -1,6 +1,6 @@ " Vim syntax support file " Maintainer: Ben Fritz -" Last Change: 2010 July 16 +" Last Change: 2010 July 24 " " Additional contributors: " @@ -4,12 +4,12 @@ " " Additional contributors: " -" Original by Bram Moolenaar -" Modified by David Ne\v{c}as (Yeti) -" XHTML support by Panagiotis Issaris -" Made w3 compliant by Edd Barrett -" Added html_font. Edd Barrett -" Progress bar based off code from "progressbar widget" plugin by -" Andreas Politz, heavily modified: -" http://www.vim.org/scripts/script.php?script_id=2006 +" Original by Bram Moolenaar +" Modified by David Ne\v{c}as (Yeti) +" XHTML support by Panagiotis Issaris +" Made w3 compliant by Edd Barrett +" Added html_font. Edd Barrett +" Progress bar based off code from "progressbar widget" plugin by +" Andreas Politz, heavily modified: +" http://www.vim.org/scripts/script.php?script_id=2006 " @@ -15,5 +15,5 @@ " -" See Mercurial change logs for more! +" See Mercurial change logs for more! " Transform a file into HTML, using the current syntax highlighting. @@ -241,6 +241,12 @@ set nomore set report=1000000 +if exists(':ownsyntax') && exists('w:current_syntax') + let s:current_syntax = w:current_syntax +else + let s:current_syntax = b:current_syntax +endif + " Split window to create a buffer with the HTML file. let s:orgbufnr = winbufnr(0) let s:origwin_stl = &l:stl @@ -315,7 +321,8 @@ \"", \("".expand("%:p:~").""), \(" 0 + let s:new = s:new . s:HtmlFormat(repeat(' ', s:foldcolumn), "FoldColumn") + endif else " add the fold column for folds not on the opening line if get(s:foldstack, 0).firstline < s:lnum @@ -831,7 +842,10 @@ " Get the diff attribute, if any. let s:diffattr = diff_hlID(s:lnum, 1) + " initialize conceal info to act like not concealed, just in case + let s:concealinfo = [0, ''] + " Loop over each character in the line let s:col = 1 while s:col <= s:len || (s:col == 1 && s:diffattr) let s:startcol = s:col " The start column for processing text @@ -834,8 +848,17 @@ " Loop over each character in the line let s:col = 1 while s:col <= s:len || (s:col == 1 && s:diffattr) let s:startcol = s:col " The start column for processing text - if s:diffattr + if !exists('g:html_ignore_conceal') && has('conceal') + let s:concealinfo = synconcealed(s:lnum, s:col) + endif + if !exists('g:html_ignore_conceal') && s:concealinfo[0] + let s:id = synID(s:lnum, s:col, 0) + let s:col = s:col + 1 + " Speed loop (it's small - that's the trick) + " Go along till we find a change in synID (ending the concealed region) + while s:col <= s:len && s:id == synID(s:lnum, s:col, 1) | let s:col = s:col + 1 | endwhile + elseif s:diffattr let s:id = diff_hlID(s:lnum, s:col) let s:col = s:col + 1 " Speed loop (it's small - that's the trick) @@ -854,12 +877,23 @@ while s:col <= s:len && s:id == synID(s:lnum, s:col, 1) | let s:col = s:col + 1 | endwhile endif - " Expand tabs - let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol) - let s:offset = 0 - let s:idx = stridx(s:expandedtab, "\t") - while s:idx >= 0 - if has("multi_byte_encoding") - if s:startcol + s:idx == 1 - let s:i = &ts + if exists('g:html_ignore_conceal') || !s:concealinfo[0] + " Expand tabs + let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol) + let s:offset = 0 + let s:idx = stridx(s:expandedtab, "\t") + while s:idx >= 0 + if has("multi_byte_encoding") + if s:startcol + s:idx == 1 + let s:i = &ts + else + if s:idx == 0 + let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:idx + s:offset) . 'c') + else + let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c') + endif + let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)]) + let s:i = &ts - (s:vcol % &ts) + endif + let s:offset -= s:i - 1 else @@ -865,9 +899,3 @@ else - if s:idx == 0 - let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:idx + s:offset) . 'c') - else - let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c') - endif - let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)]) - let s:i = &ts - (s:vcol % &ts) + let s:i = &ts - ((s:idx + s:startcol - 1) % &ts) endif @@ -873,9 +901,5 @@ endif - let s:offset -= s:i - 1 - else - let s:i = &ts - ((s:idx + s:startcol - 1) % &ts) - endif - let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '') - let s:idx = stridx(s:expandedtab, "\t") - endwhile + let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '') + let s:idx = stridx(s:expandedtab, "\t") + endwhile @@ -881,8 +905,18 @@ - " Output the text with the same synID, with class set to {s:id_name} - let s:id = synIDtrans(s:id) - let s:id_name = synIDattr(s:id, "name", s:whatterm) - let s:new = s:new . s:HtmlFormat(s:expandedtab, s:id_name) + " get the highlight group name to use + let s:id = synIDtrans(s:id) + let s:id_name = synIDattr(s:id, "name", s:whatterm) + else + " use Conceal highlighting for concealed text + let s:id_name = 'Conceal' + let s:expandedtab = s:concealinfo[1] + endif + + " Output the text with the same synID, with class set to {s:id_name}, + " unless it has been concealed completely. Always output empty lines. + if strlen(s:expandedtab) > 0 + let s:new = s:new . s:HtmlFormat(s:expandedtab, s:id_name) + endif endwhile endif @@ -886,7 +920,7 @@ endwhile endif - call extend(s:lines, split(s:new.s:HtmlEndline, '\n')) + call extend(s:lines, split(s:new.s:HtmlEndline, '\n', 1)) if !s:html_no_progress && s:pgb.needs_redraw redrawstatus let s:pgb.needs_redraw = 0 @@ -1054,8 +1088,8 @@ unlet s:htmlfont unlet s:old_et s:old_paste s:old_icon s:old_report s:old_title s:old_search s:old_magic s:old_more s:old_fdm s:old_winheight s:old_winfixheight unlet s:whatterm s:idlist s:lnum s:end s:margin s:fgc s:bgc -unlet! s:col s:id s:attr s:len s:line s:new s:expandedtab s:numblines -unlet! s:orgwin s:newwin s:orgbufnr s:idx s:i s:offset s:ls s:origwin_stl s:newwin_stl +unlet! s:col s:id s:attr s:len s:line s:new s:expandedtab s:numblines s:concealinfo +unlet! s:orgwin s:newwin s:orgbufnr s:idx s:i s:offset s:ls s:origwin_stl s:newwin_stl s:current_syntax if !v:profiling delfunc s:HtmlColor delfunc s:HtmlFormat diff --git a/src/eval.c b/src/eval.c --- a/src/eval.c +++ b/src/eval.c @@ -718,6 +718,7 @@ static void f_synIDattr __ARGS((typval_T *argvars, typval_T *rettv)); static void f_synIDtrans __ARGS((typval_T *argvars, typval_T *rettv)); static void f_synstack __ARGS((typval_T *argvars, typval_T *rettv)); +static void f_synconcealed __ARGS((typval_T *argvars, typval_T *rettv)); static void f_system __ARGS((typval_T *argvars, typval_T *rettv)); static void f_tabpagebuflist __ARGS((typval_T *argvars, typval_T *rettv)); static void f_tabpagenr __ARGS((typval_T *argvars, typval_T *rettv)); @@ -7876,6 +7877,9 @@ {"synID", 3, 3, f_synID}, {"synIDattr", 2, 3, f_synIDattr}, {"synIDtrans", 1, 1, f_synIDtrans}, +#ifdef FEAT_CONCEAL + {"synconcealed", 2, 2, f_synconcealed}, +#endif {"synstack", 2, 2, f_synstack}, {"system", 1, 2, f_system}, {"tabpagebuflist", 0, 1, f_tabpagebuflist}, @@ -17132,6 +17136,61 @@ } /* + * "synconcealed(lnum, col)" function + */ + static void +f_synconcealed(argvars, rettv) + typval_T *argvars UNUSED; + typval_T *rettv; +{ +#if defined(FEAT_SYN_HL) && defined(FEAT_CONCEAL) + long lnum; + long col; + int id; + int cchar; + int syntax_flags = 0; + char_u str[2]; +#endif + + rettv->v_type = VAR_LIST; + rettv->vval.v_list = NULL; + +#if defined(FEAT_SYN_HL) && defined(FEAT_CONCEAL) + lnum = get_tv_lnum(argvars); /* -1 on type error */ + col = get_tv_number(&argvars[1]) - 1; /* -1 on type error */ + + str[0] = NUL; + str[1] = NUL; + + if (rettv_list_alloc(rettv) != FAIL) + { + if (curwin->w_p_cole > 0) + { + if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count + && col >= 0 && col <= (long)STRLEN(ml_get(lnum))) + { + syntax_flags = syn_get_attrs(curwin, lnum, col, NULL, TRUE); + + /* get the conceal character */ + if ((syntax_flags & HL_CONCEAL) && curwin->w_p_cole < 3) + { + if (syn_get_sub_char() != NUL) + str[0] = syn_get_sub_char(); + else if (curwin->w_p_cole == 1 && lcs_conceal != NUL) + str[0] = lcs_conceal; + } + } + } + + list_append_number(rettv->vval.v_list, 0 != (syntax_flags & HL_CONCEAL)); + list_append_string(rettv->vval.v_list, str, 1); + } + else + rettv->vval.v_number = FALSE; +#endif +} + +/* * "synstack(lnum, col)" function */ static void diff --git a/src/syntax.c b/src/syntax.c --- a/src/syntax.c +++ b/src/syntax.c @@ -468,6 +468,7 @@ int dist; static int changedtick = 0; /* remember the last change ID */ + current_sub_char = NUL; /* * After switching buffers, invalidate current_state. * Also do this when a change was made, the current state may be invalid @@ -6348,6 +6349,32 @@ } /* + * Function called for expression evaluation: get syntax attributes at file + * position. + */ + int +syn_get_attrs(wp, lnum, col, spellp, keep_state) + win_T *wp; + long lnum; + colnr_T col; + int *spellp; /* return: can do spell checking */ + int keep_state; /* keep state of char at "col" */ +{ + int id; + + /* When the position is not after the current position and in the same + * line of the same buffer, need to restart parsing. */ + if (wp->w_buffer != syn_buf + || lnum != current_lnum + || col < current_col) + syntax_start(wp, lnum); + + (void)get_syntax_attr(col, spellp, keep_state); + + return get_syntax_info(&id); +} + +/* * Return conceal substitution character */ int