From: Eric Schulte <eric.schulte@gmx.com>
To: "Arne Babenhauserheide (IMK)" <arne.babenhauserheide@kit.edu>
Cc: emacs-orgmode@gnu.org
Subject: Re: babel for ditaa-eps
Date: Thu, 13 Sep 2012 09:03:03 -0600 [thread overview]
Message-ID: <877grynexk.fsf@gmx.com> (raw)
In-Reply-To: <5051C947.2000505@kit.edu> (Arne Babenhauserheide's message of "Thu, 13 Sep 2012 13:53:43 +0200")
[-- Attachment #1: Type: text/plain, Size: 696 bytes --]
"Arne Babenhauserheide (IMK)" <arne.babenhauserheide@kit.edu> writes:
> Hi Eric,
>
> It’s much easier to answer, what this does not share with ob-ditaa.el :)
>
> If I cut out the obvious renaming (to be able to use a ditaa-exp
> source type), it’s just this diff (and the first half of that only
> defines variables…):
>
Hi Arne,
I re-worked your diff into a patch against ob-ditaa.el which adds an
:eps header argument to ditaa code blocks. Please try this out and let
me know if it works and if it loses any functionality from your original
ob-ditaa-eps.el.
Should we distribute the DitaaEps.jar with Org-mode in the same manner
as we now distribute ditaa.jar?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-adding-eps-header-argument-to-ditaa-code-blocks.patch --]
[-- Type: text/x-patch, Size: 2184 bytes --]
From 643d59bfebc2a917bdd4b5da002df4b663f65be2 Mon Sep 17 00:00:00 2001
From: Eric Schulte <eric.schulte@gmx.com>
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 | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index 1c6c712..3fbf50b 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -57,6 +57,9 @@
:group 'org-babel
:type 'string)
+(defcustom org-ditaa-eps-jar-path
+ (expand-file-name "DitaaEps.jar" (file-name-nondirectory org-ditaa-jar-path)))
+
(defcustom org-ditaa-jar-option "-jar"
"Option for the ditaa jar file.
Do not leave leading or trailing spaces in this string."
@@ -76,16 +79,24 @@ 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)))
+ (eps-cmd (when eps
+ (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 eps (message eps-cmd) (shell-command eps-cmd))
nil)) ;; signal that output has already been written to file
(defun org-babel-prep-session:ditaa (session params)
--
1.7.12
[-- Attachment #3: Type: text/plain, Size: 46 bytes --]
--
Eric Schulte
http://cs.unm.edu/~eschulte
next prev parent reply other threads:[~2012-09-13 15:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-12 14:00 babel for ditaa-eps Arne Babenhauserheide (IMK)
2012-09-13 2:19 ` Luis Anaya
2012-09-13 3:08 ` Luis Anaya
2012-09-13 5:03 ` Thomas S. Dye
2012-09-13 5:16 ` Eric Schulte
2012-09-13 11:53 ` Arne Babenhauserheide (IMK)
2012-09-13 15:03 ` Eric Schulte [this message]
2012-09-13 23:28 ` Luis Anaya
2012-09-14 0:15 ` Eric Schulte
2012-09-14 2:51 ` Eric Schulte
2012-09-16 2:13 ` Luis Anaya
2012-09-16 14:13 ` Eric Schulte
2012-09-19 8:22 ` Bastien
2012-09-19 8:21 ` Bastien
2012-09-21 5:20 ` Thomas S. Dye
2012-09-21 13:29 ` Bastien
2012-09-22 8:48 ` Bastien
-- strict thread matches above, loose matches on Subject: below --
2012-09-14 3:05 Luis Anaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877grynexk.fsf@gmx.com \
--to=eric.schulte@gmx.com \
--cc=arne.babenhauserheide@kit.edu \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).