[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/auctex 4054384 25/95: Fix parsing bug in style/xcolor.e
From: |
Tassilo Horn |
Subject: |
[elpa] externals/auctex 4054384 25/95: Fix parsing bug in style/xcolor.el |
Date: |
Sun, 16 Apr 2017 01:26:48 -0400 (EDT) |
branch: externals/auctex
commit 4054384382bf6cf45980956838132bb682b3db91
Author: Arash Esbati <address@hidden>
Commit: Arash Esbati <address@hidden>
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")
- [elpa] externals/auctex 85c4656 12/95: Add function to put labels in opt. argument of environments, (continued)
- [elpa] externals/auctex 85c4656 12/95: Add function to put labels in opt. argument of environments, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex c112a9e 34/95: ; * style/empheq.el (LaTeX-empheq-item-equation): Delete unnecessary *., Tassilo Horn, 2017/04/16
- [elpa] externals/auctex f708e1b 29/95: Add new style/preview.el, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex a1091b8 35/95: Improve determination of master file with subfiles class, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 4321dcc 41/95: Tweak locale treatment on xemacs., Tassilo Horn, 2017/04/16
- [elpa] externals/auctex b0bf9ea 43/95: Partially revert previous commit, will look better later, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 1d7c229 38/95: Make papersize predicate in tex-jp.el to work again., Tassilo Horn, 2017/04/16
- [elpa] externals/auctex a49aaa4 44/95: Fix font-latex-make-match-defun to generate intended code., Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 664186d 52/95: ; Add fix related with coding system missing in my commit on Feb 14., Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 7c48c19 49/95: * tex-ispell.el (TeX-ispell-skip-cmds-list): Add hyperref macros., Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 4054384 25/95: Fix parsing bug in style/xcolor.el,
Tassilo Horn <=
- [elpa] externals/auctex b4f304b 36/95: Improve regexp for looking for documentclass macro, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 9876030 23/95: Fix minor problems, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 586cbd8 28/95: * .gitignore: Ignore only preview.el in top directory., Tassilo Horn, 2017/04/16
- [elpa] externals/auctex cf43d7d 53/95: ; Add some full stops at the end of sentences of the manual, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex de5e40b 37/95: Fix setting of coding system for Japanese TeX, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 7e7e55e 40/95: Add new style/sourcecodepro.el, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 991b582 50/95: Detect \& in tabular cells when filling, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 4fcee32 68/95: Use the variable `LaTeX-listing-label', Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 77974e6 71/95: * style/minted.el ("minted"): Add key=val query for \mint and \mintinline., Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 43b07d9 70/95: Use `TeX-line-number-at-pos' further for older emacsen, Tassilo Horn, 2017/04/16