- (let ((result-params (split-string (or (cdr (assoc :results params)) "")))
- (out-file (cdr (assoc :file params)))
- (cmdline (cdr (assoc :cmdline params)))
- (in-file (make-temp-file "org-babel-ditaa")))
+ (let* ((result-params (split-string (or (cdr (assoc :results params)) "")))
+ (out-file ((lambda (el)
+ (or el
+ (error
+ "ditaa code block requires :file header argument")))
+ (cdr (assoc :file params))))
+ (cmdline (cdr (assoc :cmdline params)))
+ (java (cdr (assoc :java params)))
+ (in-file (org-babel-temp-file "ditaa-"))
+ (cmd (concat "java " java " " org-ditaa-jar-option " "
+ (shell-quote-argument
+ (expand-file-name org-ditaa-jar-path))
+ " " cmdline
+ " " (org-babel-process-file-name in-file)
+ " " (org-babel-process-file-name out-file))))