summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2014-06-06 12:21:56 -0400
committerEric Schulte <schulte.eric@gmail.com>2014-06-06 12:21:56 -0400
commit0ba8b4f2ea4cc300d52dd5a5224a4551251fa20b (patch)
tree716482c0c4a0aecc379f62e26c474f970c97bd87
parent11ffc4f80e51f4d02b05ba22038279a73cbb0ddd (diff)
downloadorg-mode-0ba8b4f2ea4cc300d52dd5a5224a4551251fa20b.tar.gz
un-duplicate ditaa eps file name generation
* lisp/ob-ditaa.el (org-babel-execute:ditaa): Un-duplicate ditaa eps file name generation.
-rw-r--r--lisp/ob-ditaa.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index 8a75628..888cafc 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -90,11 +90,13 @@ 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)))
+ (eps-file (when eps
+ (org-babel-process-file-name (concat in-file ".eps"))))
(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"))
+ " " eps-file
" -o=" (org-babel-process-file-name out-file))))
(cmd (concat org-babel-ditaa-java-cmd
" " java " " org-ditaa-jar-option " "
@@ -104,7 +106,7 @@ This function is called by `org-babel-execute-src-block'."
" " cmdline
" " (org-babel-process-file-name in-file)
" " (if pdf-cmd
- (org-babel-process-file-name (concat in-file ".eps"))
+ eps-file
(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))