diff options
| author | Anders Johansson <mejlaandersj@gmail.com> | 2014-06-06 12:19:45 -0400 |
|---|---|---|
| committer | Eric Schulte <schulte.eric@gmail.com> | 2014-06-06 12:21:01 -0400 |
| commit | 11ffc4f80e51f4d02b05ba22038279a73cbb0ddd (patch) | |
| tree | e0f68b034d1cc1882f3791b2fee6c65616905495 | |
| parent | 266233164fffcf711422490772f13276ae0e0907 (diff) | |
| download | org-mode-11ffc4f80e51f4d02b05ba22038279a73cbb0ddd.tar.gz | |
generate intermediate EPS on ditaa pdf generation
TINYCHANGE
* lisp/ob-ditaa.el (org-babel-execute:ditaa): When generating a pdf,
ensure that an intermediate EPS file is generated first.
| -rw-r--r-- | lisp/ob-ditaa.el | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el index 26f0e4f..8a75628 100644 --- a/lisp/ob-ditaa.el +++ b/lisp/ob-ditaa.el @@ -90,6 +90,12 @@ This function is called by `org-babel-execute-src-block'." (java (cdr (assoc :java params))) (in-file (org-babel-temp-file "ditaa-")) (eps (cdr (assoc :eps params))) + (pdf-cmd (when (and (or (string= (file-name-extension out-file) "pdf") + (cdr (assoc :pdf params)))) + (concat + "epstopdf" + " " (org-babel-process-file-name (concat in-file ".eps")) + " -o=" (org-babel-process-file-name out-file)))) (cmd (concat org-babel-ditaa-java-cmd " " java " " org-ditaa-jar-option " " (shell-quote-argument @@ -97,13 +103,9 @@ This function is called by `org-babel-execute-src-block'." (if eps org-ditaa-eps-jar-path org-ditaa-jar-path))) " " cmdline " " (org-babel-process-file-name in-file) - " " (org-babel-process-file-name out-file))) - (pdf-cmd (when (and (or (string= (file-name-extension out-file) "pdf") - (cdr (assoc :pdf params)))) - (concat - "epstopdf" - " " (org-babel-process-file-name (concat in-file ".eps")) - " -o=" (org-babel-process-file-name out-file))))) + " " (if pdf-cmd + (org-babel-process-file-name (concat in-file ".eps")) + (org-babel-process-file-name out-file))))) (unless (file-exists-p org-ditaa-jar-path) (error "Could not find ditaa.jar at %s" org-ditaa-jar-path)) (with-temp-file in-file (insert body)) |