mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-07-16 02:16:27 +00:00
e030d95ddb
These languages are capable of writing results to file; for several of them this is their only mode of operation. These changes cause the languages to return to ob.el either the computed result, or nil, when they have written results to file themselves. This is in place of the previous method of returning the output file name as a string to ob.el. * lisp/ob-asymptote.el (org-babel-execute:asymptote): Return nil to signal that the intended content has been written to file. * lisp/ob-ditaa.el (org-babel-execute:ditaa): Return nil to signal that the intended content has been written to file. * lisp/ob-dot.el (org-babel-execute:dot): Return nil to signal that the intended content has been written to file. * lisp/ob-gnuplot.el (org-babel-execute:gnuplot): Return nil to signal that the intended content has been written to file. * lisp/ob-latex.el (org-babel-execute:latex): Return nil to signal that the intended content has been written to file. * lisp/ob-mscgen.el (org-babel-execute:mscgen): Return nil to signal that the intended content has been written to file. * lisp/ob-octave.el (org-babel-execute:octave): Return result; not name of output file. * lisp/ob-plantuml.el (org-babel-execute:plantuml): Return nil to signal that the intended content has been written to file. * lisp/ob-python.el (org-babel-execute:python): Return result; not name of output file. * lisp/ob-ruby.el (org-babel-execute:ruby): Return result; not name of output file. * lisp/ob-sass.el (org-babel-execute:sass): Return nil if result has been written to file
84 lines
2.9 KiB
EmacsLisp
84 lines
2.9 KiB
EmacsLisp
;;; ob-plantuml.el --- org-babel functions for plantuml evaluation
|
|
|
|
;; Copyright (C) 2010 Free Software Foundation, Inc.
|
|
|
|
;; Author: Zhang Weize
|
|
;; Keywords: literate programming, reproducible research
|
|
;; Homepage: http://orgmode.org
|
|
;; Version: 7.4
|
|
|
|
;; 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 plantuml script.
|
|
;;
|
|
;; Inspired by Ian Yang's org-export-blocks-format-plantuml
|
|
;; http://www.emacswiki.org/emacs/org-export-blocks-format-plantuml.el
|
|
|
|
;;; Requirements:
|
|
|
|
;; plantuml | http://plantuml.sourceforge.net/
|
|
;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file
|
|
|
|
;;; Code:
|
|
(require 'ob)
|
|
(require 'ob-eval)
|
|
|
|
(defvar org-babel-default-header-args:plantuml
|
|
'((:results . "file") (:exports . "results"))
|
|
"Default arguments for evaluating a plantuml source block.")
|
|
|
|
(defcustom org-plantuml-jar-path nil
|
|
"Path to the plantuml.jar file."
|
|
:group 'org-babel
|
|
:type 'string)
|
|
|
|
(defun org-babel-execute:plantuml (body params)
|
|
"Execute a block of plantuml 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 (or (cdr (assoc :file params))
|
|
(error "plantuml requires a \":file\" header argument")))
|
|
(cmdline (cdr (assoc :cmdline params)))
|
|
(in-file (org-babel-temp-file "plantuml-"))
|
|
(cmd (if (not org-plantuml-jar-path)
|
|
(error "`org-plantuml-jar-path' is not set")
|
|
(concat "java -jar "
|
|
(shell-quote-argument
|
|
(expand-file-name org-plantuml-jar-path))
|
|
(if (string= (file-name-extension out-file) "svg")
|
|
" -tsvg" "")
|
|
" -p " cmdline " < "
|
|
(org-babel-process-file-name in-file)
|
|
" > "
|
|
(org-babel-process-file-name out-file)))))
|
|
(unless (file-exists-p org-plantuml-jar-path)
|
|
(error "Could not find plantuml.jar at %s" org-plantuml-jar-path))
|
|
(with-temp-file in-file (insert (concat "@startuml\n" body "\n@enduml")))
|
|
(message "%s" cmd) (org-babel-eval cmd "")
|
|
nil)) ;; signal that output has already been written to file
|
|
|
|
(defun org-babel-prep-session:plantuml (session params)
|
|
"Return an error because plantuml does not support sessions."
|
|
(error "Plantuml does not support sessions"))
|
|
|
|
(provide 'ob-plantuml)
|
|
|
|
;; arch-tag: 451f50c5-e779-407e-ad64-70e0e8f161d1
|
|
|
|
;;; ob-plantuml.el ends here
|