2010-06-11 19:02:42 -04:00
|
|
|
;;; ob-ditaa.el --- org-babel functions for ditaa evaluation
|
2009-07-16 20:12:11 -04:00
|
|
|
|
2013-01-08 09:04:32 -05:00
|
|
|
;; Copyright (C) 2009-2013 Free Software Foundation, Inc.
|
2009-07-16 20:12:11 -04:00
|
|
|
|
|
|
|
;; Author: Eric Schulte
|
|
|
|
;; Keywords: literate programming, reproducible research
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
|
2010-06-25 12:32:35 -04:00
|
|
|
;; This file is part of GNU Emacs.
|
2009-07-16 20:12:11 -04:00
|
|
|
|
2010-06-25 12:32:35 -04:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2009-07-16 20:12:11 -04:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2010-06-25 12:32:35 -04:00
|
|
|
;; 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,
|
2009-07-16 20:12:11 -04:00
|
|
|
;; 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.
|
2010-06-25 12:32:35 -04:00
|
|
|
|
2009-07-16 20:12:11 -04:00
|
|
|
;; You should have received a copy of the GNU General Public License
|
2010-06-25 12:32:35 -04:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2009-07-16 20:12:11 -04:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; Org-Babel support for evaluating ditaa source code.
|
|
|
|
;;
|
|
|
|
;; This 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:
|
2010-06-11 19:02:42 -04:00
|
|
|
(require 'ob)
|
2012-10-26 02:18:07 -04:00
|
|
|
(require 'org-compat)
|
2012-02-29 15:23:29 -05:00
|
|
|
|
2009-09-01 17:30:39 -04:00
|
|
|
(defvar org-babel-default-header-args:ditaa
|
2012-03-19 16:38:12 -04:00
|
|
|
'((:results . "file")
|
|
|
|
(:exports . "results")
|
|
|
|
(:java . "-Dfile.encoding=UTF-8"))
|
2010-07-13 19:04:47 -04:00
|
|
|
"Default arguments for evaluating a ditaa source block.")
|
2009-07-16 20:52:31 -04:00
|
|
|
|
2012-08-19 16:19:59 -04:00
|
|
|
(defcustom org-ditaa-jar-path (expand-file-name
|
|
|
|
"ditaa.jar"
|
|
|
|
(file-name-as-directory
|
|
|
|
(expand-file-name
|
|
|
|
"scripts"
|
|
|
|
(file-name-as-directory
|
|
|
|
(expand-file-name
|
|
|
|
"../contrib"
|
|
|
|
(file-name-directory (org-find-library-dir "org")))))))
|
|
|
|
"Path to the ditaa jar executable."
|
|
|
|
:group 'org-babel
|
|
|
|
:type 'string)
|
|
|
|
|
2013-07-17 10:20:37 -04:00
|
|
|
(defcustom org-babel-ditaa-java-cmd "java"
|
|
|
|
"Java executable to use when evaluating ditaa blocks."
|
|
|
|
:group 'org-babel
|
|
|
|
:type 'string)
|
|
|
|
|
2012-09-13 10:58:31 -04:00
|
|
|
(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
|
Add :version and :package-version
* ox.el (org-export-snippet-translation-alist)
(org-export-coding-system, org-export-in-background)
(org-export-async-init-file, org-export-invisible-backends)
(org-export-dispatch-use-expert-ui):
* ox-texinfo.el (org-texinfo-filename, org-texinfo-classes)
(org-texinfo-format-headline-function)
(org-texinfo-node-description-column)
(org-texinfo-active-timestamp-format)
(org-texinfo-link-with-unknown-path-format)
(org-texinfo-tables-verbatim)
(org-texinfo-table-scientific-notation)
(org-texinfo-text-markup-alist)
(org-texinfo-format-drawer-function)
(org-texinfo-format-inlinetask-function)
(org-texinfo-info-process):
* ox-man.el (org-man-tables-centered)
(org-man-table-scientific-notation)
(org-man-source-highlight, org-man-source-highlight-langs)
(org-man-pdf-process, org-man-logfiles-extensions):
* ox-html.el (org-html-allow-name-attribute-in-anchors)
(org-html-coding-system, org-html-divs):
* ox-ascii.el (org-ascii-text-width)
(org-ascii-headline-spacing, org-ascii-indented-line-width)
(org-ascii-paragraph-spacing, org-ascii-charset)
(org-ascii-underline, org-ascii-bullets)
(org-ascii-links-to-notes)
(org-ascii-table-keep-all-vertical-lines)
(org-ascii-table-widen-columns)
(org-ascii-table-use-ascii-art)
(org-ascii-format-drawer-function)
(org-ascii-format-inlinetask-function):
* org.el (org-modules, org-export-backends)
(org-highlight-latex-and-related, orgstruct-setup-hook):
* org-attach.el (org-attach-git-annex-cutoff):
* org-archive.el (org-archive-file-header-format):
* org-agenda.el (org-agenda-todo-ignore-time-comparison-use-seconds):
* ob-python.el (org-babel-python-hline-to)
(org-babel-python-None-to):
* ob-ditaa.el (org-ditaa-eps-jar-path):
* ob-core.el (org-babel-results-keyword): Add :version and
:package-version.
* ox-ascii.el: Use utf-8-emacs as the file coding system.
2013-03-05 10:34:16 -05:00
|
|
|
:version "24.4"
|
|
|
|
:package-version '(Org . "8.0")
|
2012-09-13 10:58:31 -04:00
|
|
|
:type 'string)
|
|
|
|
|
2012-03-19 16:38:12 -04:00
|
|
|
(defcustom org-ditaa-jar-option "-jar"
|
|
|
|
"Option for the ditaa jar file.
|
|
|
|
Do not leave leading or trailing spaces in this string."
|
|
|
|
:group 'org-babel
|
|
|
|
:version "24.1"
|
|
|
|
:type 'string)
|
|
|
|
|
2009-07-16 20:12:11 -04:00
|
|
|
(defun org-babel-execute:ditaa (body params)
|
2010-07-13 19:04:47 -04:00
|
|
|
"Execute a block of Ditaa code with org-babel.
|
|
|
|
This function is called by `org-babel-execute-src-block'."
|
2010-09-01 20:08:26 -04:00
|
|
|
(let* ((result-params (split-string (or (cdr (assoc :results params)) "")))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 14:57:31 -05:00
|
|
|
(out-file (let ((el (cdr (assoc :file params))))
|
|
|
|
(or el
|
|
|
|
(error
|
|
|
|
"ditaa code block requires :file header argument"))))
|
2010-09-01 20:08:26 -04:00
|
|
|
(cmdline (cdr (assoc :cmdline params)))
|
2011-04-25 15:10:45 -04:00
|
|
|
(java (cdr (assoc :java params)))
|
2010-09-01 20:08:26 -04:00
|
|
|
(in-file (org-babel-temp-file "ditaa-"))
|
2012-09-13 10:58:31 -04:00
|
|
|
(eps (cdr (assoc :eps params)))
|
2013-07-17 10:20:37 -04:00
|
|
|
(cmd (concat org-babel-ditaa-java-cmd
|
|
|
|
" " java " " org-ditaa-jar-option " "
|
2010-09-01 20:08:26 -04:00
|
|
|
(shell-quote-argument
|
2012-09-13 10:58:31 -04:00
|
|
|
(expand-file-name
|
|
|
|
(if eps org-ditaa-eps-jar-path org-ditaa-jar-path)))
|
2010-09-22 16:40:14 -04:00
|
|
|
" " cmdline
|
|
|
|
" " (org-babel-process-file-name in-file)
|
2012-09-13 10:58:31 -04:00
|
|
|
" " (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)))))
|
2009-07-16 20:12:11 -04:00
|
|
|
(unless (file-exists-p org-ditaa-jar-path)
|
2010-07-06 13:30:58 -04:00
|
|
|
(error "Could not find ditaa.jar at %s" org-ditaa-jar-path))
|
2009-07-16 20:12:11 -04:00
|
|
|
(with-temp-file in-file (insert body))
|
2010-09-01 20:08:26 -04:00
|
|
|
(message cmd) (shell-command cmd)
|
2012-09-13 10:58:31 -04:00
|
|
|
(when pdf-cmd (message pdf-cmd) (shell-command pdf-cmd))
|
2010-12-21 05:21:28 -05:00
|
|
|
nil)) ;; signal that output has already been written to file
|
2009-07-16 20:12:11 -04:00
|
|
|
|
|
|
|
(defun org-babel-prep-session:ditaa (session params)
|
2010-07-13 19:04:47 -04:00
|
|
|
"Return an error because ditaa does not support sessions."
|
2009-07-16 20:12:11 -04:00
|
|
|
(error "Ditaa does not support sessions"))
|
|
|
|
|
2010-06-11 19:02:42 -04:00
|
|
|
(provide 'ob-ditaa)
|
2010-06-25 12:32:35 -04:00
|
|
|
|
2011-08-15 14:04:38 -04:00
|
|
|
|
2010-06-25 12:32:35 -04:00
|
|
|
|
2010-06-11 19:02:42 -04:00
|
|
|
;;; ob-ditaa.el ends here
|