Some minor updates and fixes
This commit is contained in:
parent
f42947311b
commit
c5d00669f8
@ -104,7 +104,6 @@ function! s:init_environment() " {{{1
|
||||
let b:latex.id = id
|
||||
else
|
||||
let data = {}
|
||||
let data.cmds = {}
|
||||
let data.tex = main
|
||||
let data.root = fnamemodify(data.tex, ':h')
|
||||
let data.base = fnamemodify(data.tex, ':t')
|
||||
|
@ -7,6 +7,7 @@
|
||||
function! latex#latexmk#init(initialized) " {{{1
|
||||
call latex#util#set_default('g:latex_latexmk_enabled', 1)
|
||||
if !g:latex_latexmk_enabled | return | endif
|
||||
if s:system_incompatible() | return | endif
|
||||
|
||||
" Set default options
|
||||
call latex#util#set_default('g:latex_latexmk_background', 0)
|
||||
@ -22,16 +23,10 @@ function! latex#latexmk#init(initialized) " {{{1
|
||||
call latex#util#error_deprecated('g:latex_latexmk_output')
|
||||
call latex#util#error_deprecated('g:latex_latexmk_quickfix')
|
||||
|
||||
" Check system compatibility
|
||||
if s:system_incompatible() | return | endif
|
||||
|
||||
" Set compiler (this defines the errorformat)
|
||||
compiler latexmk
|
||||
|
||||
" Initialize pid for current tex file
|
||||
if !has_key(g:latex#data[b:latex.id], 'pid')
|
||||
let g:latex#data[b:latex.id].pid = 0
|
||||
endif
|
||||
let g:latex#data[b:latex.id].pid = 0
|
||||
|
||||
" Define commands
|
||||
command! -buffer VimLatexCompile call latex#latexmk#compile()
|
||||
@ -115,18 +110,14 @@ function! latex#latexmk#clean(full) " {{{1
|
||||
let cmd = 'cd ' . shellescape(data.root) . '; '
|
||||
endif
|
||||
let cmd .= 'latexmk -outdir=' . g:latex_latexmk_build_dir
|
||||
if a:full
|
||||
let cmd .= ' -C '
|
||||
else
|
||||
let cmd .= ' -c '
|
||||
endif
|
||||
let cmd .= a:full ? ' -C ' : ' -c'
|
||||
let cmd .= latex#util#fnameescape(data.base)
|
||||
let g:latex#data[b:latex.id].cmds.clean = cmd
|
||||
let exe = {
|
||||
\ 'cmd' : cmd,
|
||||
\ 'bg' : 0,
|
||||
\ }
|
||||
call latex#util#execute(exe)
|
||||
let g:latex#data[b:latex.id].cmd_latexmk_clean = cmd
|
||||
|
||||
if a:full
|
||||
echomsg "latexmk full clean finished"
|
||||
@ -395,7 +386,7 @@ function! s:latexmk_build_cmd(data) " {{{1
|
||||
endif
|
||||
|
||||
let exe.cmd = cmd
|
||||
let a:data.cmds.compile = cmd
|
||||
let a:data.cmd_latexmk_compile = cmd
|
||||
let a:data.tmp = tmp
|
||||
|
||||
return exe
|
||||
|
@ -88,7 +88,7 @@ function! s:general.view() dict " {{{2
|
||||
let exe.cmd .= ' ' . latex#util#fnameescape(outfile)
|
||||
|
||||
call latex#util#execute(exe)
|
||||
let g:latex#data[b:latex.id].cmds.view = exe.cmd
|
||||
let self.cmd_view = exe.cmd
|
||||
endfunction
|
||||
|
||||
" }}}2
|
||||
@ -260,7 +260,7 @@ function! s:okular.view() dict " {{{2
|
||||
let exe.cmd .= '\#src:' . line('.') . latex#util#fnameescape(expand('%:p'))
|
||||
|
||||
call latex#util#execute(exe)
|
||||
let g:latex#data[b:latex.id].cmds.view = exe.cmd
|
||||
let self.cmd_view = exe.cmd
|
||||
endfunction
|
||||
|
||||
" }}}2
|
||||
@ -288,7 +288,7 @@ function! s:qpdfview.view() dict " {{{2
|
||||
let exe.cmd .= ':' . col('.')
|
||||
|
||||
call latex#util#execute(exe)
|
||||
let g:latex#data[b:latex.id].cmds.view = exe.cmd
|
||||
let self.cmd_view = exe.cmd
|
||||
endfunction
|
||||
|
||||
" }}}2
|
||||
@ -315,7 +315,7 @@ function! s:sumatrapdf.view() dict " {{{2
|
||||
let exe.cmd .= ' ' . latex#util#fnameescape(outfile)
|
||||
|
||||
call latex#util#execute(exe)
|
||||
let g:latex#data[b:latex.id].cmds.view = exe.cmd
|
||||
let self.cmd_view = exe.cmd
|
||||
endfunction
|
||||
|
||||
" }}}2
|
||||
|
Loading…
Reference in New Issue
Block a user