2012-12-11 23:58:16 +00:00
|
|
|
;;; ob-core.el --- working with code blocks in org-mode
|
2009-02-22 21:19:32 +00:00
|
|
|
|
2016-01-09 22:12:03 +00:00
|
|
|
;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
|
2009-02-22 21:19:32 +00:00
|
|
|
|
2012-04-01 22:53:28 +00:00
|
|
|
;; Authors: Eric Schulte
|
2011-08-24 18:55:11 +00:00
|
|
|
;; Dan Davison
|
2009-02-22 21:19:32 +00:00
|
|
|
;; 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-02-22 21:19:32 +00:00
|
|
|
|
2010-06-25 16:20:39 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2009-02-22 21:19:32 +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-02-22 21:19:32 +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-02-22 21:19:32 +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-02-22 21:19:32 +00:00
|
|
|
|
|
|
|
;;; Code:
|
2010-08-27 20:35:09 +00:00
|
|
|
(eval-when-compile
|
2010-08-27 20:47:59 +00:00
|
|
|
(require 'cl))
|
2010-12-01 14:19:45 +00:00
|
|
|
(require 'ob-eval)
|
2010-06-28 18:37:15 +00:00
|
|
|
(require 'org-macs)
|
2012-08-13 03:59:44 +00:00
|
|
|
(require 'org-compat)
|
2009-02-22 21:19:32 +00:00
|
|
|
|
2012-07-25 17:09:08 +00:00
|
|
|
(defconst org-babel-exeext
|
|
|
|
(if (memq system-type '(windows-nt cygwin))
|
|
|
|
".exe"
|
|
|
|
nil))
|
2016-01-31 19:57:47 +00:00
|
|
|
|
2013-03-09 16:42:17 +00:00
|
|
|
;; dynamically scoped for tramp
|
|
|
|
(defvar org-babel-call-process-region-original nil)
|
2011-03-01 17:52:35 +00:00
|
|
|
(defvar org-babel-library-of-babel)
|
2016-01-31 19:57:47 +00:00
|
|
|
(defvar org-edit-src-content-indentation)
|
|
|
|
(defvar org-src-lang-modes)
|
|
|
|
|
2015-09-27 15:45:07 +00:00
|
|
|
(declare-function outline-show-all "outline" ())
|
2014-05-28 12:47:23 +00:00
|
|
|
(declare-function org-every "org" (pred seq))
|
2016-01-31 10:36:52 +00:00
|
|
|
(declare-function org-get-indentation "org" (&optional line))
|
2013-11-24 00:00:24 +00:00
|
|
|
(declare-function org-remove-indentation "org" (code &optional n))
|
2011-12-12 17:04:15 +00:00
|
|
|
(declare-function org-reduce "org" (CL-FUNC CL-SEQ &rest CL-KEYS))
|
2012-03-19 20:38:12 +00:00
|
|
|
(declare-function org-mark-ring-push "org" (&optional pos buffer))
|
2010-08-27 20:35:09 +00:00
|
|
|
(declare-function tramp-compat-make-temp-file "tramp-compat"
|
|
|
|
(filename &optional dir-flag))
|
2010-06-23 18:24:33 +00:00
|
|
|
(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))
|
2010-08-31 01:20:01 +00:00
|
|
|
(declare-function with-parsed-tramp-file-name "tramp" (filename var &rest body))
|
2010-07-12 04:35:58 +00:00
|
|
|
(declare-function org-icompleting-read "org" (&rest args))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 23:31:23 +00:00
|
|
|
(declare-function org-edit-src-code "org-src" (&optional code edit-buffer-name))
|
|
|
|
(declare-function org-edit-src-exit "org-src" ())
|
2010-06-23 18:24:33 +00:00
|
|
|
(declare-function org-open-at-point "org" (&optional in-emacs reference-buffer))
|
2012-08-12 22:36:15 +00:00
|
|
|
(declare-function org-save-outline-visibility "org-macs" (use-markers &rest body))
|
2010-08-27 20:42:24 +00:00
|
|
|
(declare-function org-outline-overlay-data "org" (&optional use-markers))
|
|
|
|
(declare-function org-set-outline-overlay-data "org" (data))
|
2010-06-23 18:24:33 +00:00
|
|
|
(declare-function org-narrow-to-subtree "org" ())
|
2012-12-20 00:20:17 +00:00
|
|
|
(declare-function org-split-string "org" (string &optional separators))
|
2010-10-14 13:15:27 +00:00
|
|
|
(declare-function org-entry-get "org"
|
|
|
|
(pom property &optional inherit literal-nil))
|
2010-06-23 18:24:33 +00:00
|
|
|
(declare-function org-make-options-regexp "org" (kwds &optional extra))
|
|
|
|
(declare-function org-do-remove-indentation "org" (&optional n))
|
2013-02-08 16:21:54 +00:00
|
|
|
(declare-function org-next-block "org" (arg &optional backward block-regexp))
|
|
|
|
(declare-function org-previous-block "org" (arg &optional block-regexp))
|
2010-06-23 18:24:33 +00:00
|
|
|
(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))
|
2010-09-21 13:00:53 +00:00
|
|
|
(declare-function org-current-level "org" ())
|
2010-08-27 20:35:09 +00:00
|
|
|
(declare-function org-table-import "org-table" (file arg))
|
2010-10-14 13:15:27 +00:00
|
|
|
(declare-function org-add-hook "org-compat"
|
|
|
|
(hook function &optional append local))
|
2010-06-23 18:24:33 +00:00
|
|
|
(declare-function org-table-align "org-table" ())
|
|
|
|
(declare-function org-table-end "org-table" (&optional table-type))
|
2010-06-13 00:11:36 +00:00
|
|
|
(declare-function orgtbl-to-generic "org-table" (table params))
|
2010-06-23 18:24:33 +00:00
|
|
|
(declare-function orgtbl-to-orgtbl "org-table" (table params))
|
2011-03-01 17:52:35 +00:00
|
|
|
(declare-function org-babel-tangle-comment-links "ob-tangle" (&optional info))
|
2010-06-23 18:24:33 +00:00
|
|
|
(declare-function org-babel-lob-get-info "ob-lob" nil)
|
2010-06-13 00:11:36 +00:00
|
|
|
(declare-function org-babel-ref-split-args "ob-ref" (arg-string))
|
2010-10-16 18:14:20 +00:00
|
|
|
(declare-function org-babel-ref-parse "ob-ref" (assignment))
|
2010-10-24 18:45:26 +00:00
|
|
|
(declare-function org-babel-ref-resolve "ob-ref" (ref))
|
2011-06-28 20:02:01 +00:00
|
|
|
(declare-function org-babel-ref-goto-headline-id "ob-ref" (id))
|
|
|
|
(declare-function org-babel-ref-headline-body "ob-ref" ())
|
2010-08-09 03:30:16 +00:00
|
|
|
(declare-function org-babel-lob-execute-maybe "ob-lob" ())
|
2010-10-20 20:49:41 +00:00
|
|
|
(declare-function org-number-sequence "org-compat" (from &optional to inc))
|
2011-03-01 07:08:36 +00:00
|
|
|
(declare-function org-at-item-p "org-list" ())
|
2010-11-22 14:21:18 +00:00
|
|
|
(declare-function org-list-parse-list "org-list" (&optional delete))
|
|
|
|
(declare-function org-list-to-generic "org-list" (LIST PARAMS))
|
2010-12-29 17:42:23 +00:00
|
|
|
(declare-function org-list-struct "org-list" ())
|
org-list: reorder file, rename functions, improve comments
* lisp/ob.el (org-babel-result-end): apply renaming.
* lisp/org-exp.el (org-export-mark-list-properties): apply renaming.
* lisp/org-list.el (org-list-prevs-alist): renamed from
org-list-struct-prev-alist.
(org-list-parents-alist): renamed from org-list-struct-parent-alist.
(org-list-write-struct): renamed from org-list-struct-fix-struct.
(org-list-parse-list, org-sort-list, org-list-indent-item-generic,
org-toggle-checkbox, org-update-checkbox-count, org-cycle-list-bullet,
org-list-repair, org-insert-item, org-move-item-up, org-move-item-up,
org-move-item-down, org-next-item, org-previous-item,
org-end-of-item-list, org-beginning-of-item-list, org-apply-on-list):
apply renaming.
(org-get-bullet): removed function, as it is not needed anymore.
2011-01-20 18:28:23 +00:00
|
|
|
(declare-function org-list-prevs-alist "org-list" (struct))
|
2011-01-09 15:25:01 +00:00
|
|
|
(declare-function org-list-get-list-end "org-list" (item struct prevs))
|
2012-04-17 09:17:17 +00:00
|
|
|
(declare-function org-remove-if "org" (predicate seq))
|
|
|
|
(declare-function org-completing-read "org" (&rest args))
|
2012-09-30 15:20:27 +00:00
|
|
|
(declare-function org-escape-code-in-region "org-src" (beg end))
|
|
|
|
(declare-function org-unescape-code-in-string "org-src" (s))
|
2012-10-02 09:19:29 +00:00
|
|
|
(declare-function org-table-to-lisp "org-table" (&optional txt))
|
2013-01-26 21:27:51 +00:00
|
|
|
(declare-function org-reverse-string "org" (string))
|
2014-12-14 08:36:50 +00:00
|
|
|
(declare-function org-element-context "org-element" (&optional element))
|
|
|
|
(declare-function org-element-type "org-element" (element))
|
2015-01-13 16:16:45 +00:00
|
|
|
(declare-function org-element-at-point "org-element" ())
|
2016-01-31 10:36:52 +00:00
|
|
|
(declare-function org-element-normalize-string "org-element" (s))
|
2015-01-13 16:16:45 +00:00
|
|
|
(declare-function org-element-property "org-element" (property element))
|
2013-10-30 17:58:50 +00:00
|
|
|
(declare-function org-every "org" (pred seq))
|
2015-01-29 23:24:22 +00:00
|
|
|
(declare-function org-macro-escape-arguments "org-macro" (&rest args))
|
2010-06-13 00:11:36 +00:00
|
|
|
|
2010-07-08 20:38:59 +00:00
|
|
|
(defgroup org-babel nil
|
|
|
|
"Code block evaluation and management in `org-mode' documents."
|
|
|
|
:tag "Babel"
|
|
|
|
:group 'org)
|
|
|
|
|
2010-06-30 19:25:22 +00:00
|
|
|
(defcustom org-confirm-babel-evaluate t
|
2010-07-13 23:20:08 +00:00
|
|
|
"Confirm before evaluation.
|
2015-09-21 04:23:15 +00:00
|
|
|
\\<org-mode-map>\
|
2010-07-13 23:20:08 +00:00
|
|
|
Require confirmation before interactively evaluating code
|
2010-06-30 19:25:22 +00: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
|
2015-09-21 04:23:15 +00:00
|
|
|
remove code block execution from \\[org-ctrl-c-ctrl-c] \
|
|
|
|
as further protection
|
2010-06-30 19:25:22 +00:00
|
|
|
against accidental code block evaluation. The
|
|
|
|
`org-babel-no-eval-on-ctrl-c-ctrl-c' variable can be used to
|
2015-09-21 04:23:15 +00:00
|
|
|
remove code block execution from the \\[org-ctrl-c-ctrl-c] keybinding."
|
2012-08-10 15:44:45 +00:00
|
|
|
:group 'org-babel
|
|
|
|
:version "24.1"
|
|
|
|
:type '(choice boolean function))
|
2010-06-30 19:25:22 +00: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
|
2015-09-21 04:23:15 +00:00
|
|
|
"\\<org-mode-map>\
|
|
|
|
Remove code block evaluation from the \\[org-ctrl-c-ctrl-c] key binding."
|
2010-06-30 19:25:22 +00:00
|
|
|
:group 'org-babel
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2010-06-30 19:25:22 +00:00
|
|
|
:type 'boolean)
|
|
|
|
|
2012-01-11 20:54:20 +00:00
|
|
|
(defcustom org-babel-results-keyword "RESULTS"
|
|
|
|
"Keyword used to name results generated by code blocks.
|
2014-12-24 09:32:30 +00:00
|
|
|
It should be \"RESULTS\". However any capitalization may be
|
|
|
|
used."
|
2012-01-11 20:54:20 +00:00
|
|
|
:group 'org-babel
|
Add :version and :package-version
* ox.el (org-export-snippet-translation-alist)
(org-export-coding-system, org-export-in-background)
(org-export-async-init-file, org-export-invisible-backends)
(org-export-dispatch-use-expert-ui):
* ox-texinfo.el (org-texinfo-filename, org-texinfo-classes)
(org-texinfo-format-headline-function)
(org-texinfo-node-description-column)
(org-texinfo-active-timestamp-format)
(org-texinfo-link-with-unknown-path-format)
(org-texinfo-tables-verbatim)
(org-texinfo-table-scientific-notation)
(org-texinfo-text-markup-alist)
(org-texinfo-format-drawer-function)
(org-texinfo-format-inlinetask-function)
(org-texinfo-info-process):
* ox-man.el (org-man-tables-centered)
(org-man-table-scientific-notation)
(org-man-source-highlight, org-man-source-highlight-langs)
(org-man-pdf-process, org-man-logfiles-extensions):
* ox-html.el (org-html-allow-name-attribute-in-anchors)
(org-html-coding-system, org-html-divs):
* ox-ascii.el (org-ascii-text-width)
(org-ascii-headline-spacing, org-ascii-indented-line-width)
(org-ascii-paragraph-spacing, org-ascii-charset)
(org-ascii-underline, org-ascii-bullets)
(org-ascii-links-to-notes)
(org-ascii-table-keep-all-vertical-lines)
(org-ascii-table-widen-columns)
(org-ascii-table-use-ascii-art)
(org-ascii-format-drawer-function)
(org-ascii-format-inlinetask-function):
* org.el (org-modules, org-export-backends)
(org-highlight-latex-and-related, orgstruct-setup-hook):
* org-attach.el (org-attach-git-annex-cutoff):
* org-archive.el (org-archive-file-header-format):
* org-agenda.el (org-agenda-todo-ignore-time-comparison-use-seconds):
* ob-python.el (org-babel-python-hline-to)
(org-babel-python-None-to):
* ob-ditaa.el (org-ditaa-eps-jar-path):
* ob-core.el (org-babel-results-keyword): Add :version and
:package-version.
* ox-ascii.el: Use utf-8-emacs as the file coding system.
2013-03-05 15:34:16 +00:00
|
|
|
:version "24.4"
|
|
|
|
:package-version '(Org . "8.0")
|
2014-12-24 09:32:30 +00:00
|
|
|
:type 'string
|
|
|
|
:safe (lambda (v)
|
|
|
|
(and (stringp v)
|
|
|
|
(eq (compare-strings "RESULTS" nil nil v nil nil t)
|
|
|
|
t))))
|
2012-01-11 20:54:20 +00:00
|
|
|
|
2012-03-19 20:38:12 +00:00
|
|
|
(defcustom org-babel-noweb-wrap-start "<<"
|
|
|
|
"String used to begin a noweb reference in a code block.
|
|
|
|
See also `org-babel-noweb-wrap-end'."
|
|
|
|
:group 'org-babel
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
(defcustom org-babel-noweb-wrap-end ">>"
|
|
|
|
"String used to end a noweb reference in a code block.
|
|
|
|
See also `org-babel-noweb-wrap-start'."
|
|
|
|
:group 'org-babel
|
|
|
|
:type 'string)
|
|
|
|
|
2013-04-26 15:37:25 +00:00
|
|
|
(defcustom org-babel-inline-result-wrap "=%s="
|
|
|
|
"Format string used to wrap inline results.
|
|
|
|
This string must include a \"%s\" which will be replaced by the results."
|
|
|
|
:group 'org-babel
|
|
|
|
:type 'string)
|
2013-10-28 19:39:31 +00:00
|
|
|
(put 'org-babel-inline-result-wrap
|
|
|
|
'safe-local-variable
|
|
|
|
(lambda (value)
|
|
|
|
(and (stringp value)
|
|
|
|
(string-match-p "%s" value))))
|
2013-04-26 15:37:25 +00:00
|
|
|
|
2012-03-19 20:38:12 +00:00
|
|
|
(defun org-babel-noweb-wrap (&optional regexp)
|
|
|
|
(concat org-babel-noweb-wrap-start
|
|
|
|
(or regexp "\\([^ \t\n].+?[^ \t]\\|[^ \t\n]\\)")
|
|
|
|
org-babel-noweb-wrap-end))
|
|
|
|
|
2010-07-12 04:35:58 +00:00
|
|
|
(defvar org-babel-src-name-regexp
|
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
|
|
|
"^[ \t]*#\\+name:[ \t]*"
|
2010-06-17 00:12:21 +00:00
|
|
|
"Regular expression used to match a source name line.")
|
|
|
|
|
2010-10-15 21:46:20 +00:00
|
|
|
(defvar org-babel-multi-line-header-regexp
|
|
|
|
"^[ \t]*#\\+headers?:[ \t]*\\([^\n]*\\)$"
|
|
|
|
"Regular expression used to match multi-line header arguments.")
|
|
|
|
|
2010-06-17 16:29:38 +00:00
|
|
|
(defvar org-babel-src-block-regexp
|
|
|
|
(concat
|
2011-02-27 21:38:58 +00:00
|
|
|
;; (1) indentation (2) lang
|
2010-06-17 17:08:31 +00:00
|
|
|
"^\\([ \t]*\\)#\\+begin_src[ \t]+\\([^ \f\t\n\r\v]+\\)[ \t]*"
|
|
|
|
;; (3) switches
|
2010-06-17 16:29:38 +00:00
|
|
|
"\\([^\":\n]*\"[^\"\n*]*\"[^\":\n]*\\|[^\":\n]*\\)"
|
2010-06-17 17:08:31 +00:00
|
|
|
;; (4) header arguments
|
2010-06-17 16:29:38 +00:00
|
|
|
"\\([^\n]*\\)\n"
|
2010-06-17 17:08:31 +00:00
|
|
|
;; (5) body
|
2013-09-13 14:57:25 +00:00
|
|
|
"\\([^\000]*?\n\\)??[ \t]*#\\+end_src")
|
2010-06-17 16:29:38 +00:00
|
|
|
"Regexp used to identify code blocks.")
|
|
|
|
|
2011-08-01 21:31:24 +00:00
|
|
|
(defvar org-babel-inline-src-block-regexp
|
|
|
|
(concat
|
|
|
|
;; (1) replacement target (2) lang
|
2015-01-29 20:05:31 +00:00
|
|
|
"\\(?:^\\|[^-[:alnum:]]?\\)\\(src_\\([^ \f\t\n\r\v[]+\\)"
|
2011-08-01 21:31:24 +00:00
|
|
|
;; (3,4) (unused, headers)
|
2014-06-13 13:32:54 +00:00
|
|
|
"\\(\\|\\[[ \t]*\\(.*?\\)\\]\\)"
|
2011-08-01 21:31:24 +00:00
|
|
|
;; (5) body
|
|
|
|
"{\\([^\f\n\r\v]+?\\)}\\)")
|
|
|
|
"Regexp used to identify inline src-blocks.")
|
2010-06-17 00:12:21 +00:00
|
|
|
|
2010-10-15 15:13:51 +00:00
|
|
|
(defun org-babel-get-header (params key &optional others)
|
|
|
|
"Select only header argument of type KEY from a list.
|
|
|
|
Optional argument OTHERS indicates that only the header that do
|
|
|
|
not match KEY should be returned."
|
2010-10-15 17:20:21 +00:00
|
|
|
(delq nil
|
|
|
|
(mapcar
|
|
|
|
(lambda (p) (when (funcall (if others #'not #'identity) (eq (car p) key)) p))
|
|
|
|
params)))
|
2010-10-15 15:13:51 +00:00
|
|
|
|
2013-11-22 15:11:34 +00:00
|
|
|
(defun org-babel-get-inline-src-block-matches ()
|
2011-09-05 21:53:07 +00:00
|
|
|
"Set match data if within body of an inline source block.
|
|
|
|
Returns non-nil if match-data set"
|
2015-01-29 20:05:31 +00:00
|
|
|
(save-excursion
|
|
|
|
(let ((datum (org-element-context)))
|
|
|
|
(when (eq (org-element-type datum) 'inline-src-block)
|
|
|
|
(goto-char (org-element-property :begin datum))
|
|
|
|
(when (looking-at org-babel-inline-src-block-regexp)
|
|
|
|
t )))))
|
2011-09-05 21:53:07 +00:00
|
|
|
|
2011-10-22 13:28:01 +00:00
|
|
|
(defvar org-babel-inline-lob-one-liner-regexp)
|
2013-11-22 15:11:34 +00:00
|
|
|
(defun org-babel-get-lob-one-liner-matches ()
|
2011-09-05 21:53:07 +00:00
|
|
|
"Set match data if on line of an lob one liner.
|
|
|
|
Returns non-nil if match-data set"
|
|
|
|
(save-excursion
|
2015-01-29 20:05:31 +00:00
|
|
|
(let ((datum (org-element-context)))
|
|
|
|
(when (eq (org-element-type datum) 'inline-babel-call)
|
|
|
|
(goto-char (org-element-property :begin datum))))
|
2011-09-05 21:53:07 +00:00
|
|
|
(if (looking-at org-babel-inline-lob-one-liner-regexp)
|
|
|
|
t
|
|
|
|
nil)))
|
|
|
|
|
2010-10-15 15:13:51 +00:00
|
|
|
(defun org-babel-get-src-block-info (&optional light)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Get information on the current source block.
|
2010-06-17 00:02:51 +00:00
|
|
|
|
2010-10-15 15:13:51 +00:00
|
|
|
Optional argument LIGHT does not resolve remote variable
|
|
|
|
references; a process which could likely result in the execution
|
|
|
|
of other code blocks.
|
|
|
|
|
2010-06-17 00:02:51 +00:00
|
|
|
Returns a list
|
2013-06-06 10:04:02 +00:00
|
|
|
(language body header-arguments-alist switches name indent block-head)."
|
2010-10-15 15:13:51 +00:00
|
|
|
(let ((case-fold-search t) head info name indent)
|
|
|
|
;; full code block
|
2010-06-17 00:02:51 +00:00
|
|
|
(if (setq head (org-babel-where-is-src-block-head))
|
2010-10-15 15:13:51 +00:00
|
|
|
(save-excursion
|
2010-06-17 00:02:51 +00:00
|
|
|
(goto-char head)
|
|
|
|
(setq info (org-babel-parse-src-block-match))
|
2013-08-21 10:24:17 +00:00
|
|
|
(setq indent (car (last info)))
|
2010-06-17 00:02:51 +00:00
|
|
|
(setq info (butlast info))
|
2016-02-06 22:01:22 +00:00
|
|
|
(while (and (= 0 (forward-line -1))
|
2010-10-16 00:42:26 +00:00
|
|
|
(looking-at org-babel-multi-line-header-regexp))
|
|
|
|
(setf (nth 2 info)
|
|
|
|
(org-babel-merge-params
|
2011-01-20 14:19:58 +00:00
|
|
|
(nth 2 info)
|
|
|
|
(org-babel-parse-header-arguments (match-string 1)))))
|
2015-05-01 12:28:15 +00:00
|
|
|
(when (looking-at (org-babel-named-src-block-regexp-for-name))
|
|
|
|
(setq name (org-match-string-no-properties 9))))
|
2010-10-15 15:13:51 +00:00
|
|
|
;; inline source block
|
2011-09-05 21:53:07 +00:00
|
|
|
(when (org-babel-get-inline-src-block-matches)
|
2013-11-22 15:18:05 +00:00
|
|
|
(setq head (match-beginning 0))
|
2010-10-15 15:13:51 +00:00
|
|
|
(setq info (org-babel-parse-inline-src-block-match))))
|
2010-10-16 18:14:20 +00:00
|
|
|
;; resolve variable references and add summary parameters
|
2010-10-15 15:13:51 +00:00
|
|
|
(when (and info (not light))
|
2010-10-16 18:14:20 +00:00
|
|
|
(setf (nth 2 info) (org-babel-process-params (nth 2 info))))
|
2014-04-22 19:13:48 +00:00
|
|
|
(when info
|
|
|
|
(setf (nth 2 info) (org-babel-generate-file-param name (nth 2 info))))
|
2013-06-06 10:04:02 +00:00
|
|
|
(when info (append info (list name indent head)))))
|
2010-06-11 22:25:37 +00:00
|
|
|
|
2014-03-14 14:27:32 +00:00
|
|
|
(defvar org-babel-exp-reference-buffer nil
|
|
|
|
"Buffer containing original contents of the exported buffer.
|
|
|
|
This is used by Babel to resolve references in source blocks.
|
|
|
|
Its value is dynamically bound during export.")
|
|
|
|
|
2013-03-09 00:34:09 +00:00
|
|
|
(defmacro org-babel-check-confirm-evaluate (info &rest body)
|
2013-03-09 17:34:39 +00:00
|
|
|
"Evaluate BODY with special execution confirmation variables set.
|
|
|
|
|
|
|
|
Specifically; NOEVAL will indicate if evaluation is allowed,
|
|
|
|
QUERY will indicate if a user query is required, CODE-BLOCK will
|
|
|
|
hold the language of the code block, and BLOCK-NAME will hold the
|
|
|
|
name of the code block."
|
2013-03-09 00:34:09 +00:00
|
|
|
(declare (indent defun))
|
2013-03-09 17:34:39 +00:00
|
|
|
(org-with-gensyms
|
2013-10-14 13:21:59 +00:00
|
|
|
(lang block-body headers name head eval eval-no export eval-no-export)
|
2013-03-09 17:34:39 +00:00
|
|
|
`(let* ((,lang (nth 0 ,info))
|
|
|
|
(,block-body (nth 1 ,info))
|
|
|
|
(,headers (nth 2 ,info))
|
|
|
|
(,name (nth 4 ,info))
|
2013-10-14 13:21:59 +00:00
|
|
|
(,head (nth 6 ,info))
|
2013-03-09 17:34:39 +00:00
|
|
|
(,eval (or (cdr (assoc :eval ,headers))
|
|
|
|
(when (assoc :noeval ,headers) "no")))
|
|
|
|
(,eval-no (or (equal ,eval "no")
|
|
|
|
(equal ,eval "never")))
|
2014-03-14 14:27:32 +00:00
|
|
|
(,export org-babel-exp-reference-buffer)
|
2013-03-09 17:34:39 +00:00
|
|
|
(,eval-no-export (and ,export (or (equal ,eval "no-export")
|
|
|
|
(equal ,eval "never-export"))))
|
|
|
|
(noeval (or ,eval-no ,eval-no-export))
|
|
|
|
(query (or (equal ,eval "query")
|
|
|
|
(and ,export (equal ,eval "query-export"))
|
2013-07-01 20:19:54 +00:00
|
|
|
(if (functionp org-confirm-babel-evaluate)
|
2013-10-14 13:21:59 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char ,head)
|
|
|
|
(funcall org-confirm-babel-evaluate
|
|
|
|
,lang ,block-body))
|
2013-07-01 20:19:54 +00:00
|
|
|
org-confirm-babel-evaluate)))
|
2013-03-09 17:34:39 +00:00
|
|
|
(code-block (if ,info (format " %s " ,lang) " "))
|
|
|
|
(block-name (if ,name (format " (%s) " ,name) " ")))
|
2016-01-26 06:13:51 +00:00
|
|
|
;; Silence byte-compiler if `body' doesn't use those vars.
|
2016-01-25 15:11:31 +00:00
|
|
|
(ignore noeval query)
|
2013-03-09 17:34:39 +00:00
|
|
|
,@body)))
|
2013-03-09 17:16:20 +00:00
|
|
|
|
2013-03-09 00:34:09 +00:00
|
|
|
(defsubst org-babel-check-evaluate (info)
|
|
|
|
"Check if code block INFO should be evaluated.
|
|
|
|
Do not query the user."
|
|
|
|
(org-babel-check-confirm-evaluate info
|
|
|
|
(not (when noeval
|
2015-08-06 02:06:57 +00:00
|
|
|
(message "Evaluation of this%scode-block%sis disabled."
|
|
|
|
code-block block-name)))))
|
2013-03-09 17:16:20 +00:00
|
|
|
|
2013-11-17 08:12:41 +00:00
|
|
|
;; dynamically scoped for asynchronous export
|
2013-03-09 21:22:49 +00:00
|
|
|
(defvar org-babel-confirm-evaluate-answer-no)
|
|
|
|
|
2013-03-09 00:34:09 +00:00
|
|
|
(defsubst org-babel-confirm-evaluate (info)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Confirm evaluation of the code block INFO.
|
2013-03-09 21:22:49 +00:00
|
|
|
|
2013-04-10 12:52:04 +00:00
|
|
|
If the variable `org-babel-confirm-evaluate-answer-no' is bound
|
2013-03-09 21:22:49 +00:00
|
|
|
to a non-nil value, auto-answer with \"no\".
|
|
|
|
|
|
|
|
This query can also be suppressed by setting the value of
|
2010-07-13 23:20:08 +00:00
|
|
|
`org-confirm-babel-evaluate' to nil, in which case all future
|
|
|
|
interactive code block evaluations will proceed without any
|
|
|
|
confirmation from the user.
|
2010-06-30 19:25:22 +00:00
|
|
|
|
|
|
|
Note disabling confirmation may result in accidental evaluation
|
|
|
|
of potentially harmful code."
|
2013-03-09 00:34:09 +00:00
|
|
|
(org-babel-check-confirm-evaluate info
|
|
|
|
(not (when query
|
2013-03-09 21:22:49 +00:00
|
|
|
(unless
|
|
|
|
(and (not (org-bound-and-true-p
|
|
|
|
org-babel-confirm-evaluate-answer-no))
|
|
|
|
(yes-or-no-p
|
|
|
|
(format "Evaluate this%scode block%son your system? "
|
|
|
|
code-block block-name)))
|
2015-08-06 02:06:57 +00:00
|
|
|
(message "Evaluation of this%scode-block%sis aborted."
|
|
|
|
code-block block-name))))))
|
2010-06-30 19:25:22 +00:00
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2010-08-05 17:45:13 +00:00
|
|
|
(defun org-babel-execute-safely-maybe ()
|
|
|
|
(unless org-babel-no-eval-on-ctrl-c-ctrl-c
|
|
|
|
(org-babel-execute-maybe)))
|
|
|
|
|
|
|
|
(add-hook 'org-ctrl-c-ctrl-c-hook 'org-babel-execute-safely-maybe)
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-babel-execute-maybe ()
|
|
|
|
(interactive)
|
|
|
|
(or (org-babel-execute-src-block-maybe)
|
|
|
|
(org-babel-lob-execute-maybe)))
|
|
|
|
|
2013-04-18 08:06:55 +00:00
|
|
|
(defmacro org-babel-when-in-src-block (&rest body)
|
|
|
|
"Execute BODY if point is in a source block and return t.
|
|
|
|
|
|
|
|
Otherwise do nothing and return nil."
|
|
|
|
`(if (or (org-babel-where-is-src-block-head)
|
|
|
|
(org-babel-get-inline-src-block-matches))
|
|
|
|
(progn
|
|
|
|
,@body
|
|
|
|
t)
|
|
|
|
nil))
|
|
|
|
|
2009-05-24 20:38:01 +00:00
|
|
|
(defun org-babel-execute-src-block-maybe ()
|
2010-07-13 23:20:08 +00:00
|
|
|
"Conditionally execute a source block.
|
|
|
|
Detect if this is context for a Babel src-block and if so
|
2009-05-24 20:38:01 +00:00
|
|
|
then run `org-babel-execute-src-block'."
|
2009-05-22 23:23:52 +00:00
|
|
|
(interactive)
|
2013-04-18 08:06:55 +00:00
|
|
|
(org-babel-when-in-src-block
|
|
|
|
(org-babel-eval-wipe-error-buffer)
|
|
|
|
(org-babel-execute-src-block current-prefix-arg)))
|
2009-02-22 21:19:32 +00:00
|
|
|
|
2011-07-25 16:45:37 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun org-babel-view-src-block-info ()
|
|
|
|
"Display information on the current source block.
|
|
|
|
This includes header arguments, language and name, and is largely
|
|
|
|
a window into the `org-babel-get-src-block-info' function."
|
|
|
|
(interactive)
|
2012-08-09 14:13:18 +00:00
|
|
|
(let ((info (org-babel-get-src-block-info 'light))
|
|
|
|
(full (lambda (it) (> (length it) 0)))
|
|
|
|
(printf (lambda (fmt &rest args) (princ (apply #'format fmt args)))))
|
|
|
|
(when info
|
|
|
|
(with-help-window (help-buffer)
|
|
|
|
(let ((name (nth 4 info))
|
|
|
|
(lang (nth 0 info))
|
|
|
|
(switches (nth 3 info))
|
|
|
|
(header-args (nth 2 info)))
|
|
|
|
(when name (funcall printf "Name: %s\n" name))
|
|
|
|
(when lang (funcall printf "Lang: %s\n" lang))
|
2015-02-10 08:32:46 +00:00
|
|
|
(funcall printf "Properties:\n")
|
|
|
|
(funcall printf "\t:header-args \t%s\n" (org-entry-get (point) "header-args" t))
|
|
|
|
(funcall printf "\t:header-args:%s \t%s\n" lang (org-entry-get (point) (concat "header-args:" lang) t))
|
|
|
|
|
2012-08-09 14:13:18 +00:00
|
|
|
(when (funcall full switches) (funcall printf "Switches: %s\n" switches))
|
|
|
|
(funcall printf "Header Arguments:\n")
|
|
|
|
(dolist (pair (sort header-args
|
|
|
|
(lambda (a b) (string< (symbol-name (car a))
|
|
|
|
(symbol-name (car b))))))
|
2015-02-10 08:32:46 +00:00
|
|
|
(when (funcall full (format "%s" (cdr pair)))
|
2012-08-09 14:13:18 +00:00
|
|
|
(funcall printf "\t%S%s\t%s\n"
|
|
|
|
(car pair)
|
|
|
|
(if (> (length (format "%S" (car pair))) 7) "" "\t")
|
|
|
|
(cdr pair)))))))))
|
2011-07-25 16:45:37 +00:00
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2010-04-20 05:40:58 +00:00
|
|
|
(defun org-babel-expand-src-block-maybe ()
|
2010-07-13 23:20:08 +00:00
|
|
|
"Conditionally expand a source block.
|
|
|
|
Detect if this is context for a org-babel src-block and if so
|
2010-04-20 05:40:58 +00:00
|
|
|
then run `org-babel-expand-src-block'."
|
|
|
|
(interactive)
|
2013-04-18 08:06:55 +00:00
|
|
|
(org-babel-when-in-src-block
|
|
|
|
(org-babel-expand-src-block current-prefix-arg)))
|
2010-04-20 05:40:58 +00:00
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2009-09-25 03:58:28 +00:00
|
|
|
(defun org-babel-load-in-session-maybe ()
|
2010-07-13 23:20:08 +00:00
|
|
|
"Conditionally load a source block in a session.
|
|
|
|
Detect if this is context for a org-babel src-block and if so
|
2009-09-25 03:58:28 +00:00
|
|
|
then run `org-babel-load-in-session'."
|
|
|
|
(interactive)
|
2013-04-18 08:06:55 +00:00
|
|
|
(org-babel-when-in-src-block
|
|
|
|
(org-babel-load-in-session current-prefix-arg)))
|
2009-09-25 03:58:28 +00:00
|
|
|
|
|
|
|
(add-hook 'org-metaup-hook 'org-babel-load-in-session-maybe)
|
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2009-06-14 18:08:12 +00:00
|
|
|
(defun org-babel-pop-to-session-maybe ()
|
2010-07-13 23:20:08 +00:00
|
|
|
"Conditionally pop to a session.
|
|
|
|
Detect if this is context for a org-babel src-block and if so
|
2013-04-18 08:22:34 +00:00
|
|
|
then run `org-babel-switch-to-session'."
|
2009-06-14 18:08:12 +00:00
|
|
|
(interactive)
|
2013-04-18 08:06:55 +00:00
|
|
|
(org-babel-when-in-src-block
|
|
|
|
(org-babel-switch-to-session current-prefix-arg)))
|
2009-06-14 18:08:12 +00:00
|
|
|
|
|
|
|
(add-hook 'org-metadown-hook 'org-babel-pop-to-session-maybe)
|
|
|
|
|
2011-10-08 22:31:50 +00:00
|
|
|
(defconst org-babel-common-header-args-w-values
|
|
|
|
'((cache . ((no yes)))
|
|
|
|
(cmdline . :any)
|
|
|
|
(colnames . ((nil no yes)))
|
|
|
|
(comments . ((no link yes org both noweb)))
|
|
|
|
(dir . :any)
|
2015-05-19 13:38:08 +00:00
|
|
|
(eval . ((yes no no-export strip-export never-export eval never
|
|
|
|
query)))
|
2011-10-08 22:31:50 +00:00
|
|
|
(exports . ((code results both none)))
|
2013-06-22 19:52:35 +00:00
|
|
|
(epilogue . :any)
|
2011-10-08 22:31:50 +00:00
|
|
|
(file . :any)
|
2012-03-31 13:53:18 +00:00
|
|
|
(file-desc . :any)
|
2015-05-22 16:53:38 +00:00
|
|
|
(file-ext . :any)
|
2011-10-08 22:31:50 +00:00
|
|
|
(hlines . ((no yes)))
|
|
|
|
(mkdirp . ((yes no)))
|
|
|
|
(no-expand)
|
|
|
|
(noeval)
|
2012-03-19 20:38:12 +00:00
|
|
|
(noweb . ((yes no tangle no-export strip-export)))
|
2011-10-08 22:31:50 +00:00
|
|
|
(noweb-ref . :any)
|
2012-01-24 06:57:51 +00:00
|
|
|
(noweb-sep . :any)
|
2014-08-06 04:04:52 +00:00
|
|
|
(output-dir . :any)
|
2011-10-08 22:31:50 +00:00
|
|
|
(padline . ((yes no)))
|
2013-04-01 01:02:11 +00:00
|
|
|
(post . :any)
|
2013-06-22 19:52:35 +00:00
|
|
|
(prologue . :any)
|
2011-10-08 22:31:50 +00:00
|
|
|
(results . ((file list vector table scalar verbatim)
|
2012-09-26 08:56:16 +00:00
|
|
|
(raw html latex org code pp drawer)
|
2012-11-16 15:40:46 +00:00
|
|
|
(replace silent none append prepend)
|
2012-08-10 15:44:45 +00:00
|
|
|
(output value)))
|
2011-10-08 22:31:50 +00:00
|
|
|
(rownames . ((no yes)))
|
|
|
|
(sep . :any)
|
|
|
|
(session . :any)
|
|
|
|
(shebang . :any)
|
|
|
|
(tangle . ((tangle yes no :any)))
|
2013-06-08 18:29:02 +00:00
|
|
|
(tangle-mode . ((#o755 #o555 #o444 :any)))
|
2012-03-19 20:38:12 +00:00
|
|
|
(var . :any)
|
|
|
|
(wrap . :any)))
|
2011-10-08 22:31:50 +00:00
|
|
|
|
2010-02-24 20:49:07 +00:00
|
|
|
(defconst org-babel-header-arg-names
|
2011-10-08 22:31:50 +00:00
|
|
|
(mapcar #'car org-babel-common-header-args-w-values)
|
2010-07-13 23:20:08 +00: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 20:49:07 +00:00
|
|
|
|
2013-10-30 17:58:50 +00:00
|
|
|
(defconst org-babel-safe-header-args
|
|
|
|
'(:cache :colnames :comments :exports :epilogue :hlines :noeval
|
|
|
|
:noweb :noweb-ref :noweb-sep :padline :prologue :rownames
|
|
|
|
:sep :session :tangle :wrap
|
|
|
|
(:eval . ("never" "query"))
|
|
|
|
(:results . (lambda (str) (not (string-match "file" str)))))
|
|
|
|
"A list of safe header arguments for babel source blocks.
|
|
|
|
|
|
|
|
The list can have entries of the following forms:
|
|
|
|
- :ARG -> :ARG is always a safe header arg
|
|
|
|
- (:ARG . (VAL1 VAL2 ...)) -> :ARG is safe as a header arg if it is
|
|
|
|
`equal' to one of the VALs.
|
|
|
|
- (:ARG . FN) -> :ARG is safe as a header arg if the function FN
|
|
|
|
returns non-nil. FN is passed one
|
|
|
|
argument, the value of the header arg
|
|
|
|
(as a string).")
|
|
|
|
|
|
|
|
(defmacro org-babel-header-args-safe-fn (safe-list)
|
|
|
|
"Return a function that determines whether a list of header args are safe.
|
|
|
|
|
|
|
|
Intended usage is:
|
2015-09-21 04:24:12 +00:00
|
|
|
\(put \\='org-babel-default-header-args \\='safe-local-variable
|
2013-10-30 17:58:50 +00:00
|
|
|
(org-babel-header-args-safe-p org-babel-safe-header-args)
|
|
|
|
|
|
|
|
This allows org-babel languages to extend the list of safe values for
|
|
|
|
their `org-babel-default-header-args:foo' variable.
|
|
|
|
|
|
|
|
For the format of SAFE-LIST, see `org-babel-safe-header-args'."
|
|
|
|
`(lambda (value)
|
|
|
|
(and (listp value)
|
|
|
|
(org-every
|
|
|
|
(lambda (pair)
|
|
|
|
(and (consp pair)
|
|
|
|
(org-babel-one-header-arg-safe-p pair ,safe-list)))
|
|
|
|
value))))
|
|
|
|
|
2009-09-01 21:30:39 +00:00
|
|
|
(defvar org-babel-default-header-args
|
2010-04-17 20:03:30 +00:00
|
|
|
'((:session . "none") (:results . "replace") (:exports . "code")
|
2013-09-18 21:20:51 +00:00
|
|
|
(:cache . "no") (:noweb . "no") (:hlines . "no") (:tangle . "no"))
|
2009-05-23 16:05:53 +00:00
|
|
|
"Default arguments to use when evaluating a source block.")
|
2013-10-28 19:39:31 +00:00
|
|
|
(put 'org-babel-default-header-args 'safe-local-variable
|
|
|
|
(org-babel-header-args-safe-fn org-babel-safe-header-args))
|
2009-05-23 16:05:53 +00:00
|
|
|
|
2009-10-25 00:23:31 +00:00
|
|
|
(defvar org-babel-default-inline-header-args
|
2013-11-13 23:26:26 +00:00
|
|
|
'((:session . "none") (:results . "replace")
|
|
|
|
(:exports . "results") (:hlines . "yes"))
|
2009-04-26 18:42:36 +00:00
|
|
|
"Default arguments to use when evaluating an inline source block.")
|
2013-10-28 19:39:31 +00:00
|
|
|
(put 'org-babel-default-inline-header-args 'safe-local-variable
|
|
|
|
(org-babel-header-args-safe-fn org-babel-safe-header-args))
|
2009-04-26 18:42:36 +00:00
|
|
|
|
2012-04-21 13:36:04 +00:00
|
|
|
(defvar org-babel-data-names '("tblname" "results" "name"))
|
2011-05-06 20:45:38 +00:00
|
|
|
|
2009-11-20 17:40:50 +00:00
|
|
|
(defvar org-babel-result-regexp
|
2011-05-06 20:45:38 +00:00
|
|
|
(concat "^[ \t]*#\\+"
|
2011-06-02 10:04:04 +00:00
|
|
|
(regexp-opt org-babel-data-names t)
|
2013-02-09 23:05:44 +00:00
|
|
|
"\\(\\[\\("
|
|
|
|
;; FIXME The string below is `org-ts-regexp'
|
|
|
|
"<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^\r\n>]*?\\)>"
|
|
|
|
" \\)?\\([[:alnum:]]+\\)\\]\\)?\\:[ \t]*")
|
2010-07-13 23:20:08 +00:00
|
|
|
"Regular expression used to match result lines.
|
|
|
|
If the results are associated with a hash key then the hash will
|
|
|
|
be saved in the second match data.")
|
2009-11-20 17:40:50 +00:00
|
|
|
|
2010-07-12 04:35:58 +00:00
|
|
|
(defvar org-babel-result-w-name-regexp
|
|
|
|
(concat org-babel-result-regexp
|
2015-09-17 23:08:20 +00:00
|
|
|
"\\([^ ()\f\t\n\r\v]+\\)\\((\\(.*\\))\\|\\)"))
|
2010-07-12 04:35:58 +00:00
|
|
|
|
2009-07-18 19:52:51 +00:00
|
|
|
(defvar org-babel-min-lines-for-block-output 10
|
2010-07-13 23:20:08 +00:00
|
|
|
"The minimum number of lines for block output.
|
|
|
|
If number of lines of output is equal to or exceeds this
|
2009-11-20 17:40:50 +00:00
|
|
|
value, the output is placed in a #+begin_example...#+end_example
|
2012-08-11 17:10:44 +00:00
|
|
|
block. Otherwise the output is marked as literal by inserting
|
|
|
|
colons at the starts of the lines. This variable only takes
|
2009-11-20 17:40:50 +00:00
|
|
|
effect if the :results output option is in effect.")
|
2009-07-18 19:38:21 +00:00
|
|
|
|
2014-06-12 23:39:32 +00:00
|
|
|
(defvar org-babel-noweb-error-all-langs nil
|
|
|
|
"Raise errors when noweb references don't resolve.
|
|
|
|
Also see `org-babel-noweb-error-langs' to control noweb errors on
|
|
|
|
a language by language bases.")
|
|
|
|
|
2009-11-10 15:59:17 +00:00
|
|
|
(defvar org-babel-noweb-error-langs nil
|
2010-07-13 23:20:08 +00:00
|
|
|
"Languages for which Babel will raise literate programming errors.
|
|
|
|
List of languages for which errors should be raised when the
|
2009-11-20 17:40:50 +00:00
|
|
|
source code block satisfying a noweb reference in this language
|
2014-06-12 23:39:32 +00:00
|
|
|
can not be resolved. Also see `org-babel-noweb-error-all-langs'
|
|
|
|
to raise errors for all languages.")
|
2009-11-10 15:59:17 +00:00
|
|
|
|
2009-11-18 06:15:04 +00:00
|
|
|
(defvar org-babel-hash-show 4
|
|
|
|
"Number of initial characters to show of a hidden results hash.")
|
|
|
|
|
2013-01-30 17:05:51 +00:00
|
|
|
(defvar org-babel-hash-show-time nil
|
2013-03-24 18:09:31 +00:00
|
|
|
"Non-nil means show the time the code block was evaluated in the result hash.")
|
2013-01-30 17:05:51 +00:00
|
|
|
|
2010-03-13 17:34:02 +00:00
|
|
|
(defvar org-babel-after-execute-hook nil
|
|
|
|
"Hook for functions to be called after `org-babel-execute-src-block'")
|
2011-11-16 03:13:41 +00:00
|
|
|
|
2015-05-01 12:23:49 +00:00
|
|
|
(defun org-babel-named-src-block-regexp-for-name (&optional name)
|
|
|
|
"This generates a regexp used to match a src block named NAME.
|
|
|
|
If NAME is nil, match any name. Matched name is then put in
|
|
|
|
match group 9. Other match groups are defined in
|
|
|
|
`org-babel-src-block-regexp'."
|
|
|
|
(concat org-babel-src-name-regexp
|
|
|
|
(concat (if name (regexp-quote name) "\\(?9:.*?\\)") "[ \t]*" )
|
2015-05-01 11:53:47 +00:00
|
|
|
"\\(?:\n[ \t]*#\\+\\S-+:.*\\)*?"
|
|
|
|
"\n"
|
2009-08-15 01:34:23 +00:00
|
|
|
(substring org-babel-src-block-regexp 1)))
|
2009-06-13 22:46:26 +00:00
|
|
|
|
2011-11-16 03:13:41 +00:00
|
|
|
(defun org-babel-named-data-regexp-for-name (name)
|
|
|
|
"This generates a regexp used to match data named NAME."
|
2011-11-16 13:15:31 +00:00
|
|
|
(concat org-babel-result-regexp (regexp-quote name) "\\([ \t]\\|$\\)"))
|
2011-11-16 03:13:41 +00:00
|
|
|
|
2009-02-22 21:19:32 +00:00
|
|
|
;;; functions
|
2010-06-15 00:51:52 +00:00
|
|
|
(defvar call-process-region)
|
2013-06-08 19:19:38 +00:00
|
|
|
(defvar org-babel-current-src-block-location nil
|
|
|
|
"Marker pointing to the src block currently being executed.
|
|
|
|
This may also point to a call line or an inline code block. If
|
|
|
|
multiple blocks are being executed (e.g., in chained execution
|
|
|
|
through use of the :var header argument) this marker points to
|
|
|
|
the outer-most code block.")
|
2010-08-05 17:45:13 +00:00
|
|
|
|
2016-01-25 15:11:31 +00:00
|
|
|
(defvar *this*)
|
|
|
|
|
2012-10-02 07:55:42 +00:00
|
|
|
;;;###autoload
|
2009-05-24 20:38:01 +00:00
|
|
|
(defun org-babel-execute-src-block (&optional arg info params)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Execute the current source code block.
|
|
|
|
Insert the results of execution 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 18:42:36 +00:00
|
|
|
|
2011-11-28 14:13:04 +00:00
|
|
|
With prefix argument ARG, force re-execution even if an existing
|
|
|
|
result cached in the buffer would otherwise have been returned.
|
2010-09-02 04:10:54 +00:00
|
|
|
|
2009-04-26 18:42:36 +00:00
|
|
|
Optionally supply a value for INFO in the form returned by
|
2009-05-24 20:38:01 +00:00
|
|
|
`org-babel-get-src-block-info'.
|
2009-05-09 16:34:55 +00:00
|
|
|
|
|
|
|
Optionally supply a value for PARAMS which will be merged with
|
2009-11-20 17:40:50 +00:00
|
|
|
the header arguments specified at the front of the source code
|
|
|
|
block."
|
2009-05-21 14:22:24 +00:00
|
|
|
(interactive)
|
2013-06-25 13:55:32 +00:00
|
|
|
(let* ((org-babel-current-src-block-location
|
|
|
|
(or org-babel-current-src-block-location
|
|
|
|
(nth 6 info)
|
2013-11-22 15:18:05 +00:00
|
|
|
(org-babel-where-is-src-block-head)
|
|
|
|
;; inline src block
|
|
|
|
(and (org-babel-get-inline-src-block-matches)
|
|
|
|
(match-beginning 0))))
|
2013-06-25 13:55:32 +00:00
|
|
|
(info (if info
|
2013-04-18 08:02:47 +00:00
|
|
|
(copy-tree info)
|
|
|
|
(org-babel-get-src-block-info)))
|
2013-02-27 22:19:59 +00:00
|
|
|
(merged-params (org-babel-merge-params (nth 2 info) params)))
|
2013-03-09 00:34:09 +00:00
|
|
|
(when (org-babel-check-evaluate
|
2013-02-27 22:19:59 +00:00
|
|
|
(let ((i info)) (setf (nth 2 i) merged-params) i))
|
2013-03-09 00:34:09 +00:00
|
|
|
(let* ((params (if params
|
2013-02-27 22:19:59 +00:00
|
|
|
(org-babel-process-params merged-params)
|
2013-02-27 21:10:05 +00:00
|
|
|
(nth 2 info)))
|
2013-03-09 17:14:03 +00:00
|
|
|
(cachep (and (not arg) (cdr (assoc :cache params))
|
2013-03-09 00:34:09 +00:00
|
|
|
(string= "yes" (cdr (assoc :cache params)))))
|
2013-03-09 17:14:03 +00:00
|
|
|
(new-hash (when cachep (org-babel-sha1-hash info)))
|
|
|
|
(old-hash (when cachep (org-babel-current-result-hash)))
|
|
|
|
(cache-current-p (and (not arg) new-hash
|
|
|
|
(equal new-hash old-hash))))
|
|
|
|
(cond
|
|
|
|
(cache-current-p
|
|
|
|
(save-excursion ;; return cached result
|
|
|
|
(goto-char (org-babel-where-is-src-block-result nil info))
|
2015-05-24 11:42:20 +00:00
|
|
|
(forward-line)
|
|
|
|
(skip-chars-forward " \t")
|
2013-03-09 17:14:03 +00:00
|
|
|
(let ((result (org-babel-read-result)))
|
|
|
|
(message (replace-regexp-in-string
|
2016-01-25 15:11:31 +00:00
|
|
|
"%" "%%" (format "%S" result)))
|
|
|
|
result)))
|
2013-03-09 17:14:03 +00:00
|
|
|
((org-babel-confirm-evaluate
|
|
|
|
(let ((i info)) (setf (nth 2 i) merged-params) i))
|
2013-03-09 00:34:09 +00:00
|
|
|
(let* ((lang (nth 0 info))
|
|
|
|
(result-params (cdr (assoc :result-params params)))
|
|
|
|
(body (setf (nth 1 info)
|
|
|
|
(if (org-babel-noweb-p params :eval)
|
|
|
|
(org-babel-expand-noweb-references info)
|
|
|
|
(nth 1 info))))
|
|
|
|
(dir (cdr (assoc :dir params)))
|
|
|
|
(default-directory
|
|
|
|
(or (and dir (file-name-as-directory (expand-file-name dir)))
|
|
|
|
default-directory))
|
|
|
|
(org-babel-call-process-region-original ;; for tramp handler
|
2013-03-09 17:14:03 +00:00
|
|
|
(or (org-bound-and-true-p
|
|
|
|
org-babel-call-process-region-original)
|
2013-03-09 00:34:09 +00:00
|
|
|
(symbol-function 'call-process-region)))
|
2013-06-06 10:04:02 +00:00
|
|
|
(indent (nth 5 info))
|
2013-03-09 00:34:09 +00:00
|
|
|
result cmd)
|
|
|
|
(unwind-protect
|
|
|
|
(let ((call-process-region
|
|
|
|
(lambda (&rest args)
|
2013-03-09 17:14:03 +00:00
|
|
|
(apply 'org-babel-tramp-handle-call-process-region
|
|
|
|
args))))
|
|
|
|
(let ((lang-check
|
|
|
|
(lambda (f)
|
|
|
|
(let ((f (intern (concat "org-babel-execute:" f))))
|
|
|
|
(when (fboundp f) f)))))
|
2013-03-09 00:34:09 +00:00
|
|
|
(setq cmd
|
|
|
|
(or (funcall lang-check lang)
|
2013-03-09 17:14:03 +00:00
|
|
|
(funcall lang-check
|
|
|
|
(symbol-name
|
|
|
|
(cdr (assoc lang org-src-lang-modes))))
|
|
|
|
(error "No org-babel-execute function for %s!"
|
|
|
|
lang))))
|
|
|
|
(message "executing %s code block%s..."
|
|
|
|
(capitalize lang)
|
|
|
|
(if (nth 4 info) (format " (%s)" (nth 4 info)) ""))
|
|
|
|
(if (member "none" result-params)
|
|
|
|
(progn
|
|
|
|
(funcall cmd body params)
|
2013-04-22 03:35:47 +00:00
|
|
|
(message "result silenced")
|
|
|
|
(setq result nil))
|
2013-03-09 17:14:03 +00:00
|
|
|
(setq result
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(let ((result (funcall cmd body params)))
|
|
|
|
(if (and (eq (cdr (assoc :result-type params))
|
|
|
|
'value)
|
|
|
|
(or (member "vector" result-params)
|
|
|
|
(member "table" result-params))
|
|
|
|
(not (listp result)))
|
|
|
|
(list (list result)) result)))
|
|
|
|
;; If non-empty result and :file then write to :file.
|
2013-03-09 17:14:03 +00:00
|
|
|
(when (cdr (assoc :file params))
|
|
|
|
(when result
|
|
|
|
(with-temp-file (cdr (assoc :file params))
|
|
|
|
(insert
|
|
|
|
(org-babel-format-result
|
|
|
|
result (cdr (assoc :sep (nth 2 info)))))))
|
|
|
|
(setq result (cdr (assoc :file params))))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
;; Possibly perform post process provided its appropriate.
|
2013-04-04 00:02:54 +00:00
|
|
|
(when (cdr (assoc :post params))
|
|
|
|
(let ((*this* (if (cdr (assoc :file params))
|
|
|
|
(org-babel-result-to-file
|
|
|
|
(cdr (assoc :file params))
|
|
|
|
(when (assoc :file-desc params)
|
|
|
|
(or (cdr (assoc :file-desc params))
|
|
|
|
result)))
|
|
|
|
result)))
|
|
|
|
(setq result (org-babel-ref-resolve
|
|
|
|
(cdr (assoc :post params))))
|
|
|
|
(when (cdr (assoc :file params))
|
|
|
|
(setq result-params
|
|
|
|
(remove "file" result-params)))))
|
2013-03-09 17:14:03 +00:00
|
|
|
(org-babel-insert-result
|
2013-04-22 03:35:47 +00:00
|
|
|
result result-params info new-hash indent lang))
|
|
|
|
(run-hooks 'org-babel-after-execute-hook)
|
|
|
|
result)
|
2013-03-09 17:14:03 +00:00
|
|
|
(setq call-process-region
|
|
|
|
'org-babel-call-process-region-original)))))))))
|
2009-07-16 20:21:07 +00:00
|
|
|
|
2010-10-21 11:38:15 +00:00
|
|
|
(defun org-babel-expand-body:generic (body params &optional var-lines)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Expand BODY with PARAMS.
|
2011-12-06 18:20:21 +00:00
|
|
|
Expand a block of code with org-babel according to its header
|
2010-04-21 02:43:35 +00:00
|
|
|
arguments. This generic implementation of body expansion is
|
|
|
|
called for languages which have not defined their own specific
|
2010-10-21 11:38:15 +00:00
|
|
|
org-babel-expand-body:lang function."
|
2013-06-22 19:52:35 +00:00
|
|
|
(let ((pro (cdr (assoc :prologue params)))
|
|
|
|
(epi (cdr (assoc :epilogue params))))
|
|
|
|
(mapconcat #'identity
|
|
|
|
(append (when pro (list pro))
|
|
|
|
var-lines
|
|
|
|
(list body)
|
|
|
|
(when epi (list epi)))
|
|
|
|
"\n")))
|
2010-04-21 02:43:35 +00:00
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2016-01-25 15:11:31 +00:00
|
|
|
(defun org-babel-expand-src-block (&optional _arg info params)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Expand the current source code block.
|
|
|
|
Expand according to the source code block's header
|
|
|
|
arguments and pop open the results in a preview buffer."
|
2010-04-20 05:40:58 +00:00
|
|
|
(interactive)
|
|
|
|
(let* ((info (or info (org-babel-get-src-block-info)))
|
2010-06-13 01:26:08 +00:00
|
|
|
(lang (nth 0 info))
|
|
|
|
(params (setf (nth 2 info)
|
|
|
|
(sort (org-babel-merge-params (nth 2 info) params)
|
2010-04-20 05:40:58 +00:00
|
|
|
(lambda (el1 el2) (string< (symbol-name (car el1))
|
2012-08-10 15:44:45 +00:00
|
|
|
(symbol-name (car el2)))))))
|
2010-06-13 01:26:08 +00:00
|
|
|
(body (setf (nth 1 info)
|
2012-03-19 20:38:12 +00:00
|
|
|
(if (org-babel-noweb-p params :eval)
|
2010-06-13 01:26:08 +00:00
|
|
|
(org-babel-expand-noweb-references info) (nth 1 info))))
|
2010-10-21 11:38:15 +00:00
|
|
|
(expand-cmd (intern (concat "org-babel-expand-body:" lang)))
|
2011-05-13 16:54:37 +00:00
|
|
|
(assignments-cmd (intern (concat "org-babel-variable-assignments:"
|
|
|
|
lang)))
|
2010-10-21 11:38:15 +00:00
|
|
|
(expanded
|
|
|
|
(if (fboundp expand-cmd) (funcall expand-cmd body params)
|
|
|
|
(org-babel-expand-body:generic
|
2011-05-13 16:54:37 +00:00
|
|
|
body params (and (fboundp assignments-cmd)
|
|
|
|
(funcall assignments-cmd params))))))
|
2013-04-25 05:30:04 +00:00
|
|
|
(if (org-called-interactively-p 'any)
|
2013-02-24 16:49:12 +00:00
|
|
|
(org-edit-src-code
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 23:31:23 +00:00
|
|
|
expanded (concat "*Org-Babel Preview " (buffer-name) "[ " lang " ]*"))
|
2013-02-24 16:49:12 +00:00
|
|
|
expanded)))
|
2010-04-20 05:40:58 +00:00
|
|
|
|
2011-05-13 16:54:37 +00:00
|
|
|
(defun org-babel-edit-distance (s1 s2)
|
|
|
|
"Return the edit (levenshtein) distance between strings S1 S2."
|
|
|
|
(let* ((l1 (length s1))
|
|
|
|
(l2 (length s2))
|
2012-07-25 15:13:08 +00:00
|
|
|
(dist (vconcat (mapcar (lambda (_) (make-vector (1+ l2) nil))
|
2012-08-09 14:13:18 +00:00
|
|
|
(number-sequence 1 (1+ l1)))))
|
2012-12-06 15:38:44 +00:00
|
|
|
(in (lambda (i j) (aref (aref dist i) j))))
|
2012-08-10 15:44:45 +00:00
|
|
|
(setf (aref (aref dist 0) 0) 0)
|
2012-12-06 15:38:44 +00:00
|
|
|
(dolist (j (number-sequence 1 l2))
|
|
|
|
(setf (aref (aref dist 0) j) j))
|
2012-08-10 15:44:45 +00:00
|
|
|
(dolist (i (number-sequence 1 l1))
|
2012-12-06 15:38:44 +00:00
|
|
|
(setf (aref (aref dist i) 0) i)
|
2012-08-10 15:44:45 +00:00
|
|
|
(dolist (j (number-sequence 1 l2))
|
|
|
|
(setf (aref (aref dist i) j)
|
2012-12-06 15:38:44 +00:00
|
|
|
(min
|
|
|
|
(1+ (funcall in (1- i) j))
|
|
|
|
(1+ (funcall in i (1- j)))
|
|
|
|
(+ (if (equal (aref s1 (1- i)) (aref s2 (1- j))) 0 1)
|
|
|
|
(funcall in (1- i) (1- j)))))))
|
2012-08-10 15:44:45 +00:00
|
|
|
(funcall in l1 l2)))
|
2011-05-13 16:54:37 +00:00
|
|
|
|
2012-04-10 23:03:37 +00:00
|
|
|
(defun org-babel-combine-header-arg-lists (original &rest others)
|
|
|
|
"Combine a number of lists of header argument names and arguments."
|
|
|
|
(let ((results (copy-sequence original)))
|
|
|
|
(dolist (new-list others)
|
|
|
|
(dolist (arg-pair new-list)
|
2016-01-25 15:11:31 +00:00
|
|
|
(let ((header (car arg-pair)))
|
2012-04-10 23:03:37 +00:00
|
|
|
(setq results
|
|
|
|
(cons arg-pair (org-remove-if
|
|
|
|
(lambda (pair) (equal header (car pair)))
|
|
|
|
results))))))
|
|
|
|
results))
|
|
|
|
|
2011-05-13 16:54:37 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun org-babel-check-src-block ()
|
|
|
|
"Check for misspelled header arguments in the current code block."
|
|
|
|
(interactive)
|
|
|
|
;; TODO: report malformed code block
|
|
|
|
;; TODO: report incompatible combinations of header arguments
|
2011-09-15 15:11:12 +00:00
|
|
|
;; TODO: report uninitialized variables
|
2012-01-23 18:07:27 +00:00
|
|
|
(let ((too-close 2) ;; <- control closeness to report potential match
|
|
|
|
(names (mapcar #'symbol-name org-babel-header-arg-names)))
|
2011-05-13 16:54:37 +00:00
|
|
|
(dolist (header (mapcar (lambda (arg) (substring (symbol-name (car arg)) 1))
|
|
|
|
(and (org-babel-where-is-src-block-head)
|
|
|
|
(org-babel-parse-header-arguments
|
2012-08-15 07:39:24 +00:00
|
|
|
(org-no-properties
|
2011-05-13 16:54:37 +00:00
|
|
|
(match-string 4))))))
|
2012-01-23 18:07:27 +00:00
|
|
|
(dolist (name names)
|
2011-05-13 16:54:37 +00:00
|
|
|
(when (and (not (string= header name))
|
2012-01-23 18:07:27 +00:00
|
|
|
(<= (org-babel-edit-distance header name) too-close)
|
|
|
|
(not (member header names)))
|
2012-08-13 03:59:44 +00:00
|
|
|
(error "Supplied header \"%S\" is suspiciously close to \"%S\""
|
2011-05-13 16:54:37 +00:00
|
|
|
header name))))
|
|
|
|
(message "No suspicious header arguments found.")))
|
|
|
|
|
2011-10-08 22:31:50 +00:00
|
|
|
;;;###autoload
|
2013-10-06 15:05:02 +00:00
|
|
|
(defun org-babel-insert-header-arg (&optional header-arg value)
|
2011-10-08 22:31:50 +00:00
|
|
|
"Insert a header argument selecting from lists of common args and values."
|
|
|
|
(interactive)
|
2013-10-06 15:05:02 +00:00
|
|
|
(let* ((info (org-babel-get-src-block-info 'light))
|
|
|
|
(lang (car info))
|
|
|
|
(begin (nth 6 info))
|
2012-04-10 23:03:37 +00:00
|
|
|
(lang-headers (intern (concat "org-babel-header-args:" lang)))
|
|
|
|
(headers (org-babel-combine-header-arg-lists
|
|
|
|
org-babel-common-header-args-w-values
|
2013-06-07 20:19:38 +00:00
|
|
|
(when (boundp lang-headers) (eval lang-headers))))
|
2013-10-06 15:05:02 +00:00
|
|
|
(header-arg (or header-arg
|
|
|
|
(org-icompleting-read
|
|
|
|
"Header Arg: "
|
|
|
|
(mapcar
|
|
|
|
(lambda (header-spec) (symbol-name (car header-spec)))
|
|
|
|
headers))))
|
|
|
|
(vals (cdr (assoc (intern header-arg) headers)))
|
|
|
|
(value (or value
|
|
|
|
(cond
|
|
|
|
((eq vals :any)
|
|
|
|
(read-from-minibuffer "value: "))
|
|
|
|
((listp vals)
|
|
|
|
(mapconcat
|
|
|
|
(lambda (group)
|
|
|
|
(let ((arg (org-icompleting-read
|
2014-07-27 21:25:41 +00:00
|
|
|
"Value: "
|
2013-10-06 15:05:02 +00:00
|
|
|
(cons "default"
|
|
|
|
(mapcar #'symbol-name group)))))
|
|
|
|
(if (and arg (not (string= "default" arg)))
|
|
|
|
(concat arg " ")
|
|
|
|
"")))
|
|
|
|
vals ""))))))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char begin)
|
|
|
|
(goto-char (point-at-eol))
|
|
|
|
(unless (= (char-before (point)) ?\ ) (insert " "))
|
|
|
|
(insert ":" header-arg) (when value (insert " " value)))))
|
2011-10-08 22:31:50 +00:00
|
|
|
|
2012-04-10 23:03:37 +00:00
|
|
|
;; Add support for completing-read insertion of header arguments after ":"
|
|
|
|
(defun org-babel-header-arg-expand ()
|
|
|
|
"Call `org-babel-enter-header-arg-w-completion' in appropriate contexts."
|
2012-04-14 13:32:57 +00:00
|
|
|
(when (and (equal (char-before) ?\:) (org-babel-where-is-src-block-head))
|
2012-04-10 23:03:37 +00:00
|
|
|
(org-babel-enter-header-arg-w-completion (match-string 2))))
|
|
|
|
|
|
|
|
(defun org-babel-enter-header-arg-w-completion (&optional lang)
|
|
|
|
"Insert header argument appropriate for LANG with completion."
|
|
|
|
(let* ((lang-headers-var (intern (concat "org-babel-header-args:" lang)))
|
|
|
|
(lang-headers (when (boundp lang-headers-var) (eval lang-headers-var)))
|
|
|
|
(headers-w-values (org-babel-combine-header-arg-lists
|
|
|
|
org-babel-common-header-args-w-values lang-headers))
|
|
|
|
(headers (mapcar #'symbol-name (mapcar #'car headers-w-values)))
|
|
|
|
(header (org-completing-read "Header Arg: " headers))
|
|
|
|
(args (cdr (assoc (intern header) headers-w-values)))
|
|
|
|
(arg (when (and args (listp args))
|
|
|
|
(org-completing-read
|
|
|
|
(format "%s: " header)
|
|
|
|
(mapcar #'symbol-name (apply #'append args))))))
|
|
|
|
(insert (concat header " " (or arg "")))
|
|
|
|
(cons header arg)))
|
|
|
|
|
|
|
|
(add-hook 'org-tab-first-hook 'org-babel-header-arg-expand)
|
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2016-01-25 15:11:31 +00:00
|
|
|
(defun org-babel-load-in-session (&optional _arg info)
|
2010-07-13 23:20:08 +00:00
|
|
|
"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."
|
2009-09-25 03:58:28 +00:00
|
|
|
(interactive)
|
|
|
|
(let* ((info (or info (org-babel-get-src-block-info)))
|
2010-06-13 01:26:08 +00:00
|
|
|
(lang (nth 0 info))
|
|
|
|
(params (nth 2 info))
|
2013-03-02 14:28:51 +00:00
|
|
|
(body (if (not info)
|
|
|
|
(user-error "No src code block at point")
|
|
|
|
(setf (nth 1 info)
|
|
|
|
(if (org-babel-noweb-p params :eval)
|
|
|
|
(org-babel-expand-noweb-references info)
|
|
|
|
(nth 1 info)))))
|
2010-06-17 16:29:38 +00:00
|
|
|
(session (cdr (assoc :session params)))
|
2010-08-05 04:42:54 +00:00
|
|
|
(dir (cdr (assoc :dir params)))
|
|
|
|
(default-directory
|
|
|
|
(or (and dir (file-name-as-directory dir)) default-directory))
|
2010-06-17 16:29:38 +00:00
|
|
|
(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 19:22:50 +00:00
|
|
|
(end-of-line 1)))
|
2009-09-25 03:58:28 +00:00
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2010-08-18 18:07:13 +00:00
|
|
|
(defun org-babel-initiate-session (&optional arg info)
|
|
|
|
"Initiate session for current code block.
|
2010-10-29 19:43:56 +00:00
|
|
|
If called with a prefix argument then resolve any variable
|
|
|
|
references in the header arguments and assign these variables in
|
2012-08-11 17:10:44 +00:00
|
|
|
the session. Copy the body of the code block to the kill ring."
|
2010-08-18 18:00:18 +00:00
|
|
|
(interactive "P")
|
2010-10-29 19:43:56 +00:00
|
|
|
(let* ((info (or info (org-babel-get-src-block-info (not arg))))
|
2010-06-13 01:26:08 +00:00
|
|
|
(lang (nth 0 info))
|
|
|
|
(body (nth 1 info))
|
|
|
|
(params (nth 2 info))
|
2010-03-13 17:57:23 +00:00
|
|
|
(session (cdr (assoc :session params)))
|
|
|
|
(dir (cdr (assoc :dir params)))
|
|
|
|
(default-directory
|
2010-06-17 16:29:38 +00:00
|
|
|
(or (and dir (file-name-as-directory dir)) default-directory))
|
2010-10-14 18:24:33 +00:00
|
|
|
(init-cmd (intern (format "org-babel-%s-initiate-session" lang)))
|
|
|
|
(prep-cmd (intern (concat "org-babel-prep-session:" lang))))
|
2010-08-18 17:55:28 +00:00
|
|
|
(if (and (stringp session) (string= session "none"))
|
|
|
|
(error "This block is not using a session!"))
|
2010-10-14 18:24:33 +00:00
|
|
|
(unless (fboundp init-cmd)
|
2010-06-17 16:29:38 +00:00
|
|
|
(error "No org-babel-initiate-session function for %s!" lang))
|
2010-04-17 20:03:30 +00:00
|
|
|
(with-temp-buffer (insert (org-babel-trim body))
|
|
|
|
(copy-region-as-kill (point-min) (point-max)))
|
2010-08-18 18:07:13 +00:00
|
|
|
(when arg
|
2010-10-14 18:24:33 +00:00
|
|
|
(unless (fboundp prep-cmd)
|
2010-08-18 18:07:13 +00:00
|
|
|
(error "No org-babel-prep-session function for %s!" lang))
|
2010-10-14 18:24:33 +00:00
|
|
|
(funcall prep-cmd session params))
|
|
|
|
(funcall init-cmd session params)))
|
2010-08-18 18:07:13 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-babel-switch-to-session (&optional arg info)
|
|
|
|
"Switch to the session of the current code block.
|
2012-08-11 17:10:44 +00:00
|
|
|
Uses `org-babel-initiate-session' to start the session. If called
|
2010-08-18 18:07:13 +00:00
|
|
|
with a prefix argument then this is passed on to
|
|
|
|
`org-babel-initiate-session'."
|
|
|
|
(interactive "P")
|
|
|
|
(pop-to-buffer (org-babel-initiate-session arg info))
|
|
|
|
(end-of-line 1))
|
2009-07-28 14:30:23 +00:00
|
|
|
|
2010-03-16 16:55:36 +00:00
|
|
|
(defalias 'org-babel-pop-to-session 'org-babel-switch-to-session)
|
|
|
|
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(defvar org-src-window-setup)
|
|
|
|
|
2010-08-17 21:01:37 +00:00
|
|
|
;;;###autoload
|
2016-01-25 15:11:31 +00:00
|
|
|
(defun org-babel-switch-to-session-with-code (&optional arg _info)
|
2010-10-16 18:14:20 +00:00
|
|
|
"Switch to code buffer and display session."
|
|
|
|
(interactive "P")
|
2012-08-09 14:13:18 +00:00
|
|
|
(let ((swap-windows
|
|
|
|
(lambda ()
|
|
|
|
(let ((other-window-buffer (window-buffer (next-window))))
|
|
|
|
(set-window-buffer (next-window) (current-buffer))
|
|
|
|
(set-window-buffer (selected-window) other-window-buffer))
|
|
|
|
(other-window 1)))
|
|
|
|
(info (org-babel-get-src-block-info))
|
|
|
|
(org-src-window-setup 'reorganize-frame))
|
2012-08-10 15:44:45 +00:00
|
|
|
(save-excursion
|
|
|
|
(org-babel-switch-to-session arg info))
|
|
|
|
(org-edit-src-code)
|
|
|
|
(funcall swap-windows)))
|
2010-08-17 21:01:37 +00:00
|
|
|
|
2013-12-06 09:45:35 +00:00
|
|
|
;;;###autoload
|
2010-08-17 20:46:51 +00:00
|
|
|
(defmacro org-babel-do-in-edit-buffer (&rest body)
|
|
|
|
"Evaluate BODY in edit buffer if there is a code block at point.
|
|
|
|
Return t if a code block was found at point, nil otherwise."
|
|
|
|
`(let ((org-src-window-setup 'switch-invisibly))
|
2010-09-08 17:25:56 +00:00
|
|
|
(when (and (org-babel-where-is-src-block-head)
|
2014-05-15 09:50:06 +00:00
|
|
|
(org-edit-src-code))
|
2010-09-04 17:36:48 +00:00
|
|
|
(unwind-protect (progn ,@body)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 23:31:23 +00:00
|
|
|
(org-edit-src-exit))
|
2010-08-18 03:40:53 +00:00
|
|
|
t)))
|
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 org-babel-do-in-edit-buffer (body))
|
2010-08-17 20:46:51 +00:00
|
|
|
|
|
|
|
(defun org-babel-do-key-sequence-in-edit-buffer (key)
|
|
|
|
"Read key sequence and execute the command in edit buffer.
|
|
|
|
Enter a key sequence to be executed in the language major-mode
|
2012-07-11 17:33:29 +00:00
|
|
|
edit buffer. For example, TAB will alter the contents of the
|
2010-08-17 20:46:51 +00:00
|
|
|
Org-mode code block according to the effect of TAB in the
|
2012-07-11 17:33:29 +00:00
|
|
|
language major-mode buffer. For languages that support
|
2010-08-17 20:46:51 +00:00
|
|
|
interactive sessions, this can be used to send code from the Org
|
|
|
|
buffer to the session for evaluation using the native major-mode
|
|
|
|
evaluation mechanisms."
|
|
|
|
(interactive "kEnter key-sequence to execute in edit buffer: ")
|
|
|
|
(org-babel-do-in-edit-buffer
|
|
|
|
(call-interactively
|
|
|
|
(key-binding (or key (read-key-sequence nil))))))
|
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
(defvar org-bracket-link-regexp)
|
2012-10-02 07:55:42 +00:00
|
|
|
|
2013-09-08 10:41:05 +00:00
|
|
|
(defun org-babel-active-location-p ()
|
2014-12-14 08:36:50 +00:00
|
|
|
(memq (org-element-type (save-match-data (org-element-context)))
|
2013-09-08 10:41:05 +00:00
|
|
|
'(babel-call inline-babel-call inline-src-block src-block)))
|
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2009-07-25 21:37:34 +00: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 21:48:23 +00:00
|
|
|
(interactive "P")
|
2013-03-31 22:17:16 +00:00
|
|
|
(let ((info (org-babel-get-src-block-info 'light)))
|
2010-12-20 17:24:53 +00:00
|
|
|
(when 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))))
|
|
|
|
(end-of-line 1)
|
|
|
|
(while (looking-at "[\n\r\t\f ]") (forward-char 1))
|
|
|
|
;; open the results
|
|
|
|
(if (looking-at org-bracket-link-regexp)
|
|
|
|
;; file results
|
|
|
|
(org-open-at-point)
|
2011-01-11 17:41:35 +00:00
|
|
|
(let ((r (org-babel-format-result
|
|
|
|
(org-babel-read-result) (cdr (assoc :sep (nth 2 info))))))
|
|
|
|
(pop-to-buffer (get-buffer-create "*Org-Babel Results*"))
|
|
|
|
(delete-region (point-min) (point-max))
|
|
|
|
(insert r)))
|
2010-12-20 17:24:53 +00:00
|
|
|
t))))
|
2009-07-25 21:37:34 +00:00
|
|
|
|
2010-11-19 08:16:29 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defmacro org-babel-map-src-blocks (file &rest body)
|
|
|
|
"Evaluate BODY forms on each source-block in FILE.
|
|
|
|
If FILE is nil evaluate BODY forms on source blocks in current
|
|
|
|
buffer. During evaluation of BODY the following local variables
|
|
|
|
are set relative to the currently matched code block.
|
|
|
|
|
|
|
|
full-block ------- string holding the entirety of the code block
|
|
|
|
beg-block -------- point at the beginning of the code block
|
|
|
|
end-block -------- point at the end of the matched code block
|
|
|
|
lang ------------- string holding the language of the code block
|
|
|
|
beg-lang --------- point at the beginning of the lang
|
|
|
|
end-lang --------- point at the end of the lang
|
|
|
|
switches --------- string holding the switches
|
|
|
|
beg-switches ----- point at the beginning of the switches
|
|
|
|
end-switches ----- point at the end of the switches
|
|
|
|
header-args ------ string holding the header-args
|
|
|
|
beg-header-args -- point at the beginning of the header-args
|
|
|
|
end-header-args -- point at the end of the header-args
|
|
|
|
body ------------- string holding the body of the code block
|
|
|
|
beg-body --------- point at the beginning of the body
|
|
|
|
end-body --------- point at the end of the body"
|
|
|
|
(declare (indent 1))
|
2012-01-19 14:34:58 +00:00
|
|
|
(let ((tempvar (make-symbol "file")))
|
2014-12-14 08:39:08 +00:00
|
|
|
`(let* ((case-fold-search t)
|
|
|
|
(,tempvar ,file)
|
2010-11-19 08:16:29 +00:00
|
|
|
(visited-p (or (null ,tempvar)
|
|
|
|
(get-file-buffer (expand-file-name ,tempvar))))
|
|
|
|
(point (point)) to-be-removed)
|
|
|
|
(save-window-excursion
|
|
|
|
(when ,tempvar (find-file ,tempvar))
|
|
|
|
(setq to-be-removed (current-buffer))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (re-search-forward org-babel-src-block-regexp nil t)
|
2013-09-08 10:41:05 +00:00
|
|
|
(when (org-babel-active-location-p)
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(let ((full-block (match-string 0))
|
|
|
|
(beg-block (match-beginning 0))
|
|
|
|
(end-block (match-end 0))
|
|
|
|
(lang (match-string 2))
|
|
|
|
(beg-lang (match-beginning 2))
|
|
|
|
(end-lang (match-end 2))
|
|
|
|
(switches (match-string 3))
|
|
|
|
(beg-switches (match-beginning 3))
|
|
|
|
(end-switches (match-end 3))
|
|
|
|
(header-args (match-string 4))
|
|
|
|
(beg-header-args (match-beginning 4))
|
|
|
|
(end-header-args (match-end 4))
|
|
|
|
(body (match-string 5))
|
|
|
|
(beg-body (match-beginning 5))
|
|
|
|
(end-body (match-end 5)))
|
2016-01-25 15:11:31 +00:00
|
|
|
;; Silence byte-compiler in case `body' doesn't use all
|
|
|
|
;; those variables.
|
|
|
|
(ignore full-block beg-block end-block lang
|
|
|
|
beg-lang end-lang switches beg-switches
|
|
|
|
end-switches header-args beg-header-args
|
|
|
|
end-header-args body beg-body end-body)
|
|
|
|
,@body
|
2013-09-08 10:41:05 +00:00
|
|
|
(goto-char end-block)))))
|
2010-11-19 08:16:29 +00:00
|
|
|
(unless visited-p (kill-buffer to-be-removed))
|
|
|
|
(goto-char point))))
|
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 org-babel-map-src-blocks (form body))
|
2010-11-19 08:16:29 +00:00
|
|
|
|
2011-08-01 21:45:58 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defmacro org-babel-map-inline-src-blocks (file &rest body)
|
|
|
|
"Evaluate BODY forms on each inline source-block in FILE.
|
2011-01-25 17:15:47 +00:00
|
|
|
If FILE is nil evaluate BODY forms on source blocks in current
|
|
|
|
buffer."
|
2011-08-01 21:45:58 +00:00
|
|
|
(declare (indent 1))
|
2012-01-19 14:34:58 +00:00
|
|
|
(let ((tempvar (make-symbol "file")))
|
2014-12-14 08:39:08 +00:00
|
|
|
`(let* ((case-fold-search t)
|
|
|
|
(,tempvar ,file)
|
2011-01-25 17:15:47 +00:00
|
|
|
(visited-p (or (null ,tempvar)
|
|
|
|
(get-file-buffer (expand-file-name ,tempvar))))
|
|
|
|
(point (point)) to-be-removed)
|
|
|
|
(save-window-excursion
|
|
|
|
(when ,tempvar (find-file ,tempvar))
|
|
|
|
(setq to-be-removed (current-buffer))
|
|
|
|
(goto-char (point-min))
|
2011-08-01 21:45:58 +00:00
|
|
|
(while (re-search-forward org-babel-inline-src-block-regexp nil t)
|
2013-09-08 10:41:05 +00:00
|
|
|
(when (org-babel-active-location-p)
|
|
|
|
(goto-char (match-beginning 1))
|
|
|
|
(save-match-data ,@body))
|
2011-01-25 17:15:47 +00:00
|
|
|
(goto-char (match-end 0))))
|
|
|
|
(unless visited-p (kill-buffer to-be-removed))
|
|
|
|
(goto-char point))))
|
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 org-babel-map-inline-src-blocks (form body))
|
2011-01-25 17:15:47 +00:00
|
|
|
|
2011-12-17 00:32:38 +00:00
|
|
|
(defvar org-babel-lob-one-liner-regexp)
|
2012-10-02 07:55:42 +00:00
|
|
|
|
2011-12-17 00:32:38 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defmacro org-babel-map-call-lines (file &rest body)
|
|
|
|
"Evaluate BODY forms on each call line in FILE.
|
|
|
|
If FILE is nil evaluate BODY forms on source blocks in current
|
|
|
|
buffer."
|
|
|
|
(declare (indent 1))
|
2012-01-19 14:34:58 +00:00
|
|
|
(let ((tempvar (make-symbol "file")))
|
2011-12-17 00:32:38 +00:00
|
|
|
`(let* ((,tempvar ,file)
|
|
|
|
(visited-p (or (null ,tempvar)
|
|
|
|
(get-file-buffer (expand-file-name ,tempvar))))
|
|
|
|
(point (point)) to-be-removed)
|
|
|
|
(save-window-excursion
|
|
|
|
(when ,tempvar (find-file ,tempvar))
|
|
|
|
(setq to-be-removed (current-buffer))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (re-search-forward org-babel-lob-one-liner-regexp nil t)
|
2013-09-08 10:41:05 +00:00
|
|
|
(when (org-babel-active-location-p)
|
|
|
|
(goto-char (match-beginning 1))
|
|
|
|
(save-match-data ,@body))
|
2011-12-17 00:32:38 +00:00
|
|
|
(goto-char (match-end 0))))
|
|
|
|
(unless visited-p (kill-buffer to-be-removed))
|
|
|
|
(goto-char point))))
|
|
|
|
(def-edebug-spec org-babel-map-call-lines (form body))
|
|
|
|
|
2012-01-13 01:11:52 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defmacro org-babel-map-executables (file &rest body)
|
|
|
|
(declare (indent 1))
|
2012-01-19 14:34:58 +00:00
|
|
|
(let ((tempvar (make-symbol "file"))
|
|
|
|
(rx (make-symbol "rx")))
|
2012-01-13 01:11:52 +00:00
|
|
|
`(let* ((,tempvar ,file)
|
|
|
|
(,rx (concat "\\(" org-babel-src-block-regexp
|
|
|
|
"\\|" org-babel-inline-src-block-regexp
|
|
|
|
"\\|" org-babel-lob-one-liner-regexp "\\)"))
|
|
|
|
(visited-p (or (null ,tempvar)
|
|
|
|
(get-file-buffer (expand-file-name ,tempvar))))
|
|
|
|
(point (point)) to-be-removed)
|
|
|
|
(save-window-excursion
|
|
|
|
(when ,tempvar (find-file ,tempvar))
|
|
|
|
(setq to-be-removed (current-buffer))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (re-search-forward ,rx nil t)
|
2013-09-08 10:41:05 +00:00
|
|
|
(when (org-babel-active-location-p)
|
|
|
|
(goto-char (match-beginning 1))
|
|
|
|
(when (looking-at org-babel-inline-src-block-regexp)
|
|
|
|
(forward-char 1))
|
|
|
|
(save-match-data ,@body))
|
2012-01-13 01:11:52 +00:00
|
|
|
(goto-char (match-end 0))))
|
|
|
|
(unless visited-p (kill-buffer to-be-removed))
|
|
|
|
(goto-char point))))
|
|
|
|
(def-edebug-spec org-babel-map-executables (form body))
|
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2009-07-16 18:57:01 +00:00
|
|
|
(defun org-babel-execute-buffer (&optional arg)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Execute source code blocks in a buffer.
|
|
|
|
Call `org-babel-execute-src-block' on every source block in
|
2010-01-11 15:47:29 +00:00
|
|
|
the current buffer."
|
2009-02-23 23:14:48 +00:00
|
|
|
(interactive "P")
|
2010-12-21 11:06:04 +00:00
|
|
|
(org-babel-eval-wipe-error-buffer)
|
2010-09-23 18:09:19 +00:00
|
|
|
(org-save-outline-visibility t
|
2012-01-13 01:11:52 +00:00
|
|
|
(org-babel-map-executables nil
|
|
|
|
(if (looking-at org-babel-lob-one-liner-regexp)
|
|
|
|
(org-babel-lob-execute-maybe)
|
|
|
|
(org-babel-execute-src-block arg)))))
|
2009-02-23 23:14:48 +00:00
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2009-07-16 18:57:01 +00:00
|
|
|
(defun org-babel-execute-subtree (&optional arg)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Execute source code blocks in a subtree.
|
|
|
|
Call `org-babel-execute-src-block' on every source block in
|
2010-01-11 15:47:29 +00:00
|
|
|
the current subtree."
|
2009-02-22 21:19:32 +00:00
|
|
|
(interactive "P")
|
2010-06-07 18:51:30 +00:00
|
|
|
(save-restriction
|
|
|
|
(save-excursion
|
|
|
|
(org-narrow-to-subtree)
|
2010-09-01 22:06:21 +00:00
|
|
|
(org-babel-execute-buffer arg)
|
2010-06-07 18:51:30 +00:00
|
|
|
(widen))))
|
2009-02-22 21:19:32 +00:00
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2009-11-20 17:40:50 +00:00
|
|
|
(defun org-babel-sha1-hash (&optional info)
|
2010-06-12 00:12:15 +00:00
|
|
|
"Generate an sha1 hash based on the value of info."
|
2009-11-20 17:40:50 +00:00
|
|
|
(interactive)
|
2010-10-21 13:04:20 +00:00
|
|
|
(let ((print-level nil)
|
|
|
|
(info (or info (org-babel-get-src-block-info))))
|
|
|
|
(setf (nth 2 info)
|
2010-10-31 13:22:13 +00:00
|
|
|
(sort (copy-sequence (nth 2 info))
|
2010-10-21 13:04:20 +00:00
|
|
|
(lambda (a b) (string< (car a) (car b)))))
|
2012-08-15 07:56:35 +00:00
|
|
|
(let* ((rm (lambda (lst)
|
2012-11-16 15:40:46 +00:00
|
|
|
(dolist (p '("replace" "silent" "none"
|
|
|
|
"append" "prepend"))
|
2012-08-15 07:56:35 +00:00
|
|
|
(setq lst (remove p lst)))
|
|
|
|
lst))
|
|
|
|
(norm (lambda (arg)
|
|
|
|
(let ((v (if (and (listp (cdr arg)) (null (cddr arg)))
|
|
|
|
(copy-sequence (cdr arg))
|
|
|
|
(cdr arg))))
|
|
|
|
(when (and v (not (and (sequencep v)
|
|
|
|
(not (consp v))
|
|
|
|
(= (length v) 0))))
|
|
|
|
(cond
|
|
|
|
((and (listp v) ; lists are sorted
|
|
|
|
(member (car arg) '(:result-params)))
|
|
|
|
(sort (funcall rm v) #'string<))
|
|
|
|
((and (stringp v) ; strings are sorted
|
|
|
|
(member (car arg) '(:results :exports)))
|
|
|
|
(mapconcat #'identity (sort (funcall rm (split-string v))
|
|
|
|
#'string<) " "))
|
2013-12-10 07:16:26 +00:00
|
|
|
(t v))))))
|
|
|
|
;; expanded body
|
|
|
|
(lang (nth 0 info))
|
2013-12-10 18:00:29 +00:00
|
|
|
(params (nth 2 info))
|
2013-12-10 18:11:27 +00:00
|
|
|
(body (if (org-babel-noweb-p params :eval)
|
|
|
|
(org-babel-expand-noweb-references info) (nth 1 info)))
|
2013-12-10 07:16:26 +00:00
|
|
|
(expand-cmd (intern (concat "org-babel-expand-body:" lang)))
|
|
|
|
(assignments-cmd (intern (concat "org-babel-variable-assignments:"
|
|
|
|
lang)))
|
|
|
|
(expanded
|
|
|
|
(if (fboundp expand-cmd) (funcall expand-cmd body params)
|
|
|
|
(org-babel-expand-body:generic
|
|
|
|
body params (and (fboundp assignments-cmd)
|
|
|
|
(funcall assignments-cmd params))))))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(let* ((it (format "%s-%s"
|
|
|
|
(mapconcat
|
|
|
|
#'identity
|
|
|
|
(delq nil (mapcar (lambda (arg)
|
|
|
|
(let ((normalized (funcall norm arg)))
|
|
|
|
(when normalized
|
|
|
|
(format "%S" normalized))))
|
|
|
|
(nth 2 info))) ":")
|
2013-12-10 07:16:26 +00:00
|
|
|
expanded))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(hash (sha1 it)))
|
|
|
|
(when (org-called-interactively-p 'interactive) (message hash))
|
|
|
|
hash))))
|
2009-11-20 17:40:50 +00:00
|
|
|
|
2014-01-18 20:36:07 +00:00
|
|
|
(defun org-babel-current-result-hash (&optional info)
|
2012-06-28 17:49:47 +00:00
|
|
|
"Return the current in-buffer hash."
|
2014-01-18 20:36:07 +00:00
|
|
|
(org-babel-where-is-src-block-result nil info)
|
2013-02-09 03:01:54 +00:00
|
|
|
(org-no-properties (match-string 5)))
|
2009-11-20 17:40:50 +00:00
|
|
|
|
2014-01-18 20:36:07 +00:00
|
|
|
(defun org-babel-set-current-result-hash (hash info)
|
2012-06-28 17:49:47 +00:00
|
|
|
"Set the current in-buffer hash to HASH."
|
2014-01-18 20:36:07 +00:00
|
|
|
(org-babel-where-is-src-block-result nil info)
|
2013-06-30 23:57:13 +00:00
|
|
|
(save-excursion (goto-char (match-beginning 5))
|
|
|
|
(mapc #'delete-overlay (overlays-at (point)))
|
|
|
|
(forward-char org-babel-hash-show)
|
|
|
|
(mapc #'delete-overlay (overlays-at (point)))
|
|
|
|
(replace-match hash nil nil nil 5)
|
|
|
|
(goto-char (point-at-bol))
|
2012-06-28 17:49:47 +00:00
|
|
|
(org-babel-hide-hash)))
|
|
|
|
|
2009-11-18 06:15:04 +00:00
|
|
|
(defun org-babel-hide-hash ()
|
2010-07-13 23:20:08 +00:00
|
|
|
"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 17:26:30 +00:00
|
|
|
(add-to-invisibility-spec '(org-babel-hide-hash . t))
|
2009-11-18 06:15:04 +00:00
|
|
|
(save-excursion
|
|
|
|
(when (and (re-search-forward org-babel-result-regexp nil t)
|
2013-02-09 03:01:54 +00:00
|
|
|
(match-string 5))
|
|
|
|
(let* ((start (match-beginning 5))
|
2009-11-18 06:15:04 +00:00
|
|
|
(hide-start (+ org-babel-hash-show start))
|
2013-02-09 03:01:54 +00:00
|
|
|
(end (match-end 5))
|
|
|
|
(hash (match-string 5))
|
2009-11-18 06:15:04 +00:00
|
|
|
ov1 ov2)
|
2010-04-18 14:37:42 +00: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 06:15:04 +00:00
|
|
|
|
|
|
|
(defun org-babel-hide-all-hashes ()
|
2010-07-13 23:20:08 +00:00
|
|
|
"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'."
|
2009-11-18 06:15:04 +00:00
|
|
|
(save-excursion
|
2013-01-30 17:05:51 +00:00
|
|
|
(while (and (not org-babel-hash-show-time)
|
|
|
|
(re-search-forward org-babel-result-regexp nil t))
|
2009-11-18 06:15:04 +00:00
|
|
|
(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)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Return the value of the hash at POINT.
|
2015-09-21 04:23:15 +00:00
|
|
|
\\<org-mode-map>\
|
2010-07-13 23:20:08 +00:00
|
|
|
The hash is also added as the last element of the kill ring.
|
2015-09-21 04:23:15 +00:00
|
|
|
This can be called with \\[org-ctrl-c-ctrl-c]."
|
2009-11-18 06:15:04 +00:00
|
|
|
(interactive)
|
|
|
|
(let ((hash (car (delq nil (mapcar
|
2010-06-10 21:36:08 +00:00
|
|
|
(lambda (ol) (overlay-get ol 'babel-hash))
|
2010-04-20 10:17:06 +00:00
|
|
|
(overlays-at (or point (point))))))))
|
2009-11-18 06:15:04 +00:00
|
|
|
(when hash (kill-new hash) (message hash))))
|
|
|
|
(add-hook 'org-ctrl-c-ctrl-c-hook 'org-babel-hash-at-point)
|
|
|
|
|
2012-01-19 14:50:17 +00:00
|
|
|
(defun org-babel-result-hide-spec ()
|
|
|
|
"Hide portions of results lines.
|
|
|
|
Add `org-babel-hide-result' as an invisibility spec for hiding
|
|
|
|
portions of results lines."
|
|
|
|
(add-to-invisibility-spec '(org-babel-hide-result . t)))
|
|
|
|
(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."
|
|
|
|
(mapc 'delete-overlay org-babel-hide-result-overlays)
|
|
|
|
(setq org-babel-hide-result-overlays nil))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(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
|
|
|
|
(while (looking-at org-babel-multi-line-header-regexp)
|
|
|
|
(forward-line 1))
|
|
|
|
(goto-char (- (org-babel-result-end) 1)) (point)))
|
|
|
|
ov)
|
|
|
|
(if (memq t (mapcar (lambda (overlay)
|
|
|
|
(eq (overlay-get overlay 'invisible)
|
|
|
|
'org-babel-hide-result))
|
|
|
|
(overlays-at start)))
|
|
|
|
(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)))
|
|
|
|
(when (eq (overlay-get ov 'invisible)
|
|
|
|
'org-babel-hide-result)
|
|
|
|
(delete-overlay ov)))
|
|
|
|
(overlays-at start)))
|
|
|
|
(setq ov (make-overlay start end))
|
|
|
|
(overlay-put ov 'invisible 'org-babel-hide-result)
|
|
|
|
;; make the block accessible to isearch
|
|
|
|
(overlay-put
|
|
|
|
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)))
|
|
|
|
(when (eq (overlay-get ov 'invisible)
|
|
|
|
'org-babel-hide-result)
|
|
|
|
(delete-overlay ov))))
|
|
|
|
(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
|
|
|
|
'org-babel-show-result-all 'append 'local)))
|
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
(defvar org-file-properties)
|
2010-05-28 13:50:20 +00:00
|
|
|
(defun org-babel-params-from-properties (&optional lang)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Retrieve parameters specified as properties.
|
2013-06-20 15:53:56 +00:00
|
|
|
Return a list of association lists of source block params
|
|
|
|
specified in the properties of the current outline entry."
|
2009-08-02 00:06:46 +00:00
|
|
|
(save-match-data
|
2013-06-20 15:53:56 +00:00
|
|
|
(list
|
2013-06-23 08:39:00 +00:00
|
|
|
;; DEPRECATED header arguments specified as separate property at
|
2015-06-17 09:55:57 +00:00
|
|
|
;; point of definition.
|
|
|
|
(org-babel-parse-multiple-vars
|
|
|
|
(delq nil
|
|
|
|
(mapcar
|
|
|
|
(lambda (header)
|
|
|
|
(let* ((arg (symbol-name (car header)))
|
|
|
|
(val (org-entry-get (point) arg t)))
|
|
|
|
(and val
|
|
|
|
(cons (intern (concat ":" arg))
|
|
|
|
(org-babel-read val)))))
|
|
|
|
(org-babel-combine-header-arg-lists
|
|
|
|
org-babel-common-header-args-w-values
|
|
|
|
(let ((sym (intern (concat "org-babel-header-args:" lang))))
|
|
|
|
(and (boundp sym) (symbol-value sym)))))))
|
2013-06-23 08:39:00 +00:00
|
|
|
;; header arguments specified with the header-args property at
|
2015-06-17 09:55:57 +00:00
|
|
|
;; point of call.
|
2013-06-23 08:39:00 +00:00
|
|
|
(org-babel-parse-header-arguments
|
|
|
|
(org-entry-get org-babel-current-src-block-location
|
2015-06-17 09:55:57 +00:00
|
|
|
"header-args"
|
|
|
|
'inherit))
|
|
|
|
(and lang ; language-specific header arguments at point of call
|
|
|
|
(org-babel-parse-header-arguments
|
|
|
|
(org-entry-get org-babel-current-src-block-location
|
|
|
|
(concat "header-args:" lang)
|
|
|
|
'inherit))))))
|
2009-08-01 21:43:37 +00:00
|
|
|
|
2014-05-28 12:52:14 +00:00
|
|
|
(defvar org-src-preserve-indentation) ;; declare defcustom from org-src
|
2009-05-24 20:38:01 +00:00
|
|
|
(defun org-babel-parse-src-block-match ()
|
2010-07-13 23:20:08 +00:00
|
|
|
"Parse the results from a match of the `org-babel-src-block-regexp'."
|
2015-08-23 21:38:36 +00:00
|
|
|
(let* ((block-indentation (string-width (match-string 1)))
|
|
|
|
(lang (org-match-string-no-properties 2))
|
2009-08-09 14:29:06 +00:00
|
|
|
(lang-headers (intern (concat "org-babel-default-header-args:" lang)))
|
2010-06-10 21:36:08 +00:00
|
|
|
(switches (match-string 3))
|
2015-08-23 21:38:36 +00:00
|
|
|
(body (let* ((body (org-match-string-no-properties 5))
|
|
|
|
(sub-length (- (length body) 1)))
|
|
|
|
(if (and (> sub-length 0)
|
|
|
|
(string= "\n" (substring body sub-length)))
|
|
|
|
(substring body 0 sub-length)
|
|
|
|
(or body ""))))
|
2009-11-01 01:19:38 +00:00
|
|
|
(preserve-indentation (or org-src-preserve-indentation
|
2012-05-16 17:15:36 +00:00
|
|
|
(save-match-data
|
|
|
|
(string-match "-i\\>" switches)))))
|
2009-07-17 04:50:02 +00:00
|
|
|
(list lang
|
2010-04-17 20:03:30 +00:00
|
|
|
;; get block body less properties, protective commas, and indentation
|
2009-09-01 21:30:39 +00:00
|
|
|
(with-temp-buffer
|
2009-08-09 14:29:06 +00:00
|
|
|
(save-match-data
|
2012-09-30 15:20:27 +00:00
|
|
|
(insert (org-unescape-code-in-string body))
|
2009-10-08 03:59:45 +00:00
|
|
|
(unless preserve-indentation (org-do-remove-indentation))
|
2009-08-09 14:29:06 +00:00
|
|
|
(buffer-string)))
|
2013-06-20 15:53:56 +00:00
|
|
|
(apply #'org-babel-merge-params
|
|
|
|
org-babel-default-header-args
|
|
|
|
(when (boundp lang-headers) (eval lang-headers))
|
|
|
|
(append
|
|
|
|
(org-babel-params-from-properties lang)
|
|
|
|
(list (org-babel-parse-header-arguments
|
|
|
|
(org-no-properties (or (match-string 4) ""))))))
|
2010-06-10 21:36:08 +00:00
|
|
|
switches
|
|
|
|
block-indentation)))
|
2009-04-26 20:29:59 +00:00
|
|
|
|
2009-05-24 20:38:01 +00:00
|
|
|
(defun org-babel-parse-inline-src-block-match ()
|
2010-07-13 23:20:08 +00:00
|
|
|
"Parse the results from a match of the `org-babel-inline-src-block-regexp'."
|
2012-08-15 07:39:24 +00:00
|
|
|
(let* ((lang (org-no-properties (match-string 2)))
|
2009-07-17 00:52:31 +00:00
|
|
|
(lang-headers (intern (concat "org-babel-default-header-args:" lang))))
|
|
|
|
(list lang
|
2012-09-30 15:20:27 +00:00
|
|
|
(org-unescape-code-in-string (org-no-properties (match-string 5)))
|
2013-06-20 15:53:56 +00:00
|
|
|
(apply #'org-babel-merge-params
|
|
|
|
org-babel-default-inline-header-args
|
|
|
|
(if (boundp lang-headers) (eval lang-headers) nil)
|
|
|
|
(append
|
|
|
|
(org-babel-params-from-properties lang)
|
|
|
|
(list (org-babel-parse-header-arguments
|
2013-11-22 15:27:40 +00:00
|
|
|
(org-no-properties (or (match-string 4) ""))))))
|
|
|
|
nil)))
|
2009-04-26 20:29:59 +00:00
|
|
|
|
2011-10-21 17:15:06 +00:00
|
|
|
(defun org-babel-balanced-split (string alts)
|
|
|
|
"Split STRING on instances of ALTS.
|
|
|
|
ALTS is a cons of two character options where each option may be
|
|
|
|
either the numeric code of a single character or a list of
|
|
|
|
character alternatives. For example to split on balanced
|
2015-11-17 23:28:50 +00:00
|
|
|
instances of \"[ \t]:\" set ALTS to ((32 9) . 58)."
|
2012-08-09 14:13:18 +00:00
|
|
|
(let* ((matches (lambda (ch spec) (if (listp spec) (member ch spec) (equal spec ch))))
|
|
|
|
(matched (lambda (ch last)
|
|
|
|
(if (consp alts)
|
|
|
|
(and (funcall matches ch (cdr alts))
|
|
|
|
(funcall matches last (car alts)))
|
|
|
|
(funcall matches ch alts))))
|
|
|
|
(balance 0) (last 0)
|
|
|
|
quote partial lst)
|
|
|
|
(mapc (lambda (ch) ; split on [], (), "" balanced instances of [ \t]:
|
|
|
|
(setq balance (+ balance
|
|
|
|
(cond ((or (equal 91 ch) (equal 40 ch)) 1)
|
|
|
|
((or (equal 93 ch) (equal 41 ch)) -1)
|
|
|
|
(t 0))))
|
|
|
|
(when (and (equal 34 ch) (not (equal 92 last)))
|
|
|
|
(setq quote (not quote)))
|
|
|
|
(setq partial (cons ch partial))
|
|
|
|
(when (and (= balance 0) (not quote) (funcall matched ch last))
|
|
|
|
(setq lst (cons (apply #'string (nreverse
|
|
|
|
(if (consp alts)
|
|
|
|
(cddr partial)
|
|
|
|
(cdr partial))))
|
|
|
|
lst))
|
|
|
|
(setq partial nil))
|
|
|
|
(setq last ch))
|
|
|
|
(string-to-list string))
|
|
|
|
(nreverse (cons (apply #'string (nreverse partial)) lst))))
|
2011-10-21 17:15:06 +00:00
|
|
|
|
2011-11-20 16:40:08 +00:00
|
|
|
(defun org-babel-join-splits-near-ch (ch list)
|
|
|
|
"Join splits where \"=\" is on either end of the split."
|
2012-08-10 15:23:00 +00:00
|
|
|
(let ((last= (lambda (str) (= ch (aref str (1- (length str))))))
|
|
|
|
(first= (lambda (str) (= ch (aref str 0)))))
|
2011-11-20 16:40:08 +00:00
|
|
|
(reverse
|
|
|
|
(org-reduce (lambda (acc el)
|
2012-08-10 15:44:45 +00:00
|
|
|
(let ((head (car acc)))
|
|
|
|
(if (and head (or (funcall last= head) (funcall first= el)))
|
|
|
|
(cons (concat head el) (cdr acc))
|
|
|
|
(cons el acc))))
|
|
|
|
list :initial-value nil))))
|
2011-11-20 16:40:08 +00:00
|
|
|
|
2009-05-24 20:38:01 +00:00
|
|
|
(defun org-babel-parse-header-arguments (arg-string)
|
2009-02-23 06:19:34 +00:00
|
|
|
"Parse a string of header arguments returning an alist."
|
2010-11-07 14:39:05 +00:00
|
|
|
(when (> (length arg-string) 0)
|
2011-10-21 17:21:39 +00:00
|
|
|
(org-babel-parse-multiple-vars
|
|
|
|
(delq nil
|
|
|
|
(mapcar
|
|
|
|
(lambda (arg)
|
|
|
|
(if (string-match
|
|
|
|
"\\([^ \f\t\n\r\v]+\\)[ \f\t\n\r\v]+\\([^ \f\t\n\r\v]+.*\\)"
|
|
|
|
arg)
|
|
|
|
(cons (intern (match-string 1 arg))
|
|
|
|
(org-babel-read (org-babel-chomp (match-string 2 arg))))
|
|
|
|
(cons (intern (org-babel-chomp arg)) nil)))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(let ((raw (org-babel-balanced-split arg-string '((32 9) . 58))))
|
|
|
|
(cons (car raw) (mapcar (lambda (r) (concat ":" r)) (cdr raw)))))))))
|
2011-10-21 17:15:06 +00:00
|
|
|
|
|
|
|
(defun org-babel-parse-multiple-vars (header-arguments)
|
|
|
|
"Expand multiple variable assignments behind a single :var keyword.
|
|
|
|
|
|
|
|
This allows expression of multiple variables with one :var as
|
|
|
|
shown below.
|
|
|
|
|
|
|
|
#+PROPERTY: var foo=1, bar=2"
|
|
|
|
(let (results)
|
|
|
|
(mapc (lambda (pair)
|
|
|
|
(if (eq (car pair) :var)
|
2011-10-28 19:57:47 +00:00
|
|
|
(mapcar (lambda (v) (push (cons :var (org-babel-trim v)) results))
|
2011-11-20 16:40:08 +00:00
|
|
|
(org-babel-join-splits-near-ch
|
|
|
|
61 (org-babel-balanced-split (cdr pair) 32)))
|
2011-10-21 17:15:06 +00:00
|
|
|
(push pair results)))
|
|
|
|
header-arguments)
|
|
|
|
(nreverse results)))
|
2009-02-23 06:19:34 +00:00
|
|
|
|
2009-07-16 20:21:07 +00:00
|
|
|
(defun org-babel-process-params (params)
|
2010-10-16 18:14:20 +00:00
|
|
|
"Expand variables in PARAMS and add summary parameters."
|
2011-11-10 17:12:30 +00:00
|
|
|
(let* ((processed-vars (mapcar (lambda (el)
|
|
|
|
(if (consp (cdr el))
|
|
|
|
(cdr el)
|
|
|
|
(org-babel-ref-parse (cdr el))))
|
|
|
|
(org-babel-get-header params :var)))
|
|
|
|
(vars-and-names (if (and (assoc :colname-names params)
|
2011-11-09 21:11:24 +00:00
|
|
|
(assoc :rowname-names params))
|
2011-11-10 17:12:30 +00:00
|
|
|
(list processed-vars)
|
2011-11-09 21:11:24 +00:00
|
|
|
(org-babel-disassemble-tables
|
2011-11-10 17:12:30 +00:00
|
|
|
processed-vars
|
2011-11-09 21:11:24 +00:00
|
|
|
(cdr (assoc :hlines params))
|
|
|
|
(cdr (assoc :colnames params))
|
|
|
|
(cdr (assoc :rownames params)))))
|
2011-02-20 09:16:43 +00:00
|
|
|
(raw-result (or (cdr (assoc :results params)) ""))
|
2010-10-16 19:24:30 +00:00
|
|
|
(result-params (append
|
2011-02-20 09:16:43 +00:00
|
|
|
(split-string (if (stringp raw-result)
|
|
|
|
raw-result
|
|
|
|
(eval raw-result)))
|
2010-10-16 19:24:30 +00:00
|
|
|
(cdr (assoc :result-params params)))))
|
2010-10-16 18:14:20 +00:00
|
|
|
(append
|
2010-10-16 19:24:30 +00:00
|
|
|
(mapcar (lambda (var) (cons :var var)) (car vars-and-names))
|
2010-10-16 18:14:20 +00:00
|
|
|
(list
|
2011-04-04 17:28:45 +00:00
|
|
|
(cons :colname-names (or (cdr (assoc :colname-names params))
|
|
|
|
(cadr vars-and-names)))
|
|
|
|
(cons :rowname-names (or (cdr (assoc :rowname-names params))
|
|
|
|
(caddr vars-and-names)))
|
2010-10-16 18:14:20 +00:00
|
|
|
(cons :result-params result-params)
|
2010-10-16 19:24:30 +00:00
|
|
|
(cons :result-type (cond ((member "output" result-params) 'output)
|
|
|
|
((member "value" result-params) 'value)
|
|
|
|
(t 'value))))
|
2015-10-29 13:31:28 +00:00
|
|
|
(org-remove-if
|
|
|
|
(lambda (x) (memq (car x) '(:colname-names :rowname-names :result-params
|
|
|
|
:result-type :var)))
|
|
|
|
params))))
|
2010-04-19 13:26:02 +00:00
|
|
|
|
|
|
|
;; row and column names
|
|
|
|
(defun org-babel-del-hlines (table)
|
2015-11-17 23:28:50 +00:00
|
|
|
"Remove all `hline's from TABLE."
|
2014-04-22 19:01:27 +00:00
|
|
|
(remq 'hline table))
|
2010-04-19 13:26:02 +00:00
|
|
|
|
|
|
|
(defun org-babel-get-colnames (table)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Return the column names of TABLE.
|
|
|
|
Return a cons cell, the `car' of which contains the TABLE less
|
2010-06-12 00:12:15 +00:00
|
|
|
colnames, and the `cdr' of which contains a list of the column
|
|
|
|
names."
|
2010-06-13 01:26:08 +00:00
|
|
|
(if (equal 'hline (nth 1 table))
|
2010-04-19 13:26:02 +00:00
|
|
|
(cons (cddr table) (car table))
|
2010-04-30 19:03:38 +00:00
|
|
|
(cons (cdr table) (car table))))
|
2010-04-19 13:26:02 +00:00
|
|
|
|
|
|
|
(defun org-babel-get-rownames (table)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Return the row names of TABLE.
|
|
|
|
Return a cons cell, the `car' of which contains the TABLE less
|
2013-06-21 20:37:51 +00:00
|
|
|
rownames, and the `cdr' of which contains a list of the rownames.
|
|
|
|
Note: this function removes any hlines in TABLE."
|
|
|
|
(let* ((table (org-babel-del-hlines table))
|
|
|
|
(rownames (funcall (lambda ()
|
|
|
|
(let ((tp table))
|
|
|
|
(mapcar
|
2016-01-25 15:11:31 +00:00
|
|
|
(lambda (_row)
|
2013-06-21 20:37:51 +00:00
|
|
|
(prog1
|
|
|
|
(pop (car tp))
|
|
|
|
(setq tp (cdr tp))))
|
|
|
|
table))))))
|
|
|
|
(cons table rownames)))
|
2010-04-19 13:26:02 +00:00
|
|
|
|
|
|
|
(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 05:33:47 +00:00
|
|
|
(defun org-babel-pick-name (names selector)
|
2010-07-21 18:19:50 +00:00
|
|
|
"Select one out of an alist of row or column names.
|
|
|
|
SELECTOR can be either a list of names in which case those names
|
|
|
|
will be returned directly, or an index into the list NAMES in
|
|
|
|
which case the indexed names will be return."
|
|
|
|
(if (listp selector)
|
|
|
|
selector
|
|
|
|
(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))))))))
|
2010-04-20 05:33:47 +00:00
|
|
|
|
|
|
|
(defun org-babel-disassemble-tables (vars hlines colnames rownames)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Parse tables for further processing.
|
|
|
|
Process the variables in VARS according to the HLINES,
|
2010-04-19 13:26:02 +00:00
|
|
|
ROWNAMES and COLNAMES header arguments. Return a list consisting
|
|
|
|
of the vars, cnames and rnames."
|
2010-04-20 05:33:47 +00:00
|
|
|
(let (cnames rnames)
|
|
|
|
(list
|
|
|
|
(mapcar
|
|
|
|
(lambda (var)
|
|
|
|
(when (listp (cdr var))
|
|
|
|
(when (and (not (equal colnames "no"))
|
2010-06-13 01:26:08 +00:00
|
|
|
(or colnames (and (equal (nth 1 (cdr var)) 'hline)
|
2010-04-20 05:33:47 +00: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)
|
2011-10-18 16:08:39 +00:00
|
|
|
(reverse cnames) (reverse rnames))))
|
2010-04-19 13:26:02 +00:00
|
|
|
|
|
|
|
(defun org-babel-reassemble-table (table colnames rownames)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Add column and row names to a table.
|
|
|
|
Given a TABLE and set of COLNAMES and ROWNAMES add the names
|
2010-04-19 13:26:02 +00:00
|
|
|
to the table for reinsertion to org-mode."
|
|
|
|
(if (listp table)
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(let ((table (if (and rownames (= (length table) (length rownames)))
|
|
|
|
(org-babel-put-rownames table rownames) table)))
|
|
|
|
(if (and colnames (listp (car table)) (= (length (car table))
|
|
|
|
(length colnames)))
|
|
|
|
(org-babel-put-colnames table colnames) table))
|
2010-04-19 13:26:02 +00:00
|
|
|
table))
|
2009-07-16 20:21:07 +00:00
|
|
|
|
2016-01-31 10:36:52 +00:00
|
|
|
(defun org-babel-where-is-src-block-head (&optional src-block)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Find where the current source block begins.
|
2016-01-31 10:36:52 +00:00
|
|
|
|
|
|
|
If optional argument SRC-BLOCK is `src-block' type element, find
|
|
|
|
its current beginning instead.
|
|
|
|
|
2015-01-13 16:16:45 +00:00
|
|
|
Return the point at the beginning of the current source block.
|
|
|
|
Specifically at the beginning of the #+BEGIN_SRC line. Also set
|
|
|
|
match-data relatively to `org-babel-src-block-regexp', which see.
|
2009-05-21 13:40:04 +00:00
|
|
|
If the point is not on a source block then return nil."
|
2016-01-31 10:36:52 +00:00
|
|
|
(let ((element (or src-block (org-element-at-point))))
|
2015-01-13 16:16:45 +00:00
|
|
|
(when (eq (org-element-type element) 'src-block)
|
|
|
|
(let ((end (org-element-property :end element)))
|
|
|
|
(org-with-wide-buffer
|
|
|
|
;; Ensure point is not on a blank line after the block.
|
|
|
|
(beginning-of-line)
|
|
|
|
(skip-chars-forward " \r\t\n" end)
|
|
|
|
(when (< (point) end)
|
|
|
|
(prog1 (goto-char (org-element-property :post-affiliated element))
|
|
|
|
(looking-at org-babel-src-block-regexp))))))))
|
2009-05-21 13:40:04 +00:00
|
|
|
|
2010-09-08 06:13:12 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun org-babel-goto-src-block-head ()
|
|
|
|
"Go to the beginning of the current code block."
|
|
|
|
(interactive)
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(let ((head (org-babel-where-is-src-block-head)))
|
|
|
|
(if head (goto-char head) (error "Not currently in a code block"))))
|
2010-09-08 06:13:12 +00:00
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
;;;###autoload
|
2010-07-12 04:35:58 +00:00
|
|
|
(defun org-babel-goto-named-src-block (name)
|
2009-06-15 05:06:11 +00:00
|
|
|
"Go to a named source-code block."
|
2010-07-12 04:35:58 +00:00
|
|
|
(interactive
|
2012-03-19 20:38:12 +00:00
|
|
|
(let ((completion-ignore-case t)
|
2012-04-21 13:36:04 +00:00
|
|
|
(case-fold-search t)
|
2012-03-19 20:38:12 +00:00
|
|
|
(under-point (thing-at-point 'line)))
|
|
|
|
(list (org-icompleting-read
|
|
|
|
"source-block name: " (org-babel-src-block-names) nil t
|
|
|
|
(cond
|
|
|
|
;; noweb
|
|
|
|
((string-match (org-babel-noweb-wrap) under-point)
|
|
|
|
(let ((block-name (match-string 1 under-point)))
|
|
|
|
(string-match "[^(]*" block-name)
|
|
|
|
(match-string 0 block-name)))
|
|
|
|
;; #+call:
|
|
|
|
((string-match org-babel-lob-one-liner-regexp under-point)
|
|
|
|
(let ((source-info (car (org-babel-lob-get-info))))
|
|
|
|
(if (string-match "^\\([^\\[]+?\\)\\(\\[.*\\]\\)?(" source-info)
|
|
|
|
(let ((source-name (match-string 1 source-info)))
|
|
|
|
source-name))))
|
|
|
|
;; #+results:
|
|
|
|
((string-match (concat "#\\+" org-babel-results-keyword
|
|
|
|
"\\:\s+\\([^\\(]*\\)") under-point)
|
|
|
|
(match-string 1 under-point))
|
|
|
|
;; symbol-at-point
|
|
|
|
((and (thing-at-point 'symbol))
|
|
|
|
(org-babel-find-named-block (thing-at-point 'symbol))
|
|
|
|
(thing-at-point 'symbol))
|
|
|
|
(""))))))
|
2009-06-15 19:43:15 +00:00
|
|
|
(let ((point (org-babel-find-named-block name)))
|
2009-06-15 05:06:11 +00:00
|
|
|
(if point
|
|
|
|
;; taken from `org-open-at-point'
|
2012-03-19 20:38:12 +00:00
|
|
|
(progn (org-mark-ring-push) (goto-char point) (org-show-context))
|
2015-09-21 04:23:36 +00:00
|
|
|
(message "source-code block `%s' not found in this buffer" name))))
|
2009-06-15 05:06:11 +00:00
|
|
|
|
2009-06-13 22:43:24 +00:00
|
|
|
(defun org-babel-find-named-block (name)
|
|
|
|
"Find a named source-code block.
|
2009-11-18 18:31:24 +00:00
|
|
|
Return the location of the source block identified by source
|
2015-05-01 11:55:04 +00:00
|
|
|
NAME, or nil if no such block exists. Set match data according
|
|
|
|
to `org-babel-named-src-block-regexp'."
|
2009-06-13 22:43:24 +00:00
|
|
|
(save-excursion
|
2015-05-01 11:55:04 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
(ignore-errors
|
|
|
|
(org-next-block 1 nil (org-babel-named-src-block-regexp-for-name name)))))
|
2009-06-13 22:43:24 +00:00
|
|
|
|
2010-07-12 04:35:58 +00:00
|
|
|
(defun org-babel-src-block-names (&optional file)
|
|
|
|
"Returns the names of source blocks in FILE or the current buffer."
|
2015-05-01 11:55:04 +00:00
|
|
|
(when file (find-file file))
|
2010-07-12 04:35:58 +00:00
|
|
|
(save-excursion
|
2015-05-01 11:55:04 +00:00
|
|
|
(goto-char (point-min))
|
2015-05-01 12:28:15 +00:00
|
|
|
(let ((re (org-babel-named-src-block-regexp-for-name))
|
|
|
|
names)
|
|
|
|
(while (ignore-errors (org-next-block 1 nil re))
|
|
|
|
(push (org-match-string-no-properties 9) names))
|
2010-07-12 04:35:58 +00:00
|
|
|
names)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-babel-goto-named-result (name)
|
|
|
|
"Go to a named result."
|
|
|
|
(interactive
|
|
|
|
(let ((completion-ignore-case t))
|
|
|
|
(list (org-icompleting-read "source-block name: "
|
|
|
|
(org-babel-result-names) nil t))))
|
|
|
|
(let ((point (org-babel-find-named-result name)))
|
|
|
|
(if point
|
|
|
|
;; taken from `org-open-at-point'
|
|
|
|
(progn (goto-char point) (org-show-context))
|
2015-09-21 04:23:36 +00:00
|
|
|
(message "result `%s' not found in this buffer" name))))
|
2010-07-12 04:35:58 +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
|
|
|
(defun org-babel-find-named-result (name &optional point)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Find a named result.
|
|
|
|
Return the location of the result named NAME in the current
|
2009-05-21 13:40:04 +00:00
|
|
|
buffer or nil if no such result exists."
|
|
|
|
(save-excursion
|
2012-04-21 13:36:04 +00:00
|
|
|
(let ((case-fold-search t))
|
|
|
|
(goto-char (or point (point-min)))
|
|
|
|
(catch 'is-a-code-block
|
|
|
|
(when (re-search-forward
|
|
|
|
(concat org-babel-result-regexp
|
2016-01-25 15:11:31 +00:00
|
|
|
"[ \t]" (regexp-quote name) "[ \t]*[\n\f\v\r]")
|
|
|
|
nil t)
|
2012-04-21 13:36:04 +00:00
|
|
|
(when (and (string= "name" (downcase (match-string 1)))
|
|
|
|
(or (beginning-of-line 1)
|
|
|
|
(looking-at org-babel-src-block-regexp)
|
2013-06-30 23:46:32 +00:00
|
|
|
(looking-at org-babel-multi-line-header-regexp)
|
|
|
|
(looking-at org-babel-lob-one-liner-regexp)))
|
2012-04-21 13:36:04 +00:00
|
|
|
(throw 'is-a-code-block (org-babel-find-named-result name (point))))
|
|
|
|
(beginning-of-line 0) (point))))))
|
2009-05-21 13:40:04 +00:00
|
|
|
|
2010-07-12 04:35:58 +00:00
|
|
|
(defun org-babel-result-names (&optional file)
|
|
|
|
"Returns the names of results in FILE or the current buffer."
|
|
|
|
(save-excursion
|
|
|
|
(when file (find-file file)) (goto-char (point-min))
|
2012-04-21 13:36:04 +00:00
|
|
|
(let ((case-fold-search t) names)
|
2010-07-12 04:35:58 +00:00
|
|
|
(while (re-search-forward org-babel-result-w-name-regexp nil t)
|
2011-01-24 12:00:19 +00:00
|
|
|
(setq names (cons (match-string 4) names)))
|
2010-07-12 04:35:58 +00:00
|
|
|
names)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-babel-next-src-block (&optional arg)
|
|
|
|
"Jump to the next source block.
|
|
|
|
With optional prefix argument ARG, jump forward ARG many source blocks."
|
2013-02-08 16:11:13 +00:00
|
|
|
(interactive "p")
|
|
|
|
(org-next-block arg nil org-babel-src-block-regexp))
|
2010-07-12 04:35:58 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-babel-previous-src-block (&optional arg)
|
|
|
|
"Jump to the previous source block.
|
|
|
|
With optional prefix argument ARG, jump backward ARG many source blocks."
|
2013-02-08 16:11:13 +00:00
|
|
|
(interactive "p")
|
|
|
|
(org-previous-block arg org-babel-src-block-regexp))
|
2010-07-12 04:35:58 +00:00
|
|
|
|
2010-09-30 22:19:05 +00:00
|
|
|
(defvar org-babel-load-languages)
|
|
|
|
|
2010-09-19 20:47:49 +00:00
|
|
|
;;;###autoload
|
2010-10-18 19:15:35 +00:00
|
|
|
(defun org-babel-mark-block ()
|
2012-07-30 08:08:15 +00:00
|
|
|
"Mark current src block."
|
2010-10-18 19:15:35 +00:00
|
|
|
(interactive)
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(let ((head (org-babel-where-is-src-block-head)))
|
|
|
|
(when head
|
|
|
|
(save-excursion
|
|
|
|
(goto-char head)
|
|
|
|
(looking-at org-babel-src-block-regexp))
|
|
|
|
(push-mark (match-end 5) nil t)
|
|
|
|
(goto-char (match-beginning 5)))))
|
2010-10-18 19:15:35 +00:00
|
|
|
|
2010-09-19 20:47:49 +00:00
|
|
|
(defun org-babel-demarcate-block (&optional arg)
|
|
|
|
"Wrap or split the code in the region or on the point.
|
|
|
|
When called from inside of a code block the current block is
|
|
|
|
split. When called from outside of a code block a new code block
|
|
|
|
is created. In both cases if the region is demarcated and if the
|
|
|
|
region is not active then the point is demarcated."
|
|
|
|
(interactive "P")
|
2014-05-20 15:40:01 +00:00
|
|
|
(let* ((info (org-babel-get-src-block-info 'light))
|
2015-01-13 16:18:12 +00:00
|
|
|
(start (org-babel-where-is-src-block-head))
|
|
|
|
(block (and start (match-string 0)))
|
|
|
|
(headers (and start (match-string 4)))
|
2014-05-20 15:40:01 +00:00
|
|
|
(stars (concat (make-string (or (org-current-level) 1) ?*) " "))
|
2015-01-13 16:18:12 +00:00
|
|
|
(lower-case-p (and block
|
|
|
|
(let (case-fold-search)
|
|
|
|
(org-string-match-p "#\\+begin_src" block)))))
|
2010-09-19 20:47:49 +00:00
|
|
|
(if info
|
|
|
|
(mapc
|
|
|
|
(lambda (place)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char place)
|
|
|
|
(let ((lang (nth 0 info))
|
2010-10-21 02:06:11 +00:00
|
|
|
(indent (make-string (nth 5 info) ? )))
|
2010-09-21 12:44:17 +00:00
|
|
|
(when (string-match "^[[:space:]]*$"
|
|
|
|
(buffer-substring (point-at-bol)
|
|
|
|
(point-at-eol)))
|
|
|
|
(delete-region (point-at-bol) (point-at-eol)))
|
2011-09-04 23:06:07 +00:00
|
|
|
(insert (concat
|
|
|
|
(if (looking-at "^") "" "\n")
|
2014-05-20 15:40:01 +00:00
|
|
|
indent (funcall (if lower-case-p 'downcase 'upcase) "#+end_src\n")
|
2011-09-04 23:06:07 +00:00
|
|
|
(if arg stars indent) "\n"
|
2014-05-20 15:40:01 +00:00
|
|
|
indent (funcall (if lower-case-p 'downcase 'upcase) "#+begin_src ")
|
|
|
|
lang
|
2011-09-04 23:06:07 +00:00
|
|
|
(if (> (length headers) 1)
|
|
|
|
(concat " " headers) headers)
|
|
|
|
(if (looking-at "[\n\r]")
|
|
|
|
""
|
|
|
|
(concat "\n" (make-string (current-column) ? )))))))
|
2010-09-21 13:00:53 +00:00
|
|
|
(move-end-of-line 2))
|
2012-08-20 03:45:25 +00:00
|
|
|
(sort (if (org-region-active-p) (list (mark) (point)) (list (point))) #'>))
|
2010-09-21 12:44:17 +00:00
|
|
|
(let ((start (point))
|
2013-07-13 18:37:09 +00:00
|
|
|
(lang (org-icompleting-read
|
|
|
|
"Lang: "
|
|
|
|
(mapcar #'symbol-name
|
|
|
|
(delete-dups
|
|
|
|
(append (mapcar #'car org-babel-load-languages)
|
|
|
|
(mapcar (lambda (el) (intern (car el)))
|
|
|
|
org-src-lang-modes))))))
|
2010-09-21 12:44:17 +00:00
|
|
|
(body (delete-and-extract-region
|
2012-08-20 03:45:25 +00:00
|
|
|
(if (org-region-active-p) (mark) (point)) (point))))
|
2010-09-21 12:44:17 +00:00
|
|
|
(insert (concat (if (looking-at "^") "" "\n")
|
|
|
|
(if arg (concat stars "\n") "")
|
2014-05-20 15:40:01 +00:00
|
|
|
(funcall (if lower-case-p 'downcase 'upcase) "#+begin_src ")
|
|
|
|
lang "\n"
|
2010-09-21 12:44:17 +00:00
|
|
|
body
|
|
|
|
(if (or (= (length body) 0)
|
|
|
|
(string-match "[\r\n]$" body)) "" "\n")
|
2014-05-20 15:40:01 +00:00
|
|
|
(funcall (if lower-case-p 'downcase 'upcase) "#+end_src\n")))
|
2010-09-21 12:44:17 +00:00
|
|
|
(goto-char start) (move-end-of-line 1)))))
|
2010-09-19 20:47:49 +00:00
|
|
|
|
2010-06-17 17:22:54 +00:00
|
|
|
(defvar org-babel-lob-one-liner-regexp)
|
2010-06-10 21:36:08 +00:00
|
|
|
(defun org-babel-where-is-src-block-result (&optional insert info hash indent)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Find where the current source block results begin.
|
|
|
|
Return the point at the beginning of the result of the current
|
2009-11-20 17:40:50 +00: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 13:40:04 +00:00
|
|
|
(save-excursion
|
2012-04-21 13:36:04 +00:00
|
|
|
(let* ((case-fold-search t)
|
|
|
|
(on-lob-line (save-excursion
|
2011-01-27 19:48:45 +00:00
|
|
|
(beginning-of-line 1)
|
|
|
|
(looking-at org-babel-lob-one-liner-regexp)))
|
2011-09-05 21:53:07 +00:00
|
|
|
(inlinep (when (org-babel-get-inline-src-block-matches)
|
2012-08-10 15:44:45 +00:00
|
|
|
(match-end 0)))
|
2013-06-30 23:46:32 +00:00
|
|
|
(name (nth 4 (or info (org-babel-get-src-block-info 'light))))
|
2010-07-12 19:28:49 +00:00
|
|
|
(head (unless on-lob-line (org-babel-where-is-src-block-head)))
|
|
|
|
found beg end)
|
2009-07-17 04:18:03 +00:00
|
|
|
(when head (goto-char head))
|
2012-10-24 15:23:20 +00:00
|
|
|
(org-with-wide-buffer
|
|
|
|
(setq
|
|
|
|
found ;; was there a result (before we potentially insert one)
|
|
|
|
(or
|
|
|
|
inlinep
|
|
|
|
(and
|
|
|
|
;; named results:
|
|
|
|
;; - return t if it is found, else return nil
|
|
|
|
;; - if it does not need to be rebuilt, then don't set end
|
|
|
|
;; - if it does need to be rebuilt then do set end
|
|
|
|
name (setq beg (org-babel-find-named-result name))
|
|
|
|
(prog1 beg
|
2013-02-09 03:01:54 +00:00
|
|
|
(when (and hash (not (string= hash (match-string 5))))
|
2012-10-24 15:23:20 +00:00
|
|
|
(goto-char beg) (setq end beg) ;; beginning of result
|
|
|
|
(forward-line 1)
|
|
|
|
(delete-region end (org-babel-result-end)) nil)))
|
|
|
|
(and
|
|
|
|
;; unnamed results:
|
|
|
|
;; - return t if it is found, else return nil
|
|
|
|
;; - if it is found, and the hash doesn't match, delete and set end
|
|
|
|
(or on-lob-line (re-search-forward "^[ \t]*#\\+end_src" nil t))
|
|
|
|
(progn (end-of-line 1)
|
|
|
|
(if (eobp) (insert "\n") (forward-char 1))
|
|
|
|
(setq end (point))
|
2013-12-13 22:06:06 +00:00
|
|
|
(and
|
|
|
|
(not name)
|
|
|
|
(progn ;; unnamed results line already exists
|
|
|
|
(catch 'non-comment
|
|
|
|
(while (re-search-forward "[^ \f\t\n\r\v]" nil t)
|
|
|
|
(beginning-of-line 1)
|
|
|
|
(cond
|
|
|
|
((looking-at (concat org-babel-result-regexp "\n"))
|
|
|
|
(throw 'non-comment t))
|
|
|
|
((and (looking-at "^[ \t]*#")
|
|
|
|
(not (looking-at
|
|
|
|
org-babel-lob-one-liner-regexp)))
|
|
|
|
(end-of-line 1))
|
|
|
|
(t (throw 'non-comment nil))))))
|
|
|
|
(let ((this-hash (match-string 5)))
|
|
|
|
(prog1 (point)
|
|
|
|
;; must remove and rebuild if hash!=old-hash
|
|
|
|
(if (and hash (not (string= hash this-hash)))
|
|
|
|
(progn
|
|
|
|
(setq end (point-at-bol))
|
|
|
|
(forward-line 1)
|
|
|
|
(delete-region end (org-babel-result-end))
|
|
|
|
(setq beg end))
|
|
|
|
(setq end nil))))))))))
|
2012-10-24 15:23:20 +00:00
|
|
|
(if (not (and insert end)) found
|
|
|
|
(goto-char end)
|
|
|
|
(unless beg
|
|
|
|
(if (looking-at "[\n\r]") (forward-char 1) (insert "\n")))
|
2015-08-23 21:38:36 +00:00
|
|
|
(when (wholenump indent) (indent-to indent))
|
2012-10-24 15:23:20 +00:00
|
|
|
(insert (concat
|
|
|
|
"#+" org-babel-results-keyword
|
2013-01-30 17:05:51 +00:00
|
|
|
(when hash
|
|
|
|
(if org-babel-hash-show-time
|
2013-02-09 03:01:54 +00:00
|
|
|
(concat
|
|
|
|
"["(format-time-string "<%Y-%m-%d %H:%M:%S>")" "hash"]")
|
|
|
|
(concat "["hash"]")))
|
2012-10-24 15:23:20 +00:00
|
|
|
":"
|
|
|
|
(when name (concat " " name)) "\n"))
|
|
|
|
(unless beg (insert "\n") (backward-char))
|
|
|
|
(beginning-of-line 0)
|
2015-08-23 21:38:36 +00:00
|
|
|
(when hash (org-babel-hide-hash))
|
2012-10-24 15:23:20 +00:00
|
|
|
(point)))))
|
2009-05-21 13:40:04 +00:00
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
(defvar org-block-regexp)
|
2009-07-25 02:52:55 +00:00
|
|
|
(defun org-babel-read-result ()
|
|
|
|
"Read the result at `point' into emacs-lisp."
|
2009-11-02 05:29:26 +00:00
|
|
|
(let ((case-fold-search t) result-string)
|
|
|
|
(cond
|
|
|
|
((org-at-table-p) (org-babel-read-table))
|
2011-02-23 04:12:13 +00:00
|
|
|
((org-at-item-p) (org-babel-read-list))
|
2010-02-10 02:38:50 +00:00
|
|
|
((looking-at org-bracket-link-regexp) (org-babel-read-link))
|
2013-11-23 22:57:29 +00:00
|
|
|
((looking-at org-block-regexp) (org-remove-indentation (match-string 4)))
|
2013-06-21 19:40:33 +00:00
|
|
|
((or (looking-at "^[ \t]*: ") (looking-at "^[ \t]*:$"))
|
2009-11-02 05:29:26 +00:00
|
|
|
(setq result-string
|
|
|
|
(org-babel-trim
|
2010-04-17 20:03:30 +00:00
|
|
|
(mapconcat (lambda (line)
|
2013-06-21 19:40:33 +00:00
|
|
|
(or (and (> (length line) 1)
|
|
|
|
(string-match "^[ \t]*: ?\\(.+\\)" line)
|
|
|
|
(match-string 1 line))
|
|
|
|
""))
|
2009-11-02 05:29:26 +00:00
|
|
|
(split-string
|
2010-04-17 20:03:30 +00:00
|
|
|
(buffer-substring
|
|
|
|
(point) (org-babel-result-end)) "[\r\n]+")
|
2009-11-02 05:29:26 +00:00
|
|
|
"\n")))
|
|
|
|
(or (org-babel-number-p result-string) result-string))
|
2009-11-20 17:40:50 +00:00
|
|
|
((looking-at org-babel-result-regexp)
|
2009-11-02 05:29:26 +00:00
|
|
|
(save-excursion (forward-line 1) (org-babel-read-result))))))
|
2009-07-25 02:52:55 +00: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
|
2011-02-27 15:47:36 +00:00
|
|
|
(mapcar (lambda (el) (org-babel-read el 'inhibit-lisp-eval)) row)))
|
2009-07-25 02:52:55 +00:00
|
|
|
(org-table-to-lisp)))
|
|
|
|
|
2010-11-17 23:42:52 +00:00
|
|
|
(defun org-babel-read-list ()
|
|
|
|
"Read the list at `point' into emacs-lisp."
|
2011-02-27 15:47:36 +00:00
|
|
|
(mapcar (lambda (el) (org-babel-read el 'inhibit-lisp-eval))
|
|
|
|
(mapcar #'cadr (cdr (org-list-parse-list)))))
|
2010-11-17 23:42:52 +00:00
|
|
|
|
2010-06-23 18:24:33 +00:00
|
|
|
(defvar org-link-types-re)
|
2010-02-10 02:38:50 +00:00
|
|
|
(defun org-babel-read-link ()
|
2010-07-13 23:20:08 +00:00
|
|
|
"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'."
|
2010-02-10 02:38:50 +00:00
|
|
|
(let* ((case-fold-search t)
|
|
|
|
(raw (and (looking-at org-bracket-link-regexp)
|
2012-08-15 07:39:24 +00:00
|
|
|
(org-no-properties (match-string 1))))
|
2010-02-10 02:38:50 +00:00
|
|
|
(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-12-20 18:45:07 +00:00
|
|
|
(defun org-babel-format-result (result &optional sep)
|
|
|
|
"Format RESULT for writing to file."
|
2012-08-10 15:23:00 +00:00
|
|
|
(let ((echo-res (lambda (r) (if (stringp r) r (format "%S" r)))))
|
2010-12-20 18:45:07 +00:00
|
|
|
(if (listp result)
|
|
|
|
;; table result
|
|
|
|
(orgtbl-to-generic
|
2012-08-10 15:23:00 +00:00
|
|
|
result (list :sep (or sep "\t") :fmt echo-res))
|
2010-12-20 18:45:07 +00:00
|
|
|
;; scalar result
|
2012-08-10 15:23:00 +00:00
|
|
|
(funcall echo-res result))))
|
2010-12-20 18:45:07 +00:00
|
|
|
|
2010-06-12 23:13:34 +00:00
|
|
|
(defun org-babel-insert-result
|
2015-02-25 13:41:13 +00:00
|
|
|
(result &optional result-params info hash indent lang)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Insert RESULT into the current buffer.
|
2015-01-29 20:05:31 +00:00
|
|
|
|
|
|
|
By default RESULT is inserted after the end of the current source
|
|
|
|
block. The RESULT of an inline source block usually will be
|
|
|
|
wrapped inside a `results' macro and placed on the same line as
|
|
|
|
the inline source block. The macro is stripped upon export.
|
|
|
|
Multiline and non-scalar RESULTS from inline source blocks are
|
|
|
|
not allowed. With optional argument RESULT-PARAMS controls
|
|
|
|
insertion of results in the Org mode file. RESULT-PARAMS can
|
|
|
|
take the following values:
|
2009-04-01 22:46:55 +00:00
|
|
|
|
2009-08-18 23:55:10 +00:00
|
|
|
replace - (default option) insert results after the source block
|
2015-01-29 20:05:31 +00:00
|
|
|
or inline source block replacing any previously
|
|
|
|
inserted results.
|
2009-07-18 04:06:37 +00:00
|
|
|
|
2012-11-16 15:40:46 +00:00
|
|
|
silent -- no results are inserted into the Org-mode buffer but
|
|
|
|
the results are echoed to the minibuffer and are
|
|
|
|
ingested by Emacs (a potentially time consuming
|
2015-01-29 20:05:31 +00:00
|
|
|
process).
|
2009-04-01 22:46:55 +00:00
|
|
|
|
2009-08-24 17:35:59 +00:00
|
|
|
file ---- the results are interpreted as a file path, and are
|
2015-01-29 20:05:31 +00:00
|
|
|
inserted into the buffer using the Org-mode file syntax.
|
2009-08-24 17:35:59 +00:00
|
|
|
|
2010-11-17 23:42:52 +00:00
|
|
|
list ---- the results are interpreted as an Org-mode list.
|
|
|
|
|
|
|
|
raw ----- results are added directly to the Org-mode file. This
|
2009-08-18 23:55:10 +00:00
|
|
|
is a good option if you code block will output org-mode
|
|
|
|
formatted text.
|
|
|
|
|
2012-09-26 07:23:51 +00:00
|
|
|
drawer -- results are added directly to the Org-mode file as with
|
2015-01-29 20:05:31 +00:00
|
|
|
\"raw\", but are wrapped in a RESULTS drawer or results
|
|
|
|
macro, allowing them to later be replaced or removed
|
|
|
|
automatically.
|
2011-12-11 16:27:48 +00:00
|
|
|
|
2014-08-01 09:28:05 +00:00
|
|
|
org ----- results are added inside of a \"src_org{}\" or \"#+BEGIN_SRC
|
|
|
|
org\" block depending on whether the current source block is
|
|
|
|
inline or not. They are not comma-escaped when inserted,
|
|
|
|
but Org syntax here will be discarded when exporting the
|
|
|
|
file.
|
2012-09-26 08:56:16 +00:00
|
|
|
|
2015-01-29 20:05:31 +00:00
|
|
|
html ---- results are added inside of a #+BEGIN_HTML block or
|
|
|
|
html export snippet depending on whether the current
|
|
|
|
source block is inline or not. This is a good option
|
|
|
|
if your code block will output html formatted text.
|
2009-08-18 23:55:10 +00:00
|
|
|
|
2015-01-29 20:05:31 +00:00
|
|
|
latex --- results are added inside of a #+BEGIN_LATEX block or
|
|
|
|
latex export snippet depending on whether the current
|
|
|
|
source block is inline or not. This is a good option
|
|
|
|
if your code block will output latex formatted text.
|
2009-10-16 17:53:38 +00:00
|
|
|
|
|
|
|
code ---- the results are extracted in the syntax of the source
|
|
|
|
code of the language being evaluated and are added
|
2014-08-01 09:28:05 +00:00
|
|
|
inside of a source block with the source-code language
|
|
|
|
set appropriately. Also, source block inlining is
|
|
|
|
preserved in this case. Note this relies on the
|
2015-01-29 20:05:31 +00:00
|
|
|
optional LANG argument.
|
|
|
|
|
|
|
|
list ---- the results are rendered as a list. This option not
|
|
|
|
allowed for inline src blocks.
|
|
|
|
|
|
|
|
table --- the results are rendered as a table. This option not
|
|
|
|
allowed for inline src blocks.
|
|
|
|
|
|
|
|
INFO may provide the values of these header arguments (in the
|
|
|
|
`header-arguments-alist' see the docstring for
|
|
|
|
`org-babel-get-src-block-info'):
|
|
|
|
|
|
|
|
:file --- the name of the file to which output should be written.
|
|
|
|
|
|
|
|
:wrap --- the effect is similar to `latex' in RESULT-PARAMS but
|
|
|
|
using the argument supplied to specify the export block
|
|
|
|
or snippet type."
|
|
|
|
|
2009-05-22 22:38:51 +00:00
|
|
|
(if (stringp result)
|
|
|
|
(progn
|
2012-08-15 07:39:24 +00:00
|
|
|
(setq result (org-no-properties result))
|
2009-11-20 17:40:50 +00:00
|
|
|
(when (member "file" result-params)
|
2012-03-31 14:04:31 +00:00
|
|
|
(setq result (org-babel-result-to-file
|
|
|
|
result (when (assoc :file-desc (nth 2 info))
|
|
|
|
(or (cdr (assoc :file-desc (nth 2 info)))
|
|
|
|
result))))))
|
2009-04-03 22:56:02 +00:00
|
|
|
(unless (listp result) (setq result (format "%S" result))))
|
2010-09-07 22:58:39 +00:00
|
|
|
(if (and result-params (member "silent" result-params))
|
|
|
|
(progn
|
|
|
|
(message (replace-regexp-in-string "%" "%%" (format "%S" result)))
|
|
|
|
result)
|
|
|
|
(save-excursion
|
2011-06-24 21:53:30 +00:00
|
|
|
(let* ((inlinep
|
|
|
|
(save-excursion
|
2011-09-05 21:53:07 +00:00
|
|
|
(when (or (org-babel-get-inline-src-block-matches)
|
|
|
|
(org-babel-get-lob-one-liner-matches))
|
2011-06-24 21:53:30 +00:00
|
|
|
(goto-char (match-end 0))
|
2015-01-31 03:27:54 +00:00
|
|
|
(org-babel-remove-inline-result)
|
2015-01-29 20:05:31 +00:00
|
|
|
(insert " ")
|
2011-06-24 21:53:30 +00:00
|
|
|
(point))))
|
2015-01-31 03:27:54 +00:00
|
|
|
(existing-result
|
|
|
|
(unless inlinep
|
|
|
|
(org-babel-where-is-src-block-result t info hash indent)))
|
2015-01-29 20:05:31 +00:00
|
|
|
(bad-inline-p
|
|
|
|
(when inlinep
|
|
|
|
(or
|
|
|
|
(and (member "table" result-params) "`:results table'")
|
|
|
|
(and (listp result) "list result")
|
|
|
|
(and (org-string-match-p "\n." result) "multiline result")
|
|
|
|
(and (member "list" result-params) "`:results list'"))))
|
2011-01-27 18:31:47 +00:00
|
|
|
(results-switches
|
|
|
|
(cdr (assoc :results_switches (nth 2 info))))
|
2014-06-22 05:43:58 +00:00
|
|
|
(visible-beg (point-min-marker))
|
|
|
|
(visible-end (point-max-marker))
|
2012-10-24 15:23:20 +00:00
|
|
|
;; When results exist outside of the current visible
|
|
|
|
;; region of the buffer, be sure to widen buffer to
|
|
|
|
;; update them.
|
|
|
|
(outside-scope-p (and existing-result
|
|
|
|
(or (> visible-beg existing-result)
|
|
|
|
(<= visible-end existing-result))))
|
2011-01-27 18:31:47 +00:00
|
|
|
beg end)
|
|
|
|
(when (and (stringp result) ; ensure results end in a newline
|
|
|
|
(not inlinep)
|
|
|
|
(> (length result) 0)
|
|
|
|
(not (or (string-equal (substring result -1) "\n")
|
|
|
|
(string-equal (substring result -1) "\r"))))
|
|
|
|
(setq result (concat result "\n")))
|
2012-10-24 15:23:20 +00:00
|
|
|
(unwind-protect
|
|
|
|
(progn
|
|
|
|
(when outside-scope-p (widen))
|
|
|
|
(if (not existing-result)
|
|
|
|
(setq beg (or inlinep (point)))
|
|
|
|
(goto-char existing-result)
|
|
|
|
(save-excursion
|
|
|
|
(re-search-forward "#" nil t)
|
|
|
|
(setq indent (- (current-column) 1)))
|
|
|
|
(forward-line 1)
|
|
|
|
(setq beg (point))
|
|
|
|
(cond
|
|
|
|
((member "replace" result-params)
|
|
|
|
(delete-region (point) (org-babel-result-end)))
|
|
|
|
((member "append" result-params)
|
|
|
|
(goto-char (org-babel-result-end)) (setq beg (point-marker)))
|
|
|
|
((member "prepend" result-params)))) ; already there
|
|
|
|
(setq results-switches
|
|
|
|
(if results-switches (concat " " results-switches) ""))
|
2015-01-29 20:05:31 +00:00
|
|
|
(let ((wrap (lambda (start finish &optional no-escape no-newlines
|
2015-02-25 13:41:13 +00:00
|
|
|
inline-start inline-finish)
|
2015-01-29 20:05:31 +00:00
|
|
|
(when inlinep
|
|
|
|
(setq start inline-start)
|
|
|
|
(setq finish inline-finish)
|
|
|
|
(setq no-newlines t))
|
2014-08-01 09:28:05 +00:00
|
|
|
(goto-char end)
|
|
|
|
(insert (concat finish (unless no-newlines "\n")))
|
|
|
|
(goto-char beg)
|
|
|
|
(insert (concat start (unless no-newlines "\n")))
|
2012-11-06 13:20:27 +00:00
|
|
|
(unless no-escape
|
2013-02-12 16:49:06 +00:00
|
|
|
(org-escape-code-in-region (min (point) end) end))
|
2014-08-01 09:28:05 +00:00
|
|
|
(goto-char end)
|
|
|
|
(unless no-newlines (goto-char (point-at-eol)))
|
2012-10-24 15:23:20 +00:00
|
|
|
(setq end (point-marker))))
|
2015-02-25 13:41:13 +00:00
|
|
|
(tabulablep
|
|
|
|
(lambda (r)
|
|
|
|
;; Non-nil when result R can be turned into
|
|
|
|
;; a table.
|
|
|
|
(and (listp r)
|
|
|
|
(null (cdr (last r)))
|
|
|
|
(org-every
|
|
|
|
(lambda (e) (or (atom e) (null (cdr (last e)))))
|
|
|
|
result)))))
|
2012-10-24 15:23:20 +00:00
|
|
|
;; insert results based on type
|
|
|
|
(cond
|
2015-01-29 20:05:31 +00:00
|
|
|
;; Do nothing for an empty result.
|
2012-10-24 15:23:20 +00:00
|
|
|
((null result))
|
2015-01-29 20:05:31 +00:00
|
|
|
;; Illegal inline result or params.
|
|
|
|
(bad-inline-p
|
|
|
|
(error "Inline error: %s cannot be used" bad-inline-p))
|
2012-10-24 15:23:20 +00:00
|
|
|
;; insert a list if preferred
|
|
|
|
((member "list" result-params)
|
|
|
|
(insert
|
|
|
|
(org-babel-trim
|
|
|
|
(org-list-to-generic
|
|
|
|
(cons 'unordered
|
|
|
|
(mapcar
|
|
|
|
(lambda (el) (list nil (if (stringp el) el (format "%S" el))))
|
2013-04-19 17:44:40 +00:00
|
|
|
(if (listp result) result (split-string result "\n" t))))
|
2012-10-24 15:23:20 +00:00
|
|
|
'(:splicep nil :istart "- " :iend "\n")))
|
|
|
|
"\n"))
|
2015-02-23 17:37:37 +00:00
|
|
|
;; Try hard to print RESULT as a table. Give up if
|
|
|
|
;; it contains an improper list.
|
2015-02-25 13:41:13 +00:00
|
|
|
((funcall tabulablep result)
|
2012-10-24 15:23:20 +00:00
|
|
|
(goto-char beg)
|
|
|
|
(insert (concat (orgtbl-to-orgtbl
|
2014-05-01 04:56:52 +00:00
|
|
|
(if (org-every
|
2015-02-23 17:37:37 +00:00
|
|
|
(lambda (e)
|
|
|
|
(or (eq e 'hline) (listp e)))
|
2014-05-01 04:56:52 +00:00
|
|
|
result)
|
2015-02-23 17:37:37 +00:00
|
|
|
result
|
|
|
|
(list result))
|
|
|
|
nil)
|
|
|
|
"\n"))
|
|
|
|
(goto-char beg)
|
|
|
|
(when (org-at-table-p) (org-table-align))
|
|
|
|
(goto-char (org-table-end)))
|
|
|
|
;; Print verbatim a list that cannot be turned into
|
|
|
|
;; a table.
|
|
|
|
((listp result) (insert (format "%s\n" result)))
|
2012-10-24 15:23:20 +00:00
|
|
|
((member "file" result-params)
|
2015-01-29 20:05:31 +00:00
|
|
|
(when inlinep
|
|
|
|
(goto-char inlinep)
|
|
|
|
(setq result (org-macro-escape-arguments result)))
|
2012-10-24 15:23:20 +00:00
|
|
|
(insert result))
|
2015-01-29 20:05:31 +00:00
|
|
|
((and inlinep
|
|
|
|
(not (member "raw" result-params)))
|
|
|
|
(goto-char inlinep)
|
|
|
|
(insert (org-macro-escape-arguments
|
|
|
|
(org-babel-chomp result "\n"))))
|
2012-10-24 15:23:20 +00:00
|
|
|
(t (goto-char beg) (insert result)))
|
|
|
|
(setq end (point-marker))
|
|
|
|
;; possibly wrap result
|
|
|
|
(cond
|
2015-02-23 17:37:37 +00:00
|
|
|
(bad-inline-p) ; Do nothing.
|
2012-10-24 15:23:20 +00:00
|
|
|
((assoc :wrap (nth 2 info))
|
|
|
|
(let ((name (or (cdr (assoc :wrap (nth 2 info))) "RESULTS")))
|
2012-12-19 20:16:57 +00:00
|
|
|
(funcall wrap (concat "#+BEGIN_" name)
|
2015-01-29 20:05:31 +00:00
|
|
|
(concat "#+END_" (car (org-split-string name)))
|
|
|
|
nil nil (concat "{{{results(@@" name ":") "@@)}}}")))
|
2012-10-24 15:23:20 +00:00
|
|
|
((member "html" result-params)
|
2015-01-29 20:05:31 +00:00
|
|
|
(funcall wrap "#+BEGIN_HTML" "#+END_HTML" nil nil
|
|
|
|
"{{{results(@@html:" "@@)}}}"))
|
2012-10-24 15:23:20 +00:00
|
|
|
((member "latex" result-params)
|
2015-01-29 20:05:31 +00:00
|
|
|
(funcall wrap "#+BEGIN_LaTeX" "#+END_LaTeX" nil nil
|
|
|
|
"{{{results(@@latex:" "@@)}}}"))
|
2012-10-24 15:23:20 +00:00
|
|
|
((member "org" result-params)
|
2013-03-29 23:57:06 +00:00
|
|
|
(goto-char beg) (if (org-at-table-p) (org-cycle))
|
2015-01-29 20:05:31 +00:00
|
|
|
(funcall wrap "#+BEGIN_SRC org" "#+END_SRC" nil nil
|
|
|
|
"{{{results(src_org{" "})}}}"))
|
2012-10-24 15:23:20 +00:00
|
|
|
((member "code" result-params)
|
2014-08-01 09:28:05 +00:00
|
|
|
(let ((lang (or lang "none")))
|
2015-01-29 20:05:31 +00:00
|
|
|
(funcall wrap (format "#+BEGIN_SRC %s%s" lang results-switches)
|
|
|
|
"#+END_SRC" nil nil
|
|
|
|
(format "{{{results(src_%s[%s]{" lang results-switches)
|
|
|
|
"})}}}")))
|
2012-10-24 15:23:20 +00:00
|
|
|
((member "raw" result-params)
|
|
|
|
(goto-char beg) (if (org-at-table-p) (org-cycle)))
|
|
|
|
((or (member "drawer" result-params)
|
|
|
|
;; Stay backward compatible with <7.9.2
|
|
|
|
(member "wrap" result-params))
|
2013-03-29 23:57:06 +00:00
|
|
|
(goto-char beg) (if (org-at-table-p) (org-cycle))
|
2015-01-29 20:05:31 +00:00
|
|
|
(funcall wrap ":RESULTS:" ":END:" 'no-escape nil
|
|
|
|
"{{{results(" ")}}}"))
|
|
|
|
((and inlinep (member "file" result-params))
|
|
|
|
(funcall wrap nil nil nil nil "{{{results(" ")}}}"))
|
2015-02-25 13:41:13 +00:00
|
|
|
((and (not (funcall tabulablep result))
|
2012-10-24 15:23:20 +00:00
|
|
|
(not (member "file" result-params)))
|
2015-01-29 20:05:31 +00:00
|
|
|
(let ((org-babel-inline-result-wrap
|
|
|
|
;; Hard code {{{results(...)}}} on top of customization.
|
|
|
|
(format "{{{results(%s)}}}" org-babel-inline-result-wrap)))
|
|
|
|
(org-babel-examplify-region beg end results-switches)
|
|
|
|
(setq end (point))))))
|
2012-10-24 15:23:20 +00:00
|
|
|
;; possibly indent the results to match the #+results line
|
|
|
|
(when (and (not inlinep) (numberp indent) 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))
|
|
|
|
(if (null result)
|
|
|
|
(if (member "value" result-params)
|
|
|
|
(message "Code block returned no value.")
|
|
|
|
(message "Code block produced no output."))
|
|
|
|
(message "Code block evaluation complete.")))
|
|
|
|
(when outside-scope-p (narrow-to-region visible-beg visible-end))
|
|
|
|
(set-marker visible-beg nil)
|
|
|
|
(set-marker visible-end nil))))))
|
2009-03-26 05:02:50 +00:00
|
|
|
|
2013-09-20 21:07:15 +00:00
|
|
|
(defun org-babel-remove-result (&optional info keep-keyword)
|
2009-05-21 14:22:24 +00:00
|
|
|
"Remove the result of the current source block."
|
2009-05-30 19:59:46 +00:00
|
|
|
(interactive)
|
2013-09-20 21:07:15 +00:00
|
|
|
(let ((location (org-babel-where-is-src-block-result nil info)))
|
2009-11-20 17:40:50 +00:00
|
|
|
(when location
|
|
|
|
(save-excursion
|
2013-09-20 21:07:15 +00:00
|
|
|
(goto-char location)
|
2013-09-20 22:29:10 +00:00
|
|
|
(when (looking-at (concat org-babel-result-regexp ".*$"))
|
2013-09-20 21:07:15 +00:00
|
|
|
(delete-region
|
2013-10-01 12:25:31 +00:00
|
|
|
(if keep-keyword (1+ (match-end 0)) (1- (match-beginning 0)))
|
2013-09-20 21:07:15 +00:00
|
|
|
(progn (forward-line 1) (org-babel-result-end))))))))
|
2009-06-14 00:07:03 +00:00
|
|
|
|
2015-01-29 20:05:31 +00:00
|
|
|
(defun org-babel-remove-inline-result ()
|
|
|
|
"Remove the result of the current inline-src-block or babel call.
|
2015-01-31 03:27:54 +00:00
|
|
|
The result must be wrapped in a `results' macro to be removed.
|
|
|
|
Leading whitespace is trimmed."
|
|
|
|
(interactive)
|
2015-01-29 20:05:31 +00:00
|
|
|
(let* ((el (org-element-context))
|
|
|
|
(post-blank (org-element-property :post-blank el)))
|
|
|
|
(when (memq (org-element-type el) '(inline-src-block inline-babel-call))
|
|
|
|
(org-with-wide-buffer
|
|
|
|
(goto-char (org-element-property :end el))
|
|
|
|
(let ((el (org-element-context)))
|
|
|
|
(when (and (eq (org-element-type el) 'macro)
|
|
|
|
(string= (org-element-property :key el) "results"))
|
2015-01-31 03:27:54 +00:00
|
|
|
(delete-region ; And leading whitespace.
|
|
|
|
(- (org-element-property :begin el) post-blank)
|
2015-01-29 20:05:31 +00:00
|
|
|
(- (org-element-property :end el)
|
|
|
|
(org-element-property :post-blank el)))))))))
|
|
|
|
|
2014-04-13 16:58:31 +00:00
|
|
|
(defun org-babel-remove-result-one-or-many (x)
|
|
|
|
"Remove the result of the current source block.
|
|
|
|
If called with a prefix argument, remove all result blocks
|
|
|
|
in the buffer."
|
|
|
|
(interactive "P")
|
|
|
|
(if x
|
|
|
|
(org-babel-map-src-blocks nil (org-babel-remove-result))
|
|
|
|
(org-babel-remove-result)))
|
|
|
|
|
2009-06-14 00:07:03 +00:00
|
|
|
(defun org-babel-result-end ()
|
2012-07-30 08:08:15 +00:00
|
|
|
"Return the point at the end of the current set of results."
|
2009-06-14 00:07:03 +00:00
|
|
|
(save-excursion
|
2010-11-17 23:42:52 +00:00
|
|
|
(cond
|
|
|
|
((org-at-table-p) (progn (goto-char (org-table-end)) (point)))
|
2011-01-09 15:25:01 +00:00
|
|
|
((org-at-item-p) (let* ((struct (org-list-struct))
|
2011-02-18 13:13:29 +00:00
|
|
|
(prvs (org-list-prevs-alist struct)))
|
2011-02-21 19:40:49 +00:00
|
|
|
(org-list-get-list-end (point-at-bol) struct prvs)))
|
2012-04-21 13:36:04 +00:00
|
|
|
((let ((case-fold-search t)) (looking-at "^\\([ \t]*\\):results:"))
|
2012-01-24 16:12:29 +00:00
|
|
|
(progn (re-search-forward (concat "^" (match-string 1) ":END:"))
|
|
|
|
(forward-char 1) (point)))
|
2010-11-17 23:42:52 +00:00
|
|
|
(t
|
2012-03-19 20:38:12 +00:00
|
|
|
(let ((case-fold-search t))
|
|
|
|
(if (looking-at (concat "[ \t]*#\\+begin_\\([^ \t\n\r]+\\)"))
|
|
|
|
(progn (re-search-forward (concat "[ \t]*#\\+end_" (match-string 1))
|
|
|
|
nil t)
|
2010-12-15 16:58:57 +00:00
|
|
|
(forward-char 1))
|
2013-06-21 19:40:33 +00:00
|
|
|
(while (looking-at "[ \t]*\\(: \\|:$\\|\\[\\[\\)")
|
2010-11-19 23:04:59 +00:00
|
|
|
(forward-line 1))))
|
2010-11-17 23:42:52 +00:00
|
|
|
(point)))))
|
2009-02-23 06:19:34 +00:00
|
|
|
|
2012-03-31 14:04:31 +00:00
|
|
|
(defun org-babel-result-to-file (result &optional description)
|
|
|
|
"Convert RESULT into an `org-mode' link with optional DESCRIPTION.
|
2010-07-13 23:20:08 +00:00
|
|
|
If the `default-directory' is different from the containing
|
|
|
|
file's directory then expand relative links."
|
2012-03-31 14:04:31 +00:00
|
|
|
(when (stringp result)
|
|
|
|
(format "[[file:%s]%s]"
|
|
|
|
(if (and default-directory
|
|
|
|
buffer-file-name
|
|
|
|
(not (string= (expand-file-name default-directory)
|
|
|
|
(expand-file-name
|
|
|
|
(file-name-directory buffer-file-name)))))
|
|
|
|
(expand-file-name result default-directory)
|
|
|
|
result)
|
|
|
|
(if description (concat "[" description "]") ""))))
|
2009-05-22 22:38:51 +00:00
|
|
|
|
2014-02-07 09:19:50 +00:00
|
|
|
(defvar org-babel-capitalize-example-region-markers nil
|
2012-05-21 13:44:54 +00:00
|
|
|
"Make true to capitalize begin/end example markers inserted by code blocks.")
|
|
|
|
|
2014-02-07 09:19:50 +00:00
|
|
|
(define-obsolete-function-alias
|
|
|
|
'org-babel-examplize-region
|
2014-10-24 09:56:09 +00:00
|
|
|
'org-babel-examplify-region "25.1")
|
2014-02-07 09:19:50 +00:00
|
|
|
|
|
|
|
(defun org-babel-examplify-region (beg end &optional results-switches)
|
2015-09-21 04:23:36 +00:00
|
|
|
"Comment out region using the inline `==' or `: ' org example quote."
|
2009-03-25 22:55:56 +00:00
|
|
|
(interactive "*r")
|
2012-08-10 15:23:00 +00:00
|
|
|
(let ((chars-between (lambda (b e)
|
2014-02-06 21:29:29 +00:00
|
|
|
(not (string-match "^[\\s]*$"
|
|
|
|
(buffer-substring b e)))))
|
2014-02-07 09:19:50 +00:00
|
|
|
(maybe-cap (lambda (str) (if org-babel-capitalize-example-region-markers
|
2014-02-06 21:29:29 +00:00
|
|
|
(upcase str) str)))
|
|
|
|
(beg-bol (save-excursion (goto-char beg) (point-at-bol)))
|
|
|
|
(end-bol (save-excursion (goto-char end) (point-at-bol)))
|
|
|
|
(end-eol (save-excursion (goto-char end) (point-at-eol))))
|
|
|
|
(if (and (not (= end end-bol))
|
|
|
|
(or (funcall chars-between beg-bol beg)
|
|
|
|
(funcall chars-between end end-eol)))
|
2011-01-27 18:31:47 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char beg)
|
2013-04-26 15:37:25 +00:00
|
|
|
(insert (format org-babel-inline-result-wrap
|
|
|
|
(prog1 (buffer-substring beg end)
|
|
|
|
(delete-region beg end)))))
|
2011-01-27 18:31:47 +00:00
|
|
|
(let ((size (count-lines beg end)))
|
|
|
|
(save-excursion
|
|
|
|
(cond ((= size 0)) ; do nothing for an empty result
|
|
|
|
((< size org-babel-min-lines-for-block-output)
|
|
|
|
(goto-char beg)
|
|
|
|
(dotimes (n size)
|
|
|
|
(beginning-of-line 1) (insert ": ") (forward-line 1)))
|
|
|
|
(t
|
|
|
|
(goto-char beg)
|
|
|
|
(insert (if results-switches
|
2012-05-21 13:44:54 +00:00
|
|
|
(format "%s%s\n"
|
2012-08-10 15:23:00 +00:00
|
|
|
(funcall maybe-cap "#+begin_example")
|
2012-05-21 13:44:54 +00:00
|
|
|
results-switches)
|
2012-08-10 15:23:00 +00:00
|
|
|
(funcall maybe-cap "#+begin_example\n")))
|
2011-01-27 18:31:47 +00:00
|
|
|
(if (markerp end) (goto-char end) (forward-char (- end beg)))
|
2012-08-10 15:23:00 +00:00
|
|
|
(insert (funcall maybe-cap "#+end_example\n")))))))))
|
2009-03-25 22:55:56 +00:00
|
|
|
|
2010-10-29 07:49:47 +00:00
|
|
|
(defun org-babel-update-block-body (new-body)
|
|
|
|
"Update the body of the current code block to NEW-BODY."
|
2016-01-31 10:36:52 +00:00
|
|
|
(let ((element (org-element-at-point)))
|
|
|
|
(unless (eq (org-element-type element) 'src-block)
|
|
|
|
(error "Not in a source block"))
|
|
|
|
(goto-char (org-babel-where-is-src-block-head element))
|
|
|
|
(let* ((ind (org-get-indentation))
|
|
|
|
(body-start (line-beginning-position 2))
|
|
|
|
(body (org-element-normalize-string
|
|
|
|
(if (or org-src-preserve-indentation
|
|
|
|
(org-element-property :preserve-indent element))
|
|
|
|
new-body
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert (org-remove-indentation new-body))
|
|
|
|
(indent-rigidly
|
|
|
|
(point-min)
|
|
|
|
(point-max)
|
|
|
|
(+ ind org-edit-src-content-indentation))
|
|
|
|
(buffer-string))))))
|
|
|
|
(delete-region body-start
|
|
|
|
(org-with-wide-buffer
|
|
|
|
(goto-char (org-element-property :end element))
|
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
(line-beginning-position)))
|
|
|
|
(goto-char body-start)
|
|
|
|
(insert body))))
|
2010-10-29 07:49:47 +00:00
|
|
|
|
2009-06-15 16:22:36 +00:00
|
|
|
(defun org-babel-merge-params (&rest plists)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Combine all parameter association lists in PLISTS.
|
2011-01-20 15:05:22 +00:00
|
|
|
Later elements of PLISTS override the values of previous elements.
|
2010-07-13 23:20:08 +00:00
|
|
|
This takes into account some special considerations for certain
|
2009-07-07 23:44:27 +00:00
|
|
|
parameters when merging lists."
|
2012-08-10 15:44:45 +00:00
|
|
|
(let* ((results-exclusive-groups
|
|
|
|
(mapcar (lambda (group) (mapcar #'symbol-name group))
|
|
|
|
(cdr (assoc 'results org-babel-common-header-args-w-values))))
|
|
|
|
(exports-exclusive-groups
|
|
|
|
(mapcar (lambda (group) (mapcar #'symbol-name group))
|
|
|
|
(cdr (assoc 'exports org-babel-common-header-args-w-values))))
|
|
|
|
(variable-index 0)
|
|
|
|
(e-merge (lambda (exclusive-groups &rest result-params)
|
|
|
|
;; 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)))
|
2013-07-26 17:48:51 +00:00
|
|
|
params results exports tangle noweb cache vars shebang comments padline
|
|
|
|
clearnames)
|
2012-08-10 15:44:45 +00:00
|
|
|
|
2012-08-11 17:10:44 +00:00
|
|
|
(mapc
|
|
|
|
(lambda (plist)
|
|
|
|
(mapc
|
|
|
|
(lambda (pair)
|
|
|
|
(case (car pair)
|
|
|
|
(:var
|
|
|
|
(let ((name (if (listp (cdr pair))
|
|
|
|
(cadr pair)
|
|
|
|
(and (string-match "^\\([^= \f\t\n\r\v]+\\)[ \t]*="
|
|
|
|
(cdr pair))
|
|
|
|
(intern (match-string 1 (cdr pair)))))))
|
|
|
|
(if name
|
|
|
|
(setq vars
|
|
|
|
(append
|
|
|
|
(if (member name (mapcar #'car vars))
|
2013-07-26 17:48:51 +00:00
|
|
|
(progn
|
|
|
|
(push name clearnames)
|
|
|
|
(delq nil
|
|
|
|
(mapcar
|
|
|
|
(lambda (p)
|
|
|
|
(unless (equal (car p) name) p))
|
|
|
|
vars)))
|
2012-08-11 17:10:44 +00:00
|
|
|
vars)
|
|
|
|
(list (cons name pair))))
|
|
|
|
;; if no name is given and we already have named variables
|
|
|
|
;; then assign to named variables in order
|
|
|
|
(if (and vars (nth variable-index vars))
|
2013-07-26 17:48:51 +00:00
|
|
|
(let ((name (car (nth variable-index vars))))
|
|
|
|
(push name clearnames) ; clear out colnames
|
|
|
|
; and rownames
|
|
|
|
; for replace vars
|
|
|
|
(prog1 (setf (cddr (nth variable-index vars))
|
|
|
|
(concat (symbol-name name) "=" (cdr pair)))
|
|
|
|
(incf variable-index)))
|
2012-08-13 03:59:44 +00:00
|
|
|
(error "Variable \"%s\" must be assigned a default value"
|
2012-08-11 17:10:44 +00:00
|
|
|
(cdr pair))))))
|
|
|
|
(:results
|
|
|
|
(setq results (funcall e-merge results-exclusive-groups
|
|
|
|
results
|
|
|
|
(split-string
|
|
|
|
(let ((r (cdr pair)))
|
|
|
|
(if (stringp r) r (eval r)))))))
|
|
|
|
(:file
|
|
|
|
(when (cdr pair)
|
2012-08-10 15:44:45 +00:00
|
|
|
(setq results (funcall e-merge results-exclusive-groups
|
2012-08-11 17:10:44 +00:00
|
|
|
results '("file")))
|
|
|
|
(unless (or (member "both" exports)
|
|
|
|
(member "none" exports)
|
|
|
|
(member "code" exports))
|
|
|
|
(setq exports (funcall e-merge exports-exclusive-groups
|
|
|
|
exports '("results"))))
|
|
|
|
(setq params (cons pair (assq-delete-all (car pair) params)))))
|
2014-04-22 19:13:48 +00:00
|
|
|
(:file-ext
|
|
|
|
(when (cdr pair)
|
|
|
|
(setq results (funcall e-merge results-exclusive-groups
|
|
|
|
results '("file")))
|
|
|
|
(unless (or (member "both" exports)
|
|
|
|
(member "none" exports)
|
|
|
|
(member "code" exports))
|
|
|
|
(setq exports (funcall e-merge exports-exclusive-groups
|
|
|
|
exports '("results"))))
|
|
|
|
(setq params (cons pair (assq-delete-all (car pair) params)))))
|
2012-08-11 17:10:44 +00:00
|
|
|
(:exports
|
|
|
|
(setq exports (funcall e-merge exports-exclusive-groups
|
2015-10-24 09:37:46 +00:00
|
|
|
exports
|
|
|
|
(split-string (or (cdr pair) "")))))
|
2012-08-11 17:10:44 +00:00
|
|
|
(:tangle ;; take the latest -- always overwrite
|
|
|
|
(setq tangle (or (list (cdr pair)) tangle)))
|
|
|
|
(:noweb
|
|
|
|
(setq noweb (funcall e-merge
|
|
|
|
'(("yes" "no" "tangle" "no-export"
|
|
|
|
"strip-export" "eval"))
|
|
|
|
noweb
|
|
|
|
(split-string (or (cdr pair) "")))))
|
|
|
|
(:cache
|
|
|
|
(setq cache (funcall e-merge '(("yes" "no")) cache
|
|
|
|
(split-string (or (cdr pair) "")))))
|
|
|
|
(:padline
|
|
|
|
(setq padline (funcall e-merge '(("yes" "no")) padline
|
2010-10-16 16:02:57 +00:00
|
|
|
(split-string (or (cdr pair) "")))))
|
2012-08-11 17:10:44 +00:00
|
|
|
(:shebang ;; take the latest -- always overwrite
|
|
|
|
(setq shebang (or (list (cdr pair)) shebang)))
|
|
|
|
(:comments
|
|
|
|
(setq comments (funcall e-merge '(("yes" "no")) comments
|
|
|
|
(split-string (or (cdr pair) "")))))
|
|
|
|
(t ;; replace: this covers e.g. :session
|
|
|
|
(setq params (cons pair (assq-delete-all (car pair) params))))))
|
|
|
|
plist))
|
|
|
|
plists)
|
|
|
|
(setq vars (reverse vars))
|
|
|
|
(while vars (setq params (cons (cons :var (cddr (pop vars))) params)))
|
2013-07-26 17:48:51 +00:00
|
|
|
;; clear out col-names and row-names for replaced variables
|
|
|
|
(mapc
|
|
|
|
(lambda (name)
|
|
|
|
(mapc
|
|
|
|
(lambda (param)
|
2013-07-29 13:58:03 +00:00
|
|
|
(when (assoc param params)
|
|
|
|
(setf (cdr (assoc param params))
|
2013-07-30 00:18:41 +00:00
|
|
|
(org-remove-if (lambda (pair) (equal (car pair) name))
|
|
|
|
(cdr (assoc param params))))
|
|
|
|
(setf params (org-remove-if (lambda (pair) (and (equal (car pair) param)
|
|
|
|
(null (cdr pair))))
|
|
|
|
params))))
|
2013-07-26 17:48:51 +00:00
|
|
|
(list :colname-names :rowname-names)))
|
|
|
|
clearnames)
|
2012-08-11 17:10:44 +00:00
|
|
|
(mapc
|
|
|
|
(lambda (hd)
|
|
|
|
(let ((key (intern (concat ":" (symbol-name hd))))
|
|
|
|
(val (eval hd)))
|
|
|
|
(setf params (cons (cons key (mapconcat 'identity val " ")) params))))
|
|
|
|
'(results exports tangle noweb padline cache shebang comments))
|
|
|
|
params))
|
2009-06-15 16:22:36 +00:00
|
|
|
|
2012-11-30 12:58:31 +00:00
|
|
|
(defvar org-babel-use-quick-and-dirty-noweb-expansion nil
|
2012-01-02 17:59:53 +00:00
|
|
|
"Set to true to use regular expressions to expand noweb references.
|
|
|
|
This results in much faster noweb reference expansion but does
|
|
|
|
not properly allow code blocks to inherit the \":noweb-ref\"
|
|
|
|
header argument from buffer or subtree wide properties.")
|
|
|
|
|
2012-03-19 20:38:12 +00:00
|
|
|
(defun org-babel-noweb-p (params context)
|
|
|
|
"Check if PARAMS require expansion in CONTEXT.
|
|
|
|
CONTEXT may be one of :tangle, :export or :eval."
|
2012-08-15 07:56:35 +00:00
|
|
|
(let* (intersect
|
|
|
|
(intersect (lambda (as bs)
|
|
|
|
(when as
|
|
|
|
(if (member (car as) bs)
|
|
|
|
(car as)
|
|
|
|
(funcall intersect (cdr as) bs))))))
|
|
|
|
(funcall intersect (case context
|
|
|
|
(:tangle '("yes" "tangle" "no-export" "strip-export"))
|
|
|
|
(:eval '("yes" "no-export" "strip-export" "eval"))
|
|
|
|
(:export '("yes")))
|
|
|
|
(split-string (or (cdr (assoc :noweb params)) "")))))
|
2012-03-19 20:38:12 +00:00
|
|
|
|
2009-10-19 18:12:19 +00:00
|
|
|
(defun org-babel-expand-noweb-references (&optional info parent-buffer)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Expand Noweb references in the body of the current source code block.
|
|
|
|
|
|
|
|
For example the following reference would be replaced with the
|
2015-09-21 04:23:36 +00:00
|
|
|
body of the source-code block named `example-block'.
|
2009-10-19 18:12:19 +00:00
|
|
|
|
2009-12-17 18:22:00 +00: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 18:12:19 +00:00
|
|
|
|
|
|
|
This function must be called from inside of the buffer containing
|
2009-10-28 22:13:33 +00:00
|
|
|
the source-code block which holds BODY.
|
|
|
|
|
|
|
|
In addition the following syntax can be used to insert the
|
2015-09-21 04:23:36 +00:00
|
|
|
results of evaluating the source-code block named `example-block'.
|
2009-10-28 22:13:33 +00:00
|
|
|
|
2009-12-17 18:22:00 +00:00
|
|
|
<<example-block()>>
|
2009-10-28 22:13:33 +00: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 18:22:00 +00:00
|
|
|
<<example-block(a=9)>>
|
2009-10-28 22:13:33 +00:00
|
|
|
|
|
|
|
would set the value of argument \"a\" equal to \"9\". Note that
|
2009-12-17 18:22:00 +00:00
|
|
|
these arguments are not evaluated in the current source-code
|
|
|
|
block but are passed literally to the \"example-block\"."
|
2009-10-19 18:12:19 +00:00
|
|
|
(let* ((parent-buffer (or parent-buffer (current-buffer)))
|
2013-03-31 22:17:16 +00:00
|
|
|
(info (or info (org-babel-get-src-block-info 'light)))
|
2010-06-13 01:26:08 +00:00
|
|
|
(lang (nth 0 info))
|
|
|
|
(body (nth 1 info))
|
2012-08-25 22:22:24 +00:00
|
|
|
(ob-nww-start org-babel-noweb-wrap-start)
|
|
|
|
(ob-nww-end org-babel-noweb-wrap-end)
|
2011-01-16 15:21:16 +00:00
|
|
|
(comment (string= "noweb" (cdr (assoc :comments (nth 2 info)))))
|
2012-01-02 17:59:53 +00:00
|
|
|
(rx-prefix (concat "\\(" org-babel-src-name-regexp "\\|"
|
|
|
|
":noweb-ref[ \t]+" "\\)"))
|
2012-08-10 15:44:45 +00:00
|
|
|
(new-body "")
|
|
|
|
(nb-add (lambda (text) (setq new-body (concat new-body text))))
|
|
|
|
(c-wrap (lambda (text)
|
2011-01-16 15:21:16 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
(funcall (intern (concat lang "-mode")))
|
|
|
|
(comment-region (point) (progn (insert text) (point)))
|
2011-12-11 16:28:58 +00:00
|
|
|
(org-babel-trim (buffer-string)))))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
index source-name evaluate prefix)
|
2012-08-11 17:10:44 +00:00
|
|
|
(with-temp-buffer
|
2012-08-25 22:22:24 +00:00
|
|
|
(org-set-local 'org-babel-noweb-wrap-start ob-nww-start)
|
|
|
|
(org-set-local 'org-babel-noweb-wrap-end ob-nww-end)
|
2012-08-11 17:10:44 +00:00
|
|
|
(insert body) (goto-char (point-min))
|
|
|
|
(setq index (point))
|
|
|
|
(while (and (re-search-forward (org-babel-noweb-wrap) nil t))
|
|
|
|
(save-match-data (setf source-name (match-string 1)))
|
2015-09-17 23:08:20 +00:00
|
|
|
(save-match-data (setq evaluate (string-match "(.*)" source-name)))
|
2012-08-11 17:10:44 +00:00
|
|
|
(save-match-data
|
|
|
|
(setq prefix
|
|
|
|
(buffer-substring (match-beginning 0)
|
|
|
|
(save-excursion
|
|
|
|
(beginning-of-line 1) (point)))))
|
|
|
|
;; add interval to new-body (removing noweb reference)
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(funcall nb-add (buffer-substring index (point)))
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
(setq index (point))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(funcall
|
|
|
|
nb-add
|
|
|
|
(with-current-buffer parent-buffer
|
|
|
|
(save-restriction
|
|
|
|
(widen)
|
|
|
|
(mapconcat ;; Interpose PREFIX between every line.
|
|
|
|
#'identity
|
|
|
|
(split-string
|
|
|
|
(if evaluate
|
|
|
|
(let ((raw (org-babel-ref-resolve source-name)))
|
|
|
|
(if (stringp raw) raw (format "%S" raw)))
|
|
|
|
(or
|
|
|
|
;; Retrieve from the library of babel.
|
|
|
|
(nth 2 (assoc (intern source-name)
|
|
|
|
org-babel-library-of-babel))
|
|
|
|
;; Return the contents of headlines literally.
|
|
|
|
(save-excursion
|
|
|
|
(when (org-babel-ref-goto-headline-id source-name)
|
2012-08-11 17:10:44 +00:00
|
|
|
(org-babel-ref-headline-body)))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
;; Find the expansion of reference in this buffer.
|
|
|
|
(let ((rx (concat rx-prefix source-name "[ \t\n]"))
|
|
|
|
expansion)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
(if org-babel-use-quick-and-dirty-noweb-expansion
|
|
|
|
(while (re-search-forward rx nil t)
|
|
|
|
(let* ((i (org-babel-get-src-block-info 'light))
|
|
|
|
(body (org-babel-expand-noweb-references i))
|
|
|
|
(sep (or (cdr (assoc :noweb-sep (nth 2 i)))
|
|
|
|
"\n"))
|
|
|
|
(full (if comment
|
|
|
|
(let ((cs (org-babel-tangle-comment-links i)))
|
|
|
|
(concat (funcall c-wrap (car cs)) "\n"
|
|
|
|
body "\n"
|
|
|
|
(funcall c-wrap (cadr cs))))
|
|
|
|
body)))
|
|
|
|
(setq expansion (cons sep (cons full expansion)))))
|
|
|
|
(org-babel-map-src-blocks nil
|
|
|
|
(let ((i (org-babel-get-src-block-info 'light)))
|
|
|
|
(when (equal (or (cdr (assoc :noweb-ref (nth 2 i)))
|
|
|
|
(nth 4 i))
|
|
|
|
source-name)
|
|
|
|
(let* ((body (org-babel-expand-noweb-references i))
|
|
|
|
(sep (or (cdr (assoc :noweb-sep (nth 2 i)))
|
|
|
|
"\n"))
|
|
|
|
(full (if comment
|
|
|
|
(let ((cs (org-babel-tangle-comment-links i)))
|
|
|
|
(concat (funcall c-wrap (car cs)) "\n"
|
|
|
|
body "\n"
|
|
|
|
(funcall c-wrap (cadr cs))))
|
|
|
|
body)))
|
|
|
|
(setq expansion
|
|
|
|
(cons sep (cons full expansion)))))))))
|
|
|
|
(and expansion
|
|
|
|
(mapconcat #'identity (nreverse (cdr expansion)) "")))
|
|
|
|
;; Possibly raise an error if named block doesn't exist.
|
2014-06-12 23:39:32 +00:00
|
|
|
(if (or org-babel-noweb-error-all-langs
|
|
|
|
(member lang org-babel-noweb-error-langs))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(error "%s" (concat
|
|
|
|
(org-babel-noweb-wrap source-name)
|
|
|
|
"could not be resolved (see "
|
|
|
|
"`org-babel-noweb-error-langs')"))
|
|
|
|
"")))
|
|
|
|
"[\n\r]") (concat "\n" prefix))))))
|
2012-08-11 17:10:44 +00:00
|
|
|
(funcall nb-add (buffer-substring index (point-max))))
|
|
|
|
new-body))
|
2009-10-19 18:12:19 +00:00
|
|
|
|
2015-01-16 22:47:32 +00:00
|
|
|
(defun org-babel--script-escape-inner (str)
|
|
|
|
(let (in-single in-double backslash out)
|
|
|
|
(mapc
|
|
|
|
(lambda (ch)
|
|
|
|
(setq
|
|
|
|
out
|
|
|
|
(if backslash
|
|
|
|
(progn
|
|
|
|
(setq backslash nil)
|
|
|
|
(cond
|
|
|
|
((and in-single (eq ch ?'))
|
|
|
|
;; Escaped single quote inside single quoted string:
|
|
|
|
;; emit just a single quote, since we've changed the
|
|
|
|
;; outer quotes to double.
|
|
|
|
(cons ch out))
|
|
|
|
((eq ch ?\")
|
|
|
|
;; Escaped double quote
|
|
|
|
(if in-single
|
|
|
|
;; This should be interpreted as backslash+quote,
|
|
|
|
;; not an escape. Emit a three backslashes
|
|
|
|
;; followed by a quote (because one layer of
|
|
|
|
;; quoting will be stripped by `org-babel-read').
|
|
|
|
(append (list ch ?\\ ?\\ ?\\) out)
|
|
|
|
;; Otherwise we are in a double-quoted string. Emit
|
|
|
|
;; a single escaped quote
|
|
|
|
(append (list ch ?\\) out)))
|
|
|
|
((eq ch ?\\)
|
|
|
|
;; Escaped backslash: emit a single escaped backslash
|
|
|
|
(append (list ?\\ ?\\) out))
|
|
|
|
;; Other: emit a quoted backslash followed by whatever
|
|
|
|
;; the character was (because one layer of quoting will
|
|
|
|
;; be stripped by `org-babel-read').
|
|
|
|
(t (append (list ch ?\\ ?\\) out))))
|
|
|
|
(case ch
|
|
|
|
(?\[ (if (or in-double in-single)
|
|
|
|
(cons ?\[ out)
|
|
|
|
(cons ?\( out)))
|
|
|
|
(?\] (if (or in-double in-single)
|
|
|
|
(cons ?\] out)
|
|
|
|
(cons ?\) out)))
|
|
|
|
(?\{ (if (or in-double in-single)
|
|
|
|
(cons ?\{ out)
|
|
|
|
(cons ?\( out)))
|
|
|
|
(?\} (if (or in-double in-single)
|
|
|
|
(cons ?\} out)
|
|
|
|
(cons ?\) out)))
|
|
|
|
(?, (if (or in-double in-single)
|
|
|
|
(cons ?, out) (cons ?\s out)))
|
|
|
|
(?\' (if in-double
|
|
|
|
(cons ?\' out)
|
|
|
|
(setq in-single (not in-single)) (cons ?\" out)))
|
|
|
|
(?\" (if in-single
|
|
|
|
(append (list ?\" ?\\) out)
|
|
|
|
(setq in-double (not in-double)) (cons ?\" out)))
|
|
|
|
(?\\ (unless (or in-single in-double)
|
|
|
|
(error "Can't handle backslash outside string in `org-babel-script-escape'"))
|
|
|
|
(setq backslash t)
|
|
|
|
out)
|
|
|
|
(t (cons ch out))))))
|
|
|
|
(string-to-list str))
|
|
|
|
(when (or in-single in-double)
|
2015-01-24 22:20:46 +00:00
|
|
|
(error "Unterminated string in `org-babel-script-escape'"))
|
2015-01-16 22:47:32 +00:00
|
|
|
(apply #'string (reverse out))))
|
|
|
|
|
2011-06-28 23:38:30 +00:00
|
|
|
(defun org-babel-script-escape (str &optional force)
|
2010-11-23 01:20:56 +00:00
|
|
|
"Safely convert tables into elisp lists."
|
2015-01-16 22:47:32 +00:00
|
|
|
(unless (stringp str)
|
2015-01-24 22:20:46 +00:00
|
|
|
(error "`org-babel-script-escape' expects a string"))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(let ((escaped
|
2015-01-16 22:47:32 +00:00
|
|
|
(cond
|
|
|
|
((and (> (length str) 2)
|
|
|
|
(or (and (string-equal "[" (substring str 0 1))
|
|
|
|
(string-equal "]" (substring str -1)))
|
|
|
|
(and (string-equal "{" (substring str 0 1))
|
|
|
|
(string-equal "}" (substring str -1)))
|
|
|
|
(and (string-equal "(" (substring str 0 1))
|
|
|
|
(string-equal ")" (substring str -1)))))
|
|
|
|
|
|
|
|
(concat "'" (org-babel--script-escape-inner str)))
|
|
|
|
((or force
|
|
|
|
(and (> (length str) 2)
|
|
|
|
(or (and (string-equal "'" (substring str 0 1))
|
|
|
|
(string-equal "'" (substring str -1)))
|
|
|
|
;; We need to pass double-quoted strings
|
|
|
|
;; through the backslash-twiddling bits, even
|
|
|
|
;; though we don't need to change their
|
|
|
|
;; delimiters.
|
|
|
|
(and (string-equal "\"" (substring str 0 1))
|
|
|
|
(string-equal "\"" (substring str -1))))))
|
|
|
|
(org-babel--script-escape-inner str))
|
|
|
|
(t str))))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(condition-case nil (org-babel-read escaped) (error escaped))))
|
2010-11-23 01:20:56 +00:00
|
|
|
|
2011-02-27 15:47:36 +00:00
|
|
|
(defun org-babel-read (cell &optional inhibit-lisp-eval)
|
2009-05-08 23:20:05 +00:00
|
|
|
"Convert the string value of CELL to a number if appropriate.
|
2015-01-16 22:47:32 +00:00
|
|
|
Otherwise if CELL looks like lisp (meaning it starts with a
|
2015-09-21 04:23:36 +00:00
|
|
|
\"(\", \"\\='\", \"\\=`\" or a \"[\") then read and evaluate it as
|
2015-01-16 22:47:32 +00:00
|
|
|
lisp, otherwise return it unmodified as a string. Optional
|
|
|
|
argument INHIBIT-LISP-EVAL inhibits lisp evaluation for
|
|
|
|
situations in which is it not appropriate."
|
2009-05-08 23:20:05 +00:00
|
|
|
(if (and (stringp cell) (not (equal cell "")))
|
2009-06-14 00:07:03 +00:00
|
|
|
(or (org-babel-number-p cell)
|
2011-02-27 15:47:36 +00:00
|
|
|
(if (and (not inhibit-lisp-eval)
|
2013-06-08 21:13:38 +00:00
|
|
|
(or (member (substring cell 0 1) '("(" "'" "`" "["))
|
2013-04-09 16:35:44 +00:00
|
|
|
(string= cell "*this*")))
|
2010-03-22 14:49:35 +00:00
|
|
|
(eval (read cell))
|
2011-03-02 14:55:39 +00:00
|
|
|
(if (string= (substring cell 0 1) "\"")
|
|
|
|
(read cell)
|
|
|
|
(progn (set-text-properties 0 (length cell) nil cell) cell))))
|
2009-05-08 23:20:05 +00:00
|
|
|
cell))
|
|
|
|
|
2009-05-24 20:38:01 +00:00
|
|
|
(defun org-babel-number-p (string)
|
2011-12-06 18:20:21 +00:00
|
|
|
"If STRING represents a number return its value."
|
2013-04-07 09:14:07 +00:00
|
|
|
(if (and (string-match "[0-9]+" string)
|
|
|
|
(string-match "^-?[0-9]*\\.?[0-9]*$" string)
|
2010-06-08 00:59:58 +00:00
|
|
|
(= (length (substring string (match-beginning 0)
|
|
|
|
(match-end 0)))
|
|
|
|
(length string)))
|
2009-06-14 00:07:03 +00:00
|
|
|
(string-to-number string)))
|
2009-05-12 02:41:56 +00:00
|
|
|
|
2010-08-03 04:06:25 +00:00
|
|
|
(defun org-babel-import-elisp-from-file (file-name &optional separator)
|
2010-07-13 23:20:08 +00: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-12 00:04:42 +00:00
|
|
|
(let (result)
|
2010-03-05 11:29:30 +00:00
|
|
|
(save-window-excursion
|
|
|
|
(with-temp-buffer
|
2012-08-06 15:37:09 +00:00
|
|
|
(condition-case err
|
2010-03-05 11:29:30 +00:00
|
|
|
(progn
|
2010-08-03 04:06:25 +00:00
|
|
|
(org-table-import file-name separator)
|
2010-03-05 11:29:30 +00:00
|
|
|
(delete-file file-name)
|
|
|
|
(setq result (mapcar (lambda (row)
|
|
|
|
(mapcar #'org-babel-string-read row))
|
|
|
|
(org-table-to-lisp))))
|
2012-08-13 03:59:44 +00:00
|
|
|
(error (message "Error reading results: %s" err) nil)))
|
2010-03-05 11:29:30 +00:00
|
|
|
(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-12 00:04:42 +00:00
|
|
|
|
|
|
|
(defun org-babel-string-read (cell)
|
2010-03-26 22:03:54 +00:00
|
|
|
"Strip nested \"s from around strings."
|
2009-06-12 00:04:42 +00:00
|
|
|
(org-babel-read (or (and (stringp cell)
|
|
|
|
(string-match "\\\"\\(.+\\)\\\"" cell)
|
|
|
|
(match-string 1 cell))
|
2012-08-06 15:37:09 +00:00
|
|
|
cell) t))
|
2009-06-11 22:04:10 +00:00
|
|
|
|
2014-04-19 12:36:00 +00:00
|
|
|
(defun org-babel-chomp (string &optional regexp)
|
2014-04-19 12:43:28 +00:00
|
|
|
"Strip a trailing space or carriage return from STRING.
|
|
|
|
The default regexp used is \"[ \\f\\t\\n\\r\\v]\" but another one
|
|
|
|
can be specified as the REGEXP argument."
|
2014-04-19 12:36:00 +00:00
|
|
|
(let ((regexp (or regexp "[ \f\t\n\r\v]")))
|
|
|
|
(while (and (> (length string) 0)
|
|
|
|
(string-match regexp (substring string -1)))
|
|
|
|
(setq string (substring string 0 -1)))
|
|
|
|
string))
|
|
|
|
|
|
|
|
(defun org-babel-trim (string &optional regexp)
|
2014-04-19 12:43:28 +00:00
|
|
|
"Strip a leading and trailing space or carriage return from STRING.
|
|
|
|
Like `org-babel-chomp', but run on both the first and last
|
|
|
|
character of the string."
|
|
|
|
(org-babel-chomp
|
|
|
|
(org-reverse-string
|
|
|
|
(org-babel-chomp (org-reverse-string string) regexp)) regexp))
|
2014-04-19 12:36:00 +00:00
|
|
|
|
2010-02-21 05:34:23 +00:00
|
|
|
(defun org-babel-tramp-handle-call-process-region
|
|
|
|
(start end program &optional delete buffer display &rest args)
|
2012-08-10 15:23:00 +00:00
|
|
|
"Use Tramp to handle `call-process-region'.
|
2010-07-13 23:20:08 +00:00
|
|
|
Fixes a bug in `tramp-handle-call-process-region'."
|
2010-02-21 05:34:23 +00: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 20:03:30 +00:00
|
|
|
;; (apply 'call-process program tmpfile buffer display args)
|
|
|
|
;; bug in tramp
|
2010-02-21 05:34:23 +00:00
|
|
|
(apply 'process-file program tmpfile buffer display args)
|
|
|
|
(delete-file tmpfile)))
|
2010-10-14 13:15:27 +00:00
|
|
|
;; org-babel-call-process-region-original is the original emacs
|
2012-08-11 17:10:44 +00:00
|
|
|
;; definition. It is in scope from the let binding in
|
2010-10-14 13:15:27 +00:00
|
|
|
;; org-babel-execute-src-block
|
2010-06-12 23:18:50 +00:00
|
|
|
(apply org-babel-call-process-region-original
|
2010-04-17 20:03:30 +00:00
|
|
|
start end program delete buffer display args)))
|
2010-02-21 05:43:53 +00:00
|
|
|
|
2010-09-22 20:40:14 +00:00
|
|
|
(defun org-babel-local-file-name (file)
|
2010-08-30 16:34:05 +00:00
|
|
|
"Return the local name component of FILE."
|
2013-09-27 11:34:03 +00:00
|
|
|
(or (file-remote-p file 'localname) file))
|
2010-08-30 16:34:05 +00:00
|
|
|
|
2010-09-22 20:40:14 +00:00
|
|
|
(defun org-babel-process-file-name (name &optional no-quote-p)
|
|
|
|
"Prepare NAME to be used in an external process.
|
|
|
|
If NAME specifies a remote location, the remote portion of the
|
|
|
|
name is removed, since in that case the process will be executing
|
2012-08-11 17:10:44 +00:00
|
|
|
remotely. The file name is then processed by `expand-file-name'.
|
|
|
|
Unless second argument NO-QUOTE-P is non-nil, the file name is
|
|
|
|
additionally processed by `shell-quote-argument'"
|
2013-11-12 20:11:23 +00:00
|
|
|
(let ((f (org-babel-local-file-name (expand-file-name name))))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(if no-quote-p f (shell-quote-argument f))))
|
2010-09-22 20:40:14 +00:00
|
|
|
|
2010-10-01 19:56:20 +00:00
|
|
|
(defvar org-babel-temporary-directory)
|
2010-10-01 20:07:58 +00:00
|
|
|
(unless (or noninteractive (boundp 'org-babel-temporary-directory))
|
2010-09-30 13:31:14 +00:00
|
|
|
(defvar org-babel-temporary-directory
|
|
|
|
(or (and (boundp 'org-babel-temporary-directory)
|
|
|
|
(file-exists-p org-babel-temporary-directory)
|
|
|
|
org-babel-temporary-directory)
|
|
|
|
(make-temp-file "babel-" t))
|
|
|
|
"Directory to hold temporary files created to execute code blocks.
|
|
|
|
Used by `org-babel-temp-file'. This directory will be removed on
|
|
|
|
Emacs shutdown."))
|
2010-08-25 20:43:07 +00:00
|
|
|
|
2013-09-27 11:34:03 +00:00
|
|
|
(defcustom org-babel-remote-temporary-directory "/tmp/"
|
|
|
|
"Directory to hold temporary files on remote hosts."
|
|
|
|
:group 'org-babel
|
|
|
|
:type 'string)
|
|
|
|
|
2012-11-19 01:02:09 +00:00
|
|
|
(defmacro org-babel-result-cond (result-params scalar-form &rest table-forms)
|
|
|
|
"Call the code to parse raw string results according to RESULT-PARAMS."
|
2013-02-05 15:50:50 +00:00
|
|
|
(declare (indent 1)
|
|
|
|
(debug (form form &rest form)))
|
2013-04-07 12:49:15 +00:00
|
|
|
(org-with-gensyms (params)
|
|
|
|
`(let ((,params ,result-params))
|
|
|
|
(unless (member "none" ,params)
|
|
|
|
(if (or (member "scalar" ,params)
|
|
|
|
(member "verbatim" ,params)
|
|
|
|
(member "html" ,params)
|
|
|
|
(member "code" ,params)
|
|
|
|
(member "pp" ,params)
|
2015-05-26 10:54:14 +00:00
|
|
|
(member "file" ,params)
|
2013-04-07 12:49:15 +00:00
|
|
|
(and (or (member "output" ,params)
|
|
|
|
(member "raw" ,params)
|
|
|
|
(member "org" ,params)
|
|
|
|
(member "drawer" ,params))
|
|
|
|
(not (member "table" ,params))))
|
|
|
|
,scalar-form
|
|
|
|
,@table-forms)))))
|
2013-04-06 16:18:35 +00:00
|
|
|
(def-edebug-spec org-babel-result-cond (form form body))
|
2012-11-19 01:02:09 +00:00
|
|
|
|
2010-08-25 20:43:07 +00:00
|
|
|
(defun org-babel-temp-file (prefix &optional suffix)
|
|
|
|
"Create a temporary file in the `org-babel-temporary-directory'.
|
|
|
|
Passes PREFIX and SUFFIX directly to `make-temp-file' with the
|
|
|
|
value of `temporary-file-directory' temporarily set to the value
|
|
|
|
of `org-babel-temporary-directory'."
|
2013-03-23 23:26:31 +00:00
|
|
|
(if (file-remote-p default-directory)
|
|
|
|
(let ((prefix
|
|
|
|
(concat (file-remote-p default-directory)
|
2013-09-27 11:34:03 +00:00
|
|
|
(expand-file-name
|
|
|
|
prefix org-babel-remote-temporary-directory))))
|
2013-03-23 23:26:31 +00:00
|
|
|
(make-temp-file prefix nil suffix))
|
|
|
|
(let ((temporary-file-directory
|
2011-01-10 00:47:45 +00:00
|
|
|
(or (and (boundp 'org-babel-temporary-directory)
|
|
|
|
(file-exists-p org-babel-temporary-directory)
|
2010-09-30 13:31:14 +00:00
|
|
|
org-babel-temporary-directory)
|
2013-03-23 23:26:31 +00:00
|
|
|
temporary-file-directory)))
|
|
|
|
(make-temp-file prefix nil suffix))))
|
2010-09-30 13:31:14 +00:00
|
|
|
|
|
|
|
(defun org-babel-remove-temporary-directory ()
|
|
|
|
"Remove `org-babel-temporary-directory' on Emacs shutdown."
|
2010-10-01 20:07:58 +00:00
|
|
|
(when (and (boundp 'org-babel-temporary-directory)
|
|
|
|
(file-exists-p org-babel-temporary-directory))
|
2010-09-30 13:31:14 +00:00
|
|
|
;; taken from `delete-directory' in files.el
|
2010-12-08 10:11:49 +00:00
|
|
|
(condition-case nil
|
|
|
|
(progn
|
|
|
|
(mapc (lambda (file)
|
|
|
|
;; This test is equivalent to
|
|
|
|
;; (and (file-directory-p fn) (not (file-symlink-p fn)))
|
|
|
|
;; but more efficient
|
|
|
|
(if (eq t (car (file-attributes file)))
|
|
|
|
(delete-directory file)
|
|
|
|
(delete-file file)))
|
|
|
|
;; We do not want to delete "." and "..".
|
|
|
|
(directory-files org-babel-temporary-directory 'full
|
|
|
|
"^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))
|
|
|
|
(delete-directory org-babel-temporary-directory))
|
|
|
|
(error
|
|
|
|
(message "Failed to remove temporary Org-babel directory %s"
|
2011-01-10 00:47:45 +00:00
|
|
|
(if (boundp 'org-babel-temporary-directory)
|
|
|
|
org-babel-temporary-directory
|
|
|
|
"[directory not defined]"))))))
|
2010-09-30 13:31:14 +00:00
|
|
|
|
|
|
|
(add-hook 'kill-emacs-hook 'org-babel-remove-temporary-directory)
|
2010-08-25 20:43:07 +00:00
|
|
|
|
2013-10-28 19:39:31 +00:00
|
|
|
(defun org-babel-one-header-arg-safe-p (pair safe-list)
|
|
|
|
"Determine if the PAIR is a safe babel header arg according to SAFE-LIST.
|
|
|
|
|
|
|
|
For the format of SAFE-LIST, see `org-babel-safe-header-args'."
|
|
|
|
(and (consp pair)
|
|
|
|
(keywordp (car pair))
|
|
|
|
(stringp (cdr pair))
|
|
|
|
(or
|
|
|
|
(memq (car pair) safe-list)
|
|
|
|
(let ((entry (assq (car pair) safe-list)))
|
|
|
|
(and entry
|
|
|
|
(consp entry)
|
|
|
|
(cond ((functionp (cdr entry))
|
|
|
|
(funcall (cdr entry) (cdr pair)))
|
|
|
|
((listp (cdr entry))
|
|
|
|
(member (cdr pair) (cdr entry)))
|
|
|
|
(t nil)))))))
|
|
|
|
|
2014-04-22 19:13:48 +00:00
|
|
|
(defun org-babel-generate-file-param (src-name params)
|
|
|
|
"Calculate the filename for source block results.
|
|
|
|
|
|
|
|
The directory is calculated from the :output-dir property of the
|
|
|
|
source block; if not specified, use the current directory.
|
|
|
|
|
|
|
|
If the source block has a #+NAME and the :file parameter does not
|
|
|
|
contain any period characters, then the :file parameter is
|
|
|
|
treated as an extension, and the output file name is the
|
|
|
|
concatenation of the directory (as calculated above), the block
|
|
|
|
name, a period, and the parameter value as a file extension.
|
|
|
|
Otherwise, the :file parameter is treated as a full file name,
|
|
|
|
and the output file name is the directory (as calculated above)
|
|
|
|
plus the parameter value."
|
|
|
|
(let* ((file-cons (assq :file params))
|
|
|
|
(file-ext-cons (assq :file-ext params))
|
|
|
|
(file-ext (cdr-safe file-ext-cons))
|
|
|
|
(dir (cdr-safe (assq :output-dir params)))
|
|
|
|
fname)
|
|
|
|
;; create the output-dir if it does not exist
|
|
|
|
(when dir
|
|
|
|
(make-directory dir t))
|
|
|
|
(if file-cons
|
|
|
|
;; :file given; add :output-dir if given
|
|
|
|
(when dir
|
|
|
|
(setcdr file-cons (concat (file-name-as-directory dir) (cdr file-cons))))
|
|
|
|
;; :file not given; compute from name and :file-ext if possible
|
|
|
|
(when (and src-name file-ext)
|
|
|
|
(if dir
|
|
|
|
(setq fname (concat (file-name-as-directory (or dir ""))
|
|
|
|
src-name "." file-ext))
|
|
|
|
(setq fname (concat src-name "." file-ext)))
|
|
|
|
(setq params (cons (cons :file fname) params))))
|
|
|
|
params))
|
2014-04-22 18:54:55 +00:00
|
|
|
|
|
|
|
;;; Used by backends: R, Maxima, Octave.
|
|
|
|
(defun org-babel-graphical-output-file (params)
|
|
|
|
"File where a babel block should send graphical output, per PARAMS."
|
2014-04-22 19:13:48 +00:00
|
|
|
(unless (assq :file params)
|
|
|
|
(if (assq :file-ext params)
|
2014-05-16 03:26:30 +00:00
|
|
|
(user-error ":file-ext given but no :file generated; did you forget to give a block a #+NAME?")
|
|
|
|
(user-error "No :file header argument given; cannot create graphical result.")))
|
2014-04-22 18:54:55 +00:00
|
|
|
(and (member "graphics" (cdr (assq :result-params params)))
|
|
|
|
(cdr (assq :file params))))
|
|
|
|
|
2012-12-11 23:58:16 +00:00
|
|
|
(provide 'ob-core)
|
2010-06-25 16:20:39 +00:00
|
|
|
|
2012-10-02 06:50:46 +00:00
|
|
|
;; Local variables:
|
|
|
|
;; generated-autoload-file: "org-loaddefs.el"
|
|
|
|
;; End:
|
2010-06-25 16:20:39 +00:00
|
|
|
|
2012-12-11 23:58:16 +00:00
|
|
|
;;; ob-core.el ends here
|