[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [O] babel for ditaa-eps

From: Eric Schulte
Subject: Re: [O] babel for ditaa-eps
Date: Sun, 16 Sep 2012 08:13:40 -0600
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux)

Luis Anaya <address@hidden> writes:

> Eric Schulte <address@hidden> writes:
> Hi:
>> with the attachment :)
> I tried your patch and it seems that the defcustom needs to be changed
> (at least from the way it is written in the patch.

Oh yes, I used file-name-nondirectory instead of file-name-directory,
and forgot the customization documentation.  Here's updated version.

>From ef4c42ff1fba005077276458d9be70534d48a0fa Mon Sep 17 00:00:00 2001
From: Eric Schulte <address@hidden>
Date: Thu, 13 Sep 2012 08:58:31 -0600
Subject: [PATCH] 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).
 lisp/ob-ditaa.el | 19 +++++++++++++++++--
 1 file 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 " "
-                      (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)

Eric Schulte

reply via email to

[Prev in Thread] Current Thread [Next in Thread]