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

Isolate indentation of math delimiters (fixes #210)

Browse Source
This commit is contained in:
Karl Yngve Lervåg 2015-08-25 21:38:05 +02:00
parent 0a5ce0a915
commit 610bfaff0e
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
indent/tex.vim
View File

@ -89,12 +89,22 @@ function! VimtexIndent() " {{{1
endif endif
" Indent opening and closing delimiters " Indent opening and closing delimiters
let popen = s:count_delimiters(pline, s:delimiters_open) let popen = s:count_delimiters(pline, s:tex_delimiters_open)
let copen = s:count_delimiters(cline, s:delimiters_open) let copen = s:count_delimiters(cline, s:tex_delimiters_open)
let pclose = s:count_delimiters(pline, s:delimiters_close) let pclose = s:count_delimiters(pline, s:tex_delimiters_close)
let cclose = s:count_delimiters(cline, s:delimiters_close) let cclose = s:count_delimiters(cline, s:tex_delimiters_close)
let ind += &sw*(max([popen - pclose, 0]) - max([cclose - copen, 0])) let ind += &sw*(max([popen - pclose, 0]) - max([cclose - copen, 0]))
" Indent opening and closing delimiters for math mode
if match(map(synstack(v:lnum, max([col('.') - 1, 1])),
\ 'synIDattr(v:val, ''name'')'), '^texMathZone') >= 0
let popen = s:count_delimiters(pline, s:math_delimiters_open)
let copen = s:count_delimiters(cline, s:math_delimiters_open)
let pclose = s:count_delimiters(pline, s:math_delimiters_close)
let cclose = s:count_delimiters(cline, s:math_delimiters_close)
let ind += &sw*(max([popen - pclose, 0]) - max([cclose - copen, 0]))
endif
" Indent list items " Indent list items
if pline =~# '^\s*\\\(bib\)\?item' if pline =~# '^\s*\\\(bib\)\?item'
let ind += &sw let ind += &sw
@ -136,25 +146,31 @@ let s:tikz_indented = 0
" Define some common patterns " Define some common patterns
let s:envs_lists = 'itemize\|description\|enumerate\|thebibliography' let s:envs_lists = 'itemize\|description\|enumerate\|thebibliography'
let s:envs_noindent = 'document\|verbatim\|lstlisting' let s:envs_noindent = 'document\|verbatim\|lstlisting'
let s:delimiters_open = '\(' . join([ let s:tex_delimiters_open = '\(' . join([
\ '{', \ '{',
\ '(',
\ '\[', \ '\[',
\ '\\{',
\ '\\(', \ '\\(',
\ '\\\[', \ '\\\[',
\ '\\\Cbegin\s*{.\{-}}', \ '\\\Cbegin\s*{.\{-}}',
\ '\\\Cleft\s*\%([^\\]\|\\.\|\\\a*\)',
\ '\\\cbigg\?\((\|\[\|\\{\)',
\ ], '\|') . '\)' \ ], '\|') . '\)'
let s:delimiters_close = '\(' . join([ let s:tex_delimiters_close = '\(' . join([
\ '}', \ '}',
\ ')',
\ '\]', \ '\]',
\ '\\}',
\ '\\)', \ '\\)',
\ '\\\]', \ '\\\]',
\ '\\\Cend\s*{.\{-}}', \ '\\\Cend\s*{.\{-}}',
\ ], '\|') . '\)'
let s:math_delimiters_open = '\(' . join([
\ '(',
\ '\[',
\ '\\{',
\ '\\\Cleft\s*\%([^\\]\|\\.\|\\\a*\)',
\ '\\\cbigg\?\((\|\[\|\\{\)',
\ ], '\|') . '\)'
let s:math_delimiters_close = '\(' . join([
\ ')',
\ '\]',
\ '\\}',
\ '\\\Cright\s*\%([^\\]\|\\.\|\\\a*\)', \ '\\\Cright\s*\%([^\\]\|\\.\|\\\a*\)',
\ '\\\cbigg\?\()\|\]\|\\}\)', \ '\\\cbigg\?\()\|\]\|\\}\)',
\ ], '\|') . '\)' \ ], '\|') . '\)'