[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 073b17a2dc30b771ab16df7297d68914fd1e12e3

[Arash Esbati]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  073b17a2dc30b771ab16df7297d68914fd1e12e3 (commit)
      from  f375c1fa0aa28e68d518dbdfec33f70c146397a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 073b17a2dc30b771ab16df7297d68914fd1e12e3
Author: Arash Esbati <address@hidden>
Date:   Tue Aug 23 11:11:53 2016 +0200

    Update style/mathtools.el to v1.18 of mathtools.sty
    
    * style/mathtools.el (LaTeX-mathtools-package-options): Add
    "nonrobust" option.
    (LaTeX-mathtools-key-val-options): Add missing key=vals.  Insert a
    period in doc string.
    (LaTeX-mathtools-arg-mathstyle-completion)
    (LaTeX-mathtools-arg-mathsize-completion)
    (LaTeX-mathtools-arg-declarepaireddelimiter)
    (LaTeX-mathtools-env-cases)
    (LaTeX-mathtools-item-cases): New functions.
    (LaTeX-mathtools-env-multlined): Add an empty pair of square
    brackets if only the second optional argument is given.
    ("mathtools"): Update commands and environments in style hook.
    (LaTeX-mathtools-env-matrix-starred)
    (LaTeX-mathtools-env-spreadlines): Delete functions.  Use
    ["string"] when adding environments in `LaTeX-add-environments'.

diff --git a/style/mathtools.el b/style/mathtools.el
index 68fed88..c6c4b17 100644
--- a/style/mathtools.el
+++ b/style/mathtools.el
@@ -1,6 +1,6 @@
 ;;; mathtools.el --- Style hook for the LaTeX package `mathtools'.
 
-;; Copyright (C) 2011-2012, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2012, 2014, 2016 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <address@hidden>
 ;; Created: 2011-02-13
@@ -36,30 +36,213 @@
 
 ;;; Code:
 
+;; Needed for auto-parsing.
+(require 'tex)
+
 ;; amsmath options which can be passed directly to mathtools are
 ;; appended in the style hook below
 (defvar LaTeX-mathtools-package-options
-  '("fixamsmath" "donotfixamsmathbugs" "allowspaces" "disallowspaces")
+  '("fixamsmath" "donotfixamsmathbugs" "allowspaces" "disallowspaces"
+    ;; Update 2013: We now make \(\) and \[\] robust (can be disabled
+    ;; via nonrobust package option)
+    "nonrobust")
   "Package options for the mathtools package.")
 
 (defvar LaTeX-mathtools-key-val-options
   '(("showonlyrefs")
     ("mathic" ("true" "false"))
     ("showmanualtags" ("true" "false"))
+    ;; 3.4.1 Matrices
+    ("smallmatrix-align" ("c" "l" "r"))
+    ("smallmatrix-inner-space")
+    ;; 3.4.2 The multlined environment
     ("firstline-afterskip")
     ("lastline-preskip")
     ("multlined-pos" ("c" "b" "t"))
     ("multlined-width")
+    ;; 3.4.7 Centered \vdots
+    ("shortvdotsadjustabove")
+    ("shortvdotsadjustbelow")
+    ;; 3.5 Intertext and short intertext
+    ("original-intertext" ("true" "false"))
+    ("original-shortintertext" ("true" "false"))
+    ("above-intertext-sep")
+    ("below-intertext-sep")
+    ("above-shortintertext-sep")
+    ("below-shortintertext-sep")
+    ;; 3.7.2 Vertically centered colon
     ("centercolon" ("true" "false"))
+    ;; 4.2 Left sub/superscripts
     ("prescript-sub-format")
     ("prescript-sup-format")
     ("prescript-arg-format"))
-  "Options for the \\mathtoolsset command")
+  "Options for the \\mathtoolsset command.")
+
+;; Setup for \newtagform
+(TeX-auto-add-type "mathtools-newtagform" "LaTeX")
+
+(defvar LaTeX-mathtools-newtagform-regexp
+  '("\\\\newtagform{\\([^}]+\\)}"
+    1 LaTeX-auto-mathtools-newtagform)
+  "Matches the first argument of \\newtagform from mathtools package.")
+
+;; Setup for \DeclarePairedDelimiter(X)?:
+(TeX-auto-add-type "mathtools-DeclarePairedDelimiter" "LaTeX")
+
+(defvar LaTeX-mathtools-DeclarePairedDelimiter-regexp
+  `(,(concat "\\\\DeclarePairedDelimiter\\(?:X\\|XPP\\)?"
+            "{?"
+            "\\\\\\([a-zA-Z]+\\)"
+            "}?"
+            "\\(?:\\[\\([0-9]+\\)\\]\\)?")
+    (1 2) LaTeX-auto-mathtools-DeclarePairedDelimiter)
+  "Match the arguments of \\DeclarePairedDelimiterX? from mathtools package.")
+
+;; Setup for \newgathered
+(TeX-auto-add-type "mathtools-newgathered" "LaTeX")
+
+(defvar LaTeX-mathtools-newgathered-regexp
+  '("\\\\newgathered{\\([^}]+\\)}"
+    1 LaTeX-auto-mathtools-newgathered)
+  "Matches the first argument of \\newgathered from mathtools package.")
+
+(defun LaTeX-mathtools-auto-prepare ()
+  "Clear various variables for mathtools package before parsing."
+  (setq LaTeX-auto-mathtools-newtagform             nil
+       LaTeX-auto-mathtools-DeclarePairedDelimiter nil
+       LaTeX-auto-mathtools-newgathered            nil))
+
+(defun LaTeX-mathtools-auto-cleanup ()
+  "Process the parsed elements for mathtools package."
+  (when (LaTeX-mathtools-DeclarePairedDelimiter-list)
+    (dolist (delim (LaTeX-mathtools-DeclarePairedDelimiter-list))
+      (let ((cmd (car delim))
+           (arg (cadr delim)))
+       (TeX-add-symbols `(,cmd [ LaTeX-mathtools-arg-mathsize-completion ]
+                               ,(if (string= arg "")
+                                    1
+                                  (string-to-number arg)))
+                        `(,(concat cmd "*")
+                          ,(if (string= arg "")
+                               1
+                             (string-to-number arg)))))))
+  (when (LaTeX-mathtools-newgathered-list)
+    (dolist (env (mapcar #'car (LaTeX-mathtools-newgathered-list)))
+      (LaTeX-add-environments env)
+      (add-to-list 'LaTeX-item-list
+                  `(,env . LaTeX-item-equation) t)
+      (add-to-list 'LaTeX-label-alist
+                  `(,env . LaTeX-amsmath-label) t)
+      (when (boundp 'reftex-label-alist)
+       (add-to-list 'reftex-label-alist `(,env ?e nil nil t) t)))))
+
+(add-hook 'TeX-auto-prepare-hook #'LaTeX-mathtools-auto-prepare t)
+(add-hook 'TeX-auto-cleanup-hook #'LaTeX-mathtools-auto-cleanup t)
+(add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
+
+(defun LaTeX-mathtools-arg-mathstyle-completion (optional)
+  "Query and insert mathstyle argument to various commands.
+If OPTIONAL, insert it as optional argument in brackets."
+  (TeX-argument-insert
+   (let ((style (completing-read
+                (TeX-argument-prompt optional nil
+                                     (concat "Math style: " TeX-esc) t)
+                '("displaystyle" "textstyle"
+                  "scriptstyle"  "scriptscriptstyle"))))
+     (if (string= style "")
+        style
+       (concat TeX-esc style)))
+   optional))
+
+(defun LaTeX-mathtools-arg-mathsize-completion (optional)
+  "Query and insert math size argument to various commands.
+If OPTIONAL, insert it as optional argument in brackets."
+  (TeX-argument-insert
+   (let ((size (completing-read
+               (TeX-argument-prompt optional nil
+                                    (concat "Size command: " TeX-esc) t)
+               '("big" "Big" "bigg" "Bigg"))))
+     (if (string= size "")
+        size
+       (concat TeX-esc size)))
+   optional))
+
+(defun LaTeX-mathtools-arg-declarepaireddelimiter (optional &optional X)
+  "Query and insert various \\DeclarePairedDelimiter macros from mathtools 
package."
+  (let ((cmd (TeX-read-string (concat "Command: " TeX-esc)))
+       (arg (when X (TeX-read-string
+                     (TeX-argument-prompt t nil "Number of arguments")))))
+    (TeX-add-symbols `(,cmd [ LaTeX-mathtools-arg-mathsize-completion ]
+                           ,(if X
+                                ;; This is no precaution, arg has to be > 0
+                                (string-to-number arg)
+                              1))
+                    `(,(concat cmd "*")
+                      ,(if X
+                           (string-to-number arg)
+                         1)))
+    (LaTeX-add-mathtools-DeclarePairedDelimiters
+     `(,cmd ,(if X arg "")))
+    (TeX-argument-insert (concat TeX-esc cmd) optional)
+    (when arg
+      (insert (concat LaTeX-optop arg LaTeX-optcl)))))
+
+(defun LaTeX-mathtools-env-multlined (env)
+  "Query and insert two optional arguments for ENV multlined.
+If both arguments are given, insert them in brackets.  If only a
+width is given, insert it prefixed with a pair of empty
+brackets."
+  (let ((pos (TeX-read-string
+             (TeX-argument-prompt t nil "Position (t, b or c (default))")))
+       (width (completing-read
+               (TeX-argument-prompt t nil "Width")
+               (mapcar
+                (lambda (x) (concat TeX-esc (car x)))
+                (LaTeX-length-list)))))
+    (LaTeX-insert-environment
+     env
+     (cond (;; both arguments
+           (and pos   (not (string= pos ""))
+                width (not (string= width "")))
+           (format "[%s][%s]" pos width))
+          (;; pos not empty, width empty
+           (and pos (not (string= pos ""))
+                (string= width ""))
+           (format "[%s]" pos))
+          (;; pos empty, width not
+           (and (string= pos "")
+                width (not (string= width "")))
+           (format "[][%s]" width))
+          (t nil)))))
+
+(defun LaTeX-mathtools-env-cases (env)
+  "Insert various cases ENVs incl. an ampersand from mathtools package."
+  (LaTeX-insert-environment env)
+  (save-excursion
+    (insert ?&)))
+
+(defun LaTeX-mathtools-item-cases ()
+  "Insert contents to terminate a line in multi-line cases environment.
+Put line break macro on the last line.  Next, insert an ampersand."
+  (end-of-line 0)
+  (just-one-space)
+  (TeX-insert-macro "\\")
+  (forward-line 1)
+  (save-excursion
+    (insert ?&)))
 
 (TeX-add-style-hook
  "mathtools"
  (lambda ()
 
+   ;; Add mathtools to parser
+   (TeX-auto-add-regexp LaTeX-mathtools-newtagform-regexp)
+   (TeX-auto-add-regexp LaTeX-mathtools-DeclarePairedDelimiter-regexp)
+   (TeX-auto-add-regexp LaTeX-mathtools-newgathered-regexp)
+
+   ;; "default" is pre-defined
+   (LaTeX-add-mathtools-newtagforms "default")
+
    ;; mathtools requires amsmath, as some bugs in amsmath are fixed
    (TeX-run-style-hooks "amsmath")
 
@@ -67,39 +250,82 @@
      (add-to-list 'LaTeX-mathtools-package-options elt))
 
    (LaTeX-add-environments
-    '("lgathered" ["Vertical position (t or b)"])
-    '("rgathered" ["Vertical position (t or b)"])
+    ;; 3.4.1 Matrices
+    '("matrix*"  [ "Vertical alignment (l, r or c (default))" ])
+    '("pmatrix*" [ "Vertical alignment (l, r or c (default))" ])
+    '("bmatrix*" [ "Vertical alignment (l, r or c (default))" ])
+    '("Bmatrix*" [ "Vertical alignment (l, r or c (default))" ])
+    '("vmatrix*" [ "Vertical alignment (l, r or c (default))" ])
+    '("Vmatrix*" [ "Vertical alignment (l, r or c (default))" ])
+    '("smallmatrix*" [ "Vertical alignment (l, r or c (default))" ])
+    '("psmallmatrix")
+    '("psmallmatrix*" [ "Vertical alignment (l, r or c (default))" ])
+    '("bsmallmatrix")
+    '("bsmallmatrix*" [ "Vertical alignment (l, r or c (default))" ])
+    '("Bsmallmatrix")
+    '("Bsmallmatrix*" [ "Vertical alignment (l, r or c (default))" ])
+    '("vsmallmatrix")
+    '("vsmallmatrix*" [ "Vertical alignment (l, r or c (default))" ])
+    '("Vsmallmatrix")
+    '("Vsmallmatrix*" [ "Vertical alignment (l, r or c (default))" ])
+    ;; 3.4.2 The multlined environment
     '("multlined" LaTeX-mathtools-env-multlined)
-    '("matrix*" LaTeX-mathtools-env-matrix-starred)
-    '("pmatrix*" LaTeX-mathtools-env-matrix-starred)
-    '("bmatrix*" LaTeX-mathtools-env-matrix-starred)
-    '("Bmatrix*" LaTeX-mathtools-env-matrix-starred)
-    '("vmatrix*" LaTeX-mathtools-env-matrix-starred)
-    '("Vmatrix*" LaTeX-mathtools-env-matrix-starred)
-    '("spreadlines" LaTeX-mathtools-env-spreadlines)
-    "dcases" "dcases*")
+    ;; 3.4.3 More cases -like environments
+    '("dcases"   LaTeX-mathtools-env-cases)
+    '("dcases*"  LaTeX-mathtools-env-cases)
+    '("rcases"   LaTeX-mathtools-env-cases)
+    '("rcases*"  LaTeX-mathtools-env-cases)
+    '("drcases"  LaTeX-mathtools-env-cases)
+    '("drcases*" LaTeX-mathtools-env-cases)
+    '("cases*"   LaTeX-mathtools-env-cases)
+    ;; 4.4 Spreading equations
+    '("spreadlines" "Spacing between lines")
+    ;; 4.5 Gathered environments
+    '("lgathered" ["Vertical position (t or b)"])
+    '("rgathered" ["Vertical position (t or b)"]))
 
    (TeX-add-symbols
-    '("mathtoolsset" (TeX-arg-key-val LaTeX-mathtools-key-val))
-    '("mathclap" 1)
-    '("mathllap" ["Mathstyle"] t)
-    '("mathrlap" ["Mathstyle"] t)
-    '("mathclap" ["Mathstyle"] t)
-    '("mathmakebox" [TeX-arg-size] [ TeX-arg-size ] 1)
+    '("mathtoolsset" (TeX-arg-key-val LaTeX-mathtools-key-val-options))
+    ;; 3.1.1 A complement to \smash, \llap, and \rlap
+    '("mathllap" [ LaTeX-mathtools-arg-mathstyle-completion ] t)
+    '("mathrlap" [ LaTeX-mathtools-arg-mathstyle-completion ] t)
+    '("mathclap" [ LaTeX-mathtools-arg-mathstyle-completion ] t)
+    '("mathmakebox" [ (TeX-arg-length "Width") ] [ "Position" ] 1)
     '("clap" 1)
     '("mathmbox" 1)
-    '("cramped" 1)
-    '("crampedllap" [ "Mathstye" ] t)
-    '("crampedrlap" [ "Mathstyle" ] t)
-    '("crampedclap" [ "Mathstyle" ] t)
-    '("smashoperator" [ "Position (l, r or lr (default)" ] 2)
+    ;; 3.1.2 Forcing a cramped style
+    '("cramped" [ LaTeX-mathtools-arg-mathstyle-completion ] 1)
+    '("crampedllap" [ LaTeX-mathtools-arg-mathstyle-completion ] t)
+    '("crampedrlap" [ LaTeX-mathtools-arg-mathstyle-completion ] t)
+    '("crampedclap" [ LaTeX-mathtools-arg-mathstyle-completion ] t)
+    ;; 3.1.3 Smashing an operator
+    '("smashoperator" [ "Position (l, r or lr (default)" ] 1)
     ;; 3.1.4 Adjusting the limits of operators
-    ;; explicit argument encapsulation does not seem to be required
-    '("adjustlimits" 4)
-    ;; 3.2 Controlling tags
-    '("newtagform" "Name" ["Inner format"] "Left" "Right")
-    '("renewtagform" "Name" ["Inner format"] "Left" "Right")
-    '("usetagform" "Name")
+    '("adjustlimits" t (TeX-arg-literal "_") nil nil (TeX-arg-literal "_") nil)
+    ;; 3.1.5 Swapping space above AMS display math environments
+    '("SwapAboveDisplaySkip" 0)
+    ;; 3.2.1 The appearance of tags
+    '("newtagform"
+      (TeX-arg-eval
+       (lambda ()
+        (let ((newtag (TeX-read-string
+                       (TeX-argument-prompt nil nil "Name"))))
+          (LaTeX-add-mathtools-newtagforms newtag)
+          (format "%s" newtag))))
+       [ "Inner format" ] "Left" "Right")
+    '("renewtagform"
+      (TeX-arg-eval completing-read
+                   (TeX-argument-prompt nil nil "Name")
+                   (LaTeX-mathtools-newtagform-list))
+      [ "Inner format" ] "Left" "Right")
+    '("usetagform"
+      (TeX-arg-eval completing-read
+                   (TeX-argument-prompt nil nil "Name")
+                   (LaTeX-mathtools-newtagform-list)))
+    ;; 3.2.2 Showing only referenced tags
+    '("refeq" TeX-arg-ref)
+    '("noeqref" TeX-arg-ref)
+    ;; 3.3.1 Arrow-like symbols
     '("xleftrightarrow" ["Below"] "Above")
     '("xLeftarrow" ["Below"] "Above")
     '("xRightarrow" ["Below"] "Above")
@@ -113,40 +339,99 @@
     '("xleftharpoonup" ["Below"] "Above")
     '("xrightleftharpoons" ["Below"] "Above")
     '("xleftrightharpoons" ["Below"] "Above")
-    '("underbracket" [ "Rule thickness" ] [ "Bracket height" ] t)
-    '("overbracket" [ "Rule thickness" ] [ "Bracket height" ] t)
+    ;; 3.3.2 Braces and brackets
+    '("underbracket" [ (TeX-arg-length "Rule thickness") ]
+                    [ (TeX-arg-length "Bracket height") ] t)
+    '("overbracket"  [ (TeX-arg-length "Rule thickness") ]
+                    [ (TeX-arg-length "Bracket height") ] t)
     '("underbrace" 1)
     '("overbrace" 1)
     '("LaTeXunderbrace" 1)
     '("LaTeXoverbrace" 1)
     ;; 3.4.2
-    '("shoveleft"  [ TeX-arg-size ] 1)
-    '("shoveright" [ TeX-arg-size ] 1)
-    ;; don't understand t, but intertext in amsmath.el uses it
-    '("shortintertext" t)
-    '("DeclarePairedDelimiter" TeX-arg-macro "Left delimiter" "Right 
delimiter")
+    '("shoveleft"  [ (TeX-arg-length "Dimension") ] 1)
+    '("shoveright" [ (TeX-arg-length "Dimension") ] 1)
     ;; 3.4.4
     '("MoveEqLeft" [ "Number" ])
+    ;; 3.4.5 Boxing a single line in an alignment
+    '("Aboxed" 1)
+    ;; 3.4.6 Adding arrows between lines in an alignment
     '("ArrowBetweenLines" [ TeX-arg-macro ] )
     '("ArrowBetweenLines*" [ TeX-arg-macro ] )
-    ;; colon operators
+    ;; 3.4.7 Centered \vdots
+    '("vdotswithin" "Symbol")
+    '("shortvdotswithin" "Symbol")
+    '("shortvdotswithin*" "Symbol")
+    '("MTFlushSpaceAbove")
+    '("MTFlushSpaceBelow")
+    ;; 3.5 Intertext and short intertext
+    ;; don't understand t, but intertext in amsmath.el uses it
+    '("shortintertext" t)
+    ;; 3.6 Paired delimiters
+    '("DeclarePairedDelimiter"
+      LaTeX-mathtools-arg-declarepaireddelimiter
+      "Left delimiter" "Right delimiter")
+    '("DeclarePairedDelimiterX"
+      (LaTeX-mathtools-arg-declarepaireddelimiter t)
+      "Left delimiter" "Right delimiter" t)
+    '("DeclarePairedDelimiterXPP"
+      (LaTeX-mathtools-arg-declarepaireddelimiter t)
+      "Pre-code" "Left delimiter" "Right delimiter" 2)
+    '("delimsize" 0)
+    ;; 3.6.1 Expert use
+    '("reDeclarePairedDelimiterInnerWrapper"
+      (TeX-arg-eval
+       (lambda ()
+        (let ((cmd (completing-read
+                    (concat "Command: " TeX-esc)
+                    (mapcar #'car 
(LaTeX-mathtools-DeclarePairedDelimiter-list)))))
+          (concat TeX-esc cmd))))
+      (TeX-arg-eval completing-read
+                   "star or nostar: "
+                   '("star" "nostar"))
+      t)
+    ;; 3.7.1 Left and right parentheses
+    '("lparen" TeX-arg-insert-right-brace-maybe)
+    '("rparen")
+    ;; 3.7.2 Vertically centered colon
     "vcentcolon" "ordinarycolon" "coloneqq" "Coloneqq"
     "coloneq" "Coloneq" "eqqcolon" "Eqqcolon" "eqcolon"
     "Eqcolon" "colonapprox" "Colonapprox" "colonsim" "Colonsim"
-    ;; 3.7.1
-    "lparen" "rparen"
-    ;; left sub/superscripts
+    "dblcolon"
+    ;; 3.7.3 A few missing symbols
+    "nuparrow" "ndownarrow" "bigtimes"
+    ;; 4.2 Left sub/superscripts
     '("prescript" "Below" "Above" t)
-    ;; Declaring math sizes; this command doesn't seem so relevant, but
-    ;; for completion, it's included
+    ;; 4.3 Declaring math sizes
     '("DeclareMathSizes" 4)
-    ;; Gathered envionments
-    '("newgather" "Name" "Pre-line" "Post-line" "After")
-    '("renewgather" "Name" "Pre-line" "Post-line" "After")
-    ;; Split fractions
+    ;; 4.5 Gathered environments
+    '("newgathered"
+      (TeX-arg-eval
+       (lambda ()
+        (let ((env (TeX-read-string
+                    (TeX-argument-prompt nil nil "Name"))))
+          (LaTeX-add-environments env)
+          (LaTeX-add-mathtools-newgathereds env)
+          (add-to-list 'LaTeX-item-list
+                       `(,env . LaTeX-item-equation) t)
+          (add-to-list 'LaTeX-label-alist
+                       `(,env . LaTeX-amsmath-label) t)
+          (format "%s" env))))
+      3)
+    '("renewgathered"
+      (TeX-arg-eval completing-read
+                   (TeX-argument-prompt nil nil "Name")
+                   (LaTeX-mathtools-newgathered-list))
+      3)
+    ;; 4.6 Split fractions
     '("splitfrac" 2)
     '("splitdfrac" 2))
 
+   ;; Append delimiters to `TeX-braces-association'
+   ;; 3.7.1 Left and right parentheses
+   (make-local-variable 'TeX-braces-association)
+   (add-to-list 'TeX-braces-association '("\\lparen" . "\\rparen") t)
+
    (setq LaTeX-item-list
         (append '(("multlined"   . LaTeX-item-equation)
                   ("lgathered"   . LaTeX-item-equation)
@@ -158,42 +443,45 @@
                   ("Bmatrix*"    . LaTeX-item-equation)
                   ("vmatrix*"    . LaTeX-item-equation)
                   ("Vmatrix*"    . LaTeX-item-equation)
-                  ("dcases"      . LaTeX-item-equation)
-                  ("dcases*"     . LaTeX-item-equation))
+                  ("dcases"      . LaTeX-mathtools-item-cases)
+                  ("dcases*"     . LaTeX-mathtools-item-cases)
+                  ("rcases"      . LaTeX-mathtools-item-cases)
+                  ("rcases*"     . LaTeX-mathtools-item-cases)
+                  ("drcases"     . LaTeX-mathtools-item-cases)
+                  ("drcases*"    . LaTeX-mathtools-item-cases)
+                  ("cases*"      . LaTeX-mathtools-item-cases))
                 LaTeX-item-list))
 
    (setq LaTeX-label-alist
         (append '(("lgathered" . LaTeX-amsmath-label)
                   ("rgathered" . LaTeX-amsmath-label)
                   ("multlined" . LaTeX-amsmath-label))
-                LaTeX-label-alist)))
- LaTeX-dialect)
+                LaTeX-label-alist))
 
