[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/auctex f12dbb2 27/95: Improve parsing process in style/
From: |
Tassilo Horn |
Subject: |
[elpa] externals/auctex f12dbb2 27/95: Improve parsing process in style/xcolor.el |
Date: |
Sun, 16 Apr 2017 01:26:49 -0400 (EDT) |
branch: externals/auctex
commit f12dbb246f28d45fbd93b0f9b82777f7db65e5f0
Author: Arash Esbati <address@hidden>
Commit: Arash Esbati <address@hidden>
Improve parsing process in style/xcolor.el
* style/xcolor.el (LaTeX-xcolor-definecolor-regexp): Use
`regexp-opt' to build a regexp to match all color defining macros.
(LaTeX-xcolor-colorlet-regexp): Remove variable.
(LaTeX-xcolor-auto-cleanup): Romove unnecessary *.
---
style/xcolor.el | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/style/xcolor.el b/style/xcolor.el
index 48a0eb1..1001f66 100644
--- a/style/xcolor.el
+++ b/style/xcolor.el
@@ -1,6 +1,6 @@
;; xcolor.el --- AUCTeX style for `xcolor.sty' (v2.12)
-;; Copyright (C) 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2017 Free Software Foundation, Inc.
;; Author: Arash Esbati <address@hidden>
;; Maintainer: address@hidden
@@ -233,18 +233,14 @@ remainder."
(TeX-auto-add-type "xcolor-definecolorset" "LaTeX")
(defvar LaTeX-xcolor-definecolor-regexp
- `(,(concat "\\\\\\(?:define\\|provide\\|prepare\\)"
- "color"
- "\\(?:\\[\\(?:[^]]*\\)\\]\\)?{\\([^}]+\\)}")
- 1 LaTeX-auto-xcolor-definecolor)
+ (eval-when-compile
+ `(,(concat "\\\\"
+ (regexp-opt '("definecolor" "providecolor"
+ "preparecolor" "colorlet"))
+ "\\(?:\\[\\(?:[^]]*\\)\\]\\)?{\\([^}]+\\)}")
+ 1 LaTeX-auto-xcolor-definecolor))
"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\\)"
"colorset"
@@ -268,7 +264,7 @@ xcolor package.")
(let ((head (car colset))
(tail (cadr colset))
(cols (split-string
- (replace-regexp-in-string "[ %\n\r\t]*" "" (nth 2 colset))
+ (replace-regexp-in-string "[ %\n\r\t]" "" (nth 2 colset))
"\\(,[^;]+;\\|,[^;]+$\\)" t)))
(dolist (color cols)
(LaTeX-add-xcolor-definecolors (concat head color tail))))))
@@ -371,7 +367,6 @@ 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.
- [elpa] externals/auctex 4f2a322 16/95: Fix plain-TeX-auto-regexp-list docstring, (continued)
- [elpa] externals/auctex 4f2a322 16/95: Fix plain-TeX-auto-regexp-list docstring, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex fbe0782 11/95: Add `NO-INSERT' argument to `LaTeX-label', Tassilo Horn, 2017/04/16
- [elpa] externals/auctex d54e747 19/95: Fix font-latex-after-hacking-local-variables on XEmacs, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 1b3f6e8 13/95: Update style/listings.el to use `LaTeX-env-label-as-keyval', Tassilo Horn, 2017/04/16
- [elpa] externals/auctex ec7caff 14/95: Add new style/breqn.el, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 5708567 26/95: Improve parsing process in style/color.el, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex c21aff6 31/95: ; Add `LaTeX-equation-label' as symbol to `LaTeX-label-alist', Tassilo Horn, 2017/04/16
- [elpa] externals/auctex c0f3659 21/95: Fix TeX-view-predicate-list-builtin predicates wrt class opts, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex 6c91dba 20/95: Fix number of arguments of local-variable-p in XEmacs, Tassilo Horn, 2017/04/16
- [elpa] externals/auctex e18e46e 32/95: * latex.el (LaTeX-label): Eliminate premature returning of label., Tassilo Horn, 2017/04/16
- [elpa] externals/auctex f12dbb2 27/95: Improve parsing process in style/xcolor.el,
Tassilo Horn <=
- [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