vim/vimtex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better handling of relative subimports

Browse Source 
The old way of handling sub imports didn't actually allow them to be
relative, which is half the power of the import package.

The new code correctly identifies all my subimported texfiles in
a pretty complicated latex project.
This commit is contained in:
Jesper Jensen 2016-11-24 13:35:45 +01:00 committed by Jesper Jensen
parent e5eeeb1f39
commit 8c2d25ebb9
No known key found for this signature in database
GPG Key ID: F95C9E6B059D64D9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
autoload/vimtex/parser.vim
View File

@ -120,6 +120,7 @@ endfunction
function! s:input_line_parser_tex(line, file, re) " {{{1
" Handle \space commands
let l:file = substitute(a:line, '\\space\s*', ' ', 'g')
let l:subimport = 0
" Handle import package commands
if l:file =~# '\v\\%(sub)?%(import|%(input|include)from)'
@ -128,8 +129,10 @@ function! s:input_line_parser_tex(line, file, re) " {{{1
\ a:file,
\ '\v^\s*\{')
if !empty(l:candidate) | return l:candidate | endif
let l:file = substitute(l:file, '}\s*{', '', 'g')
" Handle relative paths
let l:subimport = l:file =~# '\v\\sub%(import|%(input|include)from)'
endif
" Parse file name
@ -146,7 +149,7 @@ function! s:input_line_parser_tex(line, file, re) " {{{1
" Use absolute paths
if l:file !~# '\v^(\/|[A-Z]:)'
let l:file = b:vimtex.root . '/' . l:file
let l:file = (l:subimport ? fnamemodify(a:file, ':h') : b:vimtex.root) . '/' . l:file
endif
" Only return filename if it is readable