ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow specification of table*, tabularx and tabulary table environments 

e.g.

  #+CAPTION: A wide table with tabulary
  #+LABEL: tbl:wide
  #+ATTR_LaTeX: table* tabulary width=\textwidth align=l|lp{3cm}r|l
  | 1 | 2 | 3 |
  | 4 | 5 | 6 |

  #+CAPTION: A normal table with tabularx
  #+LABEL: tbl:wide
  #+ATTR_LaTeX: table tabularx width=\textwidth align=l|lp{3cm}r|l
  | 1 | 2 | 3 |
  | 4 | 5 | 6 |

  Thanks to Tom Dye for suggestions and LaTeX background knowledge.

* lisp/org-latex.el (org-export-latex-tables): Allowing specification
  of tabular[xy] inner environments through the ATTR_LaTeX line.
This commit is contained in:
Eric Schulte 2010-12-17 13:31:09 -07:00
parent 3324942408
commit d37705391e
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lisp/org-latex.el
View File

@ -1741,7 +1741,8 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(org-table-last-column-widths (copy-sequence (org-table-last-column-widths (copy-sequence
org-table-last-column-widths)) org-table-last-column-widths))
fnum fields line lines olines gr colgropen line-fmt align fnum fields line lines olines gr colgropen line-fmt align
caption shortn label attr floatp placement longtblp) caption shortn label attr floatp placement
longtblp tblenv tabular-env)
(if org-export-latex-tables-verbatim (if org-export-latex-tables-verbatim
(let* ((tbl (concat "\\begin{verbatim}\n" raw-table (let* ((tbl (concat "\\begin{verbatim}\n" raw-table
"\\end{verbatim}\n"))) "\\end{verbatim}\n")))
@ -1758,6 +1759,17 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
'org-label raw-table) 'org-label raw-table)
longtblp (and attr (stringp attr) longtblp (and attr (stringp attr)
(string-match "\\<longtable\\>" attr)) (string-match "\\<longtable\\>" attr))
tblenv (if (and attr (stringp attr)
(string-match (regexp-quote "table*") attr))
"table*" "table")
tabular-env
(if (and attr (stringp attr)
(string-match "\\(tabular.\\)" attr))
(match-string 1 attr)
org-export-latex-tabular-environment)
width (and attr (stringp attr)
(string-match "\\<width=\\([^ \t\n\r]+\\)" attr)
(match-string 1 attr))
align (and attr (stringp attr) align (and attr (stringp attr)
(string-match "\\<align=\\([^ \t\n\r]+\\)" attr) (string-match "\\<align=\\([^ \t\n\r]+\\)" attr)
(match-string 1 attr)) (match-string 1 attr))
@ -1821,7 +1833,8 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(concat (concat
(if longtblp (if longtblp
(concat "\\begin{longtable}{" align "}\n") (concat "\\begin{longtable}{" align "}\n")
(if floatp (format "\\begin{table}%s\n" placement))) (if floatp
(format "\\begin{%s}%s\n" tblenv placement)))
(if floatp (if floatp
(format (format
"\\caption%s{%s} %s" "\\caption%s{%s} %s"
@ -1832,8 +1845,10 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(if (and org-export-latex-tables-centered (not longtblp)) (if (and org-export-latex-tables-centered (not longtblp))
"\\begin{center}\n") "\\begin{center}\n")
(if (not longtblp) (if (not longtblp)
(format "\\begin{%s}{%s}\n" (format "\\begin{%s}%s{%s}\n"
org-export-latex-tabular-environment align)) tabular-env
(if width (format "{%s}" width) "")
align))
(orgtbl-to-latex (orgtbl-to-latex
lines lines
`(:tstart nil :tend nil `(:tstart nil :tend nil
@ -1845,14 +1860,12 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
\\endfoot \\endfoot
\\endlastfoot" (length org-table-last-alignment)) \\endlastfoot" (length org-table-last-alignment))
nil))) nil)))
(if (not longtblp) (if (not longtblp) (format "\n\\end{%s}" tabular-env))
(format "\n\\end{%s}"
org-export-latex-tabular-environment))
(if longtblp "\n" (if org-export-latex-tables-centered (if longtblp "\n" (if org-export-latex-tables-centered
"\n\\end{center}\n" "\n")) "\n\\end{center}\n" "\n"))
(if longtblp (if longtblp
"\\end{longtable}" "\\end{longtable}"
(if floatp "\\end{table}")))) (if floatp (format "\\end{%s}" tblenv)))))
"\n\n")))))))) "\n\n"))))))))
(defun org-export-latex-convert-table.el-table () (defun org-export-latex-convert-table.el-table ()