[elpa] externals/auctex 143aa59 10/11: Merge branch 'master' into elpa

[Tassilo Horn]

branch: externals/auctex
commit 143aa59c508484d16e5034895a001772be3735a1
Merge: 6620d8c bf5f55b
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>

    Merge branch 'master' into elpa
---
 ChangeLog         |   54 ++++++++++++++++++++++++++++++++++++++
 Makefile.in       |    2 +-
 doc/auctex.texi   |    5 +++
 doc/changes.texi  |    3 ++
 latex.el          |   16 ++++-------
 style/acro.el     |    8 +++---
 style/acronym.el  |    8 +++---
 style/caption.el  |    1 +
 style/color.el    |    1 +
 style/colortbl.el |   74 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 style/enumitem.el |    1 +
 style/geometry.el |    1 +
 style/ltxtable.el |    2 +-
 style/minted.el   |    1 +
 style/pst-plot.el |    7 +++--
 style/pstricks.el |    9 +++---
 style/siunitx.el  |    8 +++---
 tex.el            |    6 +++-
 18 files changed, 174 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f7d673..739854e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+2015-04-02  Mos� Giordano  <address@hidden>
+
+       * doc/auctex.texi (Indenting): Document indentation of "\[...\]".
+
+       * doc/changes.texi: Mention it.
+
+2015-03-30  Mos� Giordano  <address@hidden>
+
+       * latex.el (LaTeX-begin-regexp): Add "\[".
+       (LaTeX-indent-calculate): Remove indentation of "\[...\]" from
+       here, it is automatically done in `LaTeX-indent-level-count' now
+       that `LaTeX-begin-regexp' has "\[".  (Bug#20227)
+
+2015-03-28  Mos� Giordano  <address@hidden>
+
+       * style/acro.el:
+
+       * style/acronym.el:
+
+       * style/caption.el:
+
+       * style/color.el:
+
+       * style/enumitem.el:
+
+       * style/geometry.el:
+
+       * style/minted.el:
+
+       * style/pst-plot.el:
+
+       * style/pstricks.el:
+
+       * style/siunitx.el: Update copyright years and add
+       `TeX-auto-parse' to `TeX-update-style-hook'.
+
+2015-03-28  Arash Esbati  <address@hidden>
+
+       * Makefile.in (STYLESRC): Add new style.
+
+       * style/colortbl.el: New file.
+
+       * style/ltxtable.el ("ltxtable"): Ask for a `Width' and not for a
+       `Length' in minibuffer.
+
+       * latex.el (LaTeX-common-initialization): Add standard LaTeX
+       lengths `arraycolsep', `arrayrulewidth' and `doublerulesep'.
+
+2015-03-23  Tassilo Horn  <address@hidden>
+
+       * tex.el (TeX-run-style-hooks): Apply style hooks in reverse
+       order.  With that, a local style can modify a private or a global
+       style, and a private style can modify a global one.
+
 2015-03-22  Tassilo Horn  <address@hidden>
 
        * Version 11.88.3 released.
diff --git a/Makefile.in b/Makefile.in
index 08c50a0..75ed8c2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -147,7 +147,7 @@ STYLESRC = style/prosper.el \
           style/tcolorbox.el style/color.el     style/expl3.el \
           style/bidibeamer.el style/enumitem.el style/caption.el \
           style/geometry.el  style/ltablex.el   style/ltxtable.el \
-          style/mn2e.el
+          style/mn2e.el      style/colortbl.el
 
 STYLEELC = $(STYLESRC:.el=.elc)
 
diff --git a/doc/auctex.texi b/doc/auctex.texi
index 6fb6d71..6307637 100644
--- a/doc/auctex.texi
+++ b/doc/auctex.texi
@@ -1590,6 +1590,11 @@ function additionally indents the current line.  If you 
choose
 @key{RET} is pressed.
 @end defopt
 
