monnier pushed a commit to branch externals/auctex
in repository elpa.
commit 61ef86b9fcf3d466a4357dbf8e0a4ac717086cdc
Author: Tassilo Horn <[email protected]>
Date: Thu Dec 27 19:29:30 2012 +0000
* amsmath.el ("amsmath"): Add support for the alignedat
and subarray environments. Also, add support for the shoveright
and shoveleft macros.
* font-latex.el (font-latex-math-environments): Add "xxalignat"
and "flalign".
---
ChangeLog | 8 ++++++++
font-latex.el | 4 ++--
style/amsmath.el | 12 ++++++++++++
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a26115e..877f3d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-27 Ikumi Keita <[email protected]>
+
+ * amsmath.el ("amsmath"): Add support for the alignedat
+ and subarray environments. Also, add support for the shoveright
+ and shoveleft macros.
+ * font-latex.el (font-latex-math-environments): Add "xxalignat"
+ and "flalign".
+
2012-12-26 Tassilo Horn <[email protected]>
* style/lscape.el: New style by Mads Jensen <[email protected]>.
diff --git a/font-latex.el b/font-latex.el
index 765d6cb..62aae93 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -823,7 +823,7 @@ Generated by `font-latex-make-user-keywords'.")))
KEYWORDS is a list of keywords or keywords with syntax specs.
CLASS corresponds to a keyword class and can be one of the
symbols 'warning, 'variable, 'reference, 'biblatex, 'function,
-sectioning-0, 'sectioning-1, 'sectioning-2, 'sectioning-3,
+'sectioning-0, 'sectioning-1, 'sectioning-2, 'sectioning-3,
'sectioning-4, 'sectioning-5, 'slide-title, 'textual,
'bold-command, 'italic-command, 'math-command, 'type-command,
'bold-declaration, 'italic-declaration or 'type-declaration.
@@ -1670,7 +1670,7 @@ END marks boundaries for searching for environment ends."
(defcustom font-latex-math-environments
'("display" "displaymath" "equation" "eqnarray" "gather" "multline"
- "align" "alignat" "xalignat")
+ "align" "alignat" "xalignat" "xxalignat" "flalign")
"List of math environment names for font locking."
:type '(repeat string)
:group 'font-latex)
diff --git a/style/amsmath.el b/style/amsmath.el
index 8f16425..40fc135 100644
--- a/style/amsmath.el
+++ b/style/amsmath.el
@@ -45,6 +45,7 @@
'("xxalignat" LaTeX-amsmath-env-alignat)
'("aligned" LaTeX-amsmath-env-aligned)
'("gathered" LaTeX-amsmath-env-aligned)
+ '("alignedat" LaTeX-amsmath-env-alignedat)
"align*" "gather*" "flalign*" "multline*" "equation*"
"split"
"cases"
@@ -56,6 +57,7 @@
'("eqref" TeX-arg-ref)
'("numberwithin" TeX-arg-counter "Section level")
'("raisetag" "Dimension")
+ '("shoveright" t) '("shoveleft" t)
'("intertext" t)
'("hdotsfor" ["Stretch"] "Number of columns to cover")
'("xleftarrow" ["Below"] "Above")
@@ -111,6 +113,7 @@
("xalignat" . LaTeX-item-equations)
("xalignat*" . LaTeX-item-equation)
("xxalignat" . LaTeX-item-equation)
+ ("alignedat" . LaTeX-item-equation)
("flalign" . LaTeX-item-equations)
("flalign*" . LaTeX-item-equation)
("matrix" . LaTeX-item-equation)
@@ -119,6 +122,7 @@
("Bmatrix" . LaTeX-item-equation)
("vmatrix" . LaTeX-item-equation)
("Vmatrix" . LaTeX-item-equation)
+ ("subarray" . LaTeX-item-equation)
("cases" . LaTeX-item-equation))
LaTeX-item-list))
@@ -158,6 +162,14 @@
(setq where (concat "[" where "]")))
(LaTeX-insert-environment env where)))
+(defun LaTeX-amsmath-env-alignedat (env)
+ (let ((where (read-string "(optional) Vertical position (t or b): "))
+ (ncols (read-string "Number of columns: ")))
+ (if (string= where "")
+ (setq where "")
+ (setq where (concat "[" where "]")))
+ (LaTeX-insert-environment env (concat where TeX-grop ncols TeX-grcl))))
+
(defun LaTeX-item-equation ()
(end-of-line 0)
(just-one-space)
