mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-07-15 19:46:26 +00:00
0d000f5680
* lisp/ob-core.el (org-babel--get-vars): New function. (org-babel-get-header): Delete. * lisp/ob-C.el (org-babel-C-expand-C): (org-babel-C-expand-D): * lisp/ob-R.el (org-babel-variable-assignments:R): * lisp/ob-abc.el (org-babel-expand-body:abc): * lisp/ob-asymptote.el (org-babel-variable-assignments:asymptote): * lisp/ob-awk.el (org-babel-execute:awk): * lisp/ob-calc.el (org-babel-execute:calc): * lisp/ob-clojure.el (org-babel-expand-body:clojure): * lisp/ob-dot.el (org-babel-expand-body:dot): * lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): * lisp/ob-fortran.el (org-babel-expand-body:fortran): (org-babel-fortran-ensure-main-wrap): * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): * lisp/ob-haskell.el (org-babel-variable-assignments:haskell): * lisp/ob-js.el (org-babel-variable-assignments:js): * lisp/ob-latex.el (org-babel-expand-body:latex): * lisp/ob-lilypond.el (org-babel-expand-body:lilypond): * lisp/ob-lisp.el (org-babel-expand-body:lisp): * lisp/ob-maxima.el (org-babel-maxima-expand): * lisp/ob-ocaml.el (org-babel-variable-assignments:ocaml): * lisp/ob-octave.el (org-babel-variable-assignments:octave): * lisp/ob-org.el (org-babel-expand-body:org): * lisp/ob-perl.el (org-babel-variable-assignments:perl): * lisp/ob-picolisp.el (org-babel-expand-body:picolisp): * lisp/ob-processing.el (org-babel-variable-assignments:processing): * lisp/ob-python.el (org-babel-variable-assignments:python): * lisp/ob-ruby.el (org-babel-variable-assignments:ruby): * lisp/ob-scheme.el (org-babel-expand-body:scheme): * lisp/ob-shell.el (org-babel-variable-assignments:shell): * lisp/ob-shen.el (org-babel-expand-body:shen): * lisp/ob-sql.el (org-babel-expand-body:sql): * lisp/ob-sqlite.el (org-babel-expand-body:sqlite): Adapt to change. * etc/ORG-NEWS: Document change.
73 lines
2.4 KiB
EmacsLisp
73 lines
2.4 KiB
EmacsLisp
;;; ob-org.el --- Babel Functions for Org Code Blocks -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric Schulte
|
|
;; 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:
|
|
|
|
;; This is the simplest of code blocks, where upon evaluation the
|
|
;; contents of the code block are returned in a raw result.
|
|
|
|
;;; Code:
|
|
(require 'ob)
|
|
|
|
(declare-function org-export-string-as "ox"
|
|
(string backend &optional body-only ext-plist))
|
|
|
|
(defvar org-babel-default-header-args:org
|
|
'((:results . "raw silent") (:exports . "code"))
|
|
"Default arguments for evaluating a org source block.")
|
|
|
|
(defvar org-babel-org-default-header
|
|
"#+TITLE: default empty header\n"
|
|
"Default header inserted during export of org blocks.")
|
|
|
|
(defun org-babel-expand-body:org (body params)
|
|
(dolist (var (org-babel--get-vars params))
|
|
(setq body (replace-regexp-in-string
|
|
(regexp-quote (format "$%s" (car var)))
|
|
(format "%s" (cdr var))
|
|
body nil 'literal)))
|
|
body)
|
|
|
|
(defun org-babel-execute:org (body params)
|
|
"Execute a block of Org code with.
|
|
This function is called by `org-babel-execute-src-block'."
|
|
(let ((result-params (split-string (or (cdr (assoc :results params)) "")))
|
|
(body (org-babel-expand-body:org
|
|
(replace-regexp-in-string "^," "" body) params)))
|
|
(cond
|
|
((member "latex" result-params)
|
|
(org-export-string-as (concat "#+Title: \n" body) 'latex t))
|
|
((member "html" result-params) (org-export-string-as body 'html t))
|
|
((member "ascii" result-params) (org-export-string-as body 'ascii t))
|
|
(t body))))
|
|
|
|
(defun org-babel-prep-session:org (_session _params)
|
|
"Return an error because org does not support sessions."
|
|
(error "Org does not support sessions"))
|
|
|
|
(provide 'ob-org)
|
|
|
|
|
|
|
|
;;; ob-org.el ends here
|