forked from aniani/vim
Updated runtime files.
This commit is contained in:
Bram Moolenaar
parent
3fa57e0d50
commit
91e15e13da
@ -3,7 +3,7 @@
|
||||
" Maintainer: Dávid Szabó ( complex857 AT gmail DOT com )
|
||||
" Previous Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
|
||||
" URL: https://github.com/shawncplus/phpcomplete.vim
|
||||
" Last Change: 2014 Jul 24
|
||||
" Last Change: 2014 Aug 10
|
||||
"
|
||||
" OPTIONS:
|
||||
"
|
||||
@ -94,9 +94,9 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
|
||||
" Check if we are inside of PHP markup
|
||||
let pos = getpos('.')
|
||||
let phpbegin = searchpairpos('<?', '', '?>', 'bWn',
|
||||
\ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\|comment"')
|
||||
\ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"')
|
||||
let phpend = searchpairpos('<?', '', '?>', 'Wn',
|
||||
\ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\|comment"')
|
||||
\ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"')
|
||||
|
||||
if phpbegin == [0,0] && phpend == [0,0]
|
||||
" We are outside of any PHP markup. Complete HTML
|
||||
@ -803,7 +803,7 @@ function! phpcomplete#CompleteClassName(base, kinds, current_namespace, imports)
|
||||
endif
|
||||
let relative_name = namespace_part.tag.name
|
||||
" match base without the namespace part for namespaced base but not namespaced tags, for tagfiles with old ctags
|
||||
if !has_key(tag, 'namespace') && index(kinds, tag.kind) != -1 && stridx(tag.name, base[len(namespace_part):]) == 0
|
||||
if !has_key(tag, 'namespace') && index(kinds, tag.kind) != -1 && stridx(tolower(tag.name), tolower(base[len(namespace_part):])) == 0
|
||||
call add(no_namespace_matches, {'word': leading_slash.relative_name, 'kind': tag.kind, 'menu': tag.filename, 'info': tag.filename })
|
||||
endif
|
||||
if has_key(tag, 'namespace') && index(kinds, tag.kind) != -1 && tag.namespace ==? namespace_for_class
|
||||
@ -1607,6 +1607,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
|
||||
for arg in args
|
||||
if arg =~# object.'\(,\|$\)'
|
||||
let classname_candidate = matchstr(arg, '\s*\zs'.class_name_pattern.'\ze\s\+'.object)
|
||||
let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, a:current_namespace, a:imports)
|
||||
break
|
||||
endif
|
||||
endfor
|
||||
@ -1625,6 +1626,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
|
||||
for param in docblock.params
|
||||
if param.name =~? object
|
||||
let classname_candidate = matchstr(param.type, class_name_pattern.'\(\[\]\)\?')
|
||||
let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, a:current_namespace, a:imports)
|
||||
break
|
||||
endif
|
||||
endfor
|
||||
@ -1934,7 +1936,7 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
|
||||
call search('{')
|
||||
let endline = line('.')
|
||||
|
||||
let content = join(getline(cfline, endline),"\n")
|
||||
let content = join(getline(cfline, endline), "\n")
|
||||
" Catch extends
|
||||
if content =~? 'extends'
|
||||
let extends_class = matchstr(content, 'class\_s\+'.a:class_name.'\_s\+extends\_s\+\zs'.class_name_pattern.'\ze')
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*editing.txt* For Vim version 7.4. Last change: 2014 Aug 09
|
||||
*editing.txt* For Vim version 7.4. Last change: 2014 Sep 19
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -609,7 +609,10 @@ list of the current window.
|
||||
{not in Vi}
|
||||
|
||||
:[count]arga[dd] {name} .. *:arga* *:argadd* *E479*
|
||||
Add the {name}s to the argument list.
|
||||
:[count]arga[dd]
|
||||
Add the {name}s to the argument list. When {name} is
|
||||
omitted at the current buffer name to the argument
|
||||
list.
|
||||
If [count] is omitted, the {name}s are added just
|
||||
after the current entry in the argument list.
|
||||
Otherwise they are added after the [count]'th file.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*helphelp.txt* For Vim version 7.4. Last change: 2012 Nov 28
|
||||
*helphelp.txt* For Vim version 7.4. Last change: 2014 Sep 19
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -97,7 +97,7 @@ Help on help files *helphelp*
|
||||
current file. See |help-translated|.
|
||||
|
||||
*:helpc* *:helpclose*
|
||||
:helpc[lose] Close one help window.
|
||||
:helpc[lose] Close one help window, if there is one.
|
||||
|
||||
*:helpg* *:helpgrep*
|
||||
:helpg[rep] {pattern}[@xx]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*index.txt* For Vim version 7.4. Last change: 2014 Mar 25
|
||||
*index.txt* For Vim version 7.4. Last change: 2014 Sep 19
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*spell.txt* For Vim version 7.4. Last change: 2014 Jul 02
|
||||
*spell.txt* For Vim version 7.4. Last change: 2014 Sep 19
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
|
||||
@ -2248,6 +2248,8 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
|
||||
:ha print.txt /*:ha*
|
||||
:hardcopy print.txt /*:hardcopy*
|
||||
:help helphelp.txt /*:help*
|
||||
:helpc helphelp.txt /*:helpc*
|
||||
:helpclose helphelp.txt /*:helpclose*
|
||||
:helpf helphelp.txt /*:helpf*
|
||||
:helpfind helphelp.txt /*:helpfind*
|
||||
:helpg helphelp.txt /*:helpg*
|
||||
@ -7825,6 +7827,7 @@ spell-FLAG spell.txt /*spell-FLAG*
|
||||
spell-FOL spell.txt /*spell-FOL*
|
||||
spell-FORBIDDENWORD spell.txt /*spell-FORBIDDENWORD*
|
||||
spell-HOME spell.txt /*spell-HOME*
|
||||
spell-IGNOREEXTRA spell.txt /*spell-IGNOREEXTRA*
|
||||
spell-KEEPCASE spell.txt /*spell-KEEPCASE*
|
||||
spell-KEY spell.txt /*spell-KEY*
|
||||
spell-LANG spell.txt /*spell-LANG*
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*todo.txt* For Vim version 7.4. Last change: 2014 Sep 09
|
||||
*todo.txt* For Vim version 7.4. Last change: 2014 Sep 19
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -61,42 +61,11 @@ Breaks test_eval. Inefficient, can we only compute y_width when needed?
|
||||
Problem that a previous silent ":throw" causes a following try/catch not to
|
||||
work. (ZyX, 2013 Sep 28)
|
||||
|
||||
Update for Romanian spell file. (Vanilla Ice, 2014 Aug 13)
|
||||
Still produces errors.
|
||||
Add flag to ignore fifth argument of SFX.
|
||||
Conversion from utf-8 to cp1250 can't be without errors.
|
||||
|
||||
Patch to remove ETO_IGNORELANGUAGE, it causes Chinese characters not to show
|
||||
up. (Paul Moore, 2014 Jul 30)
|
||||
Should it depend on the Windows version? Waiting for feedback.
|
||||
No longer needed after including DirectX patch?
|
||||
Related to issue 255?
|
||||
|
||||
Problem with linebreak, adds a test that fails. (Nazri Ramliy, 2014 Sep 6)
|
||||
|
||||
Patch to avoid problems with encoding conversion with diff.vim.
|
||||
(Yasuhiro Matsumoto, 2014 Sep 1.
|
||||
Depends on current language, language of file can be different.
|
||||
|
||||
Patch by Marcin Szamotulski to add count to :close (2014 Aug 10, update Aug
|
||||
14, Aug 30)
|
||||
Make ":1close" close the first window.
|
||||
Make ":+1close" close the next window.
|
||||
Make ":-1close" close the previous window.
|
||||
Can't easily close the help window, like ":pc" closes the preview window and
|
||||
":ccl" closes the quickfix window. Add ":hclose". (Chris Gaal)
|
||||
Patch for :helpclose, Christian Brabandt, 2010 Sep 6.
|
||||
|
||||
Patch to fix line formatting bug. (Christian Brabandt, 2014 Sep 7)
|
||||
|
||||
Patch to fix ml_get error. (Christian Brabandt, 2014 Sep 7)
|
||||
|
||||
Patch by Marcin Szamotulski to add +cmd to buffer commands.
|
||||
(2014 Aug 18)
|
||||
|
||||
Patch to fix encoding of arguments when setting 'encoding'. (Yasuhiro
|
||||
Matsumoto, 2014 Sep 4)
|
||||
|
||||
Patch to fix that system() with empty input fails. (Olaf Dabrunz, 2014 Aug 19)
|
||||
Patch for C/C++ syntax string handling. (Brian Bi, 2014 Sep 13)
|
||||
|
||||
When using a visual selection of multiple words and doing CTRL-W_] it jumps to
|
||||
the tag matching the word under the cursor, not the selected text.
|
||||
@ -105,6 +74,9 @@ Patch by Christian, 2014 Aug 8.
|
||||
|
||||
Completion for :buf does not use 'wildignorecase'. (Akshay H, 2014 May 31)
|
||||
|
||||
'backupcopy' should be global-local, so that some files can be written in a
|
||||
different way. Patch by Christian, 2014 Sep 17.
|
||||
|
||||
Patch to handle list with some items locked. (ZyX, 2014 Aug 17)
|
||||
Prefer the second solution.
|
||||
|
||||
@ -113,6 +85,13 @@ Issue 252. Patch by Christian, 2014 Aug 26.
|
||||
":cd C:\Windows\System32\drivers\etc*" does not work, even though the
|
||||
directory exists. (Sergio Gallelli, 2013 Dec 29)
|
||||
|
||||
Patch by Marcin Szamotulski to add count to :close (2014 Aug 10, update Aug
|
||||
14, Aug 30)
|
||||
Make ":1close" close the first window.
|
||||
Make ":+1close" close the next window.
|
||||
Make ":-1close" close the previous window.
|
||||
Doesn't look right, asked for updates.
|
||||
|
||||
Patch to add a special key name for K_CURSORHOLD. (Hirohito Higashi, 2014 Aug
|
||||
10)
|
||||
|
||||
@ -129,6 +108,9 @@ inconsistent with the documentation.
|
||||
MS-Windows: Crash opening very long file name starting with "\\".
|
||||
(Christian Brock, 2012 Jun 29)
|
||||
|
||||
ml_updatechunk() is slow when retrying for another encoding. (John Little,
|
||||
2014 Sep 11)
|
||||
|
||||
Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21)
|
||||
|
||||
Patch to allow for a different icon on MS-Windows. (Yasuhiro Matsumoto, 2014
|
||||
@ -136,11 +118,16 @@ Sep 7).
|
||||
|
||||
Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19)
|
||||
|
||||
Patch to make closed folds line up. (Charles Campbell, 2014 Sep 12)
|
||||
|
||||
"hi link" does not respect groups with GUI settings only. (Mark Lodato, 2014
|
||||
Jun 8)
|
||||
|
||||
No error for missing endwhile. (ZyX, 2014 Mar 20)
|
||||
|
||||
start_global_changes() plus end_global_changes() causes problem for
|
||||
clip_unnamed_plus. (Jason Pleau, 2014 Sep 12)
|
||||
|
||||
Patch to add :arglocal and :arglists. (Marcin Szamotulski, 2014 Aug 6)
|
||||
|
||||
PHP syntax is extremely slow. (Anhad Jai Singh, 2014 Jan 19)
|
||||
@ -238,7 +225,8 @@ Patch to support sorting on floating point number. (Alex Jakushev, 2010 Oct
|
||||
|
||||
Patch to support expression argument to sort() instead of a function name.
|
||||
Yasuhiro Matsumoto, 2013 May 31.
|
||||
Or should we add a more general mechanism, like lambda functions?
|
||||
Or should we add a more general mechanism, like a lambda() function?
|
||||
Patch by Yasuhiro Matsumoto, 2014 Sep 16.
|
||||
|
||||
VMS: Select() doesn't work properly, typing ESC may hang Vim. Use sys$qiow
|
||||
instead. (Samuel Ferencik, 2013 Sep 28)
|
||||
|
||||
@ -148,7 +148,7 @@ function s:StatementIndent( current_indent, prev_lnum )
|
||||
" Get previous non-blank/non-comment-only line
|
||||
while 1
|
||||
let line = substitute( getline(lnum), g:ada#Comment, '', '' )
|
||||
|
||||
|
||||
if line !~ '^\s*$' && line !~ '^\s*#'
|
||||
break
|
||||
endif
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
" Vim indent file
|
||||
" Language: Vim script
|
||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||
" Last Change: 2012 Aug 02
|
||||
" Last Change: 2014 Sep 19
|
||||
|
||||
" Only load this indent file when no other was loaded.
|
||||
if exists("b:did_indent")
|
||||
@ -37,7 +37,8 @@ function GetVimIndentIntern()
|
||||
|
||||
" If the current line doesn't start with '\' and below a line that starts
|
||||
" with '\', use the indent of the line above it.
|
||||
if getline(v:lnum) !~ '^\s*\\'
|
||||
let cur_text = getline(v:lnum)
|
||||
if cur_text !~ '^\s*\\'
|
||||
while lnum > 0 && getline(lnum) =~ '^\s*\\'
|
||||
let lnum = lnum - 1
|
||||
endwhile
|
||||
@ -47,27 +48,30 @@ function GetVimIndentIntern()
|
||||
if lnum == 0
|
||||
return 0
|
||||
endif
|
||||
let prev_text = getline(lnum)
|
||||
|
||||
" Add a 'shiftwidth' after :if, :while, :try, :catch, :finally, :function
|
||||
" and :else. Add it three times for a line that starts with '\' after
|
||||
" a line that doesn't (or g:vim_indent_cont if it exists).
|
||||
let ind = indent(lnum)
|
||||
if getline(v:lnum) =~ '^\s*\\' && v:lnum > 1 && getline(lnum) !~ '^\s*\\'
|
||||
if cur_text =~ '^\s*\\' && v:lnum > 1 && prev_text !~ '^\s*\\'
|
||||
if exists("g:vim_indent_cont")
|
||||
let ind = ind + g:vim_indent_cont
|
||||
else
|
||||
let ind = ind + &sw * 3
|
||||
endif
|
||||
elseif getline(lnum) =~ '^\s*aug\%[roup]' && getline(lnum) !~ '^\s*aug\%[roup]\s*!\=\s\+END'
|
||||
elseif prev_text =~ '^\s*aug\%[roup]' && prev_text !~ '^\s*aug\%[roup]\s*!\=\s\+END'
|
||||
let ind = ind + &sw
|
||||
else
|
||||
let line = getline(lnum)
|
||||
let i = match(line, '\(^\||\)\s*\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>')
|
||||
if i >= 0
|
||||
let ind += &sw
|
||||
if strpart(line, i, 1) == '|' && has('syntax_items')
|
||||
\ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$'
|
||||
let ind -= &sw
|
||||
" A line starting with :au does not increment/decrement indent.
|
||||
if prev_text !~ '^\s*au\%[tocmd]'
|
||||
let i = match(prev_text, '\(^\||\)\s*\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>')
|
||||
if i >= 0
|
||||
let ind += &sw
|
||||
if strpart(prev_text, i, 1) == '|' && has('syntax_items')
|
||||
\ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$'
|
||||
let ind -= &sw
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@ -75,9 +79,8 @@ function GetVimIndentIntern()
|
||||
" If the previous line contains an "end" after a pipe, but not in an ":au"
|
||||
" command. And not when there is a backslash before the pipe.
|
||||
" And when syntax HL is enabled avoid a match inside a string.
|
||||
let line = getline(lnum)
|
||||
let i = match(line, '[^\\]|\s*\(ene\@!\)')
|
||||
if i > 0 && line !~ '^\s*au\%[tocmd]'
|
||||
let i = match(prev_text, '[^\\]|\s*\(ene\@!\)')
|
||||
if i > 0 && prev_text !~ '^\s*au\%[tocmd]'
|
||||
if !has('syntax_items') || synIDattr(synID(lnum, i + 2, 1), "name") !~ '\(Comment\|String\)$'
|
||||
let ind = ind - &sw
|
||||
endif
|
||||
@ -86,7 +89,7 @@ function GetVimIndentIntern()
|
||||
|
||||
" Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
|
||||
" :endfun, :else and :augroup END.
|
||||
if getline(v:lnum) =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+END\)'
|
||||
if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+END\)'
|
||||
let ind = ind - &sw
|
||||
endif
|
||||
|
||||
|
||||
@ -9,35 +9,43 @@
|
||||
SPELLDIR = ..
|
||||
FILES = ro_RO.aff ro_RO.dic
|
||||
|
||||
all: $SPELLDIR/ro.iso-8859-2.spl $SPELLDIR/ro.utf-8.spl \
|
||||
$SPELLDIR/ro.cp1250.spl ../README_ro.txt
|
||||
|
||||
$SPELLDIR/ro.iso-8859-2.spl : $FILES
|
||||
:sys env LANG=ro_RO.ISO8859-2 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ro ro_RO" -c q
|
||||
all: $SPELLDIR/ro.utf-8.spl \
|
||||
$SPELLDIR/ro.iso-8859-2.spl \
|
||||
$SPELLDIR/ro.cp1250.spl \
|
||||
../README_ro.txt
|
||||
|
||||
$SPELLDIR/ro.utf-8.spl : $FILES
|
||||
:sys env LANG=ro_RO.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ro ro_RO" -c q
|
||||
:sys env LANG=ro_RO.utf8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ro ro_RO" -c q
|
||||
|
||||
# Note: this generates conversion errors, because not all characters can be
|
||||
# represented in iso-8859-2.
|
||||
$SPELLDIR/ro.iso-8859-2.spl : $FILES
|
||||
:sys env LANG=ro_RO.iso88592 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ro ro_RO" -c q
|
||||
|
||||
# Note: this generates conversion errors, because not all characters can be
|
||||
# represented in cp1250.
|
||||
$SPELLDIR/ro.cp1250.spl : $FILES
|
||||
:sys $VIM -u NONE -e -c "set enc=cp1250" -c "mkspell! $SPELLDIR/ro ro_RO" -c q
|
||||
|
||||
../README_ro.txt: README_ro_RO.txt
|
||||
../README_ro.txt: README
|
||||
:copy $source $target
|
||||
|
||||
#
|
||||
# Fetching the files from OpenOffice.org.
|
||||
#
|
||||
OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
|
||||
:attr {fetch = $OODIR/%file%} ro_RO.zip
|
||||
#OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
|
||||
OODIR = http://sourceforge.net/projects/rospell/files/Romanian%20dictionaries/dict-3.3.10
|
||||
ZIPFILE = ro_RO.3.3.10.zip
|
||||
:attr {fetch = $OODIR/%file%} $ZIPFILE
|
||||
|
||||
# The files don't depend on the .zip file so that we can delete it.
|
||||
# Only download the zip file if the targets don't exist.
|
||||
# This is a bit tricky, since the file name includes the date.
|
||||
ro_RO.aff ro_RO.dic: {buildcheck=}
|
||||
:assertpkg unzip patch
|
||||
:fetch ro_RO.zip
|
||||
:sys $UNZIP ro_RO.zip
|
||||
:delete ro_RO.zip
|
||||
:fetch $ZIPFILE
|
||||
:sys $UNZIP $ZIPFILE
|
||||
:delete $ZIPFILE
|
||||
@if not os.path.exists('ro_RO.orig.aff'):
|
||||
:copy ro_RO.aff ro_RO.orig.aff
|
||||
@if not os.path.exists('ro_RO.orig.dic'):
|
||||
@ -60,12 +68,12 @@ diff:
|
||||
|
||||
check:
|
||||
:assertpkg unzip diff
|
||||
:fetch ro_RO.zip
|
||||
:fetch $ZIPFILE
|
||||
:mkdir tmp
|
||||
:cd tmp
|
||||
@try:
|
||||
@import stat
|
||||
:sys $UNZIP ../ro_RO.zip
|
||||
:sys $UNZIP ../$ZIPFILE
|
||||
:sys {force} diff ../ro_RO.orig.aff ro_RO.aff >d
|
||||
@if os.stat('d')[stat.ST_SIZE] > 0:
|
||||
:copy ro_RO.aff ../ro_RO.new.aff
|
||||
@ -75,7 +83,19 @@ check:
|
||||
@finally:
|
||||
:cd ..
|
||||
:delete {r}{f}{q} tmp
|
||||
:delete ro_RO.zip
|
||||
:delete $ZIPFILE
|
||||
|
||||
# Remove all the downloaded and generated files.
|
||||
clean:
|
||||
:delete ro_RO.aff
|
||||
:delete ro_RO.dic
|
||||
:delete ro_RO.orig.aff
|
||||
:delete ro_RO.orig.dic
|
||||
:delete ro_RO-ante1993.aff
|
||||
:delete ro_RO-ante1993.dic
|
||||
:delete COPYING.GPL
|
||||
:delete COPYING.LGPL
|
||||
:delete COPYING.MPL
|
||||
:delete README
|
||||
|
||||
# vim: set sts=4 sw=4 :
|
||||
|
||||
@ -1,42 +1,34 @@
|
||||
*** ro_RO.orig.aff Wed Aug 31 20:34:38 2005
|
||||
--- ro_RO.aff Wed Aug 31 20:39:57 2005
|
||||
*** ro_RO.orig.aff 2014-08-29 16:29:21.162457824 +0200
|
||||
--- ro_RO.aff 2014-09-19 15:29:52.354413307 +0200
|
||||
***************
|
||||
*** 3,4 ****
|
||||
--- 3,8 ----
|
||||
*** 3,5 ****
|
||||
TRY iaăâșțîertolncusmpdbgfzvhjxkwyqACDM
|
||||
! KEY qwertyuiop|asdfghjkl|zxcvbnm
|
||||
|
||||
+ FOL 雹车定购患究辈炒刀犯购患骄苦徕沅彐玷殛腱眍镳耱篝貊<E7AF9D><E8B28A><EFBFBD><EFBFBD><EFBFBD>
|
||||
+ LOW 雹车定购患究辈炒刀犯购患骄苦徕沅彐玷殛腱眍镳耱篝貊<E7AF9D><E8B28A><EFBFBD><EFBFBD><EFBFBD>
|
||||
+ UPP 、％Θ┆<CE98><E29486>辈炒刀犯购患骄坷谅媚牌侨墒颂臀闲岩釉罩刭谯茌捱<E88C8C>
|
||||
+
|
||||
PFX E Y 1
|
||||
***************
|
||||
*** 12,15 ****
|
||||
SFX L 0 l u
|
||||
! SFX L 0 le [^cg] i
|
||||
! SFX L 0 i [cg] i
|
||||
SFX L 0 le e
|
||||
--- 16,19 ----
|
||||
SFX L 0 l u
|
||||
! SFX L 0 le [^cg]i
|
||||
! SFX L 0 i [cg]i
|
||||
SFX L 0 le e
|
||||
***************
|
||||
*** 18,20 ****
|
||||
SFX U 0 a re
|
||||
! SFX U 0 i [^i] ii
|
||||
|
||||
--- 22,24 ----
|
||||
SFX U 0 a re
|
||||
! SFX U 0 i [^i]ii
|
||||
--- 3,9 ----
|
||||
TRY iaăâșțîertolncusmpdbgfzvhjxkwyqACDM
|
||||
! # KEY qwertyuiop|asdfghjkl|zxcvbnm
|
||||
!
|
||||
! # ignore extra field (specifies type of word?)
|
||||
! IGNOREEXTRA
|
||||
!
|
||||
|
||||
***************
|
||||
*** 38,41 ****
|
||||
SFX I 0 ului [^ua]
|
||||
! SFX I a ii [gc] a
|
||||
! SFX I a ei [^cg] a
|
||||
|
||||
--- 42,45 ----
|
||||
SFX I 0 ului [^ua]
|
||||
! SFX I a ii [gc]a
|
||||
! SFX I a ei [^cg]a
|
||||
|
||||
*** 1546,1553 ****
|
||||
SFX q 0 ilor . adj. m. pl. dat.
|
||||
! SFX q 0 ă
|
||||
! SFX q 0 a
|
||||
! SFX q 0 ei
|
||||
! SFX q 0 e
|
||||
! SFX q 0 ele
|
||||
! SFX q 0 elor
|
||||
PFX q Y 1
|
||||
--- 1550,1557 ----
|
||||
SFX q 0 ilor . adj. m. pl. dat.
|
||||
! SFX q 0 ă .
|
||||
! SFX q 0 a .
|
||||
! SFX q 0 ei .
|
||||
! SFX q 0 e .
|
||||
! SFX q 0 ele .
|
||||
! SFX q 0 elor .
|
||||
PFX q Y 1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
" Vim syntax file
|
||||
" Language: php PHP 3/4/5
|
||||
" Maintainer: Jason Woofenden <jason@jasonwoof.com>
|
||||
" Last Change: Aug 28, 2013
|
||||
" Last Change: Sep 18, 2014
|
||||
" URL: https://gitorious.org/jasonwoof/vim-syntax/blobs/master/php.vim
|
||||
" Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
|
||||
" Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
|
||||
@ -123,7 +123,11 @@ syn keyword phpEnvVar GATEWAY_INTERFACE SERVER_NAME SERVER_SOFTWARE SERVER_PROTO
|
||||
syn keyword phpIntVar GLOBALS PHP_ERRMSG PHP_SELF HTTP_GET_VARS HTTP_POST_VARS HTTP_COOKIE_VARS HTTP_POST_FILES HTTP_ENV_VARS HTTP_SERVER_VARS HTTP_SESSION_VARS HTTP_RAW_POST_DATA HTTP_STATE_VARS _GET _POST _COOKIE _FILES _SERVER _ENV _SERVER _REQUEST _SESSION contained
|
||||
|
||||
" Constants
|
||||
syn keyword phpCoreConstant PHP_VERSION PHP_OS DEFAULT_INCLUDE_PATH PEAR_INSTALL_DIR PEAR_EXTENSION_DIR PHP_EXTENSION_DIR PHP_BINDIR PHP_LIBDIR PHP_DATADIR PHP_SYSCONFDIR PHP_LOCALSTATEDIR PHP_CONFIG_FILE_PATH PHP_OUTPUT_HANDLER_START PHP_OUTPUT_HANDLER_CONT PHP_OUTPUT_HANDLER_END E_ERROR E_WARNING E_PARSE E_NOTICE E_CORE_ERROR E_CORE_WARNING E_COMPILE_ERROR E_COMPILE_WARNING E_USER_ERROR E_USER_WARNING E_USER_NOTICE E_ALL contained
|
||||
syn keyword phpCoreConstant PHP_VERSION PHP_OS DEFAULT_INCLUDE_PATH PEAR_INSTALL_DIR PEAR_EXTENSION_DIR PHP_EXTENSION_DIR PHP_BINDIR PHP_LIBDIR PHP_DATADIR PHP_SYSCONFDIR PHP_LOCALSTATEDIR PHP_CONFIG_FILE_PATH PHP_OUTPUT_HANDLER_START PHP_OUTPUT_HANDLER_CONT PHP_OUTPUT_HANDLER_END contained
|
||||
|
||||
" Predefined constants
|
||||
" Generated by: curl -q http://php.net/manual/en/errorfunc.constants.php | grep -oP 'E_\w+' | sort -u
|
||||
syn keyword phpCoreConstant E_ALL E_COMPILE_ERROR E_COMPILE_WARNING E_CORE_ERROR E_CORE_WARNING E_DEPRECATED E_ERROR E_NOTICE E_PARSE E_RECOVERABLE_ERROR E_STRICT E_USER_DEPRECATED E_USER_ERROR E_USER_NOTICE E_USER_WARNING E_WARNING contained
|
||||
|
||||
syn case ignore
|
||||
|
||||
@ -502,11 +506,6 @@ syn keyword phpStructure trait
|
||||
" Some of these changes (highlighting isset/unset/echo etc) are not so
|
||||
" critical, but they make things more colourful. :-)
|
||||
|
||||
" highlight constant E_STRICT
|
||||
syntax case match
|
||||
syntax keyword phpCoreConstant E_STRICT contained
|
||||
syntax case ignore
|
||||
|
||||
" different syntax highlighting for 'echo', 'print', 'switch', 'die' and 'list' keywords
|
||||
" to better indicate what they are.
|
||||
syntax keyword phpDefine echo print contained
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
" SiSU Vim syntax file
|
||||
" SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
|
||||
" SiSU Markup: SiSU (sisu-4.0.9)
|
||||
" Last Change: 2013-02-22
|
||||
" URL (sisu-4.1.0): <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
|
||||
" SiSU Maintainer: Ralph Amissah <ralph.amissah@gmail.com>
|
||||
" SiSU Markup: SiSU (sisu-5.6.7)
|
||||
" Last Change: 2014-09-14
|
||||
" URL: <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
|
||||
" <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
|
||||
"(originally looked at Ruby Vim by Mirko Nasato)
|
||||
|
||||
if version < 600
|
||||
@ -23,15 +24,14 @@ if !exists("sisu_no_identifiers")
|
||||
syn match sisu_break contains=@NoSpell " \\\\\( \|$\)\|<br>\|<br />"
|
||||
syn match sisu_control contains=@NoSpell "^\(-\\\\-\|=\\\\=\|-\.\.-\|<:p[bn]>\)\s*$"
|
||||
syn match sisu_control contains=@NoSpell "^<:\(bo\|---\)>\s*$"
|
||||
syn match sisu_marktail contains=@NoSpell "^--[+~-]#\s*$"
|
||||
syn match sisu_marktail "[~-]#"
|
||||
syn match sisu_control "\""
|
||||
syn match sisu_underline "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)"
|
||||
syn match sisu_number contains=@NoSpell "[0-9a-f]\{32\}\|[0-9a-f]\{64\}"
|
||||
syn match sisu_link contains=@NoSpell "\(_\?https\?://\|\.\.\/\)\S\+"
|
||||
syn match sisu_link " \*\~\S\+"
|
||||
syn match sisu_action "^<:insert\d\+>"
|
||||
syn match sisu_require contains=@NoSpell "^<<\s*[a-zA-Z0-9^._-]\+\.ss[it]$"
|
||||
syn match sisu_require contains=@NoSpell "^<<{[a-zA-Z0-9^._-]\+\.ss[it]}$"
|
||||
syn match sisu_require contains=@NoSpell "^<<\s*[a-zA-Z0-9^./_-]\+\.ss[it]$"
|
||||
syn match sisu_structure "^:A\~$"
|
||||
|
||||
"% "Document Sub Headers:
|
||||
@ -44,6 +44,8 @@ if !exists("sisu_no_identifiers")
|
||||
syn match sisu_sub_header_original "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s"
|
||||
syn match sisu_sub_header_make "^\s\+:\(headings\|num_top\|breaks\|language\|italics\|bold\|emphasis\|substitute\|omit\|plaintext_wrap\|texpdf_font_mono\|texpdf_font\|stamp\|promo\|ad\|manpage\|home_button_text\|home_button_image\|cover_image\|footer\):\s"
|
||||
syn match sisu_sub_header_notes "^\s\+:\(description\|abstract\|comment\|coverage\|relation\|source\|history\|type\|format\|prefix\|prefix_[ab]\|suffix\):\s"
|
||||
syn match sisu_within_index_ignore "\S\+[:;]\(\s\+\|$\)"
|
||||
syn match sisu_within_index "[:|;]\|+\d\+"
|
||||
|
||||
"% "semantic markers: (ignore)
|
||||
syn match sisu_sem_marker ";{\|};[a-z._]*[a-z]"
|
||||
@ -93,17 +95,25 @@ syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_
|
||||
syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
|
||||
|
||||
"% "Headings:
|
||||
syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$"
|
||||
syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-4]\|:\?[A-D]\)\~\(\S\+\|[^-]\)" end="$"
|
||||
|
||||
"% "Block Group Text:
|
||||
" table
|
||||
syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^table{.\+" end="}table"
|
||||
" table
|
||||
syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^```\s\+table" end="^```\(\s\|$\)"
|
||||
syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n$"
|
||||
" block, group, poem, alt
|
||||
syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(block\|group\|poem\|alt\){" end="^}\(block\|group\|poem\|alt\)"
|
||||
syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(block\|group\|poem\|alt\){" end="^}\1"
|
||||
syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^```\s\+\(block\|group\|poem\|alt\)" end="^```\(\s\|$\)"
|
||||
" box
|
||||
syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^box\(\.[a-z]\+\)\?{" end="^}box"
|
||||
syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^```\s\+\box\(\.[a-z]\+\)\?" end="^```\(\s\|$\)"
|
||||
" code
|
||||
syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^code{" end="^}code"
|
||||
syn region sisu_content_alt contains=sisu_error,@NoSpell matchgroup=sisu_contain start="^code\(\.[a-z][0-9a-z_]\+\)\?{" end="^}code"
|
||||
syn region sisu_content_alt contains=sisu_error,@NoSpell matchgroup=sisu_contain start="^```\s\+code\(\.[a-z][0-9a-z_]\+\)\?" end="^```\(\s\|$\)"
|
||||
" quote
|
||||
syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_contain start="^```\s\+quote" end="^```\(\s\|$\)"
|
||||
|
||||
"% "Endnotes:
|
||||
" regular endnote or asterisk or plus sign endnote
|
||||
@ -138,7 +148,7 @@ syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endn
|
||||
"% "Font Face Curly Brackets:
|
||||
"syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_sem start="\S\+:{" end="}:[^<>,.!?:; ]\+" oneline
|
||||
" book index:
|
||||
syn region sisu_index matchgroup=sisu_index_block start="^={" end="}"
|
||||
syn region sisu_index contains=sisu_within_index_ignore,sisu_within_index matchgroup=sisu_index_block start="^={" end="}"
|
||||
" emphasis:
|
||||
syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\*{" end="}\*"
|
||||
" bold:
|
||||
@ -246,6 +256,8 @@ hi def link sisu_index SpecialKey
|
||||
hi def link sisu_index_block Visual
|
||||
hi def link sisu_content_endnote Special
|
||||
hi def link sisu_control Delimiter
|
||||
hi def link sisu_within_index Delimiter
|
||||
hi def link sisu_within_index_ignore SpecialKey
|
||||
hi def link sisu_ocn Include
|
||||
hi def link sisu_number Number
|
||||
hi def link sisu_identifier Function
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user