[elpa] elpa 0a3632e 45/51: Adjust query commands for loading by xcolor.el

[Tassilo Horn]

branch: elpa
commit 0a3632e51ca3d281eae940b3be45d6ea3e919145
Author: Arash Esbati <address@hidden>
Commit: Mosè Giordano <address@hidden>

    Adjust query commands for loading by xcolor.el
    
    * style/colortbl.el ("colortbl"): Run style hook for "color" only
    if "xcolor" is not an active style.
    ("colortbl"): Check if "xcolor" is an active style and run
    (TeX-arg-xcolor) or (TeX-arg-color) respectively to query for the
    arguments.
    
    Signed-off-by: Mosè Giordano <address@hidden>
---
 style/colortbl.el |   34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/style/colortbl.el b/style/colortbl.el
index 7332ced..be4b5b5 100644
--- a/style/colortbl.el
+++ b/style/colortbl.el
@@ -1,6 +1,6 @@
 ;;; colortbl.el --- AUCTeX style for `colortbl.sty' (v1.0a)
 
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <esbati'at'gmx.de>
 ;; Maintainer: address@hidden
@@ -35,22 +35,40 @@
  "colortbl"
  (lambda ()
 
-   (TeX-run-style-hooks "color" "array")
+   ;; array.el is always loaded:
+   (TeX-run-style-hooks "array")
+
+   ;; Load color.el only if xcolor.el is not already loaded.  This is
+   ;; mainly for the option `table' from xcolor.sty which loads
+   ;; colortbl.sty, but we don't want to load color.el.
+   (unless (member "xcolor" (TeX-style-list))
+     (TeX-run-style-hooks "color"))
 
    (TeX-add-symbols
-    ;; `TeX-arg-color' is provided by `color.el'.
-    '("columncolor" TeX-arg-color
+    ;; `TeX-arg-color' is provided by color.el,
+    ;; `TeX-arg-xcolor' is provided by xcolor.el.
+    '("columncolor" (TeX-arg-conditional (member "xcolor" (TeX-style-list))
+                                        (TeX-arg-xcolor)
+                                      (TeX-arg-color))
       [ TeX-arg-length "Left overhang" ] [ TeX-arg-length "Right overhang" ] )
 
-    '("rowcolor"    TeX-arg-color
+    '("rowcolor"    (TeX-arg-conditional (member "xcolor" (TeX-style-list))
+                                        (TeX-arg-xcolor)
+                                      (TeX-arg-color))
       [ TeX-arg-length "Left overhang" ] [ TeX-arg-length "Right overhang" ] )
 
-    '("cellcolor"   TeX-arg-color
+    '("cellcolor"   (TeX-arg-conditional (member "xcolor" (TeX-style-list))
+                                        (TeX-arg-xcolor)
+                                      (TeX-arg-color))
       [ TeX-arg-length "Left overhang" ] [ TeX-arg-length "Right overhang" ] )
 
-    '("arrayrulecolor" TeX-arg-color)
+    '("arrayrulecolor" (TeX-arg-conditional (member "xcolor" (TeX-style-list))
+                                        (TeX-arg-xcolor)
+                                      (TeX-arg-color)))
 
-    '("doublerulesepcolor" TeX-arg-color))
+    '("doublerulesepcolor" (TeX-arg-conditional (member "xcolor" 
(TeX-style-list))
+                                        (TeX-arg-xcolor)
+                                      (TeX-arg-color))))
 
    (LaTeX-add-lengths "minrowclearance")