mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-12-03 08:30:03 +00:00
d128662fa3
This proposal for code tidying uses multiple-value-bind to satisfy:
1. The various parsed/resolved components of the param list (session,
vars, result-type) are available in the org-babel-execute:LANG
functions.
2. Those functions don't duplicate the code for parsing the params
list and resolving references
3. The functions still have the params list available to them, should
they need to implement language-specific behaviour using it.
If the org-babel-execute:LANG functions need to be called directly,
then that would now have to be via
(multiple-value-bind (session vars result-params result-type)
(org-babel-process-params params) (funcall cmd body params))
as in org-babel-exp.el. (But is it actually necessary to by-pass
org-babel-execute-src-block?)
103 lines
4.1 KiB
EmacsLisp
103 lines
4.1 KiB
EmacsLisp
;;; org-babel-exp.el --- Exportation of org-babel source blocks
|
|
|
|
;; Copyright (C) 2009 Eric Schulte
|
|
|
|
;; Author: Eric Schulte
|
|
;; Keywords: literate programming, reproducible research
|
|
;; Homepage: http://orgmode.org
|
|
;; Version: 0.01
|
|
|
|
;;; License:
|
|
|
|
;; This program 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, or (at your option)
|
|
;; any later version.
|
|
;;
|
|
;; This program 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; see the file COPYING. If not, write to the
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
;; Boston, MA 02110-1301, USA.
|
|
|
|
;;; Commentary:
|
|
|
|
;; for more information see the comments in org-babel.el
|
|
|
|
;;; Code:
|
|
(require 'org-babel)
|
|
(require 'org-exp-blocks)
|
|
(add-to-list 'org-export-blocks '(src org-babel-exp-src-blocks))
|
|
(add-to-list 'org-export-interblocks '(src org-babel-exp-inline-src-blocks))
|
|
|
|
(defun org-babel-exp-src-blocks (body &rest headers)
|
|
"Process src block for export. Depending on the 'export'
|
|
headers argument in replace the source code block with...
|
|
|
|
both ---- the default, display the code and the results
|
|
|
|
code ---- display the code inside the block but do not process
|
|
|
|
results - process the block and replace it with the results of
|
|
execution
|
|
|
|
none ----- do not display either code or results upon export"
|
|
(interactive)
|
|
(unless headers (error "org-babel can't process a source block without knowing the source code"))
|
|
(message "org-babel processing...")
|
|
(let ((lang (car headers))
|
|
(params (org-babel-parse-header-arguments (mapconcat #'identity (cdr headers) " "))))
|
|
(org-babel-exp-do-export lang body params)))
|
|
|
|
(defun org-babel-exp-inline-src-blocks (start end)
|
|
"Process inline src blocks between START and END for export.
|
|
See `org-babel-exp-src-blocks' for export options, currently the
|
|
options and are taken from `org-babel-defualt-inline-header-args'."
|
|
(interactive)
|
|
(save-excursion
|
|
(goto-char start)
|
|
(while (and (< (point) end) (re-search-forward org-babel-inline-src-block-regexp end t))
|
|
(let* ((info (save-match-data (org-babel-parse-inline-src-block-match)))
|
|
(replacement (save-match-data
|
|
(org-babel-exp-do-export (first info) (second info) (third info) t))))
|
|
(setf end (+ end (- (length replacement)
|
|
(+ 6 (length (first info)) (length (second info))))))
|
|
(replace-match replacement t t)))))
|
|
|
|
(defun org-babel-exp-do-export (lang body params &optional inline)
|
|
(case (intern (or (cdr (assoc :exports params)) "code"))
|
|
('none "")
|
|
('code (org-babel-exp-code body lang params inline))
|
|
('results (org-babel-exp-results body lang params inline))
|
|
('both (concat (org-babel-exp-code body lang params inline)
|
|
"\n\n"
|
|
(org-babel-exp-results body lang params inline)))))
|
|
|
|
(defun org-babel-exp-code (body lang params &optional inline)
|
|
(if inline
|
|
(format "=%s=" body)
|
|
(format "#+BEGIN_SRC %s\n%s%s\n#+END_SRC" lang body
|
|
(if (string-match "\n$" body) "" "\n"))))
|
|
|
|
(defun org-babel-exp-results (body lang params &optional inline)
|
|
;; I expect there's a good reason why not, but would it be possible
|
|
;; to use org-babel-execute-src-block here? [ded]
|
|
(let* ((cmd (intern (concat "org-babel-execute:" lang)))
|
|
(result
|
|
(multiple-value-bind (session vars result-params result-type)
|
|
(org-babel-process-params params) (funcall cmd body params)))
|
|
(result-as-org (org-babel-result-to-org-string result)))
|
|
(if inline
|
|
(format "=%s=" result)
|
|
(if (stringp result)
|
|
(format "#+BEGIN_EXAMPLE\n%s%s\n#+END_EXAMPLE" result
|
|
(if (string-match "\n$" body) "" "\n"))
|
|
result-as-org))))
|
|
|
|
(provide 'org-babel-exp)
|
|
;;; org-babel-exp.el ends here
|