Merged with master

This commit is contained in:
Karl Yngve Lervåg 2016-02-17 23:07:17 +01:00
commit 9c498a7c08
2 changed files with 3 additions and 3 deletions

View File

@ -322,7 +322,7 @@ endfunction
" {{{1 Filenames (\includegraphics) " {{{1 Filenames (\includegraphics)
let s:img = { let s:img = {
\ 'pattern' : '\v\\includegraphics%(\s*\[[^]]*\])?\s*\{[^}]*', \ 'pattern' : '\v\\includegraphics\*?%(\s*\[[^]]*\]){0,2}\s*\{[^}]*',
\ 'enabled' : 1, \ 'enabled' : 1,
\} \}

View File

@ -1395,7 +1395,7 @@ documents with |neocomplete| and |vimtex|s omni completion function: >
\ '\v\\%(' \ '\v\\%('
\ . '\a*cite\a*%(\s*\[[^]]*\]){0,2}\s*\{[^}]*' \ . '\a*cite\a*%(\s*\[[^]]*\]){0,2}\s*\{[^}]*'
\ . '|\a*ref%(\s*\{[^}]*|range\s*\{[^,}]*%(\{\})?)' \ . '|\a*ref%(\s*\{[^}]*|range\s*\{[^,}]*%(\{\})?)'
\ . '|includegraphics%(\s*\[[^]]*\])?\s*\{[^}]*' \ . '|includegraphics\*?%(\s*\[[^]]*\]){0,2}\s*\{[^}]*'
\ . '|%(include%(only)?|input)\s*\{[^}]*' \ . '|%(include%(only)?|input)\s*\{[^}]*'
\ . ')' \ . ')'
< <
@ -1422,7 +1422,7 @@ To enable automatic completion with |youcompleteme|, use the following options:
let g:ycm_semantic_triggers.tex = [ let g:ycm_semantic_triggers.tex = [
\ 're!\\[A-Za-z]*cite[A-Za-z]*(\[[^]]*\]){0,2}{[^}]*', \ 're!\\[A-Za-z]*cite[A-Za-z]*(\[[^]]*\]){0,2}{[^}]*',
\ 're!\\[A-Za-z]*ref({[^}]*|range{([^,{}]*({})?))', \ 're!\\[A-Za-z]*ref({[^}]*|range{([^,{}]*({})?))',
\ 're!\\includegraphics([^]]*])?{[^}]*', \ 're!\\includegraphics\*?(\[[^]]*\]){0,2}\{[^}]*',
\ 're!\\(include(only)?|input){[^}]*' \ 're!\\(include(only)?|input){[^}]*'
\ ] \ ]
< <