address@hidden treats by default @samp{\[...\]} math mode as a regular
+environment and indents it accordingly.  If you do not like such
+behavior you only need to remove @code{\|\[} and @code{\|\]} from
address@hidden and @code{LaTeX-end-regexp} variables
+respectively.
 
 @node Filling
 @section Filling
diff --git a/doc/changes.texi b/doc/changes.texi
index 5483c84..1dd552d 100644
--- a/doc/changes.texi
+++ b/doc/changes.texi
@@ -29,6 +29,9 @@ New option @code{TeX-file-line-error} allows to select 
file:line:error
 style for error messages.
 
 @item
+Indent @samp{\[...\]} math mode as a regular environment by default.
+
address@hidden
 @code{TeX-view-program-list} can contain, as third optional element of
 each item, the name of the executable(s) needed to open the viewer.
 @end itemize
diff --git a/latex.el b/latex.el
index c232c24..187f1b6 100644
--- a/latex.el
+++ b/latex.el
@@ -2943,7 +2943,7 @@ indentation level in columns."
 (make-obsolete-variable 'LaTeX-verbatim-regexp 
'LaTeX-verbatim-environments-local
                        "2014-12-19")
 
-(defcustom LaTeX-begin-regexp "begin\\b"
+(defcustom LaTeX-begin-regexp "begin\\b\\|\\["
   "*Regexp matching macros considered begins."
   :group 'LaTeX-indentation
   :type 'regexp)
@@ -3141,10 +3141,6 @@ outer indentation in case of a commented line.  The 
symbols
             ;; End brace in the start of the line.
             (- (LaTeX-indent-calculate-last force-type)
                TeX-brace-indent-level))
-           ((and (texmathp)
-                 ;; Display math \[...\], treat as a generic environment.
-                 (equal "\\[" (car texmathp-why)))
-            LaTeX-indent-level)
            (t (LaTeX-indent-calculate-last force-type))))))
 
 (defun LaTeX-indent-level-count ()
@@ -5973,11 +5969,11 @@ i.e. you do _not_ have to cater for this yourself by 
adding \\\\' or $."
   (LaTeX-add-counters "page" "equation" "enumi" "enumii" "enumiii"
                      "enumiv" "footnote" "mpfootnote")
 
-  (LaTeX-add-lengths "baselineskip" "baselinestretch" "columnsep"
-                    "columnwidth" "evensidemargin" "linewidth" "oddsidemargin"
-                    "paperwidth" "paperheight" "parindent" "parskip"
-                    "tabcolsep" "textheight" "textwidth" "topmargin"
-                    "unitlength")
+  (LaTeX-add-lengths "arraycolsep" "arrayrulewidth" "baselineskip" 
"baselinestretch"
+                    "columnsep" "columnwidth" "doublerulesep" "evensidemargin"
+                    "linewidth" "oddsidemargin" "paperwidth" "paperheight"
+                    "parindent" "parskip" "tabcolsep" "textheight" "textwidth"
+                    "topmargin" "unitlength")
 
   (TeX-add-symbols
    '("addtocounter" TeX-arg-counter "Value")
diff --git a/style/acro.el b/style/acro.el
index 6d74533..66781c9 100644
--- a/style/acro.el
+++ b/style/acro.el
@@ -1,6 +1,6 @@
 ;;; acro.el --- AUCTeX style for `acro.sty' version 1.2a.
 
-;; Copyright (C) 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2015 Free Software Foundation, Inc.
 
 ;; Maintainer: address@hidden
 ;; Author: Mosè Giordano <address@hidden>
@@ -102,9 +102,9 @@ set to `true'."
            (LaTeX-provided-package-options-member "acro" "macros=true"))
     (add-to-list 'TeX-auto-symbol LaTeX-auto-acro-acronym)))
 
-;; FIXME: This does not seem to work unless one does a manual reparse.
-(add-hook 'TeX-auto-prepare-hook 'LaTeX-acro-prepare)
-(add-hook 'TeX-auto-cleanup-hook 'LaTeX-acro-cleanup)
+(add-hook 'TeX-auto-prepare-hook #'LaTeX-acro-prepare t)
+(add-hook 'TeX-auto-cleanup-hook #'LaTeX-acro-cleanup t)
+(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
 
 (defvar LaTeX-acro-acronym-history nil
   "History of acronyms in acro.")
diff --git a/style/acronym.el b/style/acronym.el
index b97f80a..648f4cf 100644
--- a/style/acronym.el
+++ b/style/acronym.el
@@ -1,6 +1,6 @@
 ;;; acronym.el --- AUCTeX style for `acronym.sty' version 1.38.
 
-;; Copyright (C) 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2015 Free Software Foundation, Inc.
 
 ;; Maintainer: address@hidden
 ;; Author: Mosè Giordano <address@hidden>
@@ -51,9 +51,9 @@
          (add-to-list 'LaTeX-acronym-list (list acronym)))
        LaTeX-auto-acronym))
 
-;; FIXME: This does not seem to work unless one does a manual reparse.
-(add-hook 'TeX-auto-prepare-hook 'LaTeX-acronym-prepare)
-(add-hook 'TeX-auto-cleanup-hook 'LaTeX-acronym-cleanup)
+(add-hook 'TeX-auto-prepare-hook #'LaTeX-acronym-prepare t)
+(add-hook 'TeX-auto-cleanup-hook #'LaTeX-acronym-cleanup t)
+(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
 
 (defvar LaTeX-acronym-acronym-history nil
   "History of acronyms in acronym.")
diff --git a/style/caption.el b/style/caption.el
index c79f562..ddefb5b 100644
--- a/style/caption.el
+++ b/style/caption.el
@@ -141,6 +141,7 @@ supported by `caption.sty'.")
   (setq        LaTeX-auto-caption-DeclareCaption nil))
 
 (add-hook 'TeX-auto-prepare-hook #'LaTeX-caption-auto-prepare t)
+(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
 
 (defun LaTeX-caption-update-key-val-options ()
   "Update the buffer-local key-val options before offering them
diff --git a/style/color.el b/style/color.el
index de0f50c..2af29f6 100644
--- a/style/color.el
+++ b/style/color.el
@@ -92,6 +92,7 @@ package.")
 
 (add-hook 'TeX-auto-prepare-hook #'LaTeX-color-auto-prepare t)
 (add-hook 'TeX-auto-cleanup-hook #'LaTeX-color-auto-cleanup t)
+(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
 
 (defun TeX-arg-color-definecolor (optional &optional prompt)
   "Insert arguments of `\\definecolor' from `color.sty'."
diff --git a/style/colortbl.el b/style/colortbl.el
new file mode 100644
index 0000000..7332ced
--- /dev/null
+++ b/style/colortbl.el
@@ -0,0 +1,74 @@
+;;; colortbl.el --- AUCTeX style for `colortbl.sty' (v1.0a)
+
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: Arash Esbati <esbati'at'gmx.de>
+;; Maintainer: address@hidden
+;; Created: 2015-03-22
+;; Keywords: tex
+
+;; This file is part of AUCTeX.
+
+;; AUCTeX is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; AUCTeX is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with AUCTeX; see the file COPYING.  If not, write to the Free
+;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+;; 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file adds support for `colortbl.sty' (v1.0a) from 2012/02/13.
+;; `colortbl.sty' is part of TeXLive.
+
+;;; Code:
+
+(TeX-add-style-hook
+ "colortbl"
+ (lambda ()
+
+   (TeX-run-style-hooks "color" "array")
+
+   (TeX-add-symbols
+    ;; `TeX-arg-color' is provided by `color.el'.
+    '("columncolor" TeX-arg-color
+      [ TeX-arg-length "Left overhang" ] [ TeX-arg-length "Right overhang" ] )
+
+    '("rowcolor"    TeX-arg-color
+      [ TeX-arg-length "Left overhang" ] [ TeX-arg-length "Right overhang" ] )
+
+    '("cellcolor"   TeX-arg-color
+      [ TeX-arg-length "Left overhang" ] [ TeX-arg-length "Right overhang" ] )
+
+    '("arrayrulecolor" TeX-arg-color)
+
+    '("doublerulesepcolor" TeX-arg-color))
+
+   (LaTeX-add-lengths "minrowclearance")
+
+   ;; Fontification
+   (when (and (featurep 'font-latex)
+             (eq TeX-install-font-lock 'font-latex-setup))
+     (font-latex-add-keywords '(("columncolor"  "[{[[")
+                               ("rowcolor"     "[{[[")
+                               ("cellcolor"    "[{[[")
+                               ("arrayrulecolor"     "[{")
+                               ("doublerulesepcolor" "[{"))
+                             'function)))
+ LaTeX-dialect)
+
+;; colortbl.sty has one option `debugshow'.  I ignore that since it
+;; would only take more time during insertation in a buffer and I
+;; presume that not many users use it anyway.
+(defvar LaTeX-colortbl-package-options nil
+  "Package option for the colortbl package.")
+
+;;; colortbl.el ends here
diff --git a/style/enumitem.el b/style/enumitem.el
index e2fce50..8ea4545 100644
--- a/style/enumitem.el
+++ b/style/enumitem.el
@@ -187,6 +187,7 @@ package.")
 
 (add-hook 'TeX-auto-prepare-hook #'LaTeX-enumitem-auto-prepare t)
 (add-hook 'TeX-auto-cleanup-hook #'LaTeX-enumitem-auto-cleanup t)
+(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
 
 (defun LaTeX-enumitem-env-with-opts (env)
   "Update available key-val options, then insert ENV and optional
diff --git a/style/geometry.el b/style/geometry.el
index d263183..973f63c 100644
--- a/style/geometry.el
+++ b/style/geometry.el
@@ -99,6 +99,7 @@ package.")
   (setq        LaTeX-auto-geometry-savegeometry nil))
 
 (add-hook 'TeX-auto-prepare-hook #'LaTeX-geometry-auto-prepare t)
+(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
 
 (TeX-add-style-hook
  "geometry"
diff --git a/style/ltxtable.el b/style/ltxtable.el
index ddc7c89..93dd218 100644
--- a/style/ltxtable.el
+++ b/style/ltxtable.el
@@ -37,7 +37,7 @@
    (TeX-run-style-hooks "tabularx" "longtable")
    (TeX-add-symbols
     '("LTXtable"
-      (TeX-arg-length)
+      (TeX-arg-length "Width" "1.0\\linewidth")
       (TeX-arg-eval
        (lambda ()
         (let ((longtable (file-relative-name
diff --git a/style/minted.el b/style/minted.el
index 758a52b..d829e93 100644
--- a/style/minted.el
+++ b/style/minted.el
@@ -178,6 +178,7 @@
 
 (add-hook 'TeX-auto-prepare-hook #'LaTeX-minted-auto-prepare t)
 (add-hook 'TeX-auto-cleanup-hook #'LaTeX-minted-auto-cleanup t)
+(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
 
 (TeX-add-style-hook
  "minted"
diff --git a/style/pst-plot.el b/style/pst-plot.el
index 5cb3404..2d61d88 100644
--- a/style/pst-plot.el
+++ b/style/pst-plot.el
@@ -1,6 +1,6 @@
 ;;; pst-plot.el --- AUCTeX style for `pst-plot.sty'
 
-;; Copyright (C) 2007, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2014, 2015 Free Software Foundation, Inc.
 
 ;; Author: Holger Sparr <address@hidden>
 ;; Created: 21 Jun 2007
@@ -57,8 +57,9 @@
   "Clear `LaTeX-auto-pstplot' before use."
   (setq LaTeX-auto-pstplot nil))
 
-(add-hook 'TeX-auto-prepare-hook 'LaTeX-pstplot-prepare)
-(add-hook 'TeX-auto-cleanup-hook 'LaTeX-pstplot-cleanup)
+(add-hook 'TeX-auto-prepare-hook #'LaTeX-pstplot-prepare t)
+(add-hook 'TeX-auto-cleanup-hook #'LaTeX-pstplot-cleanup t)
+(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
 
 ;;; Parameters
 (defvar LaTeX-pstplot-datasets nil
diff --git a/style/pstricks.el b/style/pstricks.el
index f6b3d92..02b2c30 100644
--- a/style/pstricks.el
+++ b/style/pstricks.el
@@ -1,6 +1,6 @@
 ;;; pstricks.el --- AUCTeX style for the `pstricks' package.
 
-;; Copyright (C) 2007, 2009, 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2009, 2013-2015 Free Software Foundation, Inc.
 
 ;; Author: Holger Sparr <address@hidden>
 ;; Maintainer: address@hidden
@@ -699,10 +699,9 @@ package PNAME"
   "Clear `LaTeX-auto-pstricks' before use."
   (setq LaTeX-auto-pstricks nil))
 
-;; FIXME: This does not seem to work unless one does a manual reparse.
-;; Check e.g. with "\definecolor" and "fillcolor=".
-(add-hook 'TeX-auto-prepare-hook 'LaTeX-pst-prepare)
-(add-hook 'TeX-auto-cleanup-hook 'LaTeX-pst-cleanup)
+(add-hook 'TeX-auto-prepare-hook #'LaTeX-pst-prepare t)
+(add-hook 'TeX-auto-cleanup-hook #'LaTeX-pst-cleanup )
+(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
 
 ;;; Additional Functionality
 (defun LaTeX-pst-parameters-add (&optional arg)
diff --git a/style/siunitx.el b/style/siunitx.el
index b279cc1..a5890f5 100644
--- a/style/siunitx.el
+++ b/style/siunitx.el
@@ -1,6 +1,6 @@
 ;;; siunitx.el --- AUCTeX style for `siunitx.sty' version 2.5s.
 
-;; Copyright (C) 2012-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
 
 ;; Maintainer: address@hidden
 ;; Author: Mosè Giordano <address@hidden>
@@ -56,9 +56,9 @@
            (add-to-list 'LaTeX-siunitx-unit-list (list symbol)))
          LaTeX-auto-siunitx-unit))
 
-;; FIXME: This does not seem to work unless one does a manual reparse.
-(add-hook 'TeX-auto-prepare-hook 'LaTeX-siunitx-prepare)
-(add-hook 'TeX-auto-cleanup-hook 'LaTeX-siunitx-cleanup)
+(add-hook 'TeX-auto-prepare-hook #'LaTeX-siunitx-prepare t)
+(add-hook 'TeX-auto-cleanup-hook #'LaTeX-siunitx-cleanup t)
+(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
 
 (defvar LaTeX-siunitx-unit-history nil
   "History of units in siunitx.")
diff --git a/tex.el b/tex.el
index 88e2336..394814e 100644
--- a/tex.el
+++ b/tex.el
@@ -2708,7 +2708,11 @@ See variable `TeX-style-hook-dialect' for supported 
dialects."
                                (and (TeX-shdex-in-p TeX-style-hook-dialect 
(aref hook 2))
                                     (funcall (aref hook 1))))
                               (t (error "Invalid style hook %S" hook))))
-                           (cdr-safe (TeX-assoc-string style 
TeX-style-hook-list)))
+                           ;; Reverse the list of style hooks in order to run
+                           ;; styles in the order global, private, local
+                           ;; (assuming TeX-style-path has that ordering,
+                           ;; too).
+                           (reverse (cdr-safe (TeX-assoc-string style 
TeX-style-hook-list))))
                  ;; This happens in case some style added a new parser, and
                  ;; now the style isn't used anymore (user deleted
                  ;; \usepackage{style}).  Then we're left over with, e.g.,