branch: externals/auctex commit 4054384382bf6cf45980956838132bb682b3db91 Author: Arash Esbati <ar...@gnu.org> Commit: Arash Esbati <ar...@gnu.org>
Fix parsing bug in style/xcolor.el * style/xcolor.el (LaTeX-xcolor-definecolor-regexp): Move parsing of \colorlet macro into `LaTeX-xcolor-colorlet-regexp'. (LaTeX-xcolor-colorlet-regexp): New variable. ("xcolor"): Activate `LaTeX-xcolor-colorlet-regexp' in style hook. --- style/xcolor.el | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/style/xcolor.el b/style/xcolor.el index 34e2484..48a0eb1 100644 --- a/style/xcolor.el +++ b/style/xcolor.el @@ -233,13 +233,17 @@ remainder." (TeX-auto-add-type "xcolor-definecolorset" "LaTeX") (defvar LaTeX-xcolor-definecolor-regexp - `(,(concat "\\\\\\(?:define\\|provide\\|prepare\\)?" + `(,(concat "\\\\\\(?:define\\|provide\\|prepare\\)" "color" - "\\(?:let\\)?" "\\(?:\\[\\(?:[^]]*\\)\\]\\)?{\\([^}]+\\)}") 1 LaTeX-auto-xcolor-definecolor) - "Match the argument of various color defining macros from -xcolor package.") + "Match the argument of various color defining macros from xcolor package.") + +(defvar LaTeX-xcolor-colorlet-regexp + `(,(concat "\\\\colorlet" + "\\(?:\\[\\(?:[^]]*\\)\\]\\)?{\\([^}]+\\)}") + 1 LaTeX-auto-xcolor-definecolor) + "Match the argument of \\colorlet macro from xcolor package.") (defvar LaTeX-xcolor-definecolorset-regexp `(,(concat "\\\\\\(?:define\\|provide\\|prepare\\)" @@ -367,6 +371,7 @@ xcolor.sty." (lambda () ;; Add color to the parser. (TeX-auto-add-regexp LaTeX-xcolor-definecolor-regexp) + (TeX-auto-add-regexp LaTeX-xcolor-colorlet-regexp) (TeX-auto-add-regexp LaTeX-xcolor-definecolorset-regexp) ;; Add list of colors which are always available. @@ -395,7 +400,7 @@ xcolor.sty." ;; \providecolor[<type>]{<name>}{<model-list>}{<spec-list>} '("providecolor" TeX-arg-xcolor-definecolor) - ;; \colorlet[<type>]{<name>}{<num model>}{<color>} + ;; \colorlet[<type>]{<name>}[<num model>]{<color>} '("colorlet" [ TeX-arg-eval completing-read (TeX-argument-prompt optional nil "Type")