From mboxrd@z Thu Jan 1 00:00:00 1970 From: Luis Anaya Subject: Re: babel for ditaa-eps Date: Wed, 12 Sep 2012 23:08:02 -0400 Message-ID: References: <50509584.30704@kit.edu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:39828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBzml-0007Qm-Q5 for emacs-orgmode@gnu.org; Wed, 12 Sep 2012 23:08:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TBzmk-0003n8-OM for emacs-orgmode@gnu.org; Wed, 12 Sep 2012 23:08:11 -0400 Received: from blu0-omc1-s9.blu0.hotmail.com ([65.55.116.20]:10511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBzmk-0003mz-KD for emacs-orgmode@gnu.org; Wed, 12 Sep 2012 23:08:10 -0400 In-Reply-To: <50509584.30704@kit.edu> (Arne Babenhauserheide's message of "Wed, 12 Sep 2012 16:00:36 +0200") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: "Arne Babenhauserheide (IMK)" Cc: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain "Arne Babenhauserheide (IMK)" writes: Hi: I made a small changed to the code. It will look for the suffix and run the epspdf step only if it's a pdf, otherwise, it will print the EPS. The reason for this is because on Groff, you're better off with the EPS file. Luis --=-=-= Content-Type: application/emacs-lisp Content-Disposition: attachment; filename="ob-ditaa-eps.el" Content-Transfer-Encoding: quoted-printable Content-Description: Modified Ditaa EPS ;;; ob-ditaa-eps.el --- org-babel functions for ditaa evaluation ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte und Arne Babenhauserheide ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . ;;; Commentary: ;; Org-Babel support for evaluating ditaa source code as eps/pdf. ;; ;; Almost verbatim copy from ob-ditaa, but with ditaa-eps and epstopdf ;; as intermediate step. ;; ;; Ditaa differs from most standard languages in that ;; ;; 1) there is no such thing as a "session" in ditaa ;; ;; 2) we are generally only going to return results of type "file" ;; ;; 3) we are adding the "file" and "cmdline" header arguments ;; ;; 4) there are no variables (at least for now) ;;; Code: (require 'ob) (defvar org-babel-default-header-args:ditaa-eps '((:results . "file") (:exports . "results") (:java . "-Dfile.encoding=3DUTF-8")) "Default arguments for evaluating a ditaa source block.") (defcustom org-ditaa-eps-jar-path (expand-file-name "DitaaEps.jar" (file-name-as-directory (expand-file-name "scripts" (file-name-as-directory (expand-file-name "../contrib" (file-name-directory (find-library-name "org"))))))) "Path to the ditaa-eps jar executable." :group 'org-babel :type 'string) (defvar org-ditaa-eps-jar-path) (defun org-babel-execute:ditaa-eps (body params) "Execute a block of Ditaa code with org-babel. This function is called by `org-babel-execute-src-block'." (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-")) (cmd0 (concat "java " java " -jar " (shell-quote-argument (expand-file-name org-ditaa-eps-jar-path)) " " cmdline " " (org-babel-process-file-name in-file) " " (org-babel-process-file-name (concat in-file ".eps")))) (cmd1 (concat "epstopdf" " " (org-babel-process-file-name (concat in-file ".eps")) " -o=3D" (org-babel-process-file-name out-file)))) (unless (file-exists-p org-ditaa-eps-jar-path) (error "Could not find ditaa.jar at %s" org-ditaa-eps-jar-path)) (with-temp-file in-file (insert body)) (cond=20 ((string-match ".\.pdf$" out-file) (message cmd0) (shell-command cmd0) (message cmd1) (shell-command cmd1)) (t (message cmd0) (shell-command cmd0) (shell-command (format "mv %s %s"=20 (concat in-file ".eps") out-file)))) nil)) ;; signal that output has already been written to file (defun org-babel-prep-session:ditaa-eps (session params) "Return an error because ditaa does not support sessions." (error "Ditaa does not support sessions")) (defun ditaa-eps-mode () (artist-mode)) (provide 'ob-ditaa-eps) ;;; ob-ditaa-eps.el ends here --=-=-= Content-Type: text/plain -- Luis R. Anaya papo anaya aroba hot mail punto com "Do not use 100 words if you can say it in 10" - Yamamoto Tsunetomo --=-=-=--