diff options
| author | Eric Schulte <eric.schulte@gmx.com> | 2012-09-13 08:58:31 -0600 |
|---|---|---|
| committer | Eric Schulte <eric.schulte@gmx.com> | 2012-09-19 08:11:17 -0600 |
| commit | 99c0b2d9c48c2e57aa65c86acee9d7523e33bd7a (patch) | |
| tree | c1e19322462ff1cfb6392fb645769f973f40bd23 | |
| parent | b913f5c7ef89ec969e935d5d742742d098df9cbe (diff) | |
| download | org-mode-99c0b2d9c48c2e57aa65c86acee9d7523e33bd7a.tar.gz | |
adding :eps header argument to ditaa code blocks
Use of this header argument will change the back-end engine from
ditaa.jar to a combination of DitaaEps.jar and epstopdf.
This patch is based off of ob-ditaa-eps.el sent to the mailing list by
Arne Babenhauserheide (IMK).
| -rw-r--r-- | lisp/ob-ditaa.el | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el index 1c6c712..609bac4 100644 --- a/lisp/ob-ditaa.el +++ b/lisp/ob-ditaa.el @@ -57,6 +57,12 @@ :group 'org-babel :type 'string) +(defcustom org-ditaa-eps-jar-path + (expand-file-name "DitaaEps.jar" (file-name-directory org-ditaa-jar-path)) + "Path to the DitaaEps.jar executable." + :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." @@ -76,16 +82,25 @@ 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-")) + (eps (cdr (assoc :eps params))) (cmd (concat "java " java " " org-ditaa-jar-option " " (shell-quote-argument - (expand-file-name org-ditaa-jar-path)) + (expand-file-name + (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)))) + " " (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))))) (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)) (message cmd) (shell-command cmd) + (when pdf-cmd (message pdf-cmd) (shell-command pdf-cmd)) nil)) ;; signal that output has already been written to file (defun org-babel-prep-session:ditaa (session params) |