org-e-ascii: Fix table export bug when ignoring sub/superscript

* contrib/lisp/org-e-ascii.el (org-e-ascii--table-cell-width):
  Refactor code.
* contrib/lisp/org-export.el: Do not normalize contents when expanding
  them, since it will be done at the end of the function, and only for
  elements.
This commit is contained in:
Nicolas Goaziou 2012-05-04 14:02:41 +02:00
parent ecd4079f0e
commit 72ca00ca09
2 changed files with 6 additions and 8 deletions

View File

@ -1068,7 +1068,7 @@ holding contextual information."
(defun org-e-ascii-dynamic-block (dynamic-block contents info)
"Transcode a DYNAMIC-BLOCK element from Org to ASCII.
CONTENTS holds the contents of the block. INFO is a plist
holding contextual information. See `org-export-data'."
holding contextual information."
contents)
@ -1661,13 +1661,12 @@ are ignored. "
(lambda (row)
(setq max-width
(max (length
(mapconcat
(lambda (obj) (org-export-data obj info))
(org-export-data
(org-element-contents
(elt (if specialp (car (org-element-contents row))
(org-element-contents row))
col))
""))
info))
max-width))))
max-width)))

View File

@ -1578,10 +1578,9 @@ Return transcoded string."
((not (org-export-interpret-p data info))
(org-export-expand
data
(org-element-normalize-string
(mapconcat (lambda (blob) (org-export-data blob info))
(org-element-contents data)
""))))
(mapconcat (lambda (blob) (org-export-data blob info))
(org-element-contents data)
"")))
;; Secondary string.
((not type)
(mapconcat (lambda (obj) (org-export-data obj info)) data ""))