|
@@ -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))
|