2010-06-11 19:02:42 -04:00
|
|
|
;;; ob.el --- working with code blocks in org-mode
|
2009-02-22 16:19:32 -05:00
|
|
|
|
2010-06-25 12:20:39 -04:00
|
|
|
;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
|
2009-02-22 16:19:32 -05:00
|
|
|
|
2009-06-12 19:55:42 -04:00
|
|
|
;; Author: Eric Schulte, Dan Davison
|
2009-02-22 16:19:32 -05:00
|
|
|
;; Keywords: literate programming, reproducible research
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
;; Version: 0.01
|
|
|
|
|
2010-06-25 12:20:39 -04:00
|
|
|
;; This file is part of GNU Emacs.
|
2009-02-22 16:19:32 -05:00
|
|
|
|
2010-06-25 12:20:39 -04:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2009-02-22 16:19:32 -05:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2010-06-25 12:20:39 -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-02-22 16:19:32 -05: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:20:39 -04:00
|
|
|
|
2009-02-22 16:19:32 -05:00
|
|
|
;; You should have received a copy of the GNU General Public License
|
2010-06-25 12:20:39 -04:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2009-02-22 16:19:32 -05:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2010-06-25 12:20:39 -04:00
|
|
|
;; See the online documentation for more information
|
|
|
|
;;
|
|
|
|
;; http://orgmode.org/worg/org-contrib/babel/
|
2009-02-22 16:19:32 -05:00
|
|
|
|
|
|
|
;;; Code:
|
2010-06-11 19:02:42 -04:00
|
|
|
(eval-when-compile (require 'cl))
|
2010-06-28 14:37:15 -04:00
|
|
|
(require 'org-macs)
|
2009-02-22 16:19:32 -05:00
|
|
|
|
2010-06-14 20:01:01 -04:00
|
|
|
(defvar org-babel-call-process-region-original)
|
2010-06-23 14:24:33 -04:00
|
|
|
(declare-function show-all "outline" ())
|
|
|
|
(declare-function tramp-compat-make-temp-file "tramp" (filename &optional dir-flag))
|
|
|
|
(declare-function tramp-dissect-file-name "tramp" (name &optional nodefault))
|
|
|
|
(declare-function tramp-file-name-user "tramp" (vec))
|
|
|
|
(declare-function tramp-file-name-host "tramp" (vec))
|
|
|
|
(declare-function org-edit-src-code "org" (context code edit-buffer-name))
|
|
|
|
(declare-function org-open-at-point "org" (&optional in-emacs reference-buffer))
|
|
|
|
(declare-function org-save-outline-visibility "org" (use-markers &rest body))
|
|
|
|
(declare-function org-narrow-to-subtree "org" ())
|
|
|
|
(declare-function org-entry-get "org" (pom property &optional inherit))
|
|
|
|
(declare-function org-make-options-regexp "org" (kwds &optional extra))
|
|
|
|
(declare-function org-match-string-no-properties "org" (num &optional string))
|
|
|
|
(declare-function org-do-remove-indentation "org" (&optional n))
|
|
|
|
(declare-function org-show-context "org" (&optional key))
|
|
|
|
(declare-function org-at-table-p "org" (&optional table-type))
|
|
|
|
(declare-function org-cycle "org" (&optional arg))
|
|
|
|
(declare-function org-uniquify "org" (list))
|
|
|
|
(declare-function org-table-import "org" (file arg))
|
|
|
|
(declare-function org-add-hook "org-compat" (hook function &optional append local))
|
|
|
|
(declare-function org-table-align "org-table" ())
|
|
|
|
(declare-function org-table-end "org-table" (&optional table-type))
|
2010-06-12 20:11:36 -04:00
|
|
|
(declare-function orgtbl-to-generic "org-table" (table params))
|
2010-06-23 14:24:33 -04:00
|
|
|
(declare-function orgtbl-to-orgtbl "org-table" (table params))
|
|
|
|
(declare-function org-babel-lob-get-info "ob-lob" nil)
|
2010-06-12 20:11:36 -04:00
|
|
|
(declare-function org-babel-ref-split-args "ob-ref" (arg-string))
|
|
|
|
(declare-function org-babel-ref-variables "ob-ref" (params))
|
2010-06-23 14:24:33 -04:00
|
|
|
(declare-function org-babel-ref-resolve-reference "ob-ref" (ref &optional params))
|
2010-06-12 20:11:36 -04:00
|
|
|
|
2010-06-30 15:25:22 -04:00
|
|
|
(defcustom org-confirm-babel-evaluate t
|
2010-07-02 22:21:31 -04:00
|
|
|
"Require confirmation before interactively evaluating code
|
2010-06-30 15:25:22 -04:00
|
|
|
blocks in Org-mode buffers. The default value of this variable
|
|
|
|
is t, meaning confirmation is required for any code block
|
|
|
|
evaluation. This variable can be set to nil to inhibit any
|
|
|
|
future confirmation requests. This variable can also be set to a
|
|
|
|
function which takes two arguments the language of the code block
|
|
|
|
and the body of the code block. Such a function should then
|
|
|
|
return a non-nil value if the user should be prompted for
|
|
|
|
execution or nil if no prompt is required.
|
|
|
|
|
|
|
|
Warning: Disabling confirmation may result in accidental
|
|
|
|
evaluation of potentially harmful code. It may be advisable
|
|
|
|
remove code block execution from C-c C-c as further protection
|
|
|
|
against accidental code block evaluation. The
|
|
|
|
`org-babel-no-eval-on-ctrl-c-ctrl-c' variable can be used to
|
|
|
|
remove code block execution from the C-c C-c keybinding."
|
2010-07-02 22:21:31 -04:00
|
|
|
:group 'org-babel
|
|
|
|
:type '(choice boolean function))
|
2010-06-30 15:25:22 -04:00
|
|
|
;; don't allow this variable to be changed through file settings
|
|
|
|
(put 'org-confirm-babel-evaluate 'safe-local-variable (lambda (x) (eq x t)))
|
|
|
|
|
|
|
|
(defcustom org-babel-no-eval-on-ctrl-c-ctrl-c nil
|
|
|
|
"This variable can be set to remove code block evaluation from
|
|
|
|
the C-c C-c key binding."
|
|
|
|
:group 'org-babel
|
|
|
|
:type 'boolean)
|
|
|
|
|
2010-06-16 20:12:21 -04:00
|
|
|
(defvar org-babel-source-name-regexp
|
|
|
|
"^[ \t]*#\\+\\(srcname\\|source\\|function\\):[ \t]*"
|
|
|
|
"Regular expression used to match a source name line.")
|
|
|
|
|
2010-06-17 12:29:38 -04:00
|
|
|
(defvar org-babel-src-block-regexp
|
|
|
|
(concat
|
2010-06-17 13:08:31 -04:00
|
|
|
;; (1) indentation (2) lang
|
|
|
|
"^\\([ \t]*\\)#\\+begin_src[ \t]+\\([^ \f\t\n\r\v]+\\)[ \t]*"
|
|
|
|
;; (3) switches
|
2010-06-17 12:29:38 -04:00
|
|
|
"\\([^\":\n]*\"[^\"\n*]*\"[^\":\n]*\\|[^\":\n]*\\)"
|
2010-06-17 13:08:31 -04:00
|
|
|
;; (4) header arguments
|
2010-06-17 12:29:38 -04:00
|
|
|
"\\([^\n]*\\)\n"
|
2010-06-17 13:08:31 -04:00
|
|
|
;; (5) body
|
2010-06-17 12:29:38 -04:00
|
|
|
"\\([^\000]+?\n\\)[ \t]*#\\+end_src")
|
|
|
|
"Regexp used to identify code blocks.")
|
|
|
|
|
|
|
|
(defvar org-babel-inline-src-block-regexp
|
|
|
|
(concat
|
2010-06-17 13:08:31 -04:00
|
|
|
;; (1) replacement target (2) lang
|
|
|
|
"[ \f\t\n\r\v]\\(src_\\([^ \f\t\n\r\v]+\\)"
|
2010-06-17 12:29:38 -04:00
|
|
|
;; (3,4) (unused, headers)
|
|
|
|
"\\(\\|\\[\\(.*?\\)\\]\\)"
|
2010-06-17 13:08:31 -04:00
|
|
|
;; (5) body
|
2010-06-17 12:29:38 -04:00
|
|
|
"{\\([^\f\n\r\v]+?\\)}\\)")
|
|
|
|
"Regexp used to identify inline src-blocks.")
|
2010-06-16 20:12:21 -04:00
|
|
|
|
2010-06-16 20:02:51 -04:00
|
|
|
(defun org-babel-get-src-block-info (&optional header-vars-only)
|
|
|
|
"Get information of the current source block.
|
|
|
|
|
|
|
|
Returns a list
|
|
|
|
(language body header-arguments-alist switches name function-args indent).
|
|
|
|
Unless HEADER-VARS-ONLY is non-nil, any variable
|
|
|
|
references provided in 'function call style' (i.e. in a
|
|
|
|
parenthesised argument list following the src block name) are
|
|
|
|
added to the header-arguments-alist."
|
|
|
|
(let ((case-fold-search t) head info args indent)
|
|
|
|
(if (setq head (org-babel-where-is-src-block-head))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char head)
|
|
|
|
(setq info (org-babel-parse-src-block-match))
|
|
|
|
(setq indent (car (last info)))
|
|
|
|
(setq info (butlast info))
|
|
|
|
(forward-line -1)
|
|
|
|
(if (looking-at
|
|
|
|
(concat org-babel-source-name-regexp
|
|
|
|
"\\([^ ()\f\t\n\r\v]+\\)\\(\(\\(.*\\)\)\\|\\)"))
|
|
|
|
(progn
|
|
|
|
(setq info (append info (list (org-babel-clean-text-properties
|
|
|
|
(match-string 2)))))
|
|
|
|
;; Note that e.g. "name()" and "name( )" result in
|
|
|
|
;; ((:var . "")). We maintain that behaviour, and the
|
|
|
|
;; resulting non-nil sixth element is relied upon in
|
|
|
|
;; org-babel-exp-code to detect a functional-style
|
|
|
|
;; block in those cases. However, "name" without any
|
|
|
|
;; parentheses would result in the same thing, so we
|
|
|
|
;; explicitly avoid that.
|
|
|
|
(if (setq args (match-string 4))
|
|
|
|
(setq info
|
|
|
|
(append info (list
|
|
|
|
(mapcar
|
|
|
|
(lambda (ref) (cons :var ref))
|
|
|
|
(org-babel-ref-split-args args))))))
|
|
|
|
(unless header-vars-only
|
|
|
|
(setf (nth 2 info)
|
|
|
|
(org-babel-merge-params (nth 5 info) (nth 2 info)))))
|
|
|
|
(setq info (append info (list nil nil))))
|
|
|
|
(append info (list indent)))
|
|
|
|
(if (save-excursion ;; inline source block
|
|
|
|
(re-search-backward "[ \f\t\n\r\v]" nil t)
|
|
|
|
(looking-at org-babel-inline-src-block-regexp))
|
|
|
|
(org-babel-parse-inline-src-block-match)
|
|
|
|
nil))))
|
2010-06-11 18:25:37 -04:00
|
|
|
|
2010-06-30 15:25:22 -04:00
|
|
|
(defun org-babel-confirm-evaluate (info)
|
|
|
|
"Confirm that the user wishes to evaluate the code block
|
|
|
|
defined by INFO. This behavior can be suppressed by setting the
|
|
|
|
value of `org-confirm-babel-evaluate' to nil, in which case all
|
|
|
|
future interactive code block evaluations will proceed without
|
|
|
|
any confirmation from the user.
|
|
|
|
|
|
|
|
Note disabling confirmation may result in accidental evaluation
|
|
|
|
of potentially harmful code."
|
2010-07-06 12:39:07 -04:00
|
|
|
(let* ((eval (cdr (assoc :eval (nth 2 info))))
|
|
|
|
(query (or (equal eval "query")
|
|
|
|
(and (functionp org-confirm-babel-evaluate)
|
|
|
|
(funcall org-confirm-babel-evaluate
|
|
|
|
(nth 0 info) (nth 1 info)))
|
|
|
|
org-confirm-babel-evaluate)))
|
2010-07-05 18:45:34 -04:00
|
|
|
(when (or (equal eval "never")
|
2010-07-06 12:39:07 -04:00
|
|
|
(and query
|
2010-07-05 18:45:34 -04:00
|
|
|
(not (yes-or-no-p
|
2010-07-06 12:39:07 -04:00
|
|
|
(format "Evaluate this%scode on your system? "
|
2010-07-05 18:45:34 -04:00
|
|
|
(if info (format " %s " (nth 0 info)) " "))))))
|
|
|
|
(error "evaluation aborted"))))
|
2010-06-30 15:25:22 -04:00
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-execute-src-block-maybe ()
|
|
|
|
"Detect if this is context for a org-babel src-block and if so
|
|
|
|
then run `org-babel-execute-src-block'."
|
2009-05-22 19:23:52 -04:00
|
|
|
(interactive)
|
2010-06-30 15:25:22 -04:00
|
|
|
(if (not org-babel-no-eval-on-ctrl-c-ctrl-c)
|
|
|
|
(let ((info (org-babel-get-src-block-info)))
|
|
|
|
(if info
|
|
|
|
(progn (org-babel-execute-src-block current-prefix-arg info) t) nil))
|
|
|
|
nil))
|
2009-05-24 16:38:01 -04:00
|
|
|
(add-hook 'org-ctrl-c-ctrl-c-hook 'org-babel-execute-src-block-maybe)
|
2009-02-22 16:19:32 -05:00
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2010-04-20 01:40:58 -04:00
|
|
|
(defun org-babel-expand-src-block-maybe ()
|
|
|
|
"Detect if this is context for a org-babel src-block and if so
|
|
|
|
then run `org-babel-expand-src-block'."
|
|
|
|
(interactive)
|
|
|
|
(let ((info (org-babel-get-src-block-info)))
|
2010-06-07 16:14:52 -04:00
|
|
|
(if info
|
|
|
|
(progn (org-babel-expand-src-block current-prefix-arg info) t)
|
|
|
|
nil)))
|
2010-04-20 01:40:58 -04:00
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2009-09-24 23:58:28 -04:00
|
|
|
(defun org-babel-load-in-session-maybe ()
|
|
|
|
"Detect if this is context for a org-babel src-block and if so
|
|
|
|
then run `org-babel-load-in-session'."
|
|
|
|
(interactive)
|
|
|
|
(let ((info (org-babel-get-src-block-info)))
|
2010-06-07 16:14:52 -04:00
|
|
|
(if info
|
|
|
|
(progn (org-babel-load-in-session current-prefix-arg info) t)
|
|
|
|
nil)))
|
2009-09-24 23:58:28 -04:00
|
|
|
|
|
|
|
(add-hook 'org-metaup-hook 'org-babel-load-in-session-maybe)
|
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2009-06-14 14:08:12 -04:00
|
|
|
(defun org-babel-pop-to-session-maybe ()
|
|
|
|
"Detect if this is context for a org-babel src-block and if so
|
|
|
|
then run `org-babel-pop-to-session'."
|
|
|
|
(interactive)
|
|
|
|
(let ((info (org-babel-get-src-block-info)))
|
|
|
|
(if info (progn (org-babel-pop-to-session current-prefix-arg info) t) nil)))
|
|
|
|
|
|
|
|
(add-hook 'org-metadown-hook 'org-babel-pop-to-session-maybe)
|
|
|
|
|
2010-02-24 15:49:07 -05:00
|
|
|
(defconst org-babel-header-arg-names
|
2010-06-07 17:08:06 -04:00
|
|
|
'(cache cmdline colnames dir exports file noweb results
|
|
|
|
session tangle var noeval)
|
2010-02-27 10:26:50 -05:00
|
|
|
"Common header arguments used by org-babel. Note that
|
|
|
|
individual languages may define their own language specific
|
|
|
|
header arguments as well.")
|
2010-02-24 15:49:07 -05:00
|
|
|
|
2009-09-01 17:30:39 -04:00
|
|
|
(defvar org-babel-default-header-args
|
2010-04-17 16:03:30 -04:00
|
|
|
'((:session . "none") (:results . "replace") (:exports . "code")
|
2010-04-20 18:27:33 -04:00
|
|
|
(:cache . "no") (:noweb . "no") (:hlines . "no"))
|
2009-05-23 12:05:53 -04:00
|
|
|
"Default arguments to use when evaluating a source block.")
|
|
|
|
|
2009-10-24 20:23:31 -04:00
|
|
|
(defvar org-babel-default-inline-header-args
|
|
|
|
'((:session . "none") (:results . "silent") (:exports . "results"))
|
2009-04-26 14:42:36 -04:00
|
|
|
"Default arguments to use when evaluating an inline source block.")
|
|
|
|
|
2010-06-14 14:55:37 -04:00
|
|
|
(defvar org-babel-current-buffer-properties)
|
|
|
|
(make-variable-buffer-local 'org-babel-current-buffer-properties)
|
|
|
|
|
2009-11-20 12:40:50 -05:00
|
|
|
(defvar org-babel-result-regexp
|
2010-02-25 17:46:55 -05:00
|
|
|
"^[ \t]*#\\+res\\(ults\\|name\\)\\(\\[\\([[:alnum:]]+\\)\\]\\)?\\:"
|
2009-11-18 13:31:24 -05:00
|
|
|
"Regular expression used to match result lines. If the
|
2009-11-20 12:40:50 -05:00
|
|
|
results are associated with a hash key then the hash will be
|
|
|
|
saved in the second match data.")
|
|
|
|
|
2009-07-18 15:52:51 -04:00
|
|
|
(defvar org-babel-min-lines-for-block-output 10
|
2009-07-18 15:38:21 -04:00
|
|
|
"If number of lines of output is equal to or exceeds this
|
2009-11-20 12:40:50 -05:00
|
|
|
value, the output is placed in a #+begin_example...#+end_example
|
|
|
|
block. Otherwise the output is marked as literal by inserting
|
|
|
|
colons at the starts of the lines. This variable only takes
|
|
|
|
effect if the :results output option is in effect.")
|
2009-07-18 15:38:21 -04:00
|
|
|
|
2009-11-10 10:59:17 -05:00
|
|
|
(defvar org-babel-noweb-error-langs nil
|
|
|
|
"List of language for which errors should be raised when the
|
2009-11-20 12:40:50 -05:00
|
|
|
source code block satisfying a noweb reference in this language
|
|
|
|
can not be resolved.")
|
2009-11-10 10:59:17 -05:00
|
|
|
|
2009-11-18 01:15:04 -05:00
|
|
|
(defvar org-babel-hash-show 4
|
|
|
|
"Number of initial characters to show of a hidden results hash.")
|
|
|
|
|
2010-03-13 12:34:02 -05:00
|
|
|
(defvar org-babel-after-execute-hook nil
|
|
|
|
"Hook for functions to be called after `org-babel-execute-src-block'")
|
2009-06-13 18:46:26 -04:00
|
|
|
(defun org-babel-named-src-block-regexp-for-name (name)
|
2010-06-11 20:12:15 -04:00
|
|
|
"This generates a regexp used to match a src block named NAME."
|
2009-11-18 13:31:24 -05:00
|
|
|
(concat org-babel-source-name-regexp (regexp-quote name) "[ \t\n]*"
|
2009-08-14 21:34:23 -04:00
|
|
|
(substring org-babel-src-block-regexp 1)))
|
2009-06-13 18:46:26 -04:00
|
|
|
|
2009-02-22 16:19:32 -05:00
|
|
|
;;; functions
|
2010-06-14 20:51:52 -04:00
|
|
|
(defvar call-process-region)
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-execute-src-block (&optional arg info params)
|
2009-11-20 12:40:50 -05:00
|
|
|
"Execute the current source code block, and insert the results
|
|
|
|
into the buffer. Source code execution and the collection and
|
|
|
|
formatting of results can be controlled through a variety of
|
|
|
|
header arguments.
|
2009-04-26 14:42:36 -04:00
|
|
|
|
|
|
|
Optionally supply a value for INFO in the form returned by
|
2009-05-24 16:38:01 -04:00
|
|
|
`org-babel-get-src-block-info'.
|
2009-05-09 12:34:55 -04:00
|
|
|
|
|
|
|
Optionally supply a value for PARAMS which will be merged with
|
2009-11-20 12:40:50 -05:00
|
|
|
the header arguments specified at the front of the source code
|
|
|
|
block."
|
2009-05-21 10:22:24 -04:00
|
|
|
(interactive)
|
2009-05-24 16:38:01 -04:00
|
|
|
(let* ((info (or info (org-babel-get-src-block-info)))
|
2010-06-30 15:25:22 -04:00
|
|
|
;; note the `evaluation-confirmed' variable is currently not
|
|
|
|
;; used, but could be used later to avoid the need for
|
|
|
|
;; chaining confirmations
|
|
|
|
(evaluation-confirmed (org-babel-confirm-evaluate info))
|
2010-06-12 21:26:08 -04:00
|
|
|
(lang (nth 0 info))
|
|
|
|
(params (setf (nth 2 info)
|
|
|
|
(sort (org-babel-merge-params (nth 2 info) params)
|
2009-11-18 16:54:12 -05:00
|
|
|
(lambda (el1 el2) (string< (symbol-name (car el1))
|
2010-06-10 13:04:12 -04:00
|
|
|
(symbol-name (car el2)))))))
|
2010-04-17 16:03:30 -04:00
|
|
|
(new-hash
|
|
|
|
(if (and (cdr (assoc :cache params))
|
|
|
|
(string= "yes" (cdr (assoc :cache params))))
|
|
|
|
(org-babel-sha1-hash info)))
|
2009-11-20 12:40:50 -05:00
|
|
|
(old-hash (org-babel-result-hash info))
|
2010-06-12 21:26:08 -04:00
|
|
|
(body (setf (nth 1 info)
|
2009-12-18 15:35:30 -05:00
|
|
|
(if (and (cdr (assoc :noweb params))
|
|
|
|
(string= "yes" (cdr (assoc :noweb params))))
|
2010-06-10 17:36:08 -04:00
|
|
|
(org-babel-expand-noweb-references info)
|
2010-06-12 21:26:08 -04:00
|
|
|
(nth 1 info))))
|
2009-11-10 15:42:05 -05:00
|
|
|
(result-params (split-string (or (cdr (assoc :results params)) "")))
|
|
|
|
(result-type (cond ((member "output" result-params) 'output)
|
|
|
|
((member "value" result-params) 'value)
|
|
|
|
(t 'value)))
|
2009-05-24 16:38:01 -04:00
|
|
|
(cmd (intern (concat "org-babel-execute:" lang)))
|
2010-02-21 00:27:44 -05:00
|
|
|
(dir (cdr (assoc :dir params)))
|
|
|
|
(default-directory
|
2010-02-28 11:07:01 -05:00
|
|
|
(or (and dir (file-name-as-directory dir)) default-directory))
|
2010-06-12 19:18:50 -04:00
|
|
|
(org-babel-call-process-region-original
|
|
|
|
(if (boundp 'org-babel-call-process-region-original) org-babel-call-process-region-original
|
2010-02-27 14:22:13 -05:00
|
|
|
(symbol-function 'call-process-region)))
|
2010-06-10 17:36:08 -04:00
|
|
|
(indent (car (last info)))
|
2009-02-22 16:19:32 -05:00
|
|
|
result)
|
2010-04-04 19:08:27 -04:00
|
|
|
(unwind-protect
|
|
|
|
(flet ((call-process-region (&rest args)
|
2010-04-17 16:03:30 -04:00
|
|
|
(apply 'org-babel-tramp-handle-call-process-region args)))
|
2010-06-17 12:29:38 -04:00
|
|
|
(unless (fboundp cmd)
|
|
|
|
(error "No org-babel-execute function for %s!" lang))
|
2010-04-04 19:08:27 -04:00
|
|
|
(if (and (not arg) new-hash (equal new-hash old-hash))
|
|
|
|
(save-excursion ;; return cached result
|
|
|
|
(goto-char (org-babel-where-is-src-block-result nil info))
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(end-of-line 1) (forward-char 1)
|
2010-04-04 19:08:27 -04:00
|
|
|
(setq result (org-babel-read-result))
|
2010-04-17 16:03:30 -04:00
|
|
|
(message (replace-regexp-in-string "%" "%%"
|
|
|
|
(format "%S" result))) result)
|
2010-04-04 19:08:27 -04:00
|
|
|
(setq result (funcall cmd body params))
|
|
|
|
(if (eq result-type 'value)
|
|
|
|
(setq result (if (and (or (member "vector" result-params)
|
|
|
|
(member "table" result-params))
|
|
|
|
(not (listp result)))
|
|
|
|
(list (list result))
|
|
|
|
result)))
|
2010-06-12 19:13:34 -04:00
|
|
|
(org-babel-insert-result
|
|
|
|
result result-params info new-hash indent lang)
|
2010-04-04 19:08:27 -04:00
|
|
|
(run-hooks 'org-babel-after-execute-hook)
|
|
|
|
result))
|
2010-06-12 19:18:50 -04:00
|
|
|
(setq call-process-region 'org-babel-call-process-region-original))))
|
2009-07-16 16:21:07 -04:00
|
|
|
|
2010-04-20 22:43:35 -04:00
|
|
|
(defun org-babel-expand-body:generic (body params &optional processed-params)
|
|
|
|
"Expand a block of code with org-babel according to it's header
|
|
|
|
arguments. This generic implementation of body expansion is
|
|
|
|
called for languages which have not defined their own specific
|
|
|
|
org-babel-expand-body:lang function." body)
|
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2010-04-20 01:40:58 -04:00
|
|
|
(defun org-babel-expand-src-block (&optional arg info params)
|
|
|
|
"Expand the current source code block according to it's header
|
|
|
|
arguments, and pop open the results in a preview buffer."
|
|
|
|
(interactive)
|
|
|
|
(let* ((info (or info (org-babel-get-src-block-info)))
|
2010-06-12 21:26:08 -04:00
|
|
|
(lang (nth 0 info))
|
|
|
|
(params (setf (nth 2 info)
|
|
|
|
(sort (org-babel-merge-params (nth 2 info) params)
|
2010-04-20 01:40:58 -04:00
|
|
|
(lambda (el1 el2) (string< (symbol-name (car el1))
|
|
|
|
(symbol-name (car el2)))))))
|
2010-06-12 21:26:08 -04:00
|
|
|
(body (setf (nth 1 info)
|
2010-04-20 01:40:58 -04:00
|
|
|
(if (and (cdr (assoc :noweb params))
|
|
|
|
(string= "yes" (cdr (assoc :noweb params))))
|
2010-06-12 21:26:08 -04:00
|
|
|
(org-babel-expand-noweb-references info) (nth 1 info))))
|
2010-04-20 01:40:58 -04:00
|
|
|
(cmd (intern (concat "org-babel-expand-body:" lang)))
|
2010-04-20 22:43:35 -04:00
|
|
|
(expanded (funcall (if (fboundp cmd) cmd 'org-babel-expand-body:generic)
|
2010-04-21 11:41:03 -04:00
|
|
|
body params)))
|
|
|
|
(org-edit-src-code
|
|
|
|
nil expanded (concat "*Org-Babel Preview " (buffer-name) "[ " lang " ]*"))))
|
2010-04-20 01:40:58 -04:00
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2009-09-24 23:58:28 -04:00
|
|
|
(defun org-babel-load-in-session (&optional arg info)
|
|
|
|
"Load the body of the current source-code block. Evaluate the
|
|
|
|
header arguments for the source block before entering the
|
|
|
|
session. After loading the body this pops open the session."
|
|
|
|
(interactive)
|
|
|
|
(let* ((info (or info (org-babel-get-src-block-info)))
|
2010-06-12 21:26:08 -04:00
|
|
|
(lang (nth 0 info))
|
|
|
|
(body (nth 1 info))
|
|
|
|
(params (nth 2 info))
|
2010-06-17 12:29:38 -04:00
|
|
|
(session (cdr (assoc :session params)))
|
|
|
|
(cmd (intern (concat "org-babel-load-session:" lang))))
|
|
|
|
(unless (fboundp cmd)
|
|
|
|
(error "No org-babel-load-session function for %s!" lang))
|
|
|
|
(pop-to-buffer (funcall cmd session body params))
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(end-of-line 1)))
|
2009-09-24 23:58:28 -04:00
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2010-03-16 12:55:36 -04:00
|
|
|
(defun org-babel-switch-to-session (&optional arg info)
|
|
|
|
"Switch to the session of the current source-code block.
|
|
|
|
If called with a prefix argument then evaluate the header arguments
|
|
|
|
for the source block before entering the session. Copy the body
|
2009-07-28 10:30:23 -04:00
|
|
|
of the source block to the kill ring."
|
|
|
|
(interactive)
|
|
|
|
(let* ((info (or info (org-babel-get-src-block-info)))
|
2010-06-12 21:26:08 -04:00
|
|
|
(lang (nth 0 info))
|
|
|
|
(body (nth 1 info))
|
|
|
|
(params (nth 2 info))
|
2010-03-13 12:57:23 -05:00
|
|
|
(session (cdr (assoc :session params)))
|
|
|
|
(dir (cdr (assoc :dir params)))
|
|
|
|
(default-directory
|
2010-06-17 12:29:38 -04:00
|
|
|
(or (and dir (file-name-as-directory dir)) default-directory))
|
|
|
|
(cmd (intern (format "org-babel-%s-initiate-session" lang)))
|
|
|
|
(cmd2 (intern (concat "org-babel-prep-session:" lang))))
|
|
|
|
(unless (fboundp cmd)
|
|
|
|
(error "No org-babel-initiate-session function for %s!" lang))
|
2009-07-28 10:30:23 -04:00
|
|
|
;; copy body to the kill ring
|
2010-04-17 16:03:30 -04:00
|
|
|
(with-temp-buffer (insert (org-babel-trim body))
|
|
|
|
(copy-region-as-kill (point-min) (point-max)))
|
2009-07-28 10:30:23 -04:00
|
|
|
;; if called with a prefix argument, then process header arguments
|
2010-06-17 12:29:38 -04:00
|
|
|
(unless (fboundp cmd2)
|
|
|
|
(error "No org-babel-prep-session function for %s!" lang))
|
|
|
|
(when arg (funcall cmd2 session params))
|
2009-07-28 10:30:23 -04:00
|
|
|
;; just to the session using pop-to-buffer
|
2010-06-17 12:29:38 -04:00
|
|
|
(pop-to-buffer (funcall cmd session params))
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(end-of-line 1)))
|
2009-07-28 10:30:23 -04:00
|
|
|
|
2010-03-16 12:55:36 -04:00
|
|
|
(defalias 'org-babel-pop-to-session 'org-babel-switch-to-session)
|
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
(defvar org-bracket-link-regexp)
|
|
|
|
;;;###autoload
|
2009-07-25 17:37:34 -04:00
|
|
|
(defun org-babel-open-src-block-result (&optional re-run)
|
|
|
|
"If `point' is on a src block then open the results of the
|
|
|
|
source code block, otherwise return nil. With optional prefix
|
|
|
|
argument RE-RUN the source-code block is evaluated even if
|
|
|
|
results already exist."
|
2009-07-25 17:48:23 -04:00
|
|
|
(interactive "P")
|
2009-07-25 17:37:34 -04:00
|
|
|
(when (org-babel-get-src-block-info)
|
|
|
|
(save-excursion
|
|
|
|
;; go to the results, if there aren't any then run the block
|
|
|
|
(goto-char (or (and (not re-run) (org-babel-where-is-src-block-result))
|
|
|
|
(progn (org-babel-execute-src-block)
|
|
|
|
(org-babel-where-is-src-block-result))))
|
2010-06-11 11:07:19 -04:00
|
|
|
(end-of-line 1)
|
|
|
|
(while (looking-at "[\n\r\t\f ]") (forward-char 1))
|
2009-07-25 17:37:34 -04:00
|
|
|
;; open the results
|
|
|
|
(if (looking-at org-bracket-link-regexp)
|
2009-07-25 17:48:23 -04:00
|
|
|
;; file results
|
|
|
|
(org-open-at-point)
|
2009-07-25 17:37:34 -04:00
|
|
|
(let ((results (org-babel-read-result)))
|
2009-07-25 17:48:23 -04:00
|
|
|
(flet ((echo-res (result)
|
|
|
|
(if (stringp result) result (format "%S" result))))
|
|
|
|
(pop-to-buffer (get-buffer-create "org-babel-results"))
|
|
|
|
(delete-region (point-min) (point-max))
|
|
|
|
(if (listp results)
|
|
|
|
;; table result
|
|
|
|
(insert (orgtbl-to-generic results '(:sep "\t" :fmt echo-res)))
|
|
|
|
;; scalar result
|
|
|
|
(insert (echo-res results))))))
|
2009-07-25 17:37:34 -04:00
|
|
|
t)))
|
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2009-07-16 14:57:01 -04:00
|
|
|
(defun org-babel-execute-buffer (&optional arg)
|
2010-01-11 10:47:29 -05:00
|
|
|
"Call `org-babel-execute-src-block' on every source block in
|
|
|
|
the current buffer."
|
2009-02-23 18:14:48 -05:00
|
|
|
(interactive "P")
|
|
|
|
(save-excursion
|
2010-05-26 21:44:04 -04:00
|
|
|
(org-save-outline-visibility t
|
|
|
|
(goto-char (point-min))
|
|
|
|
(show-all)
|
|
|
|
(while (re-search-forward org-babel-src-block-regexp nil t)
|
|
|
|
(let ((pos-end (match-end 0)))
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(org-babel-execute-src-block arg)
|
|
|
|
(goto-char pos-end))))))
|
2009-02-23 18:14:48 -05:00
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2009-07-16 14:57:01 -04:00
|
|
|
(defun org-babel-execute-subtree (&optional arg)
|
2010-01-11 10:47:29 -05:00
|
|
|
"Call `org-babel-execute-src-block' on every source block in
|
|
|
|
the current subtree."
|
2009-02-22 16:19:32 -05:00
|
|
|
(interactive "P")
|
2010-06-07 14:51:30 -04:00
|
|
|
(save-restriction
|
|
|
|
(save-excursion
|
|
|
|
(org-narrow-to-subtree)
|
|
|
|
(org-babel-execute-buffer)
|
|
|
|
(widen))))
|
2009-02-22 16:19:32 -05:00
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2009-11-20 12:40:50 -05:00
|
|
|
(defun org-babel-sha1-hash (&optional info)
|
2010-06-11 20:12:15 -04:00
|
|
|
"Generate an sha1 hash based on the value of info."
|
2009-11-20 12:40:50 -05:00
|
|
|
(interactive)
|
|
|
|
(let* ((info (or info (org-babel-get-src-block-info)))
|
|
|
|
(hash (sha1 (format "%s-%s" (mapconcat (lambda (arg) (format "%S" arg))
|
2010-06-12 21:26:08 -04:00
|
|
|
(nth 2 info) ":")
|
|
|
|
(nth 1 info)))))
|
2009-11-20 12:40:50 -05:00
|
|
|
(when (interactive-p) (message hash))
|
|
|
|
hash))
|
|
|
|
|
|
|
|
(defun org-babel-result-hash (&optional info)
|
2010-06-11 20:12:15 -04:00
|
|
|
"Return the in-buffer hash associated with the results
|
|
|
|
specified in INFO."
|
2009-11-20 12:40:50 -05:00
|
|
|
(org-babel-where-is-src-block-result nil info)
|
2009-11-18 16:54:12 -05:00
|
|
|
(org-babel-clean-text-properties (match-string 3)))
|
2009-11-20 12:40:50 -05:00
|
|
|
|
2009-11-18 01:15:04 -05:00
|
|
|
(defun org-babel-hide-hash ()
|
|
|
|
"Hide the hash in the current results line. Only the initial
|
|
|
|
`org-babel-hash-show' characters of the hash will remain
|
|
|
|
visible."
|
2010-04-18 13:26:30 -04:00
|
|
|
(add-to-invisibility-spec '(org-babel-hide-hash . t))
|
2009-11-18 01:15:04 -05:00
|
|
|
(save-excursion
|
|
|
|
(when (and (re-search-forward org-babel-result-regexp nil t)
|
|
|
|
(match-string 3))
|
|
|
|
(let* ((start (match-beginning 3))
|
|
|
|
(hide-start (+ org-babel-hash-show start))
|
|
|
|
(end (match-end 3))
|
|
|
|
(hash (match-string 3))
|
|
|
|
ov1 ov2)
|
2010-04-18 10:37:42 -04:00
|
|
|
(setq ov1 (make-overlay start hide-start))
|
|
|
|
(setq ov2 (make-overlay hide-start end))
|
|
|
|
(overlay-put ov2 'invisible 'org-babel-hide-hash)
|
|
|
|
(overlay-put ov1 'babel-hash hash)))))
|
2009-11-18 01:15:04 -05:00
|
|
|
|
|
|
|
(defun org-babel-hide-all-hashes ()
|
|
|
|
"Hide the hash in the current buffer. Only the initial
|
|
|
|
`org-babel-hash-show' characters of each hash will remain
|
|
|
|
visible. This function should be called as part of the
|
|
|
|
`org-mode-hook'."
|
|
|
|
(save-excursion
|
|
|
|
(while (re-search-forward org-babel-result-regexp nil t)
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(org-babel-hide-hash)
|
|
|
|
(goto-char (match-end 0)))))
|
|
|
|
(add-hook 'org-mode-hook 'org-babel-hide-all-hashes)
|
|
|
|
|
|
|
|
(defun org-babel-hash-at-point (&optional point)
|
|
|
|
"Return the value of the hash at `point'. The hash is also
|
|
|
|
added as the last element of the kill ring. This can be called
|
|
|
|
with C-c C-c."
|
|
|
|
(interactive)
|
|
|
|
(let ((hash (car (delq nil (mapcar
|
2010-06-10 17:36:08 -04:00
|
|
|
(lambda (ol) (overlay-get ol 'babel-hash))
|
2010-04-20 06:17:06 -04:00
|
|
|
(overlays-at (or point (point))))))))
|
2009-11-18 01:15:04 -05:00
|
|
|
(when hash (kill-new hash) (message hash))))
|
|
|
|
(add-hook 'org-ctrl-c-ctrl-c-hook 'org-babel-hash-at-point)
|
|
|
|
|
2009-11-19 17:47:49 -05:00
|
|
|
(defun org-babel-result-hide-spec ()
|
2010-06-11 20:12:15 -04:00
|
|
|
"Add `org-babel-hide-result' as an invisibility spec for hiding
|
|
|
|
portions of results lines."
|
2010-04-18 13:26:30 -04:00
|
|
|
(add-to-invisibility-spec '(org-babel-hide-result . t)))
|
2009-11-19 17:47:49 -05:00
|
|
|
(add-hook 'org-mode-hook 'org-babel-result-hide-spec)
|
|
|
|
|
|
|
|
(defvar org-babel-hide-result-overlays nil
|
|
|
|
"Overlays hiding results.")
|
|
|
|
|
|
|
|
(defun org-babel-result-hide-all ()
|
|
|
|
"Fold all results in the current buffer."
|
|
|
|
(interactive)
|
|
|
|
(org-babel-show-result-all)
|
|
|
|
(save-excursion
|
|
|
|
(while (re-search-forward org-babel-result-regexp nil t)
|
|
|
|
(save-excursion (goto-char (match-beginning 0))
|
|
|
|
(org-babel-hide-result-toggle-maybe)))))
|
|
|
|
|
|
|
|
(defun org-babel-show-result-all ()
|
|
|
|
"Unfold all results in the current buffer."
|
2010-04-18 10:37:42 -04:00
|
|
|
(mapc 'delete-overlay org-babel-hide-result-overlays)
|
2009-11-19 17:47:49 -05:00
|
|
|
(setq org-babel-hide-result-overlays nil))
|
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2009-11-19 17:47:49 -05:00
|
|
|
(defun org-babel-hide-result-toggle-maybe ()
|
|
|
|
"Toggle visibility of result at point."
|
|
|
|
(interactive)
|
|
|
|
(let ((case-fold-search t))
|
|
|
|
(if (save-excursion
|
|
|
|
(beginning-of-line 1)
|
|
|
|
(looking-at org-babel-result-regexp))
|
|
|
|
(progn (org-babel-hide-result-toggle)
|
|
|
|
t) ;; to signal that we took action
|
|
|
|
nil))) ;; to signal that we did not
|
|
|
|
|
|
|
|
(defun org-babel-hide-result-toggle (&optional force)
|
|
|
|
"Toggle the visibility of the current result."
|
|
|
|
(interactive)
|
|
|
|
(save-excursion
|
|
|
|
(beginning-of-line)
|
|
|
|
(if (re-search-forward org-babel-result-regexp nil t)
|
|
|
|
(let ((start (progn (beginning-of-line 2) (- (point) 1)))
|
|
|
|
(end (progn (goto-char (- (org-babel-result-end) 1)) (point)))
|
|
|
|
ov)
|
|
|
|
(if (memq t (mapcar (lambda (overlay)
|
2010-04-18 10:37:42 -04:00
|
|
|
(eq (overlay-get overlay 'invisible)
|
2009-11-19 17:47:49 -05:00
|
|
|
'org-babel-hide-result))
|
2010-04-20 06:17:06 -04:00
|
|
|
(overlays-at start)))
|
2009-11-19 17:47:49 -05:00
|
|
|
(if (or (not force) (eq force 'off))
|
|
|
|
(mapc (lambda (ov)
|
|
|
|
(when (member ov org-babel-hide-result-overlays)
|
|
|
|
(setq org-babel-hide-result-overlays
|
|
|
|
(delq ov org-babel-hide-result-overlays)))
|
2010-04-18 10:37:42 -04:00
|
|
|
(when (eq (overlay-get ov 'invisible)
|
2009-11-19 17:47:49 -05:00
|
|
|
'org-babel-hide-result)
|
2010-04-18 10:37:42 -04:00
|
|
|
(delete-overlay ov)))
|
2010-04-20 06:17:06 -04:00
|
|
|
(overlays-at start)))
|
2010-04-18 10:37:42 -04:00
|
|
|
(setq ov (make-overlay start end))
|
|
|
|
(overlay-put ov 'invisible 'org-babel-hide-result)
|
2009-11-19 17:47:49 -05:00
|
|
|
;; make the block accessible to isearch
|
2010-04-18 10:37:42 -04:00
|
|
|
(overlay-put
|
2009-11-19 17:47:49 -05:00
|
|
|
ov 'isearch-open-invisible
|
|
|
|
(lambda (ov)
|
|
|
|
(when (member ov org-babel-hide-result-overlays)
|
|
|
|
(setq org-babel-hide-result-overlays
|
|
|
|
(delq ov org-babel-hide-result-overlays)))
|
2010-04-18 10:37:42 -04:00
|
|
|
(when (eq (overlay-get ov 'invisible)
|
2009-11-19 17:47:49 -05:00
|
|
|
'org-babel-hide-result)
|
2010-04-18 10:37:42 -04:00
|
|
|
(delete-overlay ov))))
|
2009-11-19 17:47:49 -05:00
|
|
|
(push ov org-babel-hide-result-overlays)))
|
|
|
|
(error "Not looking at a result line"))))
|
|
|
|
|
|
|
|
;; org-tab-after-check-for-cycling-hook
|
|
|
|
(add-hook 'org-tab-first-hook 'org-babel-hide-result-toggle-maybe)
|
|
|
|
;; Remove overlays when changing major mode
|
|
|
|
(add-hook 'org-mode-hook
|
|
|
|
(lambda () (org-add-hook 'change-major-mode-hook
|
2010-06-10 17:36:08 -04:00
|
|
|
'org-babel-show-result-all 'append 'local)))
|
2009-11-19 17:47:49 -05:00
|
|
|
|
2009-06-14 17:10:04 -04:00
|
|
|
(defmacro org-babel-map-source-blocks (file &rest body)
|
|
|
|
"Evaluate BODY forms on each source-block in FILE."
|
|
|
|
(declare (indent 1))
|
2010-06-02 09:18:36 -04:00
|
|
|
`(let ((visited-p (get-file-buffer (expand-file-name ,file)))
|
|
|
|
to-be-removed)
|
2009-08-02 13:36:54 -04:00
|
|
|
(save-window-excursion
|
2010-06-02 09:18:36 -04:00
|
|
|
(find-file ,file)
|
|
|
|
(setq to-be-removed (current-buffer))
|
|
|
|
(goto-char (point-min))
|
2009-08-02 13:36:54 -04:00
|
|
|
(while (re-search-forward org-babel-src-block-regexp nil t)
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(save-match-data ,@body)
|
|
|
|
(goto-char (match-end 0))))
|
2010-06-02 09:18:36 -04:00
|
|
|
(unless visited-p
|
|
|
|
(kill-buffer to-be-removed))))
|
2009-06-14 01:08:27 -04:00
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
(defvar org-file-properties)
|
2010-05-28 09:50:20 -04:00
|
|
|
(defun org-babel-params-from-properties (&optional lang)
|
2009-08-01 17:43:37 -04:00
|
|
|
"Return an association list of any source block params which
|
|
|
|
may be specified in the properties of the current outline entry."
|
2009-08-01 20:06:46 -04:00
|
|
|
(save-match-data
|
2010-05-28 09:50:20 -04:00
|
|
|
(let (val sym)
|
|
|
|
(delq nil
|
|
|
|
(mapcar
|
|
|
|
(lambda (header-arg)
|
|
|
|
(and (setq val
|
|
|
|
(or (condition-case nil
|
|
|
|
(org-entry-get (point) header-arg t)
|
|
|
|
(error nil))
|
|
|
|
(cdr (assoc header-arg org-file-properties))))
|
|
|
|
(cons (intern (concat ":" header-arg)) val)))
|
|
|
|
(mapcar
|
|
|
|
'symbol-name
|
|
|
|
(append
|
|
|
|
org-babel-header-arg-names
|
|
|
|
(progn
|
|
|
|
(setq sym (intern (concat "org-babel-header-arg-names:" lang)))
|
|
|
|
(and (boundp sym) (eval sym))))))))))
|
2009-08-01 17:43:37 -04:00
|
|
|
|
2010-06-14 14:55:37 -04:00
|
|
|
(defun org-babel-params-from-buffer ()
|
|
|
|
"Return an association list of any source block params which
|
|
|
|
may be specified at the top of the current buffer."
|
|
|
|
(or org-babel-current-buffer-properties
|
|
|
|
(setq org-babel-current-buffer-properties
|
2010-06-22 14:46:28 -04:00
|
|
|
(save-match-data
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(widen)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(when (re-search-forward
|
|
|
|
(org-make-options-regexp (list "BABEL")) nil t)
|
|
|
|
(org-babel-parse-header-arguments
|
|
|
|
(org-match-string-no-properties 2)))))))))
|
2010-06-14 14:55:37 -04:00
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
(defvar org-src-preserve-indentation)
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-parse-src-block-match ()
|
2010-06-11 20:12:15 -04:00
|
|
|
"Parse the match data resulting from a match of the
|
|
|
|
`org-babel-src-block-regexp'."
|
2010-06-10 17:36:08 -04:00
|
|
|
(let* ((block-indentation (length (match-string 1)))
|
|
|
|
(lang (org-babel-clean-text-properties (match-string 2)))
|
2009-08-09 10:29:06 -04:00
|
|
|
(lang-headers (intern (concat "org-babel-default-header-args:" lang)))
|
2010-06-10 17:36:08 -04:00
|
|
|
(switches (match-string 3))
|
|
|
|
(body (org-babel-clean-text-properties (match-string 5)))
|
2009-10-31 21:19:38 -04:00
|
|
|
(preserve-indentation (or org-src-preserve-indentation
|
|
|
|
(string-match "-i\\>" switches))))
|
2009-07-17 00:50:02 -04:00
|
|
|
(list lang
|
2010-04-17 16:03:30 -04:00
|
|
|
;; get block body less properties, protective commas, and indentation
|
2009-09-01 17:30:39 -04:00
|
|
|
(with-temp-buffer
|
2009-08-09 10:29:06 -04:00
|
|
|
(save-match-data
|
|
|
|
(insert (org-babel-strip-protective-commas body))
|
2009-10-07 23:59:45 -04:00
|
|
|
(unless preserve-indentation (org-do-remove-indentation))
|
2009-08-09 10:29:06 -04:00
|
|
|
(buffer-string)))
|
2009-07-17 00:50:02 -04:00
|
|
|
(org-babel-merge-params
|
|
|
|
org-babel-default-header-args
|
2010-06-14 14:55:37 -04:00
|
|
|
(org-babel-params-from-buffer)
|
2010-05-28 09:50:20 -04:00
|
|
|
(org-babel-params-from-properties lang)
|
2009-07-17 00:50:02 -04:00
|
|
|
(if (boundp lang-headers) (eval lang-headers) nil)
|
2010-04-17 16:03:30 -04:00
|
|
|
(org-babel-parse-header-arguments
|
2010-06-10 17:36:08 -04:00
|
|
|
(org-babel-clean-text-properties (or (match-string 4) ""))))
|
|
|
|
switches
|
|
|
|
block-indentation)))
|
2009-04-26 16:29:59 -04:00
|
|
|
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-parse-inline-src-block-match ()
|
2010-06-11 20:12:15 -04:00
|
|
|
"Parse the match data resulting from a match of the
|
|
|
|
`org-babel-inline-src-block-regexp'."
|
2009-10-26 22:08:34 -04:00
|
|
|
(let* ((lang (org-babel-clean-text-properties (match-string 2)))
|
2009-07-16 20:52:31 -04:00
|
|
|
(lang-headers (intern (concat "org-babel-default-header-args:" lang))))
|
|
|
|
(list lang
|
2010-04-17 16:03:30 -04:00
|
|
|
(org-babel-strip-protective-commas
|
|
|
|
(org-babel-clean-text-properties (match-string 5)))
|
2009-07-17 23:36:47 -04:00
|
|
|
(org-babel-merge-params
|
2009-07-16 20:52:31 -04:00
|
|
|
org-babel-default-inline-header-args
|
2010-06-14 14:55:37 -04:00
|
|
|
(org-babel-params-from-buffer)
|
2010-05-28 09:50:20 -04:00
|
|
|
(org-babel-params-from-properties lang)
|
2009-07-16 20:52:31 -04:00
|
|
|
(if (boundp lang-headers) (eval lang-headers) nil)
|
2010-04-17 16:03:30 -04:00
|
|
|
(org-babel-parse-header-arguments
|
|
|
|
(org-babel-clean-text-properties (or (match-string 4) "")))))))
|
2009-04-26 16:29:59 -04:00
|
|
|
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-parse-header-arguments (arg-string)
|
2009-02-23 01:19:34 -05:00
|
|
|
"Parse a string of header arguments returning an alist."
|
2009-07-11 03:01:54 -04:00
|
|
|
(if (> (length arg-string) 0)
|
|
|
|
(delq nil
|
|
|
|
(mapcar
|
|
|
|
(lambda (arg)
|
2010-04-17 16:03:30 -04:00
|
|
|
(if (string-match
|
|
|
|
"\\([^ \f\t\n\r\v]+\\)[ \f\t\n\r\v]+\\([^ \f\t\n\r\v]+.*\\)"
|
|
|
|
arg)
|
2009-07-11 03:01:54 -04:00
|
|
|
(cons (intern (concat ":" (match-string 1 arg)))
|
2009-10-27 17:52:01 -04:00
|
|
|
(let ((raw (org-babel-chomp (match-string 2 arg))))
|
2010-04-17 16:03:30 -04:00
|
|
|
(if (org-babel-number-p raw)
|
|
|
|
raw (org-babel-read raw))))
|
2009-07-11 03:01:54 -04:00
|
|
|
(cons (intern (concat ":" arg)) nil)))
|
|
|
|
(split-string (concat " " arg-string) "[ \f\t\n\r\v]+:" t)))))
|
2009-02-23 01:19:34 -05:00
|
|
|
|
2009-07-16 16:21:07 -04:00
|
|
|
(defun org-babel-process-params (params)
|
|
|
|
"Parse params and resolve references.
|
|
|
|
|
2010-04-19 09:26:02 -04:00
|
|
|
Return a list (session vars result-params result-type colnames rownames)."
|
2009-07-16 16:21:07 -04:00
|
|
|
(let* ((session (cdr (assoc :session params)))
|
2010-04-20 01:33:47 -04:00
|
|
|
(vars-and-names (org-babel-disassemble-tables
|
2010-04-19 09:26:02 -04:00
|
|
|
(org-babel-ref-variables params)
|
|
|
|
(cdr (assoc :hlines params))
|
|
|
|
(cdr (assoc :colnames params))
|
|
|
|
(cdr (assoc :rownames params))))
|
|
|
|
(vars (car vars-and-names))
|
|
|
|
(colnames (cadr vars-and-names))
|
|
|
|
(rownames (caddr vars-and-names))
|
2009-07-16 16:21:07 -04:00
|
|
|
(result-params (split-string (or (cdr (assoc :results params)) "")))
|
|
|
|
(result-type (cond ((member "output" result-params) 'output)
|
|
|
|
((member "value" result-params) 'value)
|
|
|
|
(t 'value))))
|
2010-04-19 09:26:02 -04:00
|
|
|
(list session vars result-params result-type colnames rownames)))
|
|
|
|
|
|
|
|
;; row and column names
|
|
|
|
(defun org-babel-del-hlines (table)
|
|
|
|
"Remove all 'hlines from TABLE."
|
|
|
|
(remove 'hline table))
|
|
|
|
|
|
|
|
(defun org-babel-get-colnames (table)
|
2010-06-11 20:12:15 -04:00
|
|
|
"Return a cons cell, the `car' of which contains the TABLE less
|
|
|
|
colnames, and the `cdr' of which contains a list of the column
|
|
|
|
names."
|
2010-06-12 21:26:08 -04:00
|
|
|
(if (equal 'hline (nth 1 table))
|
2010-04-19 09:26:02 -04:00
|
|
|
(cons (cddr table) (car table))
|
2010-04-30 15:03:38 -04:00
|
|
|
(cons (cdr table) (car table))))
|
2010-04-19 09:26:02 -04:00
|
|
|
|
|
|
|
(defun org-babel-get-rownames (table)
|
|
|
|
"Return a cons cell, the `car' of which contains the TABLE less
|
2010-06-11 20:12:15 -04:00
|
|
|
colnames, and the `cdr' of which contains a list of the column
|
|
|
|
names. Note: this function removes any hlines in TABLE."
|
2010-04-19 09:26:02 -04:00
|
|
|
(flet ((trans (table) (apply #'mapcar* #'list table)))
|
|
|
|
(let* ((width (apply 'max (mapcar (lambda (el) (if (listp el) (length el) 0)) table)))
|
|
|
|
(table (trans (mapcar (lambda (row)
|
|
|
|
(if (not (equal row 'hline))
|
|
|
|
row
|
|
|
|
(setq row '())
|
|
|
|
(dotimes (n width) (setq row (cons 'hline row)))
|
|
|
|
row))
|
2010-04-19 17:30:38 -04:00
|
|
|
table))))
|
2010-04-19 09:26:02 -04:00
|
|
|
(cons (mapcar (lambda (row) (if (equal (car row) 'hline) 'hline row))
|
|
|
|
(trans (cdr table)))
|
|
|
|
(remove 'hline (car table))))))
|
|
|
|
|
|
|
|
(defun org-babel-put-colnames (table colnames)
|
|
|
|
"Add COLNAMES to TABLE if they exist."
|
|
|
|
(if colnames (apply 'list colnames 'hline table) table))
|
|
|
|
|
|
|
|
(defun org-babel-put-rownames (table rownames)
|
|
|
|
"Add ROWNAMES to TABLE if they exist."
|
|
|
|
(if rownames
|
|
|
|
(mapcar (lambda (row)
|
|
|
|
(if (listp row)
|
|
|
|
(cons (or (pop rownames) "") row)
|
|
|
|
row)) table)
|
|
|
|
table))
|
|
|
|
|
2010-04-20 01:33:47 -04:00
|
|
|
(defun org-babel-pick-name (names selector)
|
|
|
|
"Select one out of an alist of row or column names."
|
|
|
|
(when names
|
|
|
|
(if (and selector (symbolp selector) (not (equal t selector)))
|
|
|
|
(cdr (assoc selector names))
|
|
|
|
(if (integerp selector)
|
|
|
|
(nth (- selector 1) names)
|
|
|
|
(cdr (car (last names)))))))
|
|
|
|
|
|
|
|
(defun org-babel-disassemble-tables (vars hlines colnames rownames)
|
2010-04-19 09:26:02 -04:00
|
|
|
"Process the variables in VARS according to the HLINES,
|
|
|
|
ROWNAMES and COLNAMES header arguments. Return a list consisting
|
|
|
|
of the vars, cnames and rnames."
|
2010-04-20 01:33:47 -04:00
|
|
|
(let (cnames rnames)
|
|
|
|
(list
|
|
|
|
(mapcar
|
|
|
|
(lambda (var)
|
|
|
|
(when (listp (cdr var))
|
|
|
|
(when (and (not (equal colnames "no"))
|
2010-06-12 21:26:08 -04:00
|
|
|
(or colnames (and (equal (nth 1 (cdr var)) 'hline)
|
2010-04-20 01:33:47 -04:00
|
|
|
(not (member 'hline (cddr (cdr var)))))))
|
|
|
|
(let ((both (org-babel-get-colnames (cdr var))))
|
|
|
|
(setq cnames (cons (cons (car var) (cdr both))
|
|
|
|
cnames))
|
|
|
|
(setq var (cons (car var) (car both)))))
|
|
|
|
(when (and rownames (not (equal rownames "no")))
|
|
|
|
(let ((both (org-babel-get-rownames (cdr var))))
|
|
|
|
(setq rnames (cons (cons (car var) (cdr both))
|
|
|
|
rnames))
|
|
|
|
(setq var (cons (car var) (car both)))))
|
|
|
|
(when (and hlines (not (equal hlines "yes")))
|
|
|
|
(setq var (cons (car var) (org-babel-del-hlines (cdr var))))))
|
|
|
|
var)
|
|
|
|
vars)
|
|
|
|
cnames rnames)))
|
2010-04-19 09:26:02 -04:00
|
|
|
|
|
|
|
(defun org-babel-reassemble-table (table colnames rownames)
|
|
|
|
"Given a TABLE and set of COLNAMES and ROWNAMES add the names
|
|
|
|
to the table for reinsertion to org-mode."
|
|
|
|
(if (listp table)
|
|
|
|
((lambda (table)
|
2010-04-23 13:54:31 -04:00
|
|
|
(if (and colnames (listp (car table)) (= (length (car table))
|
|
|
|
(length colnames)))
|
|
|
|
(org-babel-put-colnames table colnames) table))
|
|
|
|
(if (and rownames (= (length table) (length rownames)))
|
|
|
|
(org-babel-put-rownames table rownames) table))
|
2010-04-19 09:26:02 -04:00
|
|
|
table))
|
2009-07-16 16:21:07 -04:00
|
|
|
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-where-is-src-block-head ()
|
2009-05-21 09:40:04 -04:00
|
|
|
"Return the point at the beginning of the current source
|
|
|
|
block. Specifically at the beginning of the #+BEGIN_SRC line.
|
|
|
|
If the point is not on a source block then return nil."
|
|
|
|
(let ((initial (point)) top bottom)
|
|
|
|
(or
|
2009-11-18 13:31:24 -05:00
|
|
|
(save-excursion ;; on a source name line
|
2009-05-21 09:40:04 -04:00
|
|
|
(beginning-of-line 1)
|
2009-11-18 13:31:24 -05:00
|
|
|
(and (looking-at org-babel-source-name-regexp) (forward-line 1)
|
2009-05-24 16:38:01 -04:00
|
|
|
(looking-at org-babel-src-block-regexp)
|
2009-05-21 09:40:04 -04:00
|
|
|
(point)))
|
|
|
|
(save-excursion ;; on a #+begin_src line
|
|
|
|
(beginning-of-line 1)
|
2009-05-24 16:38:01 -04:00
|
|
|
(and (looking-at org-babel-src-block-regexp)
|
2009-05-21 09:40:04 -04:00
|
|
|
(point)))
|
|
|
|
(save-excursion ;; inside a src block
|
|
|
|
(and
|
2010-03-22 13:09:37 -04:00
|
|
|
(re-search-backward "^[ \t]*#\\+begin_src" nil t) (setq top (point))
|
|
|
|
(re-search-forward "^[ \t]*#\\+end_src" nil t) (setq bottom (point))
|
2009-05-21 09:40:04 -04:00
|
|
|
(< top initial) (< initial bottom)
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(progn (goto-char top) (beginning-of-line 1)
|
|
|
|
(looking-at org-babel-src-block-regexp))
|
2009-05-21 09:40:04 -04:00
|
|
|
(point))))))
|
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
;;;###autoload
|
2009-06-15 01:06:11 -04:00
|
|
|
(defun org-babel-goto-named-source-block (&optional name)
|
|
|
|
"Go to a named source-code block."
|
|
|
|
(interactive "ssource-block name: ")
|
2009-06-15 15:43:15 -04:00
|
|
|
(let ((point (org-babel-find-named-block name)))
|
2009-06-15 01:06:11 -04:00
|
|
|
(if point
|
|
|
|
;; taken from `org-open-at-point'
|
2009-06-15 15:43:15 -04:00
|
|
|
(progn (goto-char point) (org-show-context))
|
2009-06-15 01:06:11 -04:00
|
|
|
(message "source-code block '%s' not found in this buffer" name))))
|
|
|
|
|
2009-06-13 18:43:24 -04:00
|
|
|
(defun org-babel-find-named-block (name)
|
|
|
|
"Find a named source-code block.
|
2009-11-18 13:31:24 -05:00
|
|
|
Return the location of the source block identified by source
|
|
|
|
NAME, or nil if no such block exists. Set match data according to
|
|
|
|
org-babel-named-src-block-regexp."
|
2009-06-13 18:43:24 -04:00
|
|
|
(save-excursion
|
|
|
|
(let ((case-fold-search t)
|
2009-06-13 22:48:44 -04:00
|
|
|
(regexp (org-babel-named-src-block-regexp-for-name name)) msg)
|
2009-06-15 01:06:11 -04:00
|
|
|
(goto-char (point-min))
|
|
|
|
(when (or (re-search-forward regexp nil t)
|
|
|
|
(re-search-backward regexp nil t))
|
|
|
|
(match-beginning 0)))))
|
2009-06-13 18:43:24 -04:00
|
|
|
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-find-named-result (name)
|
2009-05-21 09:40:04 -04:00
|
|
|
"Return the location of the result named NAME in the current
|
|
|
|
buffer or nil if no such result exists."
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
2009-11-20 12:40:50 -05:00
|
|
|
(when (re-search-forward
|
2010-04-17 16:03:30 -04:00
|
|
|
(concat org-babel-result-regexp
|
|
|
|
"[ \t]" (regexp-quote name) "[ \t\n\f\v\r]") nil t)
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(beginning-of-line 0) (point))))
|
2009-05-21 09:40:04 -04:00
|
|
|
|
2010-06-17 13:22:54 -04:00
|
|
|
(defvar org-babel-lob-one-liner-regexp)
|
2010-06-10 17:36:08 -04:00
|
|
|
(defun org-babel-where-is-src-block-result (&optional insert info hash indent)
|
2009-05-21 09:40:04 -04:00
|
|
|
"Return the point at the beginning of the result of the current
|
2009-11-20 12:40:50 -05:00
|
|
|
source block. Specifically at the beginning of the results line.
|
|
|
|
If no result exists for this block then create a results line
|
|
|
|
following the source block."
|
2009-05-21 09:40:04 -04:00
|
|
|
(save-excursion
|
2009-07-11 13:39:05 -04:00
|
|
|
(let* ((on-lob-line (progn (beginning-of-line 1)
|
|
|
|
(looking-at org-babel-lob-one-liner-regexp)))
|
2010-06-10 17:36:08 -04:00
|
|
|
(name (if on-lob-line
|
2010-06-12 21:26:08 -04:00
|
|
|
(nth 0 (org-babel-lob-get-info))
|
|
|
|
(nth 4 (or info (org-babel-get-src-block-info)))))
|
2009-07-17 09:54:11 -04:00
|
|
|
(head (unless on-lob-line (org-babel-where-is-src-block-head))) end)
|
2009-07-17 00:18:03 -04:00
|
|
|
(when head (goto-char head))
|
2009-08-18 20:25:07 -04:00
|
|
|
(or (and name (org-babel-find-named-result name))
|
2010-03-22 13:09:37 -04:00
|
|
|
(and (or on-lob-line (re-search-forward "^[ \t]*#\\+end_src" nil t))
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(progn (end-of-line 1)
|
2009-05-29 23:34:50 -04:00
|
|
|
(if (eobp) (insert "\n") (forward-char 1))
|
|
|
|
(setq end (point))
|
2009-09-28 23:18:01 -04:00
|
|
|
(or (and (not name)
|
2009-11-20 12:40:50 -05:00
|
|
|
(progn ;; unnamed results line already exists
|
2009-09-28 23:18:01 -04:00
|
|
|
(re-search-forward "[^ \f\t\n\r\v]" nil t)
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(beginning-of-line 1)
|
2010-04-17 16:03:30 -04:00
|
|
|
(looking-at
|
|
|
|
(concat org-babel-result-regexp "\n"))))
|
|
|
|
;; or (with optional insert) back up and
|
|
|
|
;; make one ourselves
|
2009-08-18 20:25:07 -04:00
|
|
|
(when insert
|
2009-11-27 14:03:25 -05:00
|
|
|
(goto-char end)
|
2010-04-17 16:03:30 -04:00
|
|
|
(if (looking-at "[\n\r]")
|
|
|
|
(forward-char 1) (insert "\n"))
|
2010-06-10 17:36:08 -04:00
|
|
|
(insert (concat
|
|
|
|
(if indent
|
|
|
|
(mapconcat
|
|
|
|
(lambda (el) " ")
|
|
|
|
(number-sequence 1 indent) "")
|
|
|
|
"")
|
|
|
|
"#+results"
|
|
|
|
(when hash (concat "["hash"]"))
|
|
|
|
":"
|
2010-06-15 19:36:07 -04:00
|
|
|
(when name (concat " " name)) "\n\n"))
|
|
|
|
(backward-char)
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(beginning-of-line 0)
|
2009-11-18 01:15:04 -05:00
|
|
|
(if hash (org-babel-hide-hash)) t)))
|
2009-05-21 09:40:04 -04:00
|
|
|
(point))))))
|
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
(defvar org-block-regexp)
|
2009-07-24 22:52:55 -04:00
|
|
|
(defun org-babel-read-result ()
|
|
|
|
"Read the result at `point' into emacs-lisp."
|
2009-11-02 00:29:26 -05:00
|
|
|
(let ((case-fold-search t) result-string)
|
|
|
|
(cond
|
|
|
|
((org-at-table-p) (org-babel-read-table))
|
2010-02-09 21:38:50 -05:00
|
|
|
((looking-at org-bracket-link-regexp) (org-babel-read-link))
|
2009-11-02 00:48:44 -05:00
|
|
|
((looking-at org-block-regexp) (org-babel-trim (match-string 4)))
|
2010-06-10 17:36:08 -04:00
|
|
|
((looking-at "^[ \t]*: ")
|
2009-11-02 00:29:26 -05:00
|
|
|
(setq result-string
|
|
|
|
(org-babel-trim
|
2010-04-17 16:03:30 -04:00
|
|
|
(mapconcat (lambda (line)
|
|
|
|
(if (and (> (length line) 1)
|
2010-06-10 17:36:08 -04:00
|
|
|
(string-match "^[ \t]*: \\(.+\\)" line))
|
|
|
|
(match-string 1 line)
|
2010-04-17 16:03:30 -04:00
|
|
|
line))
|
2009-11-02 00:29:26 -05:00
|
|
|
(split-string
|
2010-04-17 16:03:30 -04:00
|
|
|
(buffer-substring
|
|
|
|
(point) (org-babel-result-end)) "[\r\n]+")
|
2009-11-02 00:29:26 -05:00
|
|
|
"\n")))
|
|
|
|
(or (org-babel-number-p result-string) result-string))
|
2009-11-20 12:40:50 -05:00
|
|
|
((looking-at org-babel-result-regexp)
|
2009-11-02 00:29:26 -05:00
|
|
|
(save-excursion (forward-line 1) (org-babel-read-result))))))
|
2009-07-24 22:52:55 -04:00
|
|
|
|
|
|
|
(defun org-babel-read-table ()
|
|
|
|
"Read the table at `point' into emacs-lisp."
|
|
|
|
(mapcar (lambda (row)
|
|
|
|
(if (and (symbolp row) (equal row 'hline)) row
|
|
|
|
(mapcar #'org-babel-read row)))
|
|
|
|
(org-table-to-lisp)))
|
|
|
|
|
2010-06-23 14:24:33 -04:00
|
|
|
(defvar org-link-types-re)
|
2010-02-09 21:38:50 -05:00
|
|
|
(defun org-babel-read-link ()
|
|
|
|
"Read the link at `point' into emacs-lisp. If the path of the
|
|
|
|
link is a file path it is expanded using `expand-file-name'."
|
|
|
|
(let* ((case-fold-search t)
|
|
|
|
(raw (and (looking-at org-bracket-link-regexp)
|
|
|
|
(org-babel-clean-text-properties (match-string 1))))
|
|
|
|
(type (and (string-match org-link-types-re raw)
|
|
|
|
(match-string 1 raw))))
|
|
|
|
(cond
|
|
|
|
((not type) (expand-file-name raw))
|
|
|
|
((string= type "file")
|
|
|
|
(and (string-match "file\\(.*\\):\\(.+\\)" raw)
|
|
|
|
(expand-file-name (match-string 2 raw))))
|
|
|
|
(t raw))))
|
|
|
|
|
2010-06-12 19:13:34 -04:00
|
|
|
(defun org-babel-insert-result
|
|
|
|
(result &optional result-params info hash indent lang)
|
2009-02-23 01:19:34 -05:00
|
|
|
"Insert RESULT into the current buffer after the end of the
|
2009-11-20 12:40:50 -05:00
|
|
|
current source block. With optional argument RESULT-PARAMS
|
|
|
|
controls insertion of results in the org-mode file.
|
|
|
|
RESULT-PARAMS can take the following values...
|
2009-04-01 18:46:55 -04:00
|
|
|
|
2009-08-18 19:55:10 -04:00
|
|
|
replace - (default option) insert results after the source block
|
|
|
|
replacing any previously inserted results
|
2009-07-18 00:06:37 -04:00
|
|
|
|
2009-08-18 19:55:10 -04:00
|
|
|
silent -- no results are inserted
|
2009-04-01 18:46:55 -04:00
|
|
|
|
2009-08-24 13:35:59 -04:00
|
|
|
file ---- the results are interpreted as a file path, and are
|
|
|
|
inserted into the buffer using the Org-mode file syntax
|
|
|
|
|
2009-08-18 19:55:10 -04:00
|
|
|
raw ----- results are added directly to the org-mode file. This
|
|
|
|
is a good option if you code block will output org-mode
|
|
|
|
formatted text.
|
|
|
|
|
|
|
|
org ----- this is the same as the 'raw' option
|
|
|
|
|
|
|
|
html ---- results are added inside of a #+BEGIN_HTML block. This
|
|
|
|
is a good option if you code block will output html
|
|
|
|
formatted text.
|
|
|
|
|
|
|
|
latex --- results are added inside of a #+BEGIN_LATEX block.
|
|
|
|
This is a good option if you code block will output
|
2009-10-16 13:53:38 -04:00
|
|
|
latex formatted text.
|
|
|
|
|
|
|
|
code ---- the results are extracted in the syntax of the source
|
|
|
|
code of the language being evaluated and are added
|
|
|
|
inside of a #+BEGIN_SRC block with the source-code
|
2010-06-12 19:13:34 -04:00
|
|
|
language set appropriately. Note this relies on the
|
|
|
|
optional LANG argument."
|
2009-05-22 18:38:51 -04:00
|
|
|
(if (stringp result)
|
|
|
|
(progn
|
2009-05-24 16:38:01 -04:00
|
|
|
(setq result (org-babel-clean-text-properties result))
|
2009-11-20 12:40:50 -05:00
|
|
|
(when (member "file" result-params)
|
|
|
|
(setq result (org-babel-result-to-file result))))
|
2009-04-03 18:56:02 -04:00
|
|
|
(unless (listp result) (setq result (format "%S" result))))
|
2009-03-29 18:08:53 -04:00
|
|
|
(if (= (length result) 0)
|
2009-07-16 01:16:49 -04:00
|
|
|
(if (member "value" result-params)
|
|
|
|
(message "No result returned by source block")
|
|
|
|
(message "Source block produced no output"))
|
2009-11-20 12:40:50 -05:00
|
|
|
(if (and result-params (member "silent" result-params))
|
2010-06-07 19:50:59 -04:00
|
|
|
(progn
|
|
|
|
(message (replace-regexp-in-string "%" "%%" (format "%S" result)))
|
|
|
|
result)
|
2009-05-21 10:22:24 -04:00
|
|
|
(when (and (stringp result) ;; ensure results end in a newline
|
2009-04-01 18:46:55 -04:00
|
|
|
(not (or (string-equal (substring result -1) "\n")
|
|
|
|
(string-equal (substring result -1) "\r"))))
|
|
|
|
(setq result (concat result "\n")))
|
|
|
|
(save-excursion
|
2010-06-07 19:50:59 -04:00
|
|
|
(let ((existing-result (org-babel-where-is-src-block-result
|
2010-06-10 17:36:08 -04:00
|
|
|
t info hash indent))
|
2010-04-17 16:03:30 -04:00
|
|
|
(results-switches
|
2010-06-12 21:26:08 -04:00
|
|
|
(cdr (assoc :results_switches (nth 2 info))))
|
2010-06-10 17:36:08 -04:00
|
|
|
beg end)
|
2010-06-07 19:50:59 -04:00
|
|
|
(when existing-result
|
|
|
|
(goto-char existing-result)
|
2010-06-10 13:02:07 -04:00
|
|
|
(save-excursion
|
|
|
|
(re-search-forward "#" nil t)
|
2010-06-10 17:36:08 -04:00
|
|
|
(setq indent (- (current-column) 1)))
|
2010-06-07 19:50:59 -04:00
|
|
|
(forward-line 1)
|
2010-06-10 17:36:08 -04:00
|
|
|
(setq beg (point))
|
2010-06-07 19:50:59 -04:00
|
|
|
(cond
|
|
|
|
((member "replace" result-params)
|
|
|
|
(delete-region (point) (org-babel-result-end)))
|
|
|
|
((member "append" result-params)
|
2010-06-10 17:36:08 -04:00
|
|
|
(goto-char (org-babel-result-end)) (setq beg (point)))
|
2010-06-07 19:50:59 -04:00
|
|
|
((member "prepend" result-params) ;; already there
|
|
|
|
)))
|
2009-11-20 12:40:50 -05:00
|
|
|
(setq results-switches
|
|
|
|
(if results-switches (concat " " results-switches) ""))
|
2009-11-04 13:49:01 -05:00
|
|
|
(cond
|
|
|
|
;; assume the result is a table if it's not a string
|
|
|
|
((not (stringp result))
|
|
|
|
(insert (concat (orgtbl-to-orgtbl
|
2010-04-10 16:12:28 -04:00
|
|
|
(if (or (eq 'hline (car result))
|
|
|
|
(and (listp (car result))
|
|
|
|
(listp (cdr (car result)))))
|
2009-11-04 13:49:01 -05:00
|
|
|
result (list result))
|
2009-12-18 13:10:03 -05:00
|
|
|
'(:fmt (lambda (cell) (format "%s" cell)))) "\n"))
|
2010-07-04 13:28:59 -04:00
|
|
|
(goto-char beg) (when (org-at-table-p) (org-table-align)))
|
2009-11-20 12:40:50 -05:00
|
|
|
((member "file" result-params)
|
2009-11-04 13:49:01 -05:00
|
|
|
(insert result))
|
2009-11-20 12:40:50 -05:00
|
|
|
((member "html" result-params)
|
2010-04-17 16:03:30 -04:00
|
|
|
(insert (format "#+BEGIN_HTML%s\n%s#+END_HTML\n"
|
|
|
|
results-switches result)))
|
2009-11-20 12:40:50 -05:00
|
|
|
((member "latex" result-params)
|
2010-04-17 16:03:30 -04:00
|
|
|
(insert (format "#+BEGIN_LaTeX%s\n%s#+END_LaTeX\n"
|
|
|
|
results-switches result)))
|
2009-11-20 12:40:50 -05:00
|
|
|
((member "code" result-params)
|
2010-04-17 16:03:30 -04:00
|
|
|
(insert (format "#+BEGIN_SRC %s%s\n%s#+END_SRC\n"
|
2010-06-12 19:13:34 -04:00
|
|
|
(or lang "none") results-switches result)))
|
2009-11-20 12:40:50 -05:00
|
|
|
((or (member "raw" result-params) (member "org" result-params))
|
2009-11-04 13:49:01 -05:00
|
|
|
(save-excursion (insert result)) (if (org-at-table-p) (org-cycle)))
|
|
|
|
(t
|
2009-11-20 12:40:50 -05:00
|
|
|
(org-babel-examplize-region
|
2010-06-10 17:36:08 -04:00
|
|
|
(point) (progn (insert result) (point)) results-switches)))
|
2010-06-10 13:02:07 -04:00
|
|
|
;; possibly indent the results to match the #+results line
|
2010-06-10 17:36:08 -04:00
|
|
|
(setq end (if (listp result) (org-table-end) (point)))
|
|
|
|
(when (and indent (> indent 0)
|
|
|
|
;; in this case `table-align' does the work for us
|
|
|
|
(not (and (listp result)
|
|
|
|
(member "append" result-params))))
|
|
|
|
(indent-rigidly beg end indent))))
|
2009-04-26 16:29:59 -04:00
|
|
|
(message "finished"))))
|
2009-03-26 01:02:50 -04:00
|
|
|
|
2009-11-04 13:41:40 -05:00
|
|
|
(defun org-babel-remove-result (&optional info)
|
2009-05-21 10:22:24 -04:00
|
|
|
"Remove the result of the current source block."
|
2009-05-30 15:59:46 -04:00
|
|
|
(interactive)
|
2009-11-20 12:40:50 -05:00
|
|
|
(let ((location (org-babel-where-is-src-block-result nil info)) start)
|
|
|
|
(when location
|
|
|
|
(save-excursion
|
|
|
|
(goto-char location) (setq start (point)) (forward-line 1)
|
|
|
|
(delete-region start (org-babel-result-end))))))
|
2009-06-13 20:07:03 -04:00
|
|
|
|
|
|
|
(defun org-babel-result-end ()
|
|
|
|
"Return the point at the end of the current set of results"
|
|
|
|
(save-excursion
|
|
|
|
(if (org-at-table-p)
|
2009-09-22 21:49:49 -04:00
|
|
|
(progn (goto-char (org-table-end)) (point))
|
2009-08-18 19:55:10 -04:00
|
|
|
(let ((case-fold-search t))
|
|
|
|
(cond
|
2010-06-10 17:36:08 -04:00
|
|
|
((looking-at "[ \t]*#\\+begin_latex")
|
2010-06-15 21:20:29 -04:00
|
|
|
(re-search-forward "[ \t]*#\\+end_latex" nil t)
|
2009-09-22 21:49:49 -04:00
|
|
|
(forward-line 1))
|
2010-06-10 17:36:08 -04:00
|
|
|
((looking-at "[ \t]*#\\+begin_html")
|
2010-06-15 21:20:29 -04:00
|
|
|
(re-search-forward "[ \t]*#\\+end_html" nil t)
|
2009-09-22 21:49:49 -04:00
|
|
|
(forward-line 1))
|
2010-06-10 17:36:08 -04:00
|
|
|
((looking-at "[ \t]*#\\+begin_example")
|
2010-06-15 21:20:29 -04:00
|
|
|
(re-search-forward "[ \t]*#\\+end_example" nil t)
|
2009-09-22 21:49:49 -04:00
|
|
|
(forward-line 1))
|
2010-06-10 17:36:08 -04:00
|
|
|
((looking-at "[ \t]*#\\+begin_src")
|
2010-06-15 21:20:29 -04:00
|
|
|
(re-search-forward "[ \t]*#\\+end_src" nil t)
|
2009-10-16 13:53:38 -04:00
|
|
|
(forward-line 1))
|
2010-06-10 17:36:08 -04:00
|
|
|
(t (progn (while (looking-at "[ \t]*\\(: \\|\\[\\[\\)")
|
2009-09-22 21:49:49 -04:00
|
|
|
(forward-line 1))))))
|
2009-06-13 20:07:03 -04:00
|
|
|
(point))))
|
2009-02-23 01:19:34 -05:00
|
|
|
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-result-to-file (result)
|
2010-03-01 17:16:40 -05:00
|
|
|
"Convert RESULT into an `org-mode' link. If the
|
|
|
|
`default-directory' is different from the containing file's
|
|
|
|
directory then expand relative links."
|
|
|
|
(format
|
|
|
|
"[[file:%s]]"
|
|
|
|
(if (and default-directory
|
|
|
|
buffer-file-name
|
|
|
|
(not (string= (expand-file-name default-directory)
|
2010-04-17 16:03:30 -04:00
|
|
|
(expand-file-name
|
|
|
|
(file-name-directory buffer-file-name)))))
|
2010-03-01 17:16:40 -05:00
|
|
|
(expand-file-name result default-directory)
|
|
|
|
result)))
|
2009-05-22 18:38:51 -04:00
|
|
|
|
2009-11-04 13:49:01 -05:00
|
|
|
(defun org-babel-examplize-region (beg end &optional results-switches)
|
2009-03-25 18:55:56 -04:00
|
|
|
"Comment out region using the ': ' org example quote."
|
|
|
|
(interactive "*r")
|
2010-05-25 19:31:34 -04:00
|
|
|
(let ((size (count-lines beg end)))
|
2009-07-18 15:38:21 -04:00
|
|
|
(save-excursion
|
|
|
|
(cond ((= size 0)
|
2010-04-17 16:03:30 -04:00
|
|
|
(error (concat "This should be impossible:"
|
|
|
|
"a newline was appended to result if missing")))
|
2009-07-18 15:38:21 -04:00
|
|
|
((< size org-babel-min-lines-for-block-output)
|
|
|
|
(goto-char beg)
|
|
|
|
(dotimes (n size)
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(beginning-of-line 1) (insert ": ") (forward-line 1)))
|
2009-07-18 15:38:21 -04:00
|
|
|
(t
|
|
|
|
(goto-char beg)
|
2009-11-04 13:49:01 -05:00
|
|
|
(insert (if results-switches
|
|
|
|
(format "#+begin_example%s\n" results-switches)
|
|
|
|
"#+begin_example\n"))
|
2009-07-18 15:38:21 -04:00
|
|
|
(forward-char (- end beg))
|
|
|
|
(insert "#+end_example\n"))))))
|
2009-03-25 18:55:56 -04:00
|
|
|
|
2009-06-15 12:22:36 -04:00
|
|
|
(defun org-babel-merge-params (&rest plists)
|
|
|
|
"Combine all parameter association lists in PLISTS. Later
|
|
|
|
elements of PLISTS override the values of previous element. This
|
2009-07-07 19:44:27 -04:00
|
|
|
takes into account some special considerations for certain
|
|
|
|
parameters when merging lists."
|
2009-09-26 22:19:22 -04:00
|
|
|
(let ((results-exclusive-groups
|
2010-04-17 16:03:30 -04:00
|
|
|
'(("file" "vector" "table" "scalar" "raw" "org"
|
|
|
|
"html" "latex" "code" "pp")
|
2010-06-07 19:50:59 -04:00
|
|
|
("replace" "silent" "append" "prepend")
|
2009-09-26 22:19:22 -04:00
|
|
|
("output" "value")))
|
2009-10-11 19:32:46 -04:00
|
|
|
(exports-exclusive-groups
|
|
|
|
'(("code" "results" "both" "none")))
|
2010-02-05 21:04:50 -05:00
|
|
|
params results exports tangle noweb cache vars var ref shebang comments)
|
2009-07-18 16:15:43 -04:00
|
|
|
(flet ((e-merge (exclusive-groups &rest result-params)
|
2010-04-17 16:03:30 -04:00
|
|
|
;; maintain exclusivity of mutually exclusive parameters
|
|
|
|
(let (output)
|
|
|
|
(mapc (lambda (new-params)
|
|
|
|
(mapc (lambda (new-param)
|
|
|
|
(mapc (lambda (exclusive-group)
|
|
|
|
(when (member new-param exclusive-group)
|
|
|
|
(mapcar (lambda (excluded-param)
|
|
|
|
(setq output
|
|
|
|
(delete
|
|
|
|
excluded-param
|
|
|
|
output)))
|
|
|
|
exclusive-group)))
|
|
|
|
exclusive-groups)
|
|
|
|
(setq output (org-uniquify
|
|
|
|
(cons new-param output))))
|
|
|
|
new-params))
|
|
|
|
result-params)
|
|
|
|
output)))
|
2009-07-18 16:15:43 -04:00
|
|
|
(mapc (lambda (plist)
|
|
|
|
(mapc (lambda (pair)
|
|
|
|
(case (car pair)
|
|
|
|
(:var
|
|
|
|
;; we want only one specification per variable
|
2010-04-17 16:03:30 -04:00
|
|
|
(when (string-match
|
|
|
|
(concat "^\\([^= \f\t\n\r\v]+\\)[ \t]*="
|
|
|
|
"[ \t]*\\([^\f\n\r\v]+\\)$") (cdr pair))
|
2009-07-18 16:15:43 -04:00
|
|
|
;; TODO: When is this not true?
|
|
|
|
(setq var (intern (match-string 1 (cdr pair)))
|
|
|
|
ref (match-string 2 (cdr pair))
|
2010-04-17 16:03:30 -04:00
|
|
|
vars (cons (cons var ref)
|
|
|
|
(assq-delete-all var vars)))))
|
2009-07-18 16:15:43 -04:00
|
|
|
(:results
|
2009-09-26 22:19:22 -04:00
|
|
|
(setq results
|
2010-04-17 16:03:30 -04:00
|
|
|
(e-merge results-exclusive-groups
|
|
|
|
results (split-string (cdr pair)))))
|
2009-09-26 22:19:22 -04:00
|
|
|
(:file
|
|
|
|
(when (cdr pair)
|
2010-04-17 16:03:30 -04:00
|
|
|
(setq results (e-merge results-exclusive-groups
|
|
|
|
results '("file")))
|
2010-01-09 14:43:03 -05:00
|
|
|
(unless (or (member "both" exports)
|
|
|
|
(member "none" exports)
|
|
|
|
(member "code" exports))
|
2010-04-17 16:03:30 -04:00
|
|
|
(setq exports (e-merge exports-exclusive-groups
|
|
|
|
exports '("results"))))
|
|
|
|
(setq params
|
|
|
|
(cons pair
|
|
|
|
(assq-delete-all (car pair) params)))))
|
2009-07-18 16:24:02 -04:00
|
|
|
(:exports
|
2010-04-17 16:03:30 -04:00
|
|
|
(setq exports
|
|
|
|
(e-merge exports-exclusive-groups
|
|
|
|
exports (split-string (cdr pair)))))
|
2009-12-30 19:37:03 -05:00
|
|
|
(:tangle ;; take the latest -- always overwrite
|
|
|
|
(setq tangle (or (list (cdr pair)) tangle)))
|
2009-12-18 15:35:30 -05:00
|
|
|
(:noweb
|
2010-04-17 16:03:30 -04:00
|
|
|
(setq noweb
|
|
|
|
(e-merge '(("yes" "no")) noweb
|
|
|
|
(split-string (or (cdr pair) "")))))
|
2009-12-22 12:11:23 -05:00
|
|
|
(:cache
|
2010-04-17 16:03:30 -04:00
|
|
|
(setq cache
|
|
|
|
(e-merge '(("yes" "no")) cache
|
|
|
|
(split-string (or (cdr pair) "")))))
|
2010-02-05 21:04:50 -05:00
|
|
|
(:shebang ;; take the latest -- always overwrite
|
|
|
|
(setq shebang (or (list (cdr pair)) shebang)))
|
|
|
|
(:comments
|
2010-04-17 16:03:30 -04:00
|
|
|
(setq comments
|
|
|
|
(e-merge '(("yes" "no")) comments
|
|
|
|
(split-string (or (cdr pair) "")))))
|
2009-07-18 16:24:02 -04:00
|
|
|
(t ;; replace: this covers e.g. :session
|
2010-04-17 16:03:30 -04:00
|
|
|
(setq params
|
|
|
|
(cons pair
|
|
|
|
(assq-delete-all (car pair) params))))))
|
2009-07-18 16:15:43 -04:00
|
|
|
plist))
|
|
|
|
plists))
|
2009-07-07 19:44:27 -04:00
|
|
|
(setq vars (mapcar (lambda (pair) (format "%s=%s" (car pair) (cdr pair))) vars))
|
|
|
|
(while vars (setq params (cons (cons :var (pop vars)) params)))
|
2010-02-05 21:04:50 -05:00
|
|
|
(cons (cons :comments (mapconcat 'identity comments " "))
|
|
|
|
(cons (cons :shebang (mapconcat 'identity shebang " "))
|
|
|
|
(cons (cons :cache (mapconcat 'identity cache " "))
|
|
|
|
(cons (cons :noweb (mapconcat 'identity noweb " "))
|
|
|
|
(cons (cons :tangle (mapconcat 'identity tangle " "))
|
2010-04-17 16:03:30 -04:00
|
|
|
(cons (cons :exports
|
|
|
|
(mapconcat 'identity exports " "))
|
|
|
|
(cons
|
|
|
|
(cons :results
|
|
|
|
(mapconcat 'identity results " "))
|
|
|
|
params)))))))))
|
2009-06-15 12:22:36 -04:00
|
|
|
|
2009-10-19 14:12:19 -04:00
|
|
|
(defun org-babel-expand-noweb-references (&optional info parent-buffer)
|
|
|
|
"This function expands Noweb style references in the body of
|
|
|
|
the current source-code block. For example the following
|
|
|
|
reference would be replaced with the body of the source-code
|
2009-12-17 13:22:00 -05:00
|
|
|
block named 'example-block'.
|
2009-10-19 14:12:19 -04:00
|
|
|
|
2009-12-17 13:22:00 -05:00
|
|
|
<<example-block>>
|
|
|
|
|
|
|
|
Note that any text preceding the <<foo>> construct on a line will
|
|
|
|
be interposed between the lines of the replacement text. So for
|
|
|
|
example if <<foo>> is placed behind a comment, then the entire
|
|
|
|
replacement text will also be commented.
|
2009-10-19 14:12:19 -04:00
|
|
|
|
|
|
|
This function must be called from inside of the buffer containing
|
2009-10-28 18:13:33 -04:00
|
|
|
the source-code block which holds BODY.
|
|
|
|
|
|
|
|
In addition the following syntax can be used to insert the
|
|
|
|
results of evaluating the source-code block named 'example-block'.
|
|
|
|
|
2009-12-17 13:22:00 -05:00
|
|
|
<<example-block()>>
|
2009-10-28 18:13:33 -04:00
|
|
|
|
|
|
|
Any optional arguments can be passed to example-block by placing
|
|
|
|
the arguments inside the parenthesis following the convention
|
|
|
|
defined by `org-babel-lob'. For example
|
|
|
|
|
2009-12-17 13:22:00 -05:00
|
|
|
<<example-block(a=9)>>
|
2009-10-28 18:13:33 -04:00
|
|
|
|
|
|
|
would set the value of argument \"a\" equal to \"9\". Note that
|
2009-12-17 13:22:00 -05:00
|
|
|
these arguments are not evaluated in the current source-code
|
|
|
|
block but are passed literally to the \"example-block\"."
|
2009-10-19 14:12:19 -04:00
|
|
|
(let* ((parent-buffer (or parent-buffer (current-buffer)))
|
|
|
|
(info (or info (org-babel-get-src-block-info)))
|
2010-06-12 21:26:08 -04:00
|
|
|
(lang (nth 0 info))
|
|
|
|
(body (nth 1 info))
|
2009-12-17 13:22:00 -05:00
|
|
|
(new-body "") index source-name evaluate prefix)
|
2009-10-19 14:12:19 -04:00
|
|
|
(flet ((nb-add (text)
|
|
|
|
(setq new-body (concat new-body text))))
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert body) (goto-char (point-min))
|
|
|
|
(setq index (point))
|
2009-11-01 14:38:17 -05:00
|
|
|
(while (and (re-search-forward "<<\\(.+?\\)>>" nil t))
|
2009-10-19 14:12:19 -04:00
|
|
|
(save-match-data (setf source-name (match-string 1)))
|
2009-10-28 18:13:33 -04:00
|
|
|
(save-match-data (setq evaluate (string-match "\(.*\)" source-name)))
|
2009-12-17 13:22:00 -05:00
|
|
|
(save-match-data
|
2010-04-17 16:03:30 -04:00
|
|
|
(setq prefix
|
|
|
|
(buffer-substring (match-beginning 0)
|
|
|
|
(save-excursion
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(beginning-of-line 1) (point)))))
|
2009-10-28 18:13:33 -04:00
|
|
|
;; add interval to new-body (removing noweb reference)
|
|
|
|
(goto-char (match-beginning 0))
|
2009-10-19 14:12:19 -04:00
|
|
|
(nb-add (buffer-substring index (point)))
|
2009-10-28 18:13:33 -04:00
|
|
|
(goto-char (match-end 0))
|
2009-10-19 14:12:19 -04:00
|
|
|
(setq index (point))
|
2010-07-06 13:30:58 -04:00
|
|
|
(nb-add (with-current-buffer parent-buffer
|
|
|
|
(mapconcat ;; interpose PREFIX between every line
|
2009-12-17 13:22:00 -05:00
|
|
|
#'identity
|
|
|
|
(split-string
|
|
|
|
(if evaluate
|
|
|
|
(let ((raw (org-babel-ref-resolve-reference
|
|
|
|
source-name nil)))
|
|
|
|
(if (stringp raw) raw (format "%S" raw)))
|
2010-06-07 20:38:35 -04:00
|
|
|
(save-restriction
|
|
|
|
(widen)
|
2010-07-06 13:30:58 -04:00
|
|
|
(let ((point (org-babel-find-named-block
|
|
|
|
source-name)))
|
2010-06-07 20:38:35 -04:00
|
|
|
(if point
|
|
|
|
(save-excursion
|
|
|
|
(goto-char point)
|
|
|
|
(org-babel-trim
|
|
|
|
(org-babel-expand-noweb-references
|
|
|
|
(org-babel-get-src-block-info))))
|
|
|
|
;; optionally raise an error if named
|
|
|
|
;; source-block doesn't exist
|
|
|
|
(if (member lang org-babel-noweb-error-langs)
|
2010-07-06 13:30:58 -04:00
|
|
|
(error "%s"
|
|
|
|
(concat
|
|
|
|
"<<" source-name ">> "
|
|
|
|
"could not be resolved (see "
|
|
|
|
"`org-babel-noweb-error-langs')"))
|
2010-06-07 20:38:35 -04:00
|
|
|
"")))))
|
|
|
|
"[\n\r]") (concat "\n" prefix)))))
|
2009-10-19 14:12:19 -04:00
|
|
|
(nb-add (buffer-substring index (point-max)))))
|
|
|
|
new-body))
|
|
|
|
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-clean-text-properties (text)
|
2009-02-22 16:19:32 -05:00
|
|
|
"Strip all properties from text return."
|
2010-05-17 19:13:20 -04:00
|
|
|
(when text
|
|
|
|
(set-text-properties 0 (length text) nil text) text))
|
2009-02-22 16:19:32 -05:00
|
|
|
|
2009-07-05 13:52:21 -04:00
|
|
|
(defun org-babel-strip-protective-commas (body)
|
|
|
|
"Strip protective commas from bodies of source blocks."
|
2009-06-02 19:26:57 -04:00
|
|
|
(replace-regexp-in-string "^,#" "#" body))
|
|
|
|
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-read (cell)
|
2009-05-08 19:20:05 -04:00
|
|
|
"Convert the string value of CELL to a number if appropriate.
|
2009-07-11 22:45:57 -04:00
|
|
|
Otherwise if cell looks like lisp (meaning it starts with a
|
|
|
|
\"(\" or a \"'\") then read it as lisp, otherwise return it
|
|
|
|
unmodified as a string.
|
2009-05-08 19:20:05 -04:00
|
|
|
|
|
|
|
This is taken almost directly from `org-read-prop'."
|
|
|
|
(if (and (stringp cell) (not (equal cell "")))
|
2009-06-13 20:07:03 -04:00
|
|
|
(or (org-babel-number-p cell)
|
|
|
|
(if (or (equal "(" (substring cell 0 1))
|
2010-04-09 21:06:07 -04:00
|
|
|
(equal "'" (substring cell 0 1))
|
|
|
|
(equal "`" (substring cell 0 1)))
|
2010-03-22 10:49:35 -04:00
|
|
|
(eval (read cell))
|
2009-06-13 20:07:03 -04:00
|
|
|
(progn (set-text-properties 0 (length cell) nil cell) cell)))
|
2009-05-08 19:20:05 -04:00
|
|
|
cell))
|
|
|
|
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-number-p (string)
|
2010-06-11 20:12:15 -04:00
|
|
|
"Return t if STRING represents a number."
|
Xemacs incompatibilities
Carsten Dominik <carsten.dominik@gmail.com> writes:
> On May 17, 2010, at 4:39 PM, Michael Sperber wrote:
>
>> In particular, fixing the require won't be enough: org-babel-python.el
>> uses `run-python' and interacts with the inferior Python, whereas
>> python-mode.el defines `py-shell'.
>>
>> Should I try to abstract over the differences?
>
> Yes, this would be much appreciated. (I think, Eric or Dan?)
OK, I've attached a patch that makes `org-babel-python' work on XEmacs.
Most of the issues are pure XEmacs issues. Notes:
- XEmacs doesn't have [[:digit:]] - I hope to rectify this in the
future, but it seems there's no downside in this particular case to
replacing by [0-9].
- XEmacs doesn't have `move-end-of-line', but does have `end-of-line'.
I don't understand the intent of having both of these, but the code
seems fine with `end-of-line'.
- It seems there are way too few `require's throughout org-babel. I
don't know if it's OK to add the ones I needed.
- `org-babel-python-evaluate' looked broken as-is: It doesn't use the
`body' argument properly, the result is (I think) processed in the
wrong order and not properly split into lines. I've fixed all these,
but a review is probably in order.
2010-05-24 15:22:50 -04:00
|
|
|
(if (and (string-match "^-?[0-9]*\\.?[0-9]*$" string)
|
2010-06-07 20:59:58 -04:00
|
|
|
(= (length (substring string (match-beginning 0)
|
|
|
|
(match-end 0)))
|
|
|
|
(length string)))
|
2009-06-13 20:07:03 -04:00
|
|
|
(string-to-number string)))
|
2009-05-11 22:41:56 -04:00
|
|
|
|
2009-07-19 12:01:00 -04:00
|
|
|
(defun org-babel-import-elisp-from-file (file-name)
|
2009-06-11 18:04:10 -04:00
|
|
|
"Read the results located at FILE-NAME into an elisp table. If
|
|
|
|
the table is trivial, then return it as a scalar."
|
2009-06-11 20:04:42 -04:00
|
|
|
(let (result)
|
2010-03-05 06:29:30 -05:00
|
|
|
(save-window-excursion
|
|
|
|
(with-temp-buffer
|
|
|
|
(condition-case nil
|
|
|
|
(progn
|
|
|
|
(org-table-import file-name nil)
|
|
|
|
(delete-file file-name)
|
|
|
|
(setq result (mapcar (lambda (row)
|
|
|
|
(mapcar #'org-babel-string-read row))
|
|
|
|
(org-table-to-lisp))))
|
|
|
|
(error nil)))
|
|
|
|
(if (null (cdr result)) ;; if result is trivial vector, then scalarize it
|
|
|
|
(if (consp (car result))
|
|
|
|
(if (null (cdr (car result)))
|
|
|
|
(caar result)
|
|
|
|
result)
|
|
|
|
(car result))
|
|
|
|
result))))
|
2009-06-11 20:04:42 -04:00
|
|
|
|
|
|
|
(defun org-babel-string-read (cell)
|
2010-03-26 18:03:54 -04:00
|
|
|
"Strip nested \"s from around strings."
|
2009-06-11 20:04:42 -04:00
|
|
|
(org-babel-read (or (and (stringp cell)
|
|
|
|
(string-match "\\\"\\(.+\\)\\\"" cell)
|
|
|
|
(match-string 1 cell))
|
|
|
|
cell)))
|
2009-06-11 18:04:10 -04:00
|
|
|
|
2009-06-11 17:31:37 -04:00
|
|
|
(defun org-babel-reverse-string (string)
|
2010-06-11 20:12:15 -04:00
|
|
|
"Return the reverse of STRING."
|
2009-06-11 17:31:37 -04:00
|
|
|
(apply 'string (reverse (string-to-list string))))
|
|
|
|
|
2009-05-24 16:38:01 -04:00
|
|
|
(defun org-babel-chomp (string &optional regexp)
|
2009-05-14 09:53:52 -04:00
|
|
|
"Remove any trailing space or carriage returns characters from
|
|
|
|
STRING. Default regexp used is \"[ \f\t\n\r\v]\" but can be
|
|
|
|
overwritten by specifying a regexp as a second argument."
|
2009-11-01 14:36:47 -05:00
|
|
|
(let ((regexp (or regexp "[ \f\t\n\r\v]")))
|
2010-04-17 16:03:30 -04:00
|
|
|
(while (and (> (length string) 0)
|
|
|
|
(string-match regexp (substring string -1)))
|
2009-11-01 14:36:47 -05:00
|
|
|
(setq string (substring string 0 -1)))
|
|
|
|
string))
|
2009-05-14 09:53:52 -04:00
|
|
|
|
2009-06-11 17:31:37 -04:00
|
|
|
(defun org-babel-trim (string &optional regexp)
|
2010-06-11 20:12:15 -04:00
|
|
|
"Like `org-babel-chomp' only it runs on both the front and back
|
|
|
|
of the string."
|
2009-06-11 17:31:37 -04:00
|
|
|
(org-babel-chomp (org-babel-reverse-string
|
2010-04-17 16:03:30 -04:00
|
|
|
(org-babel-chomp (org-babel-reverse-string string) regexp))
|
|
|
|
regexp))
|
2009-06-11 17:31:37 -04:00
|
|
|
|
2010-06-12 19:18:50 -04:00
|
|
|
(defvar org-babel-org-babel-call-process-region-original nil)
|
2010-02-21 00:34:23 -05:00
|
|
|
(defun org-babel-tramp-handle-call-process-region
|
|
|
|
(start end program &optional delete buffer display &rest args)
|
2010-06-11 20:12:15 -04:00
|
|
|
"Use tramp to handle call-process-region. Fixes a bug in
|
|
|
|
`tramp-handle-call-process-region'."
|
2010-02-21 00:34:23 -05:00
|
|
|
(if (and (featurep 'tramp) (file-remote-p default-directory))
|
|
|
|
(let ((tmpfile (tramp-compat-make-temp-file "")))
|
|
|
|
(write-region start end tmpfile)
|
|
|
|
(when delete (delete-region start end))
|
|
|
|
(unwind-protect
|
2010-04-17 16:03:30 -04:00
|
|
|
;; (apply 'call-process program tmpfile buffer display args)
|
|
|
|
;; bug in tramp
|
2010-02-21 00:34:23 -05:00
|
|
|
(apply 'process-file program tmpfile buffer display args)
|
|
|
|
(delete-file tmpfile)))
|
2010-06-12 19:18:50 -04:00
|
|
|
;; org-babel-call-process-region-original is the original emacs definition. It
|
2010-02-21 00:34:23 -05:00
|
|
|
;; is in scope from the let binding in org-babel-execute-src-block
|
2010-06-12 19:18:50 -04:00
|
|
|
(apply org-babel-call-process-region-original
|
2010-04-17 16:03:30 -04:00
|
|
|
start end program delete buffer display args)))
|
2010-02-21 00:43:53 -05:00
|
|
|
|
2010-02-23 11:10:11 -05:00
|
|
|
(defun org-babel-maybe-remote-file (file)
|
2010-06-11 20:12:15 -04:00
|
|
|
"If FILE specifies a remove file, then parse the information on
|
|
|
|
the remote connection."
|
2010-02-23 11:10:11 -05:00
|
|
|
(if (file-remote-p default-directory)
|
|
|
|
(let* ((vec (tramp-dissect-file-name default-directory))
|
|
|
|
(user (tramp-file-name-user vec))
|
|
|
|
(host (tramp-file-name-host vec)))
|
|
|
|
(concat "/" user (when user "@") host ":" file))
|
|
|
|
file))
|
2010-02-21 00:43:53 -05:00
|
|
|
|
2010-06-11 19:02:42 -04:00
|
|
|
(provide 'ob)
|
2010-06-25 12:20:39 -04:00
|
|
|
|
|
|
|
;; arch-tag: 01a7ebee-06c5-4ee4-a709-e660d28c0af1
|
|
|
|
|
2010-06-11 19:02:42 -04:00
|
|
|
;;; ob.el ends here
|