From 8c2d25ebb90b6778877afe7fbc12c657c2e84adf Mon Sep 17 00:00:00 2001
From: Jesper Jensen <delusionalLogic@gmail.com>
Date: Thu, 24 Nov 2016 13:35:45 +0100
Subject: [PATCH 1/2] Better handling of relative subimports

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.
---
 autoload/vimtex/parser.vim | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/autoload/vimtex/parser.vim b/autoload/vimtex/parser.vim
index dfb400d..73096e1 100644
--- a/autoload/vimtex/parser.vim
+++ b/autoload/vimtex/parser.vim
@@ -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

From 75a95c6801c2265c782a25e8b2776a6a4a91fcfb Mon Sep 17 00:00:00 2001
From: Jesper Jensen <jesper@slashwin.dk>
Date: Fri, 25 Nov 2016 00:01:54 +0100
Subject: [PATCH 2/2] Style improvements

---
 autoload/vimtex/parser.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/autoload/vimtex/parser.vim b/autoload/vimtex/parser.vim
index 73096e1..dd237a3 100644
--- a/autoload/vimtex/parser.vim
+++ b/autoload/vimtex/parser.vim
@@ -120,19 +120,20 @@ 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
+  let l:subimport = 0
   if l:file =~# '\v\\%(sub)?%(import|%(input|include)from)'
     let l:candidate = s:input_line_parser_tex(
           \ substitute(l:file, '\\\w*\s*{[^{}]*}\s*', '', ''),
           \ 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)'
+
+    let l:file = substitute(l:file, '}\s*{', '', 'g')
   endif
 
   " Parse file name