summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-01-04 11:22:28 +0100
committerBastien Guerry <bzg@altern.org>2012-01-04 11:22:28 +0100
commitd3a45bd7221578e9e3f4ca08b8ee9d0d1a5e9bbc (patch)
treef9b0d238cc058b725156a3439d8d0fcc10a775f9
parentad2f2df5dbad483d7dd055531fb0f3d8c6de9f9d (diff)
downloadorg-mode-d3a45bd7221578e9e3f4ca08b8ee9d0d1a5e9bbc.tar.gz
ob-ditaa.el: New option `org-ditaa-jar-option'.
* ob-ditaa.el (org-ditaa-jar-path): Make a defcustom. (org-ditaa-jar-option): New option. (org-babel-execute:ditaa): Use it. Thanks to Waldemar Reusch for reporting this need.
-rw-r--r--lisp/ob-ditaa.el18
1 files changed, 15 insertions, 3 deletions
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index 57ae4b9..17e9d5d 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -39,10 +39,22 @@
(require 'ob)
(defvar org-babel-default-header-args:ditaa
- '((:results . "file") (:exports . "results") (:java . "-Dfile.encoding=UTF-8"))
+ '((:results . "file")
+ (:exports . "results")
+ (:java . "-Dfile.encoding=UTF-8"))
"Default arguments for evaluating a ditaa source block.")
-(defvar org-ditaa-jar-path)
+(defcustom org-ditaa-jar-path nil
+ "Path for the ditaa jar file."
+ :group 'org-babel
+ :type 'string)
+
+(defcustom org-ditaa-jar-option "-jar"
+ "Option for the ditaa jar file.
+Do not leave leading or trailing spaces in this string."
+ :group 'org-babel
+ :type 'string)
+
(defun org-babel-execute:ditaa (body params)
"Execute a block of Ditaa code with org-babel.
This function is called by `org-babel-execute-src-block'."
@@ -55,7 +67,7 @@ This function is called by `org-babel-execute-src-block'."
(cmdline (cdr (assoc :cmdline params)))
(java (cdr (assoc :java params)))
(in-file (org-babel-temp-file "ditaa-"))
- (cmd (concat "java " java " -jar "
+ (cmd (concat "java " java " " org-ditaa-jar-option " "
(shell-quote-argument
(expand-file-name org-ditaa-jar-path))
" " cmdline