diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-03-27 13:43:49 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-03-27 13:51:55 +0200 |
commit | 7648354952892d061f626b7a8844f791b2dfe4af (patch) | |
tree | b61bbb9ea2c96279ff74bfaadd56af5dc250b3b3 | |
parent | 4dde26f0863ca57fd3fdfb8dc57c631cb22e6cc1 (diff) | |
download | org-mode-7648354952892d061f626b7a8844f791b2dfe4af.tar.gz |
ox-latex: Fix user-defined align string in matrices
* lisp/ox-latex.el (org-latex--align-string): Change signature.
Center all cells in matrices, yet preserve user-defined align
string.
(org-latex--math-table): Apply signature change.
Reported-by: Phil Regier <phil.regier@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112873>
-rw-r--r-- | lisp/ox-latex.el | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 99715c4..bc62edd 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -3103,10 +3103,12 @@ contextual information." ;; table, insert their definition just after it. (org-latex--delayed-footnotes-definitions table info))))))) -(defun org-latex--align-string (table info) +(defun org-latex--align-string (table info &optional math?) "Return an appropriate LaTeX alignment string. TABLE is the considered table. INFO is a plist used as -a communication channel." +a communication channel. When optional argument MATH? is +non-nil, TABLE is meant to be a matrix, where all cells are +centered." (or (org-export-read-attribute :attr_latex table :align) (let (align) ;; Extract column groups and alignment from first (non-rule) @@ -3122,11 +3124,12 @@ a communication channel." ;; Check left border for the first cell only. (when (and (memq 'left borders) (not align)) (push "|" align)) - (push (cl-case (org-export-table-cell-alignment cell info) - (left "l") - (right "r") - (center "c")) - align) + (push (if math? "c" ;center cells in matrices + (cl-case (org-export-table-cell-alignment cell info) + (left "l") + (right "r") + (center "c")) + align)) (when (memq 'right borders) (push "|" align)))) info) (apply 'concat (nreverse align))))) @@ -3311,11 +3314,8 @@ This function assumes TABLE has `org' as its `:type' property and (plist-get attr :math-prefix) ;; Environment. Also treat special cases. (cond ((member env '("array" "tabular")) - ;; Make sure cells are always centered while preserving - ;; vertical separators. - (let ((align (replace-regexp-in-string - "[lr]" "c" (org-latex--align-string table info)))) - (format "\\begin{%s}{%s}\n%s\\end{%s}" env align contents env))) + (format "\\begin{%s}{%s}\n%s\\end{%s}" + env (org-latex--align-string table info t) contents env)) ((assoc env org-latex-table-matrix-macros) (format "\\%s%s{\n%s}" env |