mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-22 18:10:43 +00:00
ec0b3892b9
* ob.el (org-babel-process-file-name): New function (org-babel-maybe-remote-file): Delete function * ob-sql.el (org-babel-execute:sql): Use org-babel-process-file-name * ob-scheme.el (org-babel-execute:scheme): Use org-babel-process-file-name * ob-sass.el (org-babel-execute:sass): Use org-babel-process-file-name * ob-ruby.el (org-babel-ruby-evaluate): Use org-babel-process-file-name * ob-python.el (org-babel-python-evaluate-external-process): Use org-babel-process-file-name (org-babel-python-evaluate-session): Use org-babel-process-file-name * ob-plantuml.el (org-babel-execute:plantuml): Use org-babel-process-file-name * ob-perl.el (org-babel-perl-evaluate): Use org-babel-process-file-name * ob-octave.el (org-babel-octave-evaluate-external-process): Use org-babel-process-file-name (org-babel-octave-evaluate-session): Use org-babel-process-file-name, don't use org-babel-maybe-remote-file * ob-lisp.el (org-babel-execute:lisp): Use org-babel-process-file-name * ob-ledger.el (org-babel-execute:ledger): Use org-babel-process-file-name * ob-js.el (org-babel-execute:js): Use org-babel-process-file-name * ob-haskell.el (org-babel-haskell-export-to-lhs): Use org-babel-process-file-name * ob-gnuplot.el (org-babel-execute:gnuplot): Use org-babel-process-file-name * ob-eval.el (org-babel-eval-read-file): Don't use org-babel-maybe-remote-file * ob-dot.el (org-babel-execute:dot): Use org-babel-process-file-name * ob-ditaa.el (org-babel-execute:ditaa): Use org-babel-process-file-name * ob-clojure.el (org-babel-clojure-evaluate-external-process): Use org-babel-process-file-name * ob-asymptote.el (org-babel-execute:asymptote): Use org-babel-process-file-name * ob-R.el (org-babel-R-assign-elisp): Don't use org-babel-maybe-remote-file, use org-babel-process-file-name (org-babel-R-evaluate-external-process): Use org-babel-process-file-name (org-babel-R-evaluate-session): Use org-babel-process-file-name * ob-C.el (org-babel-C-execute): Use org-babel-process-file-name In addition to passing the file path through `expand-file-name', tramp-style remote file names are converted to conventional (local) file paths. The reason is that, if a tramp file name was in use in emacs, then the shell command will be executing on the remote machine in question. Further, by default the file name is passed through `shell-quote-argument'.
93 lines
3 KiB
EmacsLisp
93 lines
3 KiB
EmacsLisp
;;; ob-dot.el --- org-babel functions for dot evaluation
|
|
|
|
;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric Schulte
|
|
;; Keywords: literate programming, reproducible research
|
|
;; Homepage: http://orgmode.org
|
|
;; Version: 7.01trans
|
|
|
|
;; 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 dot source code.
|
|
;;
|
|
;; For information on dot see http://www.graphviz.org/
|
|
;;
|
|
;; This differs from most standard languages in that
|
|
;;
|
|
;; 1) there is no such thing as a "session" in dot
|
|
;;
|
|
;; 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)
|
|
(require 'ob-eval)
|
|
|
|
(defvar org-babel-default-header-args:dot
|
|
'((:results . "file") (:exports . "results"))
|
|
"Default arguments to use when evaluating a dot source block.")
|
|
|
|
(defun org-babel-expand-body:dot (body params &optional processed-params)
|
|
"Expand BODY according to PARAMS, return the expanded body."
|
|
(let ((vars (nth 1 (or processed-params
|
|
(org-babel-process-params params)))))
|
|
(mapc
|
|
(lambda (pair)
|
|
(let ((name (symbol-name (car pair)))
|
|
(value (cdr pair)))
|
|
(setq body
|
|
(replace-regexp-in-string
|
|
(concat "\$" (regexp-quote name))
|
|
(if (stringp value) value (format "%S" value))
|
|
body))))
|
|
vars)
|
|
body))
|
|
|
|
(defun org-babel-execute:dot (body params)
|
|
"Execute a block of Dot code with org-babel.
|
|
This function is called by `org-babel-execute-src-block'."
|
|
(let* ((processed-params (org-babel-process-params params))
|
|
(result-params (split-string (or (cdr (assoc :results params)) "")))
|
|
(out-file (cdr (assoc :file params)))
|
|
(cmdline (or (cdr (assoc :cmdline params))
|
|
(format "-T%s" (file-name-extension out-file))))
|
|
(cmd (or (cdr (assoc :cmd params)) "dot"))
|
|
(in-file (org-babel-temp-file "dot-")))
|
|
(with-temp-file in-file
|
|
(insert (org-babel-expand-body:dot body params processed-params)))
|
|
(org-babel-eval
|
|
(concat cmd
|
|
" " (org-babel-process-file-name in-file)
|
|
" " cmdline
|
|
" -o " (org-babel-process-file-name out-file)) "")
|
|
out-file))
|
|
|
|
(defun org-babel-prep-session:dot (session params)
|
|
"Return an error because Dot does not support sessions."
|
|
(error "Dot does not support sessions"))
|
|
|
|
(provide 'ob-dot)
|
|
|
|
;; arch-tag: 817d0516-7b47-4f77-a8b2-2aadd8e4d0e2
|
|
|
|
;;; ob-dot.el ends here
|