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
|
|
|
|
2012-01-03 12:47:01 -05:00
|
|
|
;; Copyright (C) 2009-2012 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)
|
2012-02-29 15:23:29 -05:00
|
|
|
;;
|
|
|
|
;; 5) it depends on a variable defined in org-exp-blocks (namely
|
|
|
|
;; `org-ditaa-jar-path') so be sure you have org-exp-blocks loaded
|
2009-07-16 20:12:11 -04:00
|
|
|
|
|
|
|
;;; Code:
|
2010-06-11 19:02:42 -04:00
|
|
|
(require 'ob)
|
2012-02-29 15:23:29 -05:00
|
|
|
|
|
|
|
(defvar org-ditaa-jar-path) ;; provided by org-exp-blocks
|
2009-07-16 20:12:11 -04:00
|
|
|
|
2009-09-01 17:30:39 -04:00
|
|
|
(defvar org-babel-default-header-args:ditaa
|
2012-01-04 05:22:28 -05: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-01-04 05:22:28 -05: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
|
Add version tag "24.1" for options introduced since Emacs 23.4 (and <= 24.1)
* org-exp.el (org-export-kill-product-buffer-when-displayed)
(org-export-initial-scope, org-export-date-timestamp-format)
(org-export-with-tasks, org-export-email-info)
(org-export-table-remove-empty-lines): Add version tag.
* org-mobile.el (org-mobile-files-exclude-regexp)
(org-mobile-use-encryption, org-mobile-encryption-tempfile)
(org-mobile-encryption-password, org-mobile-agendas): Add
version tag.
* ob-plantuml.el (org-plantuml-jar-path): Add version tag.
* org.el (org-babel-load-languages, org-clone-delete-id)
(org-log-buffer-setup-hook)
(org-loop-over-headlines-in-active-region)
(org-use-sub-superscripts, org-startup-with-beamer-mode)
(org-startup-with-inline-images, org-ctrl-k-protect-subtree)
(org-catch-invisible-edits)
(org-link-search-must-match-exact-headline)
(org-confirm-shell-link-not-regexp)
(org-confirm-elisp-link-not-regexp, org-log-refile)
(org-refile-use-cache)
(org-refile-active-region-within-subtree)
(org-todo-repeat-to-state, org-get-priority-function)
(org-agenda-jump-prefer-future)
(org-read-date-force-compatible-dates)
(org-use-effective-time)
(org-complete-tags-always-offer-all-agenda-tags)
(org-properties-postprocess-alist)
(org-format-latex-signal-error)
(org-latex-to-mathml-jar-file)
(org-latex-to-mathml-convert-command)
(org-export-latex-default-packages-alist)
(org-hidden-keywords, org-pretty-entities)
(org-pretty-entities-include-sub-superscripts)
(org-src-fontify-natively, org-effort-durations)
(org-speed-command-hook): Add version tag.
* org-html.el (org-export-html-footnote-separator)
(org-export-html-mathjax-options)
(org-export-html-mathjax-template)
(org-export-html-headline-anchor-format)
(org-export-html-preamble-format)
(org-export-html-postamble-format)
(org-export-html-table-align-individual-fields)
(org-export-html-protect-char-alist, org-export-html-divs):
Add version tag.
* org-ctags.el (org-ctags-path-to-ctags)
(org-ctags-open-link-functions)
(org-ctags-new-topic-template): Add version tag.
* ob-exp.el (org-export-babel-evaluate): Add version tag.
* org-beamer.el (org-beamer-use-parts)
(org-beamer-frame-level, org-beamer-frame-default-options)
(org-beamer-column-view-format, org-beamer-themes)
(org-beamer-environments-extra, org-beamer-fragile-re)
(org-beamer-outline-frame-title)
(org-beamer-outline-frame-options): Add version tag.
* org-wl.el (org-wl-link-remove-filter)
(org-wl-shimbun-prefer-web-links)
(org-wl-nntp-prefer-web-links, org-wl-disable-folder-check)
(org-wl-namazu-default-index): Add version tag.
* org-clock.el (org-task-overrun-text)
(org-clocktable-defaults, org-clock-clocktable-formatter)
(org-clock-clocktable-language-setup)
(org-clock-report-include-clocking-task)
(org-clock-resolve-expert): Add version tag.
* ob-lob.el (org-babel-lob-files): Add version tag.
* org-freemind.el (org-freemind-node-css-style): Add version
tag.
* org-archive.el (org-archive-reversed-order)
(org-archive-subtree-add-inherited-tags): Add version tag.
* org-bibtex.el (org-bibtex-autogen-keys, org-bibtex-prefix)
(org-bibtex-treat-headline-as-title)
(org-bibtex-export-arbitrary-fields)
(org-bibtex-key-property, org-bibtex-tags)
(org-bibtex-tags-are-keywords, org-bibtex-no-export-tags)
(org-bibtex-type-property-name): Add version tag.
* org-timer.el (org-timer-default-timer): Add version tag.
* org-taskjuggler.el (org-export-taskjuggler-extension)
(org-export-taskjuggler-project-tag)
(org-export-taskjuggler-resource-tag)
(org-export-taskjuggler-target-version)
(org-export-taskjuggler-default-project-version)
(org-export-taskjuggler-default-project-duration)
(org-export-taskjuggler-default-reports)
(org-export-taskjuggler-default-global-properties): Add
version tag.
* org-habit.el (org-habit-today-glyph)
(org-habit-completed-glyph): Add version tag.
* org-list.el (org-alphabetical-lists)
(org-list-ending-method, org-list-end-regexp)
(org-list-automatic-rules, org-list-use-circular-motion)
(org-list-indent-offset): Add version tag.
* ob-picolisp.el (org-babel-picolisp-cmd): Add version tag.
* org-icalendar.el (org-icalendar-alarm-time)
(org-icalendar-combined-description)
(org-icalendar-honor-noexport-tag)
(org-icalendar-date-time-format): Add version tag.
* org-src.el (org-src-tab-acts-natively): Add version tag.
* org-exp-blocks.el (org-export-blocks-postblock-hook): Add
version tag.
* org-table.el (org-table-exit-follow-field-mode-when-leaving-table)
(org-table-fix-formulas-confirm)
(org-table-duration-custom-format)
(org-table-formula-field-format): Add version tag.
* org-publish.el (org-publish-sitemap-sort-files)
(org-publish-sitemap-sort-folders)
(org-publish-sitemap-sort-ignore-case)
(org-publish-sitemap-date-format)
(org-publish-sitemap-file-entry-format): Add version tag.
* ob-js.el (org-babel-js-cmd): Add version tag.
* org-docbook.el (org-export-docbook-footnote-separator)
(org-export-docbook-xslt-stylesheet): Add version tag.
* org-entities.el (org-entities-ascii-explanatory)
(org-entities-user): Add version tag.
* ob.el (org-confirm-babel-evaluate)
(org-babel-no-eval-on-ctrl-c-ctrl-c): Add version tag.
* ob-tangle.el (org-babel-tangle-lang-exts)
(org-babel-post-tangle-hook, org-babel-pre-tangle-hook)
(org-babel-tangle-body-hook)
(org-babel-tangle-comment-format-beg)
(org-babel-tangle-comment-format-end)
(org-babel-process-comment-text): Add version tag.
* org-gnus.el (org-gnus-nnimap-query-article-no-from-file):
Add version tag.
* org-crypt.el (org-crypt-disable-auto-save): Add version tag.
* org-inlinetask.el (org-inlinetask-default-state): Add
version tag.
* ob-scheme.el (org-babel-scheme-cmd): Add version tag.
* ob-lisp.el (org-babel-lisp-dir-fmt): Add version tag.
* org-attach.el (org-attach-store-link-p): Add version tag.
* org-capture.el (org-capture-templates)
(org-capture-before-finalize-hook)
(org-capture-after-finalize-hook): Add version tag.
* org-agenda.el (org-agenda-skip-deadline-prewarning-if-scheduled)
(org-agenda-time-leading-zero, org-agenda-follow-indirect)
(org-agenda-menu-two-column, org-agenda-menu-show-matcher)
(org-agenda-timegrid-use-ampm)
(org-agenda-remove-timeranges-from-blocks)
(org-agenda-inactive-leader, org-agenda-current-time-string)
(org-agenda-show-current-time-in-grid)
(org-agenda-search-view-force-full-words)
(org-agenda-search-view-always-boolean)
(org-agenda-clock-consistency-checks)
(org-agenda-include-deadlines)
(org-agenda-move-date-from-past-immediately-to-today)
(org-agenda-day-face-function)
(org-agenda-category-icon-alist)
(org-agenda-bulk-custom-functions)
(org-agenda-insert-diary-extract-time): Add version tag.
* org-latex.el (org-export-latex-inputenc-alist)
(org-export-latex-tag-markup)
(org-export-latex-timestamp-inactive-markup)
(org-export-latex-href-format)
(org-export-latex-hyperref-format)
(org-export-latex-footnote-separator)
(org-export-latex-quotes)
(org-export-latex-table-caption-above)
(org-export-latex-listings-w-names)
(org-export-latex-minted-langs)
(org-export-latex-listings-options)
(org-export-latex-minted-options)
(org-latex-default-figure-position, org-export-pdf-logfiles):
Add version tag.
* org-faces.el (org-faces-easy-properties)
(org-fontify-quote-and-verse-blocks, org-cycle-level-faces):
Add version tag.
* ob-ditaa.el (org-ditaa-jar-option): Add version tag.
Thanks to Glenn Morris for reporting this.
2012-02-13 09:49:28 -05:00
|
|
|
:version "24.1"
|
2012-01-04 05:22:28 -05:00
|
|
|
: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)) "")))
|
2011-01-27 17:42:27 -05:00
|
|
|
(out-file ((lambda (el)
|
|
|
|
(or el
|
|
|
|
(error
|
|
|
|
"ditaa code block requires :file header argument")))
|
|
|
|
(cdr (assoc :file params))))
|
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-01-04 05:22:28 -05:00
|
|
|
(cmd (concat "java " java " " org-ditaa-jar-option " "
|
2010-09-01 20:08:26 -04:00
|
|
|
(shell-quote-argument
|
|
|
|
(expand-file-name org-ditaa-jar-path))
|
2010-09-22 16:40:14 -04:00
|
|
|
" " cmdline
|
|
|
|
" " (org-babel-process-file-name in-file)
|
|
|
|
" " (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)
|
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
|