[elpa] 60/299: * Makefile.in (STYLESRC): Activate new style array.el.

[Stefan Monnier]

monnier pushed a commit to branch externals/auctex
in repository elpa.

commit e850d67a3df7f0e3bb4af9c748f9b49b99778c6c
Author: Tassilo Horn <address@hidden>
Date:   Mon Feb 18 19:23:38 2013 +0000

    * Makefile.in (STYLESRC): Activate new style array.el.
    
    * style/array.el: New style.
    
    * style/tabularx.el: Expand copyright range.
    ("tabularx"): The package relies on the array package, so run its
    style hook.
---
 ChangeLog                       |   10 +++++++++
 Makefile.in                     |    3 +-
 style/{tabularx.el => array.el} |   40 +++++++++++++++++---------------------
 style/tabularx.el               |    7 ++++-
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0aacfc2..9002184 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-02-18  Mads Jensen  <address@hidden>
+
+       * Makefile.in (STYLESRC): Activate new style array.el.
+
+       * style/array.el: New style.
+
+       * style/tabularx.el: Expand copyright range.
+       ("tabularx"): The package relies on the array package, so run its
+       style hook.
+
 2013-02-18  Tassilo Horn  <address@hidden>
 
        * tex.el (require): Require crm.
diff --git a/Makefile.in b/Makefile.in
index 45be16c..09087d0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -129,7 +129,8 @@ STYLESRC = style/prosper.el \
           style/multirow.el  style/imakeidx.el  style/afterpage.el \
           style/longtable.el style/lipsum.el    style/kantlipsum.el \
           style/memoir.el    style/placeins.el  style/nameref.el \
-          style/fancynum.el  style/fancyhdr.el  style/filecontents.el
+          style/fancynum.el  style/fancyhdr.el  style/filecontents.el \
+          style/array.el
 STYLEELC = $(STYLESRC:.el=.elc)
 
 CLEANFILES = $(AUCELC) $(STYLEELC) $(MULEELC)
diff --git a/style/tabularx.el b/style/array.el
similarity index 52%
copy from style/tabularx.el
copy to style/array.el
index 0fc8234..89c2222 100644
--- a/style/tabularx.el
+++ b/style/array.el
@@ -1,10 +1,9 @@
-;;; tabularx.el --- AUCTeX style for the tabularx package.
+;;; array.el --- AUCTeX style for `array.sty'
 
-;; Copyright (C) 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2013 Free Software Foundation, Inc.
 
-;; Author: Ralf Angeli <address@hidden>
+;; Author: Mads Jensen <address@hidden>
 ;; Maintainer: address@hidden
-;; Created: 2009-02-22
 ;; Keywords: tex
 
 ;; This file is part of AUCTeX.
@@ -26,27 +25,24 @@
 
 ;;; Commentary:
 
-;; This file adds support for the tabularx package.
+;; This file adds support for `array.sty'
 
 ;;; Code:
 
-(defvar LaTeX-tabularx-package-options
-  '("infoshow" "debugshow")
-  "Package options for the tabularx package.")
-
 (TeX-add-style-hook
- "tabularx"
+ "array"
  (lambda ()
-   ;; New symbols
    (TeX-add-symbols
-    "tracingtabularx"
-    '("tabularxcolumn" 0))
-   ;; New environments
-   (LaTeX-add-environments
-    ;; XXX: The tabularx environment takes the same arguments as the
-    ;; tabular* environment.  However, the supported tokens in the
-    ;; format can differ, so at some point in time we might want to
-    ;; separate tabular* and tabularx.
-    '("tabularx" LaTeX-env-tabular*))))
-
-;;; tabularx.el ends here
+    '("newcolumntype" "Column type" [ "Number of arguments" ] t)
+    '("showcols" 0)
+    '("firsthline" 0)
+    '("lasthline" 0))
+
+   ;; `array.sty' adds a couple of new lengths.  They're added here, rather 
than
+   ;; in the `TeX-add-symbols' block.
+   (LaTeX-add-lengths "extratabsurround" "extrarowheight")))
+
+(defvar LaTeX-array-package-options nil
+  "Package options for array.")
+
+;; array.el ends here
diff --git a/style/tabularx.el b/style/tabularx.el
index 0fc8234..f7d9ea7 100644
--- a/style/tabularx.el
+++ b/style/tabularx.el
@@ -1,6 +1,6 @@
 ;;; tabularx.el --- AUCTeX style for the tabularx package.
 
-;; Copyright (C) 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2013 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <address@hidden>
 ;; Maintainer: address@hidden
@@ -47,6 +47,9 @@
     ;; tabular* environment.  However, the supported tokens in the
     ;; format can differ, so at some point in time we might want to
     ;; separate tabular* and tabularx.
-    '("tabularx" LaTeX-env-tabular*))))
+    '("tabularx" LaTeX-env-tabular*))
+   
+   ;; `tabularx' requires array to define the column types
+   (TeX-run-style-hooks "array")))
 
 ;;; tabularx.el ends here