-(defun LaTeX-mathtools-env-matrix-starred (env)
-  (let ((where (TeX-read-string "(optional) Vertical placement of columns: ")))
-    (if (string= where "")
-       (setq where "")
-      (setq where (concat "[" where "]")))
-    (LaTeX-insert-environment env where)))
+   ;; RefTeX support: Add env's to `reftex-label-alist'
+   (when (boundp 'reftex-label-alist)
+     (let ((envs '(("lgathered"  ?e nil nil t)
+                  ("rgathered"  ?e nil nil t)
+                  ("multlined"  ?e nil nil t))))
+       (dolist (env envs)
+        (add-to-list 'reftex-label-alist env t))))
 
-(defun LaTeX-mathtools-env-spreadlines (env)
-  (let ((spread (TeX-read-string "Spacing between lines: ")))
-    (LaTeX-insert-environment env (concat TeX-grop spread TeX-grcl))
-    (newline-and-indent)))
+   ;; Fontification
+   (when (and (featurep 'font-latex)
+             (eq TeX-install-font-lock 'font-latex-setup))
+     (font-latex-add-keywords '(("mathtoolsset"  "{")
+                               ("newtagform"    "{[{{")
+                               ("renewtagform"  "{[{{")
+                               ("DeclarePairedDelimiter"     "|{\\{{")
+                               ("DeclarePairedDelimiterX"    "|{\\[{{{")
+                               ("DeclarePairedDelimiterXPP"  "|{\\[{{{{{")
+                               ("reDeclarePairedDelimiterInnerWrapper" 
"|{\\{{")
+                               ("DeclareMathSizes"           "{{{{")
+                               ("newgathered"                "{{{{")
+                               ("renewgathered"              "{{{{"))
+                             'function)
+     (font-latex-add-keywords '(("usetagform" "{"))
+                             'variable)))
+ LaTeX-dialect)
 
-;; FIXME: there are probably more subtle ways to support more than one
-;; optional argument; please change if this is the case
-(defun LaTeX-mathtools-env-multlined (env)
-  (let ((pos (TeX-read-string "(optional) Position: "))
-       (width (TeX-read-string "(optional) Width: "))
-       (extra ""))
-    (if (not (string= pos ""))
-       (setq pos (concat LaTeX-optop pos LaTeX-optcl))
-      (setq pos ""))
-    (if (not (string= width ""))
-       (setq width (concat LaTeX-optop width LaTeX-optcl))
-      (setq width ""))
-    (setq extra (concat pos width))
-    (LaTeX-insert-environment env extra)))
-
-;;; mathtools.el ends here.
+;;; mathtools.el ends here

-----------------------------------------------------------------------

Summary of changes:
 style/mathtools.el |  442 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 365 insertions(+), 77 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX