mirror of
https://github.com/vim/vim.git
synced 2025-07-24 10:45:12 -04:00
Update runtime files.
This commit is contained in:
Bram Moolenaar
parent
0324f9ea0a
commit
09c6f265b2
@ -1,6 +1,6 @@
|
||||
" Vim autoload file for the tohtml plugin.
|
||||
" Maintainer: Ben Fritz <fritzophrenic@gmail.com>
|
||||
" Last Change: 2018 Nov 11
|
||||
" Last Change: 2019 Aug 16
|
||||
"
|
||||
" Additional contributors:
|
||||
"
|
||||
@ -364,6 +364,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
let body_line = ''
|
||||
|
||||
let html = []
|
||||
let s:html5 = 0
|
||||
if s:settings.use_xhtml
|
||||
call add(html, xml_line)
|
||||
endif
|
||||
@ -371,8 +372,9 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
call add(html, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
|
||||
call add(html, '<html xmlns="http://www.w3.org/1999/xhtml">')
|
||||
elseif s:settings.use_css && !s:settings.no_pre
|
||||
call add(html, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">")
|
||||
call add(html, "<!DOCTYPE html>")
|
||||
call add(html, '<html>')
|
||||
let s:html5 = 1
|
||||
else
|
||||
call add(html, '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"')
|
||||
call add(html, ' "http://www.w3.org/TR/html4/loose.dtd">')
|
||||
@ -383,7 +385,11 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
" include encoding as close to the top as possible, but only if not already
|
||||
" contained in XML information
|
||||
if s:settings.encoding != "" && !s:settings.use_xhtml
|
||||
call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . tag_close)
|
||||
if s:html5
|
||||
call add(html, '<meta charset="' . s:settings.encoding . '"' . tag_close)
|
||||
else
|
||||
call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . tag_close)
|
||||
endif
|
||||
endif
|
||||
|
||||
call add(html, '<title>diff</title>')
|
||||
@ -392,6 +398,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
call add(html, '<meta name="settings" content="'.
|
||||
\ join(filter(keys(s:settings),'s:settings[v:val]'),',').
|
||||
\ ',prevent_copy='.s:settings.prevent_copy.
|
||||
\ ',use_input_for_pc='.s:settings.use_input_for_pc.
|
||||
\ '"'.tag_close)
|
||||
call add(html, '<meta name="colorscheme" content="'.
|
||||
\ (exists('g:colors_name')
|
||||
@ -400,16 +407,8 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
|
||||
call add(html, '</head>')
|
||||
let body_line_num = len(html)
|
||||
if !empty(s:settings.prevent_copy)
|
||||
call add(html, "<body onload='FixCharWidth();".(s:settings.line_ids ? " JumpToLine();" : "")."'>")
|
||||
call add(html, "<!-- hidden divs used by javascript to get the width of a char -->")
|
||||
call add(html, "<div id='oneCharWidth'>0</div>")
|
||||
call add(html, "<div id='oneInputWidth'><input size='1' value='0'".tag_close."</div>")
|
||||
call add(html, "<div id='oneEmWidth' style='width: 1em;'></div>")
|
||||
else
|
||||
call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
|
||||
endif
|
||||
call add(html, "<table border='1' width='100%' id='vimCodeElement".s:settings.id_suffix."'>")
|
||||
call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
|
||||
call add(html, "<table ".(s:settings.use_css? "" : "border='1' width='100%' ")."id='vimCodeElement".s:settings.id_suffix."'>")
|
||||
|
||||
call add(html, '<tr>')
|
||||
for buf in a:win_list
|
||||
@ -443,7 +442,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
" Grab the style information. Some of this will be duplicated so only insert
|
||||
" it if it's not already there. {{{
|
||||
1
|
||||
let style_start = search('^<style type="text/css">')
|
||||
let style_start = search('^<style\( type="text/css"\)\?>')
|
||||
1
|
||||
let style_end = search('^</style>')
|
||||
if style_start > 0 && style_end > 0
|
||||
@ -481,7 +480,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
" TODO: restore using grabbed lines if undolevel is 1?
|
||||
normal! 2u
|
||||
if s:settings.use_css
|
||||
call add(html, '<td valign="top"><div>')
|
||||
call add(html, '<td><div>')
|
||||
elseif s:settings.use_xhtml
|
||||
call add(html, '<td nowrap="nowrap" valign="top"><div>')
|
||||
else
|
||||
@ -515,7 +514,13 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
let name = substitute(name, '\d*\.x\?html$', '', '') . i . '.' . fnamemodify(copy(name), ":t:e")
|
||||
let i += 1
|
||||
endwhile
|
||||
|
||||
let s:ei_sav = &eventignore
|
||||
set eventignore+=FileType
|
||||
exe "topleft new " . name
|
||||
let &eventignore=s:ei_sav
|
||||
unlet s:ei_sav
|
||||
|
||||
setlocal modifiable
|
||||
|
||||
" just in case some user autocmd creates content in the new buffer, make sure
|
||||
@ -544,7 +549,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
" add required javascript in reverse order so we can just call append again
|
||||
" and again without adjusting {{{
|
||||
|
||||
let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids || !empty(s:settings.prevent_copy)
|
||||
let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids
|
||||
|
||||
" insert script closing tag if needed
|
||||
if s:uses_script
|
||||
@ -555,31 +560,6 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
\ ])
|
||||
endif
|
||||
|
||||
" insert script which corrects the size of small input elements in
|
||||
" prevent_copy mode. See 2html.vim for details on why this is needed and how
|
||||
" it works.
|
||||
if !empty(s:settings.prevent_copy)
|
||||
call append(style_start, [
|
||||
\ '',
|
||||
\ '/* simulate a "ch" unit by asking the browser how big a zero character is */',
|
||||
\ 'function FixCharWidth() {',
|
||||
\ ' /* get the hidden element which gives the width of a single character */',
|
||||
\ ' var goodWidth = document.getElementById("oneCharWidth").clientWidth;',
|
||||
\ ' /* get all input elements, we''ll filter on class later */',
|
||||
\ ' var inputTags = document.getElementsByTagName("input");',
|
||||
\ ' var ratio = 5;',
|
||||
\ ' var inputWidth = document.getElementById("oneInputWidth").clientWidth;',
|
||||
\ ' var emWidth = document.getElementById("oneEmWidth").clientWidth;',
|
||||
\ ' if (inputWidth > goodWidth) {',
|
||||
\ ' while (ratio < 100*goodWidth/emWidth && ratio < 100) {',
|
||||
\ ' ratio += 5;',
|
||||
\ ' }',
|
||||
\ ' document.getElementById("vimCodeElement'.s:settings.id_suffix.'").className = "em"+ratio;',
|
||||
\ ' }',
|
||||
\ '}'
|
||||
\ ])
|
||||
endif
|
||||
|
||||
" insert javascript to get IDs from line numbers, and to open a fold before
|
||||
" jumping to any lines contained therein
|
||||
if s:settings.line_ids
|
||||
@ -659,10 +639,9 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
endif
|
||||
|
||||
if s:uses_script
|
||||
" insert script tag; javascript is always needed for the line number
|
||||
" normalization for URL hashes
|
||||
" insert script tag if needed
|
||||
call append(style_start, [
|
||||
\ "<script type='text/javascript'>",
|
||||
\ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">",
|
||||
\ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
|
||||
endif
|
||||
|
||||
@ -673,11 +652,13 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
|
||||
" is pretty useless for really long lines. {{{
|
||||
if s:settings.use_css
|
||||
call append(style_start,
|
||||
\ ['<style type="text/css">']+
|
||||
\ ['<style' . (s:html5 ? '' : 'type="text/css"') . '>']+
|
||||
\ style+
|
||||
\ [ s:settings.use_xhtml ? '' : '<!--',
|
||||
\ 'table { table-layout: fixed; }',
|
||||
\ 'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }',
|
||||
\ 'table, td, th { border: 1px solid; }',
|
||||
\ 'td { vertical-align: top; }',
|
||||
\ 'th, td { width: '.printf("%.1f",100.0/len(a:win_list)).'%; }',
|
||||
\ 'td div { overflow: auto; }',
|
||||
\ s:settings.use_xhtml ? '' : '-->',
|
||||
@ -720,21 +701,22 @@ func! tohtml#GetUserSettings() "{{{
|
||||
endif
|
||||
|
||||
" get current option settings with appropriate defaults {{{
|
||||
call tohtml#GetOption(user_settings, 'no_progress', !has("statusline") )
|
||||
call tohtml#GetOption(user_settings, 'diff_one_file', 0 )
|
||||
call tohtml#GetOption(user_settings, 'number_lines', &number )
|
||||
call tohtml#GetOption(user_settings, 'pre_wrap', &wrap )
|
||||
call tohtml#GetOption(user_settings, 'use_css', 1 )
|
||||
call tohtml#GetOption(user_settings, 'ignore_conceal', 0 )
|
||||
call tohtml#GetOption(user_settings, 'ignore_folding', 0 )
|
||||
call tohtml#GetOption(user_settings, 'dynamic_folds', 0 )
|
||||
call tohtml#GetOption(user_settings, 'no_foldcolumn', user_settings.ignore_folding)
|
||||
call tohtml#GetOption(user_settings, 'hover_unfold', 0 )
|
||||
call tohtml#GetOption(user_settings, 'no_pre', 0 )
|
||||
call tohtml#GetOption(user_settings, 'no_invalid', 0 )
|
||||
call tohtml#GetOption(user_settings, 'whole_filler', 0 )
|
||||
call tohtml#GetOption(user_settings, 'use_xhtml', 0 )
|
||||
call tohtml#GetOption(user_settings, 'line_ids', user_settings.number_lines )
|
||||
call tohtml#GetOption(user_settings, 'no_progress', !has("statusline") )
|
||||
call tohtml#GetOption(user_settings, 'diff_one_file', 0 )
|
||||
call tohtml#GetOption(user_settings, 'number_lines', &number )
|
||||
call tohtml#GetOption(user_settings, 'pre_wrap', &wrap )
|
||||
call tohtml#GetOption(user_settings, 'use_css', 1 )
|
||||
call tohtml#GetOption(user_settings, 'ignore_conceal', 0 )
|
||||
call tohtml#GetOption(user_settings, 'ignore_folding', 0 )
|
||||
call tohtml#GetOption(user_settings, 'dynamic_folds', 0 )
|
||||
call tohtml#GetOption(user_settings, 'no_foldcolumn', user_settings.ignore_folding)
|
||||
call tohtml#GetOption(user_settings, 'hover_unfold', 0 )
|
||||
call tohtml#GetOption(user_settings, 'no_pre', 0 )
|
||||
call tohtml#GetOption(user_settings, 'no_invalid', 0 )
|
||||
call tohtml#GetOption(user_settings, 'whole_filler', 0 )
|
||||
call tohtml#GetOption(user_settings, 'use_xhtml', 0 )
|
||||
call tohtml#GetOption(user_settings, 'line_ids', user_settings.number_lines )
|
||||
call tohtml#GetOption(user_settings, 'use_input_for_pc', 'fallback')
|
||||
" }}}
|
||||
|
||||
" override those settings that need it {{{
|
||||
@ -868,6 +850,16 @@ func! tohtml#GetUserSettings() "{{{
|
||||
let user_settings.no_invalid = 0
|
||||
endif
|
||||
|
||||
" enforce valid values for use_input_for_pc
|
||||
if user_settings.use_input_for_pc !~# 'fallback\|none\|all'
|
||||
let user_settings.use_input_for_pc = 'fallback'
|
||||
echohl WarningMsg
|
||||
echomsg '2html: "' . g:html_use_input_for_pc . '" is not valid for g:html_use_input_for_pc'
|
||||
echomsg '2html: defaulting to "' . user_settings.use_input_for_pc . '"'
|
||||
echohl None
|
||||
sleep 3
|
||||
endif
|
||||
|
||||
if exists('g:html_id_expr')
|
||||
let user_settings.id_suffix = eval(g:html_id_expr)
|
||||
if user_settings.id_suffix !~ '^[-_:.A-Za-z0-9]*$'
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*eval.txt* For Vim version 8.1. Last change: 2019 Nov 06
|
||||
*eval.txt* For Vim version 8.1. Last change: 2019 Nov 17
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -11585,21 +11585,6 @@ text...
|
||||
Unlock the internal variable {name}. Does the
|
||||
opposite of |:lockvar|.
|
||||
|
||||
*:eval*
|
||||
:eval {expr} Evaluate {expr} and discard the result. Example: >
|
||||
:eval Getlist()->Filter()->append('$')
|
||||
|
||||
< The expression is supposed to have a side effect,
|
||||
since the resulting value is not used. In the example
|
||||
the `append()` call appends the List with text to the
|
||||
buffer. This is similar to `:call` but works with any
|
||||
expression.
|
||||
|
||||
The command can be shortened to `:ev` or `:eva`, but
|
||||
these are hard to recognize and therefore not to be
|
||||
used.
|
||||
|
||||
|
||||
:if {expr1} *:if* *:end* *:endif* *:en* *E171* *E579* *E580*
|
||||
:en[dif] Execute the commands until the next matching ":else"
|
||||
or ":endif" if {expr1} evaluates to non-zero.
|
||||
@ -11886,6 +11871,21 @@ text...
|
||||
And to get a beep: >
|
||||
:exe "normal \<Esc>"
|
||||
<
|
||||
*:eval*
|
||||
:eval {expr} Evaluate {expr} and discard the result. Example: >
|
||||
:eval Getlist()->Filter()->append('$')
|
||||
|
||||
< The expression is supposed to have a side effect,
|
||||
since the resulting value is not used. In the example
|
||||
the `append()` call appends the List with text to the
|
||||
buffer. This is similar to `:call` but works with any
|
||||
expression.
|
||||
|
||||
The command can be shortened to `:ev` or `:eva`, but
|
||||
these are hard to recognize and therefore not to be
|
||||
used.
|
||||
|
||||
|
||||
*:exe* *:execute*
|
||||
:exe[cute] {expr1} .. Executes the string that results from the evaluation
|
||||
of {expr1} as an Ex command.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*gui.txt* For Vim version 8.1. Last change: 2019 Nov 10
|
||||
*gui.txt* For Vim version 8.1. Last change: 2019 Nov 16
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -309,7 +309,7 @@ because the menu command will always be applied to the top window.
|
||||
|
||||
If you are on the ':' line (or '/' or '?'), then clicking the left or right
|
||||
mouse button will position the cursor on the ':' line (if 'mouse' contains
|
||||
'c', 'a' or 'A').
|
||||
'c' or 'a').
|
||||
|
||||
In any situation the middle mouse button may be clicked to paste the current
|
||||
selection.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*motion.txt* For Vim version 8.1. Last change: 2019 Nov 04
|
||||
*motion.txt* For Vim version 8.1. Last change: 2019 Nov 16
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -964,6 +964,7 @@ These commands are not marks themselves, but jump to a mark:
|
||||
- numbered marks '0 - '9
|
||||
- last insert position '^
|
||||
- last change position '.
|
||||
- last affected text area '[ and ']
|
||||
- the Visual area '< and '>
|
||||
- line numbers in placed signs
|
||||
- line numbers in quickfix positions
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*pi_netrw.txt* For Vim version 8.1. Last change: 2019 Nov 10
|
||||
*pi_netrw.txt* For Vim version 8.1. Last change: 2019 Nov 14
|
||||
|
||||
------------------------------------------------
|
||||
NETRW REFERENCE MANUAL by Charles E. Campbell
|
||||
@ -1184,7 +1184,7 @@ One may easily "bookmark" the currently browsed directory by using >
|
||||
*.netrwbook*
|
||||
Bookmarks are retained in between sessions of vim in a file called .netrwbook
|
||||
as a |List|, which is typically stored in the first directory on the user's
|
||||
|'runtimepath'|; entries are kept in sorted order.
|
||||
'runtimepath'; entries are kept in sorted order.
|
||||
|
||||
If there are marked files and/or directories, mb will add them to the bookmark
|
||||
list.
|
||||
@ -3512,7 +3512,7 @@ Example: Clear netrw's marked file list via a mapping on gu >
|
||||
- Click "Add..."
|
||||
- Set External Editor (adjust path as needed, include
|
||||
the quotes and !.! at the end):
|
||||
"c:\Program Files\Vim\vim881\gvim.exe" !.!
|
||||
"c:\Program Files\Vim\vim81\gvim.exe" !.!
|
||||
- Check that the filetype in the box below is
|
||||
{asterisk}.{asterisk} (all files), or whatever types
|
||||
you want (cec: change {asterisk} to * ; I had to
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*popup.txt* For Vim version 8.1. Last change: 2019 Nov 11
|
||||
*popup.txt* For Vim version 8.1. Last change: 2019 Nov 17
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -863,7 +863,7 @@ Some recommended key actions:
|
||||
Tab accept current suggestion
|
||||
|
||||
A mouse click arrives as <LeftMouse>. The coordinates can be obtained with
|
||||
|mousegetpos()|.
|
||||
|getmousepos()|.
|
||||
|
||||
Vim provides standard filters |popup_filter_menu()| and
|
||||
|popup_filter_yesno()|.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*syntax.txt* For Vim version 8.1. Last change: 2019 Oct 27
|
||||
*syntax.txt* For Vim version 8.1. Last change: 2019 Nov 14
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -476,6 +476,16 @@ conversion. See |-E| and |-s-ex| for details. It is probably best to create a
|
||||
script to replace all the -c commands and use it with the -u flag instead of
|
||||
specifying each command separately.
|
||||
|
||||
*hl-TOhtmlProgress* *TOhtml-progress-color*
|
||||
When displayed, the progress bar will show colored boxes along the statusline
|
||||
as the HTML conversion proceeds. By default, the background color as the
|
||||
current "DiffDelete" highlight group is used. If "DiffDelete" and "StatusLine"
|
||||
have the same background color, TOhtml will automatically adjust the color to
|
||||
differ. If you do not like the automatically selected colors, you can define
|
||||
your own highlight colors for the progress bar. Example: >
|
||||
|
||||
hi TOhtmlProgress guifg=#c0ffee ctermbg=7
|
||||
<
|
||||
*g:html_number_lines*
|
||||
Default: current 'number' setting.
|
||||
When 0, buffer text is displayed in the generated HTML without line numbering.
|
||||
@ -507,8 +517,8 @@ For example: >
|
||||
<
|
||||
*g:html_use_css*
|
||||
Default: 1.
|
||||
When 1, generate valid HTML 4.01 markup with CSS1 styling, supported in all
|
||||
modern browsers and most old browsers.
|
||||
When 1, generate valid HTML 5 markup with CSS styling, supported in all modern
|
||||
browsers and many old browsers.
|
||||
When 0, generate <font> tags and similar outdated markup. This is not
|
||||
recommended but it may work better in really old browsers, email clients,
|
||||
forum posts, and similar situations where basic CSS support is unavailable.
|
||||
@ -580,23 +590,43 @@ affected in this way as follows:
|
||||
Example, to make the fold column and line numbers uncopyable: >
|
||||
:let g:html_prevent_copy = "fn"
|
||||
<
|
||||
This feature is currently implemented by inserting read-only <input> elements
|
||||
into the markup to contain the uncopyable areas. This does not work well in
|
||||
all cases. When pasting to some applications which understand HTML, the
|
||||
<input> elements also get pasted. But plain-text paste destinations should
|
||||
always work.
|
||||
The method used to prevent copying in the generated page depends on the value
|
||||
of |g:html_use_input_for_pc|.
|
||||
|
||||
*g:html_use_input_for_pc*
|
||||
Default: "fallback"
|
||||
If |g:html_prevent_copy| is non-empty, then:
|
||||
|
||||
When "all", read-only <input> elements are used in place of normal text for
|
||||
uncopyable regions. In some browsers, especially older browsers, after
|
||||
selecting an entire page and copying the selection, the <input> tags are not
|
||||
pasted with the page text. If |g:html_no_invalid| is 0, the <input> tags have
|
||||
invalid type; this works in more browsers, but the page will not validate.
|
||||
Note: this method does NOT work in recent versions of Chrome and equivalent
|
||||
browsers; the <input> tags get pasted with the text.
|
||||
|
||||
When "fallback" (default value), the same <input> elements are generated for
|
||||
older browsers, but newer browsers (detected by CSS feature query) hide the
|
||||
<input> elements and instead use generated content in an ::before pseudoelement
|
||||
to display the uncopyable text. This method should work with the largest
|
||||
number of browsers, both old and new.
|
||||
|
||||
When "none", the <input> elements are not generated at all. Only the
|
||||
generated-content method is used. This means that old browsers, notably
|
||||
Internet Explorer, will either copy the text intended not to be copyable, or
|
||||
the non-copyable text may not appear at all. However, this is the most
|
||||
standards-based method, and there will be much less markup.
|
||||
|
||||
*g:html_no_invalid*
|
||||
Default: 0.
|
||||
When 0, if |g:html_prevent_copy| is non-empty, an invalid attribute is
|
||||
intentionally inserted into the <input> element for the uncopyable areas. This
|
||||
increases the number of applications you can paste to without also pasting the
|
||||
<input> elements. Specifically, Microsoft Word will not paste the <input>
|
||||
elements if they contain this invalid attribute.
|
||||
When 1, no invalid markup is ever intentionally inserted, and the generated
|
||||
page should validate. However, be careful pasting into Microsoft Word when
|
||||
|g:html_prevent_copy| is non-empty; it can be hard to get rid of the <input>
|
||||
elements which get pasted.
|
||||
When 0, if |g:html_prevent_copy| is non-empty and |g:html_use_input_for_pc| is
|
||||
not "none", an invalid attribute is intentionally inserted into the <input>
|
||||
element for the uncopyable areas. This prevents pasting the <input> elements
|
||||
in some applications. Specifically, some versions of Microsoft Word will not
|
||||
paste the <input> elements if they contain this invalid attribute. When 1, no
|
||||
invalid markup is inserted, and the generated page should validate. However,
|
||||
<input> elements may be pasted into some applications and can be difficult to
|
||||
remove afterward.
|
||||
|
||||
*g:html_hover_unfold*
|
||||
Default: 0.
|
||||
|
||||
@ -5038,6 +5038,7 @@ TERM starting.txt /*TERM*
|
||||
TOhtml-encoding syntax.txt /*TOhtml-encoding*
|
||||
TOhtml-encoding-detect syntax.txt /*TOhtml-encoding-detect*
|
||||
TOhtml-performance syntax.txt /*TOhtml-performance*
|
||||
TOhtml-progress-color syntax.txt /*TOhtml-progress-color*
|
||||
TOhtml-uncopyable-text syntax.txt /*TOhtml-uncopyable-text*
|
||||
TOhtml-wrap-text syntax.txt /*TOhtml-wrap-text*
|
||||
TRUE eval.txt /*TRUE*
|
||||
@ -6648,6 +6649,7 @@ g:html_prevent_copy syntax.txt /*g:html_prevent_copy*
|
||||
g:html_start_line syntax.txt /*g:html_start_line*
|
||||
g:html_use_css syntax.txt /*g:html_use_css*
|
||||
g:html_use_encoding syntax.txt /*g:html_use_encoding*
|
||||
g:html_use_input_for_pc syntax.txt /*g:html_use_input_for_pc*
|
||||
g:html_use_xhtml syntax.txt /*g:html_use_xhtml*
|
||||
g:html_whole_filler syntax.txt /*g:html_whole_filler*
|
||||
g:netrw_altfile pi_netrw.txt /*g:netrw_altfile*
|
||||
@ -6873,6 +6875,7 @@ getlatestvimscripts-install pi_getscript.txt /*getlatestvimscripts-install*
|
||||
getline() eval.txt /*getline()*
|
||||
getloclist() eval.txt /*getloclist()*
|
||||
getmatches() eval.txt /*getmatches()*
|
||||
getmousepos() eval.txt /*getmousepos()*
|
||||
getpid() eval.txt /*getpid()*
|
||||
getpos() eval.txt /*getpos()*
|
||||
getqflist() eval.txt /*getqflist()*
|
||||
@ -7132,6 +7135,7 @@ hl-StatusLine syntax.txt /*hl-StatusLine*
|
||||
hl-StatusLineNC syntax.txt /*hl-StatusLineNC*
|
||||
hl-StatusLineTerm syntax.txt /*hl-StatusLineTerm*
|
||||
hl-StatusLineTermNC syntax.txt /*hl-StatusLineTermNC*
|
||||
hl-TOhtmlProgress syntax.txt /*hl-TOhtmlProgress*
|
||||
hl-TabLine syntax.txt /*hl-TabLine*
|
||||
hl-TabLineFill syntax.txt /*hl-TabLineFill*
|
||||
hl-TabLineSel syntax.txt /*hl-TabLineSel*
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*todo.txt* For Vim version 8.1. Last change: 2019 Nov 13
|
||||
*todo.txt* For Vim version 8.1. Last change: 2019 Nov 17
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -38,16 +38,25 @@ browser use: https://github.com/vim/vim/issues/1234
|
||||
*known-bugs*
|
||||
-------------------- Known bugs and current work -----------------------
|
||||
|
||||
Add a function to fetch the mouse_lnum and mouse_col values? Can be used in a
|
||||
mapping. Remove setting v:mouse_lnum etc. from the popup filter, the values
|
||||
are wrong.
|
||||
Patch #5232 from Andy Massimino to replace:
|
||||
Patch to parse ":line" in tags file and use it for search. (Daniel Hahler,
|
||||
#2546) Fixes #1057. Missing a test.
|
||||
|
||||
Problem with cursor in wrong position: #5214
|
||||
Update files for javascriptreact and typescriptreact.
|
||||
Can we close #4830?
|
||||
|
||||
Don't use javascriptreact but javascript.jsx? #4830
|
||||
Although there is a good argument against using ".jsx".
|
||||
When 'selection' is "exclusive" then using vi' on the second ' does not select
|
||||
anything. (#5183)
|
||||
Patch from Christian:
|
||||
https://github.com/chrisbra/vim/commit/7482d1d389e7db97e247f8b509003e5ec27427a9
|
||||
When using exclusive selection and vi" that fails, cursor moves to the left.
|
||||
Cursor should not move. (#4024)
|
||||
|
||||
Update libvterm on github, rename termscreen.c back to screen.c.
|
||||
Patch: New value "uselast" for 'switchbuf'. (Lemonboy, 2017 Apr 23, #1652)
|
||||
|
||||
Patch to remove FORTIFY_SOURCE also from CPPFLAGS. (Benedikt Morbach, #2786)
|
||||
|
||||
Patch from Namsh to allow building with both XIM and hangulin. (2019 Aug 29)
|
||||
|
||||
|
||||
Popup windows:
|
||||
@ -65,9 +74,8 @@ Popup windows:
|
||||
|
||||
Text properties:
|
||||
- Implement prop_find() issue #4970
|
||||
- Adjusting column/length when inserting text
|
||||
- Text properties spanning more than one line
|
||||
- See remakrs at top of src/textprop.c
|
||||
- See remarks at top of src/textprop.c
|
||||
|
||||
'incsearch' with :s:
|
||||
- Get E20 when using command history to get "'<,'>s/a/b" and no Visual area
|
||||
@ -179,13 +187,6 @@ Adding "10" to 'spellsuggest' causes spell suggestions to become very slow.
|
||||
goes to any buffer, and then :bnext skips help buffers, since they are
|
||||
unlisted. (#4478)
|
||||
|
||||
When 'selection' is "exclusive" then using vi' on the second ' does not select
|
||||
anything. (#5183)
|
||||
Patch from Christian:
|
||||
https://github.com/chrisbra/vim/commit/7482d1d389e7db97e247f8b509003e5ec27427a9
|
||||
When using exclusive selection and vi" that fails, cursor moves to the left.
|
||||
Cursor should not move. (#4024)
|
||||
|
||||
Enable 'termbidi' if $VTE_VERSION >= 5703 ?
|
||||
|
||||
Universal solution to detect if t_RS is working, using cursor position.
|
||||
@ -194,8 +195,6 @@ Koichi Iwamoto, #2126
|
||||
The :syntax cchar value can only be a single character. It would be useful to
|
||||
support combining characters. (Charles Campbell) Also #4687
|
||||
|
||||
Patch: New value "uselast" for 'switchbuf'. (Lemonboy, 2017 Apr 23, #1652)
|
||||
|
||||
Include Haiku port. (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24)
|
||||
It can replace the BeOS code, which is likely not used anymore.
|
||||
Now on github: #1856. Updated Oct 2017
|
||||
@ -207,10 +206,6 @@ Problem showing a line if the number column width changes when using "o".
|
||||
When using :packadd for a replacement language plugin, it is loaded after the
|
||||
default one. #4698
|
||||
|
||||
Patch to remove FORTIFY_SOURCE also from CPPFLAGS. (Benedikt Morbach, #2786)
|
||||
|
||||
Patch from Namsh to allow building with both XIM and hangulin. (2019 Aug 29)
|
||||
|
||||
When using :packadd files under "later" are not used, which is inconsistent
|
||||
with packages under "start". (xtal8, #1994)
|
||||
|
||||
@ -683,9 +678,6 @@ used for git temp files.
|
||||
|
||||
Cursor in wrong position when line wraps. (#2540)
|
||||
|
||||
Patch to parse ":line" in tags file and use it for search. (Daniel Hahler,
|
||||
#2546) Fixes #1057. Missing a test.
|
||||
|
||||
Setting 'columns' in a BufEnter autocommand causes a second tab width to
|
||||
behave strangely, as if there is a gap and a vertical window separator.
|
||||
(Michael Soyka, 2018 Sep 23, #3477)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*usr_41.txt* For Vim version 8.1. Last change: 2019 Sep 23
|
||||
*usr_41.txt* For Vim version 8.1. Last change: 2019 Nov 17
|
||||
|
||||
VIM USER MANUAL - by Bram Moolenaar
|
||||
|
||||
@ -903,6 +903,7 @@ Interactive: *interactive-functions*
|
||||
confirm() let the user make a choice
|
||||
getchar() get a character from the user
|
||||
getcharmod() get modifiers for the last typed character
|
||||
getmousepos() get last known mouse position
|
||||
feedkeys() put characters in the typeahead queue
|
||||
input() get a line from the user
|
||||
inputlist() let the user pick an entry from a list
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
" Vim filetype plugin
|
||||
" Language: J
|
||||
" Maintainer: David Bürgin <676c7473@gmail.com>
|
||||
" URL: https://github.com/glts/vim-j
|
||||
" Last Change: 2015-09-27
|
||||
" Maintainer: David Bürgin <dbuergin@gluet.ch>
|
||||
" URL: https://gitlab.com/glts/vim-j
|
||||
" Last Change: 2015-10-27
|
||||
|
||||
if exists('b:did_ftplugin')
|
||||
finish
|
||||
@ -25,7 +25,7 @@ setlocal include=\\v^\\s*(load\|require)\\s*'\\zs\\f+\\ze'
|
||||
setlocal includeexpr=substitute(substitute(tr(v:fname,'\\','/'),'\\v^[^~][^/.]*(/[^/.]+)$','&\\1',''),'\\v^\\~[^/]+/','','')
|
||||
setlocal suffixesadd=.ijs
|
||||
|
||||
let b:undo_ftplugin = 'setlocal matchpairs< formatoptions< commentstring< comments< iskeyword< path< include< includeexpr< suffixesadd<'
|
||||
let b:undo_ftplugin = 'setlocal suffixesadd< includeexpr< include< path< matchpairs< formatoptions< commentstring< comments< iskeyword<'
|
||||
|
||||
" Section movement with ]] ][ [[ []. The start/end patterns below are amended
|
||||
" inside the function in order to avoid matching on the current cursor line.
|
||||
|
||||
@ -100,7 +100,7 @@ Type=Application
|
||||
Keywords[de]=Text;Editor;
|
||||
Keywords[eo]=Teksto;redaktilo;
|
||||
Keywords[ja]=テキスト;エディタ;
|
||||
Keywords[ru]=текст;текстовый редактор
|
||||
Keywords[ru]=текст;текстовый редактор;
|
||||
Keywords[tr]=Metin;düzenleyici;
|
||||
Keywords=Text;editor;
|
||||
# Translators: This is the Icon file name. Do NOT translate
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
" Vim indent file
|
||||
" Language: J
|
||||
" Maintainer: David Bürgin <676c7473@gmail.com>
|
||||
" URL: https://github.com/glts/vim-j
|
||||
" Maintainer: David Bürgin <dbuergin@gluet.ch>
|
||||
" URL: https://gitlab.com/glts/vim-j
|
||||
" Last Change: 2015-01-11
|
||||
|
||||
if exists('b:did_indent')
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
" Vim plugin for converting a syntax highlighted file to HTML.
|
||||
" Maintainer: Ben Fritz <fritzophrenic@gmail.com>
|
||||
" Last Change: 2018 Nov 11
|
||||
" Last Change: 2019 Nov 13
|
||||
"
|
||||
" The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and
|
||||
" $VIMRUNTIME/syntax/2html.vim
|
||||
@ -8,17 +8,46 @@
|
||||
if exists('g:loaded_2html_plugin')
|
||||
finish
|
||||
endif
|
||||
let g:loaded_2html_plugin = 'vim8.1_v1'
|
||||
let g:loaded_2html_plugin = 'vim8.1_v2'
|
||||
|
||||
"
|
||||
" Changelog: {{{
|
||||
" 8.1_v1 (this version): Fix Bitbucket issue #6: Don't generate empty script
|
||||
" tag.
|
||||
" Fix Bitbucket issue #5: javascript should
|
||||
" declare variables with "var".
|
||||
" Fix Bitbucket issue #13: errors thrown sourcing
|
||||
" 2html.vim directly when plugins not loaded.
|
||||
" Fix Bitbucket issue #16: support 'vartabstop'.
|
||||
" 8.1_v2 (this version): - Fix Bitbucket issue #19: fix calculation of tab
|
||||
" stop position to use in expanding a tab, when that
|
||||
" tab occurs after a syntax match which in turn
|
||||
" comes after previously expanded tabs.
|
||||
" - Set eventignore while splitting a window for the
|
||||
" destination file to ignore FileType events;
|
||||
" speeds up processing when the destination file
|
||||
" already exists and HTML highlight takes too long.
|
||||
" - Fix Bitbucket issue #20: progress bar could not be
|
||||
" seen when DiffDelete background color matched
|
||||
" StatusLine background color. Added TOhtmlProgress
|
||||
" highlight group for manual user override, but
|
||||
" calculate it to be visible compared to StatusLine
|
||||
" by default.
|
||||
" - Fix Bitbucket issue #1: Remove workaround for old
|
||||
" browsers which don't support 'ch' CSS unit, since
|
||||
" all modern browsers, including IE>=9, support it.
|
||||
" - Fix Bitbucket issue #10: support termguicolors
|
||||
" - Fix Bitbucket issue #21: default to using
|
||||
" generated content instead of <input> tags for
|
||||
" uncopyable text, so that text is correctly
|
||||
" prevented from being copied in chrome. Use
|
||||
" g:html_use_input_for_pc option to control the
|
||||
" method used.
|
||||
" - Switch to HTML5 to allow using vnu as a validator
|
||||
" in unit test.
|
||||
" - Fix fallback sizing of <input> tags for browsers
|
||||
" without "ch" support.
|
||||
" - Fix cursor on unselectable diff filler text.
|
||||
" 8.1_v1 (Vim 8.1.0528): - Fix Bitbucket issue #6: Don't generate empty
|
||||
" script tag.
|
||||
" - Fix Bitbucket issue #5: javascript should
|
||||
" declare variables with "var".
|
||||
" - Fix Bitbucket issue #13: errors thrown sourcing
|
||||
" 2html.vim directly when plugins not loaded.
|
||||
" - Fix Bitbucket issue #16: support 'vartabstop'.
|
||||
"
|
||||
" 7.4 updates: {{{
|
||||
" 7.4_v2 (Vim 7.4.0899): Fix error raised when converting a diff containing
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
" Vim syntax file
|
||||
" Language: J
|
||||
" Maintainer: David Bürgin <676c7473@gmail.com>
|
||||
" URL: https://github.com/glts/vim-j
|
||||
" Last Change: 2015-01-11
|
||||
" Maintainer: David Bürgin <dbuergin@gluet.ch>
|
||||
" URL: https://gitlab.com/glts/vim-j
|
||||
" Last Change: 2019-11-12
|
||||
|
||||
if exists('b:current_syntax')
|
||||
finish
|
||||
@ -23,10 +23,10 @@ syntax match jControl /\<\%(for\|goto\|label\)_\a\k*\./
|
||||
" Standard library names. A few names need to be defined with ":syntax match"
|
||||
" because they would otherwise take precedence over the corresponding jControl
|
||||
" and jDefineExpression items.
|
||||
syntax keyword jStdlibNoun ARGV BINPATH CR CRLF DEL Debug EAV EMPTY FF FHS IF64 IFIOS IFJCDROID IFJHS IFQT IFRASPI IFUNIX IFWIN IFWINCE IFWINE IFWOW64 JB01 JBOXED JCHAR JCMPX JFL JINT JPTR JSIZES JSTR JTYPES JVERSION LF LF2 TAB UNAME UNXLIB dbhelp libjqt
|
||||
syntax keyword jStdlibNoun ARGV BINPATH CR CRLF DEL Debug EAV EMPTY FF FHS IF64 IFBE IFIOS IFJA IFJHS IFJNET IFQT IFRASPI IFUNIX IFWIN IFWINCE IFWINE IFWOW64 JB01 JBOXED JCHAR JCHAR2 JCHAR4 JCMPX JFL JINT JLIB JPTR JSB JSIZES JSTR JSTR2 JSTR4 JTYPES JVERSION LF LF2 LIBFILE TAB UNAME UNXLIB dbhelp libjqt
|
||||
syntax keyword jStdlibAdverb define each every fapplylines inv inverse items leaf rows rxapply rxmerge table
|
||||
syntax keyword jStdlibConjunction bind cuts def on
|
||||
syntax keyword jStdlibVerb AND Endian IFDEF OR XOR anddf android_exec_am android_exec_host andunzip apply boxopen boxxopen bx calendar cd cdcb cder cderx cdf charsub chopstring cleartags clear coclass cocreate cocurrent codestroy coerase cofind cofindv cofullname coinfo coinsert compare coname conames conew conl conouns conounsx copath copathnl copathnlx coreset costate cut cutLF cutopen cutpara datatype dbctx dberm dberr dbg dbjmp dblocals dblxq dblxs dbnxt dbq dbr dbret dbrr dbrrx dbrun dbs dbsig dbsq dbss dbst dbstack dbstk dbstop dbstopme dbstopnext dbstops dbtrace dbview deb debc delstring detab dfh dir dircompare dircompares dirfind dirpath dirss dirssrplc dirtree dirused dlb dltb dltbs dquote drop dropafter dropto dtb dtbs echo empty endian erase evtloop exit expand f2utf8 fappend fappends fboxname fc fcompare fcompares fcopynew fdir ferase fetch fexist fexists fgets file2url fixdotdot fliprgb fmakex foldpara foldtext fpathcreate fpathname fputs fread freadblock freadr freads frename freplace fsize fss fssrplc fstamp fstringreplace ftype fview fwrite fwritenew fwrites getalpha getargs getdate getenv getqtbin hfd hostpathsep ic install iospath isatty isotimestamp isutf8 jcwdpath joinstring jpath jpathsep jsystemdefs launch list ljust load loadd loadtags mema memf memr memw nameclass namelist names nc nl pick quote require rjust rplc rxE rxall rxcomp rxcut rxeq rxerror rxfirst rxfree rxfrom rxhandles rxin rxindex rxinfo rxmatch rxmatches rxrplc rxutf8 script scriptd scripts setalpha setbreak shell show sign sminfo smoutput sort split splitnostring splitstring ss startupandroid startupconsole startupide stderr stdin stdout stringreplace symdat symget symset ta tagcp tagopen tagselect take takeafter taketo timespacex timestamp timex tmoutput toCRLF toHOST toJ todate todayno tolower topara toupper tsdiff tsrep tstamp type ucp ucpcount unxlib usleep utf8 uucp valdate wcsize weekday weeknumber weeksinyear winpathsep xedit
|
||||
syntax keyword jStdlibVerb AND Endian IFDEF OR XOR abspath anddf android_exec_am android_exec_host android_getdisplaymetrics andunzip apply boxopen boxxopen bx calendar cd cdcb cder cderx cdf charsub chopstring clear coclass cocreate cocurrent codestroy coerase cofind cofindv cofullname coinfo coinsert compare coname conames conew conl conouns conounsx copath copathnl copathnlx coreset costate cut cutLF cutopen cutpara datatype dbctx dbcut dberm dberr dbg dbinto dbjmp dblocals dblxq dblxs dbnxt dbout dbover dbq dbr dbret dbrr dbrrx dbrun dbs dbsig dbsq dbss dbst dbstack dbstk dbstop dbstopme dbstopnext dbstops dbtrace dbview deb debc delstring detab dfh dir dircompare dircompares dirfind dirpath dirss dirssrplc dirtree dirused dlb dltb dltbs dquote drop dropafter dropto dtb dtbs echo empty endian erase evtloop exit expand f2utf8 fappend fappends fboxname fc fcompare fcompares fcopynew fdir ferase fetch fexist fexists fgets file2url fixdotdot fliprgb fmakex foldpara foldtext fpathcreate fpathname fputs fread freadblock freadr freads frename freplace fsize fss fssrplc fstamp fstringreplace ftype fview fwrite fwritenew fwrites getalpha getargs getdate getenv getqtbin hfd hostpathsep ic install iospath isatty isotimestamp isutf16 isutf8 jcwdpath joinstring jpath jpathsep jsystemdefs launch list ljust load loadd mema memf memr memu memw nameclass namelist names nc nl pick quote require rjust rplc rxE rxall rxcomp rxcut rxeq rxerror rxfirst rxfree rxfrom rxhandles rxin rxindex rxinfo rxmatch rxmatches rxrplc rxutf8 script scriptd scripts setalpha setbreak shell show sign sminfo smoutput sort split splitnostring splitstring ss startupandroid stderr stdin stdout stringreplace symdat symget symset take takeafter taketo timespacex timestamp timex tmoutput toCRLF toHOST toJ todate todayno tolist tolower topara toupper tsdiff tsrep tstamp type ucp ucpcount undquote unxlib usleep utf8 uucp valdate wcsize weekday weeknumber weeksinyear winpathsep xedit
|
||||
syntax match jStdlibNoun /\<\%(adverb\|conjunction\|dyad\|monad\|noun\|verb\)\>/
|
||||
syntax match jStdlibVerb /\<\%(Note\|\%(assert\|break\|do\)\.\@!\)\>/
|
||||
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
" Placeholder for backwards compatilibity: .jsx used to stand for JavaScript.
|
||||
" Placeholder for backwards compatilibity: .jsx used to be associated with the
|
||||
" filetpye JavaScript.
|
||||
runtime! syntax/javascript.vim
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
2057
runtime/syntax/typescriptcommon.vim
Normal file
2057
runtime/syntax/typescriptcommon.vim
Normal file
File diff suppressed because it is too large
Load Diff
160
runtime/syntax/typescriptreact.vim
Normal file
160
runtime/syntax/typescriptreact.vim
Normal file
@ -0,0 +1,160 @@
|
||||
" Vim syntax file
|
||||
" Language: TypeScript with React (JSX)
|
||||
" Maintainer: Bram Moolenaar
|
||||
" Last Change: 2019 Nov 17
|
||||
" Based On: Herrington Darkholme's yats.vim
|
||||
" Changes: See https:github.com/HerringtonDarkholme/yats.vim
|
||||
" Credits: See yats.vim on github
|
||||
|
||||
if !exists("main_syntax")
|
||||
if exists("b:current_syntax")
|
||||
finish
|
||||
endif
|
||||
let main_syntax = 'typescriptreact'
|
||||
endif
|
||||
|
||||
let s:cpo_save = &cpo
|
||||
set cpo&vim
|
||||
|
||||
syntax region tsxTag
|
||||
\ start=+<\([^/!?<>="':]\+\)\@=+
|
||||
\ skip=+</[^ /!?<>"']\+>+
|
||||
\ end=+/\@<!>+
|
||||
\ end=+\(/>\)\@=+
|
||||
\ contained
|
||||
\ contains=tsxTagName,tsxIntrinsicTagName,tsxAttrib,tsxEscJs,
|
||||
\tsxCloseString,@tsxComment
|
||||
|
||||
syntax match tsxTag /<>/ contained
|
||||
|
||||
|
||||
" <tag></tag>
|
||||
" s~~~~~~~~~e
|
||||
" and self close tag
|
||||
" <tag/>
|
||||
" s~~~~e
|
||||
" A big start regexp borrowed from https://git.io/vDyxc
|
||||
syntax region tsxRegion
|
||||
\ start=+<\_s*\z([a-zA-Z1-9\$_-]\+\(\.\k\+\)*\)+
|
||||
\ skip=+<!--\_.\{-}-->+
|
||||
\ end=+</\_s*\z1>+
|
||||
\ matchgroup=tsxCloseString end=+/>+
|
||||
\ fold
|
||||
\ contains=tsxRegion,tsxCloseString,tsxCloseTag,tsxTag,tsxCommentInvalid,tsxFragment,tsxEscJs,@Spell
|
||||
\ keepend
|
||||
\ extend
|
||||
|
||||
" <> </>
|
||||
" s~~~~~~e
|
||||
" A big start regexp borrowed from https://git.io/vDyxc
|
||||
syntax region tsxFragment
|
||||
\ start=+\(\((\|{\|}\|\[\|,\|&&\|||\|?\|:\|=\|=>\|\Wreturn\|^return\|\Wdefault\|^\|>\)\_s*\)\@<=<>+
|
||||
\ skip=+<!--\_.\{-}-->+
|
||||
\ end=+</>+
|
||||
\ fold
|
||||
\ contains=tsxRegion,tsxCloseString,tsxCloseTag,tsxTag,tsxCommentInvalid,tsxFragment,tsxEscJs,@Spell
|
||||
\ keepend
|
||||
\ extend
|
||||
|
||||
" </tag>
|
||||
" ~~~~~~
|
||||
syntax match tsxCloseTag
|
||||
\ +</\_s*[^/!?<>"']\+>+
|
||||
\ contained
|
||||
\ contains=tsxTagName,tsxIntrinsicTagName
|
||||
|
||||
syntax match tsxCloseTag +</>+ contained
|
||||
|
||||
syntax match tsxCloseString
|
||||
\ +/>+
|
||||
\ contained
|
||||
|
||||
" <!-- -->
|
||||
" ~~~~~~~~
|
||||
syntax match tsxCommentInvalid /<!--\_.\{-}-->/ display
|
||||
|
||||
syntax region tsxBlockComment
|
||||
\ contained
|
||||
\ start="/\*"
|
||||
\ end="\*/"
|
||||
|
||||
syntax match tsxLineComment
|
||||
\ "//.*$"
|
||||
\ contained
|
||||
\ display
|
||||
|
||||
syntax cluster tsxComment contains=tsxBlockComment,tsxLineComment
|
||||
|
||||
syntax match tsxEntity "&[^; \t]*;" contains=tsxEntityPunct
|
||||
syntax match tsxEntityPunct contained "[&.;]"
|
||||
|
||||
" <tag key={this.props.key}>
|
||||
" ~~~
|
||||
syntax match tsxTagName
|
||||
\ +[</]\_s*[^/!?<>"'* ]\++hs=s+1
|
||||
\ contained
|
||||
\ nextgroup=tsxAttrib
|
||||
\ skipwhite
|
||||
\ display
|
||||
syntax match tsxIntrinsicTagName
|
||||
\ +[</]\_s*[a-z1-9-]\++hs=s+1
|
||||
\ contained
|
||||
\ nextgroup=tsxAttrib
|
||||
\ skipwhite
|
||||
\ display
|
||||
|
||||
" <tag key={this.props.key}>
|
||||
" ~~~
|
||||
syntax match tsxAttrib
|
||||
\ +[a-zA-Z_][-0-9a-zA-Z_]*+
|
||||
\ nextgroup=tsxEqual skipwhite
|
||||
\ contained
|
||||
\ display
|
||||
|
||||
" <tag id="sample">
|
||||
" ~
|
||||
syntax match tsxEqual +=+ display contained
|
||||
\ nextgroup=tsxString skipwhite
|
||||
|
||||
" <tag id="sample">
|
||||
" s~~~~~~e
|
||||
syntax region tsxString contained start=+"+ end=+"+ contains=tsxEntity,@Spell display
|
||||
|
||||
" <tag key={this.props.key}>
|
||||
" s~~~~~~~~~~~~~~e
|
||||
syntax region tsxEscJs
|
||||
\ contained
|
||||
\ contains=@typescriptValue,@tsxComment
|
||||
\ matchgroup=typescriptBraces
|
||||
\ start=+{+
|
||||
\ end=+}+
|
||||
\ extend
|
||||
|
||||
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" Source the part common with typescriptreact.vim
|
||||
source <sfile>:h/typescriptcommon.vim
|
||||
|
||||
|
||||
syntax cluster typescriptExpression add=tsxRegion,tsxFragment
|
||||
|
||||
hi def link tsxTag htmlTag
|
||||
hi def link tsxTagName Function
|
||||
hi def link tsxIntrinsicTagName htmlTagName
|
||||
hi def link tsxString String
|
||||
hi def link tsxNameSpace Function
|
||||
hi def link tsxCommentInvalid Error
|
||||
hi def link tsxBlockComment Comment
|
||||
hi def link tsxLineComment Comment
|
||||
hi def link tsxAttrib Type
|
||||
hi def link tsxEscJs tsxEscapeJs
|
||||
hi def link tsxCloseTag htmlTag
|
||||
hi def link tsxCloseString Identifier
|
||||
|
||||
let b:current_syntax = "typescriptreact"
|
||||
if main_syntax == 'typescriptreact'
|
||||
unlet main_syntax
|
||||
endif
|
||||
|
||||
let &cpo = s:cpo_save
|
||||
unlet s:cpo_save
|
||||
@ -8,7 +8,7 @@
|
||||
aprender fácilmente a usar Vim como un editor de propósito general.
|
||||
|
||||
El tiempo necesario para completar el tutor es aproximadamente de 25-30
|
||||
minutos, dependiendo de cuanto tiempo se dedique a la experimentación.
|
||||
minutos, dependiendo de cuánto tiempo se dedique a la experimentación.
|
||||
|
||||
Los mandatos de estas lecciones modificarán el texto. Haga una copia de
|
||||
este fichero para practicar (con «vimtutor» esto ya es una copia).
|
||||
@ -98,7 +98,7 @@ NOTA: A medida que vaya avanzando en este tutor no intente memorizar,
|
||||
|
||||
1. Mueva el cursor a la primera línea de abajo señalada con --->.
|
||||
|
||||
2. Para que la primera línea se igual a la segunda mueva el cursor bajo el
|
||||
2. Para que la primera línea sea igual a la segunda, mueva el cursor bajo el
|
||||
primer carácter que sigue al texto que ha de ser insertado.
|
||||
|
||||
3. Pulse i y escriba los caracteres a añadir.
|
||||
@ -109,7 +109,7 @@ NOTA: A medida que vaya avanzando en este tutor no intente memorizar,
|
||||
---> Flta texto en esta .
|
||||
---> Falta algo de texto en esta línea.
|
||||
|
||||
5. Cuando se sienta cómodo insertando texto pase al resumen que esta más
|
||||
5. Cuando se sienta cómodo insertando texto pase al resumen que está más
|
||||
abajo.
|
||||
|
||||
|
||||
@ -224,8 +224,8 @@ NOTE: Para los aventureros, pulsando s
|
||||
3) El cielo es azul,
|
||||
4) Yo tengo un coche,
|
||||
5) Los relojes marcan la hora,
|
||||
6) El azucar es dulce,
|
||||
7) Y así eres tu.
|
||||
6) El azúcar es dulce,
|
||||
7) Y así eres tú.
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Lección 2.5: EL MANDATO DESHACER
|
||||
@ -288,7 +288,7 @@ NOTE: Para los aventureros, pulsando s
|
||||
|
||||
5. Repita los pasos 2 a 4 para poner todas las líneas en el orden correcto.
|
||||
|
||||
d) ¿Puedes aprenderla tu?
|
||||
d) ¿Puedes aprenderla tú?
|
||||
b) Las violetas son azules,
|
||||
c) La inteligencia se aprende,
|
||||
a) Las rosas son rojas,
|
||||
@ -593,7 +593,7 @@ NOTA: El fichero recuperado se sit
|
||||
:!dir - muestra el contenido de un directorio.
|
||||
:!del NOMBRE_DE_FICHERO - borra el fichero NOMBRE_DE FICHERO.
|
||||
|
||||
2. :#,#w NOMBRE_DE _FICHERO guarda desde las líneas # hasta la # en el
|
||||
2. :#,#w NOMBRE_DE _FICHERO guarda desde la línea # hasta la # en el
|
||||
fichero NOMBRE_DE_FICHERO.
|
||||
|
||||
3. :r NOMBRE_DE _FICHERO recupera el fichero del disco NOMBRE_DE FICHERO
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
aprender fácilmente a usar Vim como un editor de propósito general.
|
||||
|
||||
El tiempo necesario para completar el tutor es aproximadamente de 25-30
|
||||
minutos, dependiendo de cuanto tiempo se dedique a la experimentación.
|
||||
minutos, dependiendo de cuánto tiempo se dedique a la experimentación.
|
||||
|
||||
Los mandatos de estas lecciones modificarán el texto. Haga una copia de
|
||||
este fichero para practicar (con «vimtutor» esto ya es una copia).
|
||||
@ -98,7 +98,7 @@ NOTA: A medida que vaya avanzando en este tutor no intente memorizar,
|
||||
|
||||
1. Mueva el cursor a la primera línea de abajo señalada con --->.
|
||||
|
||||
2. Para que la primera línea se igual a la segunda mueva el cursor bajo el
|
||||
2. Para que la primera línea sea igual a la segunda, mueva el cursor bajo el
|
||||
primer carácter que sigue al texto que ha de ser insertado.
|
||||
|
||||
3. Pulse i y escriba los caracteres a añadir.
|
||||
@ -109,7 +109,7 @@ NOTA: A medida que vaya avanzando en este tutor no intente memorizar,
|
||||
---> Flta texto en esta .
|
||||
---> Falta algo de texto en esta línea.
|
||||
|
||||
5. Cuando se sienta cómodo insertando texto pase al resumen que esta más
|
||||
5. Cuando se sienta cómodo insertando texto pase al resumen que está más
|
||||
abajo.
|
||||
|
||||
|
||||
@ -224,8 +224,8 @@ NOTE: Para los aventureros, pulsando sólo el objeto estando en modo Normal
|
||||
3) El cielo es azul,
|
||||
4) Yo tengo un coche,
|
||||
5) Los relojes marcan la hora,
|
||||
6) El azucar es dulce,
|
||||
7) Y así eres tu.
|
||||
6) El azúcar es dulce,
|
||||
7) Y así eres tú.
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Lección 2.5: EL MANDATO DESHACER
|
||||
@ -288,7 +288,7 @@ NOTE: Para los aventureros, pulsando sólo el objeto estando en modo Normal
|
||||
|
||||
5. Repita los pasos 2 a 4 para poner todas las líneas en el orden correcto.
|
||||
|
||||
d) ¿Puedes aprenderla tu?
|
||||
d) ¿Puedes aprenderla tú?
|
||||
b) Las violetas son azules,
|
||||
c) La inteligencia se aprende,
|
||||
a) Las rosas son rojas,
|
||||
@ -593,7 +593,7 @@ NOTA: El fichero recuperado se sitúa a partir de la posición del cursor.
|
||||
:!dir - muestra el contenido de un directorio.
|
||||
:!del NOMBRE_DE_FICHERO - borra el fichero NOMBRE_DE FICHERO.
|
||||
|
||||
2. :#,#w NOMBRE_DE _FICHERO guarda desde las líneas # hasta la # en el
|
||||
2. :#,#w NOMBRE_DE _FICHERO guarda desde la línea # hasta la # en el
|
||||
fichero NOMBRE_DE_FICHERO.
|
||||
|
||||
3. :r NOMBRE_DE _FICHERO recupera el fichero del disco NOMBRE_DE FICHERO
|
||||
|
||||
38
src/po/de.po
38
src/po/de.po
@ -11,7 +11,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Vim\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-24 20:05+0200\n"
|
||||
"POT-Creation-Date: 2019-11-13 22:38+0100\n"
|
||||
"PO-Revision-Date: 2008-05-24 17:26+0200\n"
|
||||
"Last-Translator: Christian Brabandt <cb@256bit.org>\n"
|
||||
"Language-Team: German\n"
|
||||
@ -3711,8 +3711,8 @@ msgid "E315: ml_get: invalid lnum: %ld"
|
||||
msgstr "E315: ml_get: unzulässige Zeilennummer: %ld"
|
||||
|
||||
#, c-format
|
||||
msgid "E316: ml_get: cannot find line %ld"
|
||||
msgstr "E316: ml_get: kann Zeile %ld nicht finden"
|
||||
msgid "E316: ml_get: cannot find line %ld in buffer %d %s"
|
||||
msgstr "E316: ml_get: kann Zeile %ld in Puffer %d %s nicht finden"
|
||||
|
||||
msgid "E317: pointer block id wrong 3"
|
||||
msgstr "E317: Zeiger Block id falsch 3"
|
||||
@ -3999,6 +3999,12 @@ msgstr "Beep!"
|
||||
msgid "E677: Error writing temp file"
|
||||
msgstr "E677: Fehler beim Schreiben einer temporären Datei"
|
||||
|
||||
#, c-format
|
||||
msgid "%ld second ago"
|
||||
msgid_plural "%ld seconds ago"
|
||||
msgstr[0] "vor %ld Sekunde"
|
||||
msgstr[1] "vor %ld Sekunden"
|
||||
|
||||
msgid "ERROR: "
|
||||
msgstr "FEHLER: "
|
||||
|
||||
@ -4298,8 +4304,8 @@ msgstr "E527: Fehlendes Komma"
|
||||
msgid "E528: Must specify a ' value"
|
||||
msgstr "E528: Ein ' Wert muss angegeben werden"
|
||||
|
||||
msgid "E595: contains unprintable or wide character"
|
||||
msgstr "E595: Enthält nicht-druckbare oder Multi-Byte Zeichen"
|
||||
msgid "E595: 'showbreak' contains unprintable or wide character"
|
||||
msgstr "E595: 'showbreak' enthält nicht-druckbare oder Multi-Byte Zeichen"
|
||||
|
||||
msgid "E596: Invalid font(s)"
|
||||
msgstr "E596: Ungültige Schriftart(en)"
|
||||
@ -4553,8 +4559,7 @@ msgid "shell returned %d"
|
||||
msgstr "Shell gab %d zurück"
|
||||
|
||||
msgid "E278: Cannot put a terminal buffer in a popup window"
|
||||
msgstr ""
|
||||
"E278: Terminal kann nicht in einem Popup-Fenster geöffnet werdent."
|
||||
msgstr "E278: Terminal kann nicht in einem Popup-Fenster geöffnet werdent."
|
||||
|
||||
#, c-format
|
||||
msgid "E997: Tabpage not found: %d"
|
||||
@ -4859,10 +4864,10 @@ msgstr "E353: Register %s ist leer"
|
||||
|
||||
msgid ""
|
||||
"\n"
|
||||
"--- Registers ---"
|
||||
"Type Name Content"
|
||||
msgstr ""
|
||||
"\n"
|
||||
"--- Register ---"
|
||||
"Typ Name Inhalt"
|
||||
|
||||
msgid ""
|
||||
"E883: search pattern and expression register may not contain two or more "
|
||||
@ -5731,9 +5736,6 @@ msgstr "Tag-Datei %s wird durchsucht"
|
||||
msgid "E430: Tag file path truncated for %s\n"
|
||||
msgstr "E430: Tag-Dateipfad wurde abgeschnitten für %s\n"
|
||||
|
||||
msgid "Ignoring long line in tags file"
|
||||
msgstr "Ignoriere zu lange Zeile in Tag-Datei"
|
||||
|
||||
#, c-format
|
||||
msgid "E431: Format error in tags file \"%s\""
|
||||
msgstr "E431: Format Fehler in Tag-Datei \"%s\""
|
||||
@ -5749,6 +5751,9 @@ msgstr "E432: Tag-Datei ist nicht sortiert: %s"
|
||||
msgid "E433: No tags file"
|
||||
msgstr "E433: Keine Tag-Datei"
|
||||
|
||||
msgid "Ignoring long line in tags file"
|
||||
msgstr "Ignoriere zu lange Zeile in Tag-Datei"
|
||||
|
||||
msgid "E434: Can't find tag pattern"
|
||||
msgstr "E434: Kann Tag-Muster nicht finden"
|
||||
|
||||
@ -5796,6 +5801,9 @@ msgstr "Kann Datei $VIMRUNTIME/rgb.txt nicht
|
||||
msgid "E181: Invalid attribute: %s"
|
||||
msgstr "E181: Ungültiges Attribut: %s"
|
||||
|
||||
msgid "E279: Sorry, ++shell is not supported on this system"
|
||||
msgstr "E279: Schade, ++shell wird auf diesem System nicht unterstützt"
|
||||
|
||||
#, c-format
|
||||
msgid "Kill job in \"%s\"?"
|
||||
msgstr "Beende job in \"%s\"?"
|
||||
@ -5993,12 +6001,6 @@ msgstr "Nichts zum Wiederherstellen"
|
||||
msgid "number changes when saved"
|
||||
msgstr "Nummer Änderung Wann Gesichert"
|
||||
|
||||
#, c-format
|
||||
msgid "%ld second ago"
|
||||
msgid_plural "%ld seconds ago"
|
||||
msgstr[0] "vor %ld Sekunde"
|
||||
msgstr[1] "vor %ld Sekunden"
|
||||
|
||||
msgid "E790: undojoin is not allowed after undo"
|
||||
msgstr "E790: 'undojoin' ist nicht erlaubt nach 'undo'"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user