Commits

Arne Babenhauserheide committed dc612ff

added mode for using ditaa-eps instead of ditaa in org-mode babel.

  • Participants
  • Parent commits 2e4038a
  • Branches kit

Comments (0)

Files changed (3)

  '(org-agenda-start-on-weekday nil)
  '(org-agenda-start-with-clockreport-mode nil)
  '(org-capture-templates (quote (("t" "A simple task" entry (file+headline "~/plan.org" "Aufgaben Sammeln") "* ❢ %?"))))
+ '(org-ditaa-eps-jar-path "~/.emacs.d/private/org/DitaaEps.jar")
  '(org-ditaa-jar-path "~/.emacs.d/private/org/ditaa0_9/ditaa0_9.jar")
  '(org-export-latex-classes (quote (("article" "\\documentclass[11pt]{scrartcl}" ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}") ("\\paragraph{%s}" . "\\paragraph*{%s}") ("\\subparagraph{%s}" . "\\subparagraph*{%s}")) ("report" "\\documentclass[11pt]{scrreprt}" ("\\part{%s}" . "\\part*{%s}") ("\\chapter{%s}" . "\\chapter*{%s}") ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}") ("\\paragraph{%s}" . "\\paragraph*{%s}") ("\\subparagraph{%s}" . "\\subparagraph*{%s}")) ("book" "\\documentclass[11pt]{scrbook}" ("\\part{%s}" . "\\part*{%s}") ("\\chapter{%s}" . "\\chapter*{%s}") ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}")) ("beamer" "\\documentclass{beamer}" org-beamer-sectioning))))
  '(org-extend-today-until 4)
 7ec80793f003470ce20cc437cfa38a537a446e1f libs/ropemacs
 780fa1dab3774fdba8c6791db985a6657a547b7a libs/ropemode
 d60799e4eed42e31a0468b92102b22bb67a21382 libs/vimpulse
-377496bd31bb5962fb7f0385236bacaddc3072bb private
+fe44fae7512d9401348eb76f1eadf88b4322a694 private

File libs/ob-ditaa-eps.el

+;;; 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 <http://www.gnu.org/licenses/>.
+
+;;; 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=UTF-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=" (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))
+    (message cmd0) (shell-command cmd0)
+    (message cmd1) (shell-command cmd1)
+    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