summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2011-06-01 10:18:34 -0600
committerEric Schulte <schulte.eric@gmail.com>2011-06-14 09:28:38 -0700
commit2601678dc0f0c29ee711af2d43d58e3b0fb03c6e (patch)
treec9d252d053447f0fab4d2d93a921833bb52bebcf
parentbcfdc775bf4998698e83b8be153078bd894bbbfd (diff)
downloadorg-mode-2601678dc0f0c29ee711af2d43d58e3b0fb03c6e.tar.gz
replacing the "multicolumn" option for latex tables
This brings the behavior inline with the documentation. * lisp/org-latex.el (org-export-latex-tables): Check for the "multiline" option and set the `floatp' option to true when multicolumn tables are requested.
-rw-r--r--lisp/org-latex.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index ef8b2b1..d959134 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1844,7 +1844,8 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
longtblp (and attr (stringp attr)
(string-match "\\<longtable\\>" attr))
tblenv (if (and attr (stringp attr)
- (string-match (regexp-quote "table*") attr))
+ (or (string-match (regexp-quote "table*") attr)
+ (string-match "\\<multicolumn\\>" attr)))
"table*" "table")
tabular-env
(if (and attr (stringp attr)
@@ -1857,7 +1858,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
align (and attr (stringp attr)
(string-match "\\<align=\\([^ \t\n\r]+\\)" attr)
(match-string 1 attr))
- floatp (or caption label)
+ floatp (or caption label (string= "table*" tblenv))
placement (if (and attr
(stringp attr)
(string-match "[ \t]*\\<placement=\\(\\S-+\\)" attr))