Merge branch 'lervag:master' into parse-docclass-and-pkg-options

Author: kiryph

autoload/vimtex/env.vim

@@ -142,10 +142,10 @@ function! vimtex#env#change(open, close, new) abort
   endif
 
   let l:coming_from_inline = a:open.match ==# '$'
-        \ || (
+        \ || (a:open.match ==# '\(' && !(
         \      trim(getline(a:open.lnum))  ==# '\('
         \   && trim(getline(a:close.lnum))  ==# '\)'
-        \ )
+        \ ))
 
   return l:coming_from_inline
         \ ? vimtex#env#change_to_indented(a:open, a:close, l:new)

autoload/vimtex/syntax/p/zref_clever.vim

@@ -0,0 +1,29 @@
+" VimTeX - LaTeX plugin for Vim
+"
+" Maintainer: Karl Yngve Lervåg
+" Email:      karl.yngve@gmail.com
+"
+
+function! vimtex#syntax#p#zref_clever#load(cfg) abort " {{{1
+  syntax match texCmdZRef "\v\\zc?ref>"
+        \ skipwhite skipnl
+        \ nextgroup=texZRefArg
+
+  syntax match texCmdZRef "\\zlabel\>"
+        \ skipwhite skipnl
+        \ nextgroup=texZRefOpt,texRefArg
+
+  call vimtex#syntax#core#new_arg('texZRefArg', {
+        \ 'contains': 'texComment,@NoSpell',
+        \})
+  call vimtex#syntax#core#new_opt('texZRefOpt', {
+        \ 'next': 'texRefArg',
+        \ 'opts': 'oneline',
+        \})
+
+  highlight def link texZRefArg           texRefArg
+  highlight def link texZRefOpt           texRefOpt
+  highlight def link texCmdZRef           texCmdRef
+endfunction
+
+" }}}1

test/test-completion-commands/test-tkz-euclide.tex

@@ -0,0 +1,23 @@
+\documentclass{minimal}
+\usepackage{tkz-euclide}
+
+\begin{document}
+\begin{tikzpicture}[scale=.5]
+% fixed points
+\tkzDefPoint(0,0){A}
+\tkzDefPoint(5,2){B}
+% calculus
+\tkzInterCC(A,B)(B,A)
+\tkzGetPoints{C}{D}
+% drawings
+\tkzDrawCircles(A,B B,A)
+\tkzDrawPolygon(A,B,C)
+\tkzDrawPoints(A,...,D)
+% marking
+\tkzMarkSegments[mark=s||](A,B B,C C,A)
+% labelling
+\tkzLabelSegments[swap](A,B){$c$}
+\tkzLabelPoints(A,B,D)
+\tkzLabelPoints[above](C)
+\end{tikzpicture} 
+\end{document}

test/test-completion-commands/test-tkz-euclide.vim

@@ -0,0 +1,20 @@
+set nocompatible
+set runtimepath^=~/.local/plugged/vimtex
+set runtimepath+=~/.local/plugged/vimtex/after
+filetype plugin indent on
+syntax enable
+
+nnoremap q :qall!<cr>
+
+let g:vimtex_view_method = "zathura"
+let g:vimtex_cache_persistent = v:false
+
+silent edit test-tkz-euclide.tex
+
+if empty($INMAKE) | finish | endif
+
+let s:candidates = vimtex#test#completion('\', 'tkz')
+call assert_true(len(s:candidates) > 0)
+call assert_equal(s:candidates[0].word, 'tkzAutoLabelPoints')
+
+call vimtex#test#finished()

test/test-syntax/test-zref.tex

@@ -0,0 +1,19 @@
+\documentclass{scrartcl}
+\usepackage{amsmath}
+\usepackage{hyperref}
+\usepackage{zref-user}
+\usepackage{zref-clever}
+
+\begin{document}
+
+\section{sub3 with spaces}\zlabel{sec:sub3 with spaces}
+
+\begin{equation}
+  f(x) = 42
+  \label{eq:sub3 with spaces}
+\end{equation}
+
+This is \zcref{sec:sub3 with spaces}, and \zcref{eq:sub3 with spaces} is up top.
+The same here, but without anything clever done to it: \zref{eq:sub3 with spaces}.
+
+\end{document}