diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2024-09-11 09:22:14 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2024-09-11 09:47:30 +0200 |
| commit | 830cf054bcd1b144562bd3530588083958cd15c6 (patch) | |
| tree | 41bb1280f2d6576cd3e46f4985fde574b3eb0702 | |
| parent | def611111854612057421bb14f88ed161cfcb7f3 (diff) | |
| download | rneovim-830cf054bcd1b144562bd3530588083958cd15c6.tar.gz rneovim-830cf054bcd1b144562bd3530588083958cd15c6.tar.bz2 rneovim-830cf054bcd1b144562bd3530588083958cd15c6.zip | |
vim-patch:d30ffdc: runtime(pandoc): Update compiler plugin to use actual 'spelllang'
Previously these would be cached in buffer-local variables and
would not change on :compiler pandoc
closes: vim/vim#15642
https://github.com/vim/vim/commit/d30ffdca495d116da359aaea806ad0da7b4b6c75
Co-authored-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/compiler/pandoc.vim | 27 | ||||
| -rw-r--r-- | runtime/doc/quickfix.txt | 3 |
2 files changed, 17 insertions, 13 deletions
diff --git a/runtime/compiler/pandoc.vim b/runtime/compiler/pandoc.vim index ecc935a836..6c15e104c3 100644 --- a/runtime/compiler/pandoc.vim +++ b/runtime/compiler/pandoc.vim @@ -1,10 +1,12 @@ " Vim compiler file " Compiler: Pandoc " Maintainer: Konfekt -" Last Change: 2024 Aug 20 +" Last Change: 2024 Sep 8 " " Expects output file extension, say `:make html` or `:make pdf`. " Passes additional arguments to pandoc, say `:make html --self-contained`. +" Adjust command-line flags by buffer-local/global variable +" b/g:pandoc_compiler_args which defaults to empty. if exists("current_compiler") finish @@ -40,18 +42,21 @@ silent! function s:PandocFiletype(filetype) abort endif endfunction -let b:pandoc_compiler_from = get(b:, 'pandoc_compiler_from', s:PandocFiletype(&filetype)) -let b:pandoc_compiler_lang = get(b:, 'pandoc_compiler_lang', &spell ? matchstr(&spelllang, '^\a\a') : '') +silent! function s:PandocLang() + let lang = get(b:, 'pandoc_compiler_lang', + \ &spell ? matchstr(&spelllang, '^\a\a') : '') + if lang ==# 'en' | let lang = '' | endif + return empty(lang) ? '' : '--metadata lang='..lang +endfunction execute 'CompilerSet makeprg=pandoc'..escape( - \ ' --standalone' . - \ (b:pandoc_compiler_from ==# 'markdown' && (getline(1) =~# '^%\s\+\S\+' || (search('^title:\s+\S+', 'cnw') > 0)) ? - \ '' : ' --metadata title=%:t:r:S') . - \ (empty(b:pandoc_compiler_lang) ? - \ '' : ' --metadata lang='..b:pandoc_compiler_lang) . - \ ' --from='..b:pandoc_compiler_from . - \ ' '..get(b:, 'pandoc_compiler_args', get(g:, 'pandoc_compiler_args', '')) . - \ ' --output %:r:S.$* -- %:S', ' ') + \ ' --standalone'.. + \ (s:PandocFiletype(&filetype) ==# 'markdown' && (getline(1) =~# '^%\s\+\S\+' || (search('^title:\s+\S+', 'cnw') > 0)) ? + \ '' : ' --metadata title=%:t:r:S').. + \ ' '..s:PandocLang().. + \ ' --from='..s:PandocFiletype(&filetype).. + \ ' '..get(b:, 'pandoc_compiler_args', get(g:, 'pandoc_compiler_args', '')).. + \ ' --output %:r:S.$* -- %:S', ' ') CompilerSet errorformat=\"%f\",\ line\ %l:\ %m let &cpo = s:keepcpo diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index e408eb44f4..992b9b8871 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1318,8 +1318,7 @@ Additional arguments can be passed to pandoc: The `--from` argument is an educated guess using the buffer file type; it can be overridden by setting `b:pandoc_compiler_from`. -Likewise the `--metadata lang` argument is set using `&spelllang`; -it can be overridden by setting `b:pandoc_compiler_lang`. +The `--metadata lang` argument is set using 'spelllang'; If `--from=markdown` is assumed and no title set in a title header or YAML block, then the filename (without extension) is used as the title. |