2010-06-25 16:20:39 +00:00
|
|
|
;;; ob-table.el --- support for calling org-babel functions from tables
|
2009-05-10 21:03:26 +00:00
|
|
|
|
2013-01-01 15:04:24 +00:00
|
|
|
;; Copyright (C) 2009-2013 Free Software Foundation, Inc.
|
2009-05-10 21:03:26 +00:00
|
|
|
|
|
|
|
;; Author: Eric Schulte
|
|
|
|
;; Keywords: literate programming, reproducible research
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
|
2010-06-25 16:20:39 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
2009-05-10 21:03:26 +00:00
|
|
|
|
2010-06-25 16:20:39 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2009-05-10 21:03:26 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2010-06-25 16:20:39 +00: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-05-10 21:03:26 +00: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 16:20:39 +00:00
|
|
|
|
2009-05-10 21:03:26 +00:00
|
|
|
;; You should have received a copy of the GNU General Public License
|
2010-06-25 16:20:39 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2009-05-10 21:03:26 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; Should allow calling functions from org-mode tables using the
|
|
|
|
;; function `sbe' as so...
|
2010-06-25 16:20:39 +00:00
|
|
|
|
2009-05-10 21:03:26 +00:00
|
|
|
;; #+begin_src emacs-lisp :results silent
|
2010-06-25 16:20:39 +00:00
|
|
|
;; (defun fibbd (n) (if (< n 2) 1 (+ (fibbd (- n 1)) (fibbd (- n 2)))))
|
2009-05-10 21:03:26 +00:00
|
|
|
;; #+end_src
|
2010-06-25 16:20:39 +00:00
|
|
|
|
Standardized code block keywords
Nick Dokos <nicholas.dokos@hp.com> writes:
> Eric Schulte <schulte.eric@gmail.com> wrote:
>
>> The attached updated patch fixes a bug in the original.
>>
>
> Minor problem in applying:
>
> ,----
> | $ git apply ~/Mail/inbox/724
> | /home/nick/Mail/inbox/724:671: trailing whitespace.
> | #+name:
> | /home/nick/Mail/inbox/724:599: new blank line at EOF.
> | +
> | warning: 2 lines add whitespace errors.
> `----
The attached version fixes these issues, Thanks -- Eric
>From 0e43d59ee8d46a63f86780a502de726271bc39de Mon Sep 17 00:00:00 2001
From: Eric Schulte <schulte.eric@gmail.com>
Date: Fri, 28 Oct 2011 10:44:21 -0600
Subject: [PATCH] removing code block, results and call-line synonyms -- BREAKING CHANGE
Following a round of on-list discussion many code block synonyms have
been removed, moving forward the following syntax is valid.
- call lines are specified with #+call:
- code blocks are named with #+name:
- results are named with #+name:, however results generated by a code
block may still be labeled with #+results:, and tables named with
#+tblname: will be considered to be named results
The following function may be used to update an existing Org-mode
buffer to the new syntax.
(defun update-org-buffer ()
"Update an Org-mode buffer to the new data, code block and call line syntax."
(interactive)
(save-excursion
(flet ((to-re (lst) (concat "^[ \t]*#\\+" (regexp-opt lst t)
"\\(\\[\\([[:alnum:]]+\\)\\]\\)?\\:[ \t]*"))
(update (re new)
(goto-char (point-min))
(while (re-search-forward re nil t)
(replace-match new nil nil nil 1))))
(let ((old-re (to-re '("RESULTS" "DATA" "SRCNAME" "SOURCE")))
(lob-re (to-re '("LOB")))
(case-fold-search t))
(update old-re "name")
(update lob-re "call")))))
Note: If an old version of Org-mode (e.g., the one shipped with Emacs)
is installed on your system many of the important variables will
be pre-defined with a defvar and *will not* have their values
automatically updated, these include the following.
- org-babel-data-names
- org-babel-result-regexp
- org-babel-src-block-regexp
- org-babel-src-name-regexp
- org-babel-src-name-w-name-regexp
It may be necessary to either remove the source code of older
versions of Org-mode, or to explicitly evaluate the ob.el file.
* lisp/ob-exp.el (org-exp-res/src-name-cleanup): Updated
Documentation.
* lisp/ob-lob.el (org-babel-block-lob-one-liner-regexp): Updated
regular expression.
(org-babel-inline-lob-one-liner-regexp): Updated regular expression.
* lisp/ob-ref.el (org-babel-ref-resolve): Notice when something that
looks like a data results may actually be a code block.
* lisp/ob-table.el: Updated documentation.
* lisp/ob.el (org-babel-src-name-regexp): Simplified regexp.
(org-babel-get-src-block-info): Updated match strings.
(org-babel-data-names): Simplified acceptable names.
(org-babel-find-named-block): Indentation.
(org-babel-find-named-result): Updated to not return a code block as
a result.
* lisp/org.el (org-fontify-meta-lines-and-blocks-1): Removing
references to old syntactic elements.
(org-additional-option-like-keywords): Removing references to old
syntactic elements.
* contrib/babel/library-of-babel.org: Updated to make use of the new
syntax.
* testing/examples/babel-dangerous.org: Updated to make use of the new
syntax.
* testing/examples/babel.org: Updated to make use of the new syntax.
* testing/examples/ob-awk-test.org: Updated to make use of the new
syntax.
* testing/examples/ob-fortran-test.org: Updated to make use of the new
syntax.
* testing/lisp/test-ob.el: Removed two bad tests which tested the
literal values of old regular expressions rather than their
behavior.
2011-10-28 23:52:48 +00:00
|
|
|
;; #+name: fibbd
|
2009-05-10 21:03:26 +00:00
|
|
|
;; #+begin_src emacs-lisp :var n=2 :results silent
|
|
|
|
;; (fibbd n)
|
|
|
|
;; #+end_src
|
2010-06-25 16:20:39 +00:00
|
|
|
|
2009-05-10 21:03:26 +00:00
|
|
|
;; | original | fibbd |
|
|
|
|
;; |----------+--------|
|
|
|
|
;; | 0 | |
|
|
|
|
;; | 1 | |
|
|
|
|
;; | 2 | |
|
|
|
|
;; | 3 | |
|
|
|
|
;; | 4 | |
|
|
|
|
;; | 5 | |
|
|
|
|
;; | 6 | |
|
|
|
|
;; | 7 | |
|
|
|
|
;; | 8 | |
|
|
|
|
;; | 9 | |
|
|
|
|
;; #+TBLFM: $2='(sbe 'fibbd (n $1))
|
|
|
|
|
|
|
|
;;; Code:
|
2010-06-11 23:02:42 +00:00
|
|
|
(require 'ob)
|
2009-05-10 21:03:26 +00:00
|
|
|
|
2009-05-24 20:38:01 +00:00
|
|
|
(defun org-babel-table-truncate-at-newline (string)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Replace newline character with ellipses.
|
|
|
|
If STRING ends in a newline character, then remove the newline
|
2010-06-12 00:12:15 +00:00
|
|
|
character and replace it with ellipses."
|
2010-11-14 15:50:47 +00:00
|
|
|
(if (and (stringp string) (string-match "[\n\r]\\(.\\)?" string))
|
|
|
|
(concat (substring string 0 (match-beginning 0))
|
|
|
|
(if (match-string 1 string) "...")) string))
|
2009-05-22 15:33:28 +00:00
|
|
|
|
2009-05-10 21:03:26 +00:00
|
|
|
(defmacro sbe (source-block &rest variables)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Return the results of calling SOURCE-BLOCK with VARIABLES.
|
|
|
|
Each element of VARIABLES should be a two
|
2009-11-10 16:50:34 +00:00
|
|
|
element list, whose first element is the name of the variable and
|
|
|
|
second element is a string of its value. The following call to
|
|
|
|
`sbe' would be equivalent to the following source code block.
|
2009-05-10 21:03:26 +00:00
|
|
|
|
2010-03-25 17:09:38 +00:00
|
|
|
(sbe 'source-block (n $2) (m 3))
|
2009-05-10 21:03:26 +00:00
|
|
|
|
2010-03-25 17:09:38 +00:00
|
|
|
#+begin_src emacs-lisp :var results=source-block(n=val_at_col_2, m=3) :results silent
|
2009-05-10 21:03:26 +00:00
|
|
|
results
|
2010-03-25 17:09:38 +00:00
|
|
|
#+end_src
|
|
|
|
|
|
|
|
NOTE: by default string variable names are interpreted as
|
|
|
|
references to source-code blocks, to force interpretation of a
|
2012-03-05 17:45:25 +00:00
|
|
|
cell's value as a string, prefix the identifier a \"$\" (e.g.,
|
|
|
|
\"$$2\" instead of \"$2\" or \"$@2$2\" instead of \"@2$2\").
|
2011-10-07 18:16:33 +00:00
|
|
|
|
|
|
|
NOTE: it is also possible to pass header arguments to the code
|
|
|
|
block. In this case a table cell should hold the string value of
|
|
|
|
the header argument which can then be passed before all variables
|
|
|
|
as shown in the example below.
|
|
|
|
|
|
|
|
| 1 | 2 | :file nothing.png | nothing.png |
|
|
|
|
#+TBLFM: @1$4='(sbe test-sbe $3 (x $1) (y $2))"
|
|
|
|
(let* ((header-args (if (stringp (car variables)) (car variables) ""))
|
|
|
|
(variables (if (stringp (car variables)) (cdr variables) variables)))
|
|
|
|
(let* (quote
|
|
|
|
(variables
|
|
|
|
(mapcar
|
|
|
|
(lambda (var)
|
|
|
|
;; ensure that all cells prefixed with $'s are strings
|
|
|
|
(cons (car var)
|
|
|
|
(delq nil (mapcar
|
|
|
|
(lambda (el)
|
|
|
|
(if (eq '$ el)
|
2012-03-05 14:32:03 +00:00
|
|
|
(prog1 nil (setq quote t))
|
2011-10-07 18:16:33 +00:00
|
|
|
(prog1 (if quote
|
|
|
|
(format "\"%s\"" el)
|
2012-08-15 07:39:24 +00:00
|
|
|
(org-no-properties el))
|
2011-10-07 18:16:33 +00:00
|
|
|
(setq quote nil))))
|
|
|
|
(cdr var)))))
|
|
|
|
variables)))
|
|
|
|
(unless (stringp source-block)
|
|
|
|
(setq source-block (symbol-name source-block)))
|
|
|
|
((lambda (result)
|
|
|
|
(org-babel-trim (if (stringp result) result (format "%S" result))))
|
|
|
|
(if (and source-block (> (length source-block) 0))
|
|
|
|
(let ((params
|
|
|
|
(eval `(org-babel-parse-header-arguments
|
|
|
|
(concat
|
|
|
|
":var results="
|
|
|
|
,source-block
|
2011-10-07 18:22:04 +00:00
|
|
|
"[" ,header-args "]"
|
2011-10-07 18:16:33 +00:00
|
|
|
"("
|
|
|
|
(mapconcat
|
|
|
|
(lambda (var-spec)
|
|
|
|
(if (> (length (cdr var-spec)) 1)
|
|
|
|
(format "%S='%S"
|
|
|
|
(car var-spec)
|
|
|
|
(mapcar #'read (cdr var-spec)))
|
|
|
|
(format "%S=%s"
|
|
|
|
(car var-spec) (cadr var-spec))))
|
|
|
|
',variables ", ")
|
|
|
|
")")))))
|
|
|
|
(org-babel-execute-src-block
|
|
|
|
nil (list "emacs-lisp" "results" params)
|
|
|
|
'((:results . "silent"))))
|
|
|
|
"")))))
|
Provide edebug specifications for macros
* org-macs.el (org-with-gensyms, org-called-interactively-p)
(with-silent-modifications, org-bound-and-true-p)
(org-unmodified, org-re, org-preserve-lc)
(org-without-partial-completion, org-with-point-at)
(org-no-warnings, org-if-unprotected, org-if-unprotected-1)
(org-if-unprotected-at, org-with-remote-undo)
(org-no-read-only, org-save-outline-visibility)
(org-with-wide-buffer, org-with-limited-levels)
(org-eval-in-environment): Provide edebug specifications.
* org-src.el (org-src-do-at-code-block): Dto.
* org-publish.el (org-publish-with-aux-preprocess-maybe): Dto.
* org-compat.el (org-xemacs-without-invisibility): Dto.
* org-clock.el (org-with-clock-position, org-with-clock): Dto.
* org-agenda.el (org-agenda-with-point-at-orig-entry)
(org-batch-agenda, org-batch-agenda-csv)
(org-batch-store-agenda-views): Dto.
* ob.el (org-babel-do-in-edit-buffer)
(org-babel-map-src-blocks, org-babel-map-inline-src-blocks): Dto.
* ob-tangle.el (org-babel-with-temp-filebuffer): Dto.
* ob-table.el (sbe): Dto.
* ob-exp.el (org-babel-exp-in-export-file): Dto.
* ob-comint.el (org-babel-comint-in-buffer)
(org-babel-comint-with-output): Dto.
2011-08-11 06:57:25 +00:00
|
|
|
(def-edebug-spec sbe (form form))
|
2009-05-10 21:03:26 +00:00
|
|
|
|
2010-06-11 23:02:42 +00:00
|
|
|
(provide 'ob-table)
|
2010-06-25 16:20:39 +00:00
|
|
|
|
2011-08-15 18:04:38 +00:00
|
|
|
|
2010-06-25 16:20:39 +00:00
|
|
|
|
2010-06-11 23:02:42 +00:00
|
|
|
;;; ob-table.el ends here
|