branch: externals/auctex
commit 66ed2ac0732d0a0af1045091fb24535ac5d3bdbf
Author: Arash Esbati <arash.esb...@gmail.com>
Commit: Arash Esbati <arash.esb...@gmail.com>
Add test for new column counting code
* tests/latex/tabular-count-ampersands-out.tex:
* tests/latex/tabular-count-ampersands-in.tex: New files.
* tests/latex/latex-test.el
(LaTeX-count-ampersands-inserted-in-tabular): Test new column
counting code in `LaTeX-array-count-columns'.
---
tests/latex/latex-test.el | 26 ++++++++++++++--
tests/latex/tabular-count-ampersands-in.tex | 36 +++++++++++++++++++++
tests/latex/tabular-count-ampersands-out.tex | 43 ++++++++++++++++++++++++++
3 files changed, 103 insertions(+), 2 deletions(-)
diff --git a/tests/latex/latex-test.el b/tests/latex/latex-test.el
index cc23caf..28af7b5 100644
--- a/tests/latex/latex-test.el
+++ b/tests/latex/latex-test.el
@@ -1,6 +1,6 @@
;;; latex-test.el --- tests for LaTeX mode
-;; Copyright (C) 2014, 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2014--2016 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
@@ -48,7 +48,11 @@ line and from another directory."
'LaTeX-math-indent/in
"math-indent-in.tex"
'LaTeX-math-indent/out
- "math-indent-out.tex")
+ "math-indent-out.tex"
+ 'tabular-count-ampersands/in
+ "tabular-count-ampersands-in.tex"
+ 'tabular-count-ampersands/out
+ "tabular-count-ampersands-out.tex")
(ert-deftest LaTeX-indent-tabular ()
(should (string=
@@ -106,4 +110,22 @@ line and from another directory."
(LaTeX-insert-environment "foobar")
(buffer-string)))))
+;; Test for inserting &'s with `M-RET' in various tabular environment.
+;; FIXME: One thing missing is running style hooks while running the test.
+(ert-deftest LaTeX-count-ampersands-inserted-in-tabular ()
+ (should (string=
+ (with-temp-buffer
+ (insert-file-contents tabular-count-ampersands/in)
+ (LaTeX-mode)
+ (goto-char (point-min))
+ ;; Do not ask for opt. argument in (TeX-insert-macro "\\"):
+ (let ((TeX-insert-macro-default-style 'mandatory-args-only))
+ (while (search-forward "LaTeX-insert-item" nil t)
+ (LaTeX-insert-item)))
+ (buffer-string))
+ (with-temp-buffer
+ (insert-file-contents tabular-count-ampersands/out)
+ (LaTeX-mode)
+ (buffer-string)))))
+
;;; latex-test.el ends here
diff --git a/tests/latex/tabular-count-ampersands-in.tex
b/tests/latex/tabular-count-ampersands-in.tex
new file mode 100644
index 0000000..97bc5f8
--- /dev/null
+++ b/tests/latex/tabular-count-ampersands-in.tex
@@ -0,0 +1,36 @@
+\documentclass{article}
+% \usepackage{tabularx,tabulary,longtable}
+\begin{document}
+
+Standard LaTeX tabular:
+\begin{tabular}[t]{llll}
+ 1 & 2 & 3 & LaTeX-insert-item
+\end{tabular}
+
+LaTeX tabular with *-operator:
+\begin{tabular}[t]{*{3}{l}r}
+ 1 & 2 & 3 & LaTeX-insert-item
+\end{tabular}
+
+\begin{tabular}{*{3}{l}>{\tiny\hfill}l<{\hfill}}
+ 1 & 2 & 3 & LaTeX-insert-item
+\end{tabular}
+
+\begin{tabular}[t]{*{3}{lc}r}
+ 1 & 2 & 3 & 4 & 5 & 6 & LaTeX-insert-item
+\end{tabular}
+
+\begin{tabular}[t]{*{3}{lc*{2}{l}} r}
+ 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 & 9 & 10 & 11 & 12 & LaTeX-insert-item
+\end{tabular}
+
+Standard LaTeX tabular*:
+\begin{tabular*}{1.0\linewidth}[t]{@{}lllr@{}}
+ 1 & 2 & 3 & LaTeX-insert-item
+\end{tabular*}
+
+\begin{tabular*}{1.0\linewidth}[t]{@{}*{3}{|l}|r|}
+ 1 & 2 & 3 & LaTeX-insert-item
+\end{tabular*}
+
+\end{document}
diff --git a/tests/latex/tabular-count-ampersands-out.tex
b/tests/latex/tabular-count-ampersands-out.tex
new file mode 100644
index 0000000..1163637
--- /dev/null
+++ b/tests/latex/tabular-count-ampersands-out.tex
@@ -0,0 +1,43 @@
+\documentclass{article}
+% \usepackage{tabularx,tabulary,longtable}
+\begin{document}
+
+Standard LaTeX tabular:
+\begin{tabular}[t]{llll}
+ 1 & 2 & 3 & LaTeX-insert-item \\
+ &&&
+\end{tabular}
+
+LaTeX tabular with *-operator:
+\begin{tabular}[t]{*{3}{l}r}
+ 1 & 2 & 3 & LaTeX-insert-item \\
+ &&&
+\end{tabular}
+
+\begin{tabular}{*{3}{l}>{\tiny\hfill}l<{\hfill}}
+ 1 & 2 & 3 & LaTeX-insert-item \\
+ &&&
+\end{tabular}
+
+\begin{tabular}[t]{*{3}{lc}r}
+ 1 & 2 & 3 & 4 & 5 & 6 & LaTeX-insert-item \\
+ &&&&&&
+\end{tabular}
+
+\begin{tabular}[t]{*{3}{lc*{2}{l}} r}
+ 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 & 9 & 10 & 11 & 12 & LaTeX-insert-item \\
+ &&&&&&&&&&&&
+\end{tabular}
+
+Standard LaTeX tabular*:
+\begin{tabular*}{1.0\linewidth}[t]{@{}lllr@{}}
+ 1 & 2 & 3 & LaTeX-insert-item \\
+ &&&
+\end{tabular*}
+
+\begin{tabular*}{1.0\linewidth}[t]{@{}*{3}{|l}|r|}
+ 1 & 2 & 3 & LaTeX-insert-item \\
+ &&&
+\end{tabular*}
+
+\end{document}
