summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2011-12-07 21:03:05 +0100
committerNicolas Goaziou <n.goaziou@gmail.com>2011-12-07 21:03:05 +0100
commitda566e9fe20129e8ed2320bc7b355a37f065b923 (patch)
tree00fbb8ef0362f85798950488127ca762d63bc25f
parentb377e54c6a5831c70d543693e5aaf860953c40ee (diff)
downloadorg-mode-da566e9fe20129e8ed2320bc7b355a37f065b923.tar.gz
EXPERIMENTAL/org-latex: Fix bug in table transcoding
* EXPERIMENTAL/org-latex.el (org-latex-table): Fix confusion between communication channel and table information plists.
-rw-r--r--EXPERIMENTAL/org-latex.el64
1 files changed, 32 insertions, 32 deletions
diff --git a/EXPERIMENTAL/org-latex.el b/EXPERIMENTAL/org-latex.el
index 7831b9e..61cfa7c 100644
--- a/EXPERIMENTAL/org-latex.el
+++ b/EXPERIMENTAL/org-latex.el
@@ -1698,43 +1698,43 @@ CONTENTS is nil. INFO is a plist holding contextual information."
(format "\\begin{center}\n%s\n\\end{center}" output)
output)))
;; Case 3: Standard table.
- (t (let* (
- (info (org-export-table-format-info raw-table))
- (clean-table (org-export-clean-table
- raw-table (plist-get info :special-column-p)))
- (columns-number (length (plist-get info :alignment))))
- ;; Convert ROWS to send them to `orgtbl-to-latex'. In
- ;; particular, send each cell to
- ;; `org-element-parse-secondary-string' to expand any Org
- ;; object within. Eventually, flesh the format string out with
- ;; the table.
- (format (org-latex-table--format-string table info)
- (orgtbl-to-latex
- (mapcar
- (lambda (row)
- (if (string-match org-table-hline-regexp row)
- 'hline
- (mapcar
- (lambda (cell)
- (org-export-secondary-string
- (org-element-parse-secondary-string
- cell
- (cdr (assq 'table org-element-string-restrictions)))
- 'latex info))
- (org-split-string row "[ \t]*|[ \t]*"))))
- (org-split-string clean-table "\n"))
- `(:tstart nil :tend nil
- ;; Longtable environment requires specific
- ;; header line end.
- :hlend ,(and attr
- (string-match "\\<longtable\\>" attr)
- (format "\\\\
+ (t
+ (let* ((table-info (org-export-table-format-info raw-table))
+ (clean-table (org-export-clean-table
+ raw-table (plist-get table-info :special-column-p)))
+ (columns-number (length (plist-get table-info :alignment))))
+ ;; Convert ROWS to send them to `orgtbl-to-latex'. In
+ ;; particular, send each cell to
+ ;; `org-element-parse-secondary-string' to expand any Org
+ ;; object within. Eventually, flesh the format string out with
+ ;; the table.
+ (format (org-latex-table--format-string table table-info)
+ (orgtbl-to-latex
+ (mapcar
+ (lambda (row)
+ (if (string-match org-table-hline-regexp row)
+ 'hline
+ (mapcar
+ (lambda (cell)
+ (org-export-secondary-string
+ (org-element-parse-secondary-string
+ cell
+ (cdr (assq 'table org-element-string-restrictions)))
+ 'latex info))
+ (org-split-string row "[ \t]*|[ \t]*"))))
+ (org-split-string clean-table "\n"))
+ `(:tstart nil :tend nil
+ ;; Longtable environment requires specific
+ ;; header line end.
+ :hlend ,(and attr
+ (string-match "\\<longtable\\>" attr)
+ (format "\\\\
\\hline
\\endhead
\\hline\\multicolumn{%d}{r}{Continued on next page}\\\\
\\endfoot
\\endlastfoot"
- columns-number))))))))))
+ columns-number))))))))))
;;;; Target