2016-06-20 12:35:16 +00:00
|
|
|
;;; ob-core.el --- Working with Code Blocks -*- lexical-binding: t; -*-
|
2009-02-22 21:19:32 +00:00
|
|
|
|
2023-01-01 10:31:12 +00:00
|
|
|
;; Copyright (C) 2009-2023 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
|
2021-09-26 07:44:29 +00:00
|
|
|
;; URL: https://orgmode.org
|
2009-02-22 21:19:32 +00:00
|
|
|
|
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
|
2017-09-13 22:52:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2009-02-22 21:19:32 +00:00
|
|
|
|
|
|
|
;;; Code:
|
2022-08-04 13:53:05 +00:00
|
|
|
|
|
|
|
(require 'org-macs)
|
|
|
|
(org-assert-version)
|
|
|
|
|
2015-11-06 12:04:20 +00:00
|
|
|
(require 'cl-lib)
|
2010-12-01 14:19:45 +00:00
|
|
|
(require 'ob-eval)
|
2010-06-28 18:37:15 +00:00
|
|
|
(require 'org-macs)
|
2022-01-16 07:07:25 +00:00
|
|
|
(require 'org-fold)
|
2012-08-13 03:59:44 +00:00
|
|
|
(require 'org-compat)
|
2022-01-16 07:07:25 +00:00
|
|
|
(require 'org-cycle)
|
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
|
|
|
|
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)
|
2018-03-13 08:29:50 +00:00
|
|
|
(defvar org-link-file-path-type)
|
2016-01-31 19:57:47 +00:00
|
|
|
(defvar org-src-lang-modes)
|
2020-04-10 02:26:58 +00:00
|
|
|
(defvar org-babel-tangle-uncomment-comments)
|
2016-01-31 19:47:06 +00:00
|
|
|
|
2022-06-16 05:10:38 +00:00
|
|
|
(declare-function org-attach-dir "org-attach" (&optional create-if-not-exists-p no-fs-check))
|
2016-08-08 20:01:57 +00:00
|
|
|
(declare-function org-at-item-p "org-list" ())
|
|
|
|
(declare-function org-at-table-p "org" (&optional table-type))
|
|
|
|
(declare-function org-babel-lob-execute-maybe "ob-lob" ())
|
|
|
|
(declare-function org-babel-ref-goto-headline-id "ob-ref" (id))
|
|
|
|
(declare-function org-babel-ref-headline-body "ob-ref" ())
|
|
|
|
(declare-function org-babel-ref-parse "ob-ref" (assignment))
|
|
|
|
(declare-function org-babel-ref-resolve "ob-ref" (ref))
|
|
|
|
(declare-function org-babel-ref-split-args "ob-ref" (arg-string))
|
|
|
|
(declare-function org-babel-tangle-comment-links "ob-tangle" (&optional info))
|
|
|
|
(declare-function org-current-level "org" ())
|
2022-01-16 07:07:25 +00:00
|
|
|
(declare-function org-cycle "org-cycle" (&optional arg))
|
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" ())
|
2023-07-13 08:51:15 +00:00
|
|
|
(declare-function org-src-preserve-indentation-p "org-src" (node))
|
2021-10-16 16:01:56 +00:00
|
|
|
(declare-function org-element-at-point "org-element" (&optional pom cached-only))
|
|
|
|
(declare-function org-element-at-point-no-context "org-element" (&optional pom))
|
2016-08-08 20:01:57 +00:00
|
|
|
(declare-function org-element-context "org-element" (&optional element))
|
|
|
|
(declare-function org-element-normalize-string "org-element" (s))
|
2023-05-16 10:41:53 +00:00
|
|
|
(declare-function org-element-property "org-element-ast" (property node))
|
2023-05-03 14:26:41 +00:00
|
|
|
(declare-function org-element-begin "org-element" (node))
|
|
|
|
(declare-function org-element-end "org-element" (node))
|
|
|
|
(declare-function org-element-post-affiliated "org-element" (node))
|
|
|
|
(declare-function org-element-contents-begin "org-element" (node))
|
|
|
|
(declare-function org-element-contents-end "org-element" (node))
|
2023-05-03 12:56:35 +00:00
|
|
|
(declare-function org-element-parent "org-element-ast" (node))
|
2023-05-16 10:41:53 +00:00
|
|
|
(declare-function org-element-type "org-element-ast" (node &optional anonymous))
|
|
|
|
(declare-function org-element-type-p "org-element-ast" (node &optional types))
|
2016-08-08 20:01:57 +00:00
|
|
|
(declare-function org-entry-get "org" (pom property &optional inherit literal-nil))
|
|
|
|
(declare-function org-escape-code-in-region "org-src" (beg end))
|
2020-01-08 22:08:47 +00:00
|
|
|
(declare-function org-forward-heading-same-level "org" (arg &optional invisible-ok))
|
2019-10-20 21:34:02 +00:00
|
|
|
(declare-function org-in-commented-heading-p "org" (&optional no-inheritance))
|
2016-01-28 16:11:48 +00:00
|
|
|
(declare-function org-indent-line "org" ())
|
2016-08-08 20:01:57 +00:00
|
|
|
(declare-function org-list-get-list-end "org-list" (item struct prevs))
|
|
|
|
(declare-function org-list-prevs-alist "org-list" (struct))
|
|
|
|
(declare-function org-list-struct "org-list" ())
|
|
|
|
(declare-function org-list-to-generic "org-list" (LIST PARAMS))
|
|
|
|
(declare-function org-list-to-lisp "org-list" (&optional delete))
|
2022-10-29 19:15:29 +00:00
|
|
|
(declare-function org-list-to-org "org-list" (list &optional params))
|
2016-08-08 20:01:57 +00:00
|
|
|
(declare-function org-macro-escape-arguments "org-macro" (&rest args))
|
|
|
|
(declare-function org-mark-ring-push "org" (&optional pos buffer))
|
2021-10-16 16:01:56 +00:00
|
|
|
(declare-function org-narrow-to-subtree "org" (&optional element))
|
2013-02-08 16:21:54 +00:00
|
|
|
(declare-function org-next-block "org" (arg &optional backward block-regexp))
|
2016-08-08 20:01:57 +00:00
|
|
|
(declare-function org-open-at-point "org" (&optional in-emacs reference-buffer))
|
2013-02-08 16:21:54 +00:00
|
|
|
(declare-function org-previous-block "org" (arg &optional block-regexp))
|
2022-01-16 07:07:25 +00:00
|
|
|
(declare-function org-fold-show-context "org-fold" (&optional key))
|
2017-12-15 21:24:44 +00:00
|
|
|
(declare-function org-src-coderef-format "org-src" (&optional element))
|
2016-08-18 13:23:00 +00:00
|
|
|
(declare-function org-src-coderef-regexp "org-src" (fmt &optional label))
|
2019-08-30 21:36:00 +00:00
|
|
|
(declare-function org-src-get-lang-mode "org-src" (lang))
|
2010-06-23 18:24:33 +00:00
|
|
|
(declare-function org-table-align "org-table" ())
|
2020-09-06 09:27:11 +00:00
|
|
|
(declare-function org-table-convert-region "org-table" (beg0 end0 &optional separator))
|
2010-06-23 18:24:33 +00:00
|
|
|
(declare-function org-table-end "org-table" (&optional table-type))
|
2016-08-08 20:01:57 +00:00
|
|
|
(declare-function org-table-import "org-table" (file arg))
|
|
|
|
(declare-function org-table-to-lisp "org-table" (&optional txt))
|
|
|
|
(declare-function org-unescape-code-in-string "org-src" (s))
|
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))
|
2016-08-08 20:01:57 +00:00
|
|
|
(declare-function tramp-compat-make-temp-file "tramp-compat" (filename &optional dir-flag))
|
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
|
2016-08-23 20:13:56 +00:00
|
|
|
blocks in Org 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
|
2010-06-30 19:25:22 +00:00
|
|
|
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
|
2016-10-15 15:36:47 +00:00
|
|
|
remove code block execution from `\\[org-ctrl-c-ctrl-c]' \
|
2015-09-21 04:23:15 +00:00
|
|
|
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
|
2016-10-15 15:36:47 +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>\
|
2016-10-15 15:36:47 +00:00
|
|
|
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)
|
2022-10-04 21:42:27 +00:00
|
|
|
(org-string-equal-ignore-case "RESULTS" v))))
|
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)
|
2023-08-18 08:00:13 +00:00
|
|
|
(string-match-p "%s" value))))
|
2013-04-26 15:37:25 +00:00
|
|
|
|
2016-10-01 08:35:14 +00:00
|
|
|
(defcustom org-babel-hash-show-time nil
|
|
|
|
"Non-nil means show the time the code block was evaluated in the result hash."
|
|
|
|
:group 'org-babel
|
|
|
|
:type 'boolean
|
|
|
|
:package-version '(Org . "9.0")
|
|
|
|
:safe #'booleanp)
|
|
|
|
|
2017-01-25 04:54:58 +00:00
|
|
|
(defcustom org-babel-uppercase-example-markers nil
|
|
|
|
"When non-nil, begin/end example markers will be inserted in upper case."
|
|
|
|
:group 'org-babel
|
|
|
|
:type 'boolean
|
|
|
|
:version "26.1"
|
|
|
|
:package-version '(Org . "9.1")
|
|
|
|
:safe #'booleanp)
|
|
|
|
|
2012-03-19 20:38:12 +00:00
|
|
|
(defun org-babel-noweb-wrap (&optional regexp)
|
2019-02-04 17:01:04 +00:00
|
|
|
"Return regexp matching a Noweb reference.
|
|
|
|
|
|
|
|
Match any reference, or only those matching REGEXP, if non-nil.
|
|
|
|
|
|
|
|
When matching, reference is stored in match group 1."
|
|
|
|
(concat (regexp-quote org-babel-noweb-wrap-start)
|
|
|
|
(or regexp "\\([^ \t\n]\\(?:.*?[^ \t\n]\\)?\\)")
|
|
|
|
(regexp-quote org-babel-noweb-wrap-end)))
|
2012-03-19 20:38:12 +00:00
|
|
|
|
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
|
2023-04-25 19:06:50 +00:00
|
|
|
"\\(\\(?:.\\|\n\\)*?\n\\)??[ \t]*#\\+end_src")
|
2010-06-17 16:29:38 +00:00
|
|
|
"Regexp used to identify code blocks.")
|
|
|
|
|
2015-10-29 19:26:11 +00:00
|
|
|
(defun org-babel--get-vars (params)
|
|
|
|
"Return the babel variable assignments in PARAMS.
|
|
|
|
|
2016-11-03 11:45:30 +00:00
|
|
|
PARAMS is a quasi-alist of header args, which may contain
|
2015-10-29 19:26:11 +00:00
|
|
|
multiple entries for the key `:var'. This function returns a
|
|
|
|
list of the cdr of all the `:var' entries."
|
|
|
|
(mapcar #'cdr
|
2015-11-06 12:04:20 +00:00
|
|
|
(cl-remove-if-not (lambda (x) (eq (car x) :var)) params)))
|
2010-10-15 15:13:51 +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.")
|
|
|
|
|
2015-11-05 15:51:06 +00:00
|
|
|
(defun org-babel-check-confirm-evaluate (info)
|
|
|
|
"Check whether INFO allows code block evaluation.
|
|
|
|
|
|
|
|
Returns nil if evaluation is disallowed, t if it is
|
|
|
|
unconditionally allowed, and the symbol `query' if the user
|
|
|
|
should be asked whether to allow evaluation."
|
|
|
|
(let* ((headers (nth 2 info))
|
|
|
|
(eval (or (cdr (assq :eval headers))
|
|
|
|
(when (assq :noeval headers) "no")))
|
|
|
|
(eval-no (member eval '("no" "never")))
|
|
|
|
(export org-babel-exp-reference-buffer)
|
|
|
|
(eval-no-export (and export (member eval '("no-export" "never-export"))))
|
|
|
|
(noeval (or eval-no eval-no-export))
|
|
|
|
(query (or (equal eval "query")
|
|
|
|
(and export (equal eval "query-export"))
|
|
|
|
(if (functionp org-confirm-babel-evaluate)
|
2017-09-07 15:43:32 +00:00
|
|
|
(funcall org-confirm-babel-evaluate
|
|
|
|
;; Language, code block body.
|
2020-08-03 02:34:36 +00:00
|
|
|
(nth 0 info)
|
2020-09-06 03:39:08 +00:00
|
|
|
(org-babel--expand-body info))
|
2015-11-05 15:51:06 +00:00
|
|
|
org-confirm-babel-evaluate))))
|
|
|
|
(cond
|
|
|
|
(noeval nil)
|
|
|
|
(query 'query)
|
|
|
|
(t t))))
|
|
|
|
|
|
|
|
(defun org-babel-check-evaluate (info)
|
2013-03-09 00:34:09 +00:00
|
|
|
"Check if code block INFO should be evaluated.
|
2015-11-05 15:51:06 +00:00
|
|
|
Do not query the user, but do display an informative message if
|
|
|
|
evaluation is blocked. Returns non-nil if evaluation is not blocked."
|
2016-11-04 07:33:51 +00:00
|
|
|
(let ((confirmed (org-babel-check-confirm-evaluate info)))
|
|
|
|
(unless confirmed
|
|
|
|
(message "Evaluation of this %s code block%sis disabled."
|
2015-11-05 15:51:06 +00:00
|
|
|
(nth 0 info)
|
2016-11-04 07:33:51 +00:00
|
|
|
(let ((name (nth 4 info)))
|
|
|
|
(if name (format " (%s) " name) " "))))
|
|
|
|
confirmed))
|
2015-11-05 15:51:06 +00:00
|
|
|
|
|
|
|
;; Dynamically scoped for asynchronous export.
|
2013-03-09 21:22:49 +00:00
|
|
|
(defvar org-babel-confirm-evaluate-answer-no)
|
|
|
|
|
2015-11-05 15:51:06 +00:00
|
|
|
(defun 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
|
|
|
|
|
|
|
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
|
2015-11-05 15:51:06 +00:00
|
|
|
of potentially harmful code.
|
|
|
|
|
|
|
|
The variable `org-babel-confirm-evaluate-answer-no' is used by
|
|
|
|
the async export process, which requires a non-interactive
|
|
|
|
environment, to override this check."
|
|
|
|
(let* ((evalp (org-babel-check-confirm-evaluate info))
|
|
|
|
(lang (nth 0 info))
|
|
|
|
(name (nth 4 info))
|
2015-11-07 00:00:50 +00:00
|
|
|
(name-string (if name (format " (%s) " name) " ")))
|
2015-11-05 15:51:06 +00:00
|
|
|
(pcase evalp
|
|
|
|
(`nil nil)
|
|
|
|
(`t t)
|
2015-11-07 00:00:50 +00:00
|
|
|
(`query (or
|
2016-06-23 12:18:38 +00:00
|
|
|
(and (not (bound-and-true-p
|
2015-11-07 00:00:50 +00:00
|
|
|
org-babel-confirm-evaluate-answer-no))
|
|
|
|
(yes-or-no-p
|
|
|
|
(format "Evaluate this %s code block%son your system? "
|
|
|
|
lang name-string)))
|
|
|
|
(progn
|
2021-09-29 07:22:47 +00:00
|
|
|
(message "Evaluation of this %s code block%sis aborted."
|
|
|
|
lang name-string)
|
|
|
|
nil)))
|
2015-11-07 00:00:50 +00:00
|
|
|
(x (error "Unexpected value `%s' from `org-babel-check-confirm-evaluate'" x)))))
|
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 ()
|
2023-08-04 08:33:01 +00:00
|
|
|
"Maybe `org-babel-execute-maybe'.
|
|
|
|
This function does nothing unless `org-babel-no-eval-on-ctrl-c-ctrl-c'
|
|
|
|
is non-nil."
|
2010-08-05 17:45:13 +00:00
|
|
|
(unless org-babel-no-eval-on-ctrl-c-ctrl-c
|
|
|
|
(org-babel-execute-maybe)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-babel-execute-maybe ()
|
2023-08-04 08:33:01 +00:00
|
|
|
"Execute src block or babel call at point."
|
2010-08-05 17:45:13 +00:00
|
|
|
(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."
|
2023-05-16 10:41:53 +00:00
|
|
|
`(if (org-element-type-p (org-element-context) '(inline-src-block src-block))
|
2013-04-18 08:06:55 +00:00
|
|
|
(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)
|
2022-10-18 15:34:18 +00:00
|
|
|
(let ((info (org-babel-get-src-block-info 'no-eval))
|
2012-08-09 14:13:18 +00:00
|
|
|
(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.
|
2018-02-16 20:16:15 +00:00
|
|
|
Detect if this is context for an 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.
|
2018-02-16 20:16:15 +00:00
|
|
|
Detect if this is context for an 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.
|
2018-02-16 20:16:15 +00:00
|
|
|
Detect if this is context for an 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)
|
2020-08-02 08:39:02 +00:00
|
|
|
(file-mode . ((#o755 #o555 #o444 :any)))
|
2011-10-08 22:31:50 +00:00
|
|
|
(hlines . ((no yes)))
|
|
|
|
(mkdirp . ((yes no)))
|
|
|
|
(no-expand)
|
|
|
|
(noeval)
|
2022-11-06 20:08:06 +00:00
|
|
|
(noweb . ((yes no tangle strip-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)
|
2021-09-06 16:45:42 +00:00
|
|
|
(noweb-prefix . ((no yes)))
|
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)
|
2018-04-12 13:13:02 +00:00
|
|
|
(raw html latex org code pp drawer link graphics)
|
2022-11-22 02:06:24 +00:00
|
|
|
(replace silent none discard 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)
|
2023-05-03 17:19:28 +00:00
|
|
|
(wrap . :any))
|
|
|
|
"Alist defining common header args and their allowed values.
|
2023-05-03 17:51:33 +00:00
|
|
|
|
|
|
|
Keys of the alist are header arg symbols.
|
|
|
|
Values of the alist are either a symbol `:any' or a list of allowed
|
|
|
|
values as symbols:
|
|
|
|
|
|
|
|
(header-name . :any)
|
|
|
|
(header-name . ((value1 value2 value3 ...))
|
|
|
|
(header-name . ((value1 value2 value3 ... :any))
|
|
|
|
|
|
|
|
When Org considers header-arg property inheritance, the innermost
|
|
|
|
value from the list is considered.
|
|
|
|
|
|
|
|
Symbol `:any' in the value list implies that any value is allowed.
|
|
|
|
Yet the explicitly listed values from the list will be offered as
|
|
|
|
completion candidates.
|
|
|
|
|
|
|
|
FIXME: This is currently just supported for `results' and `exports'.
|
|
|
|
Values in the alist can also be a list of lists. The inner lists
|
|
|
|
define exclusive groups of values that can be set at the same time for
|
|
|
|
a given header argument.
|
|
|
|
|
|
|
|
(results . ((file list ...)
|
|
|
|
(raw html ...))
|
|
|
|
|
|
|
|
The above example allows multi-component header arguments like
|
|
|
|
|
|
|
|
#+begin_src bash :results file raw
|
|
|
|
<:results will combine the two values \"file raw\".>
|
|
|
|
|
|
|
|
#+begin_src bash :results file list
|
|
|
|
<:results will only use the last value \"list\".>
|
|
|
|
|
|
|
|
#+property: header-args :results file html
|
|
|
|
...
|
|
|
|
#+begin_src bash :results list
|
|
|
|
<:results will inherit with partial override \"list html\".>
|
|
|
|
|
|
|
|
See info node `(org)Results of evaluation' for more details.")
|
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
|
2021-09-06 16:45:42 +00:00
|
|
|
:noweb :noweb-ref :noweb-sep :noweb-prefix :padline
|
|
|
|
:prologue :rownames :sep :session :tangle :wrap
|
2013-10-30 17:58:50 +00:00
|
|
|
(: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)
|
2015-11-06 12:04:20 +00:00
|
|
|
(cl-every
|
2013-10-30 17:58:50 +00:00
|
|
|
(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"))
|
2020-08-28 18:05:59 +00:00
|
|
|
"Default arguments to use when evaluating a source block.
|
|
|
|
|
|
|
|
This is a list in which each element is an alist. Each key
|
|
|
|
corresponds to a header argument, and each value to that header's
|
|
|
|
value. The value can either be a string or a closure that
|
2022-06-28 03:42:27 +00:00
|
|
|
evaluates to a string.
|
|
|
|
|
|
|
|
A closure is evaluated when the source block is being
|
|
|
|
evaluated (e.g. during execution or export), with point at the
|
|
|
|
source block. It is not possible to use an arbitrary function
|
2022-07-24 20:53:32 +00:00
|
|
|
symbol (e.g. `some-func'), since org uses lexical binding. To
|
2022-06-28 03:42:27 +00:00
|
|
|
achieve the same functionality, call the function within a
|
|
|
|
closure (e.g. (lambda () (some-func))).
|
2020-08-28 18:05:59 +00:00
|
|
|
|
|
|
|
To understand how closures can be used as default header
|
|
|
|
arguments, imagine you'd like to set the file name output of a
|
|
|
|
latex source block to a sha1 of its contents. We could achieve
|
|
|
|
this with:
|
|
|
|
|
2022-08-04 09:02:49 +00:00
|
|
|
(defun org-src-sha ()
|
|
|
|
(let ((elem (org-element-at-point)))
|
|
|
|
(concat (sha1 (org-element-property :value elem)) \".svg\")))
|
2020-08-28 18:05:59 +00:00
|
|
|
|
2022-08-04 09:02:49 +00:00
|
|
|
(setq org-babel-default-header-args:latex
|
|
|
|
`((:results . \"file link replace\")
|
|
|
|
(:file . (lambda () (org-src-sha)))))
|
2020-08-28 18:05:59 +00:00
|
|
|
|
|
|
|
Because the closure is evaluated with point at the source block,
|
|
|
|
the call to `org-element-at-point' above will always retrieve
|
2022-06-28 03:42:27 +00:00
|
|
|
information about the current source block.
|
|
|
|
|
|
|
|
Some header arguments can be provided multiple times for a source
|
|
|
|
block. An example of such a header argument is :var. This
|
|
|
|
functionality is also supported for default header arguments by
|
|
|
|
providing the header argument multiple times in the alist. For
|
|
|
|
example:
|
|
|
|
|
2022-07-25 19:54:49 +00:00
|
|
|
((:var . \"foo=\\\"bar\\\"\")
|
2022-06-28 03:42:27 +00:00
|
|
|
(:var . \"bar=\\\"foo\\\"\"))")
|
2020-08-28 18:05:59 +00:00
|
|
|
|
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
|
|
|
|
2016-02-03 23:03:34 +00:00
|
|
|
(defconst org-babel-name-regexp
|
|
|
|
(format "^[ \t]*#\\+%s:[ \t]*"
|
|
|
|
;; FIXME: TBLNAME is for backward compatibility.
|
|
|
|
(regexp-opt '("NAME" "TBLNAME")))
|
|
|
|
"Regexp matching a NAME keyword.")
|
2011-05-06 20:45:38 +00:00
|
|
|
|
2016-02-03 23:03:34 +00:00
|
|
|
(defconst org-babel-result-regexp
|
2020-05-13 13:13:14 +00:00
|
|
|
(rx (seq bol
|
|
|
|
(zero-or-more (any "\t "))
|
|
|
|
"#+results"
|
|
|
|
(opt "["
|
|
|
|
;; Time stamp part.
|
|
|
|
(opt "("
|
|
|
|
(= 4 digit) (= 2 "-" (= 2 digit))
|
|
|
|
" "
|
|
|
|
(= 2 digit) (= 2 ":" (= 2 digit))
|
|
|
|
") ")
|
|
|
|
;; SHA1 hash.
|
|
|
|
(group (one-or-more hex-digit))
|
|
|
|
"]")
|
|
|
|
":"
|
|
|
|
(zero-or-more (any "\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
|
2016-02-03 23:03:34 +00:00
|
|
|
be saved in match group 1.")
|
2009-11-20 17:40:50 +00:00
|
|
|
|
2016-02-03 23:03:34 +00:00
|
|
|
(defconst org-babel-result-w-name-regexp
|
|
|
|
(concat org-babel-result-regexp "\\(?9:[^ \t\n\r\v\f]+\\)")
|
|
|
|
"Regexp matching a RESULTS keyword with a name.
|
|
|
|
Name is saved in match group 9.")
|
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.")
|
|
|
|
|
2010-03-13 17:34:02 +00:00
|
|
|
(defvar org-babel-after-execute-hook nil
|
2021-09-16 10:32:43 +00:00
|
|
|
"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)
|
2019-10-20 10:12:27 +00:00
|
|
|
"Generate a regexp used to match a source block named NAME.
|
2015-05-01 12:23:49 +00:00
|
|
|
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)
|
2019-10-20 10:12:27 +00:00
|
|
|
"Generate a regexp used to match data named NAME."
|
2016-02-03 23:03:34 +00:00
|
|
|
(concat org-babel-name-regexp (regexp-quote name) "[ \t]*$"))
|
2011-11-16 03:13:41 +00:00
|
|
|
|
2016-08-08 12:04:11 +00:00
|
|
|
(defun org-babel--normalize-body (datum)
|
|
|
|
"Normalize body for element or object DATUM.
|
2016-08-28 09:45:39 +00:00
|
|
|
DATUM is a source block element or an inline source block object.
|
|
|
|
Remove final newline character and spurious indentation."
|
2016-08-08 12:04:11 +00:00
|
|
|
(let* ((value (org-element-property :value datum))
|
2016-08-28 09:45:39 +00:00
|
|
|
(body (if (string-suffix-p "\n" value)
|
2016-08-08 12:04:11 +00:00
|
|
|
(substring value 0 -1)
|
|
|
|
value)))
|
2023-05-16 10:41:53 +00:00
|
|
|
(cond ((org-element-type-p datum 'inline-src-block)
|
2016-08-28 09:45:39 +00:00
|
|
|
;; Newline characters and indentation in an inline
|
|
|
|
;; src-block are not meaningful, since they could come from
|
|
|
|
;; some paragraph filling. Treat them as a white space.
|
|
|
|
(replace-regexp-in-string "\n[ \t]*" " " body))
|
2023-07-13 08:51:15 +00:00
|
|
|
((org-src-preserve-indentation-p datum) body)
|
2016-08-28 09:45:39 +00:00
|
|
|
(t (org-remove-indentation body)))))
|
2016-08-08 12:04:11 +00:00
|
|
|
|
2009-02-22 21:19:32 +00:00
|
|
|
;;; functions
|
2013-06-08 19:19:38 +00:00
|
|
|
(defvar org-babel-current-src-block-location nil
|
2018-09-20 09:23:49 +00:00
|
|
|
"Marker pointing to the source block currently being executed.
|
2013-06-08 19:19:38 +00:00
|
|
|
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
|
|
|
|
2020-08-28 18:05:59 +00:00
|
|
|
(defun org-babel-eval-headers (headers)
|
|
|
|
"Compute header list set with HEADERS.
|
|
|
|
|
|
|
|
Evaluate all header arguments set to functions prior to returning
|
|
|
|
the list of header arguments."
|
|
|
|
(let ((lst nil))
|
|
|
|
(dolist (elem headers)
|
2021-09-29 12:05:10 +00:00
|
|
|
(if (and (cdr elem) (functionp (cdr elem)))
|
2020-08-28 18:05:59 +00:00
|
|
|
(push `(,(car elem) . ,(funcall (cdr elem))) lst)
|
|
|
|
(push elem lst)))
|
2021-09-29 12:05:10 +00:00
|
|
|
(reverse lst)))
|
2020-08-28 18:05:59 +00:00
|
|
|
|
2022-10-18 15:34:18 +00:00
|
|
|
(defun org-babel-get-src-block-info (&optional no-eval datum)
|
2016-02-10 23:54:12 +00:00
|
|
|
"Extract information from a source block or inline source block.
|
|
|
|
|
2022-10-18 15:34:18 +00:00
|
|
|
When optional argument NO-EVAL is non-nil, Babel does not resolve
|
2017-12-21 23:06:39 +00:00
|
|
|
remote variable references; a process which could likely result
|
|
|
|
in the execution of other code blocks, and do not evaluate Lisp
|
|
|
|
values in parameters.
|
2016-02-10 23:54:12 +00:00
|
|
|
|
|
|
|
By default, consider the block at point. However, when optional
|
|
|
|
argument DATUM is provided, extract information from that parsed
|
|
|
|
object instead.
|
|
|
|
|
|
|
|
Return nil if point is not on a source block. Otherwise, return
|
|
|
|
a list with the following pattern:
|
|
|
|
|
2016-08-28 09:45:39 +00:00
|
|
|
(language body arguments switches name start coderef)"
|
2016-02-10 23:54:12 +00:00
|
|
|
(let* ((datum (or datum (org-element-context)))
|
|
|
|
(type (org-element-type datum))
|
|
|
|
(inline (eq type 'inline-src-block)))
|
|
|
|
(when (memq type '(inline-src-block src-block))
|
|
|
|
(let* ((lang (org-element-property :language datum))
|
|
|
|
(lang-headers (intern
|
|
|
|
(concat "org-babel-default-header-args:" lang)))
|
|
|
|
(name (org-element-property :name datum))
|
|
|
|
(info
|
|
|
|
(list
|
|
|
|
lang
|
2016-08-08 12:04:11 +00:00
|
|
|
(org-babel--normalize-body datum)
|
2016-02-10 23:54:12 +00:00
|
|
|
(apply #'org-babel-merge-params
|
|
|
|
(if inline org-babel-default-inline-header-args
|
|
|
|
org-babel-default-header-args)
|
2021-09-29 07:18:48 +00:00
|
|
|
(and (boundp lang-headers) (eval lang-headers t))
|
2016-02-10 23:54:12 +00:00
|
|
|
(append
|
|
|
|
;; If DATUM is provided, make sure we get node
|
|
|
|
;; properties applicable to its location within
|
|
|
|
;; the document.
|
2023-05-03 14:26:41 +00:00
|
|
|
(org-with-point-at (org-element-begin datum)
|
2022-10-18 15:34:18 +00:00
|
|
|
(org-babel-params-from-properties lang no-eval))
|
2017-12-21 23:06:39 +00:00
|
|
|
(mapcar (lambda (h)
|
2022-10-18 15:34:18 +00:00
|
|
|
(org-babel-parse-header-arguments h no-eval))
|
2016-08-08 11:13:11 +00:00
|
|
|
(cons (org-element-property :parameters datum)
|
|
|
|
(org-element-property :header datum)))))
|
2016-02-10 23:54:12 +00:00
|
|
|
(or (org-element-property :switches datum) "")
|
|
|
|
name
|
|
|
|
(org-element-property (if inline :begin :post-affiliated)
|
2016-08-28 09:45:39 +00:00
|
|
|
datum)
|
|
|
|
(and (not inline) (org-src-coderef-format datum)))))
|
2022-10-18 15:34:18 +00:00
|
|
|
(unless no-eval
|
2016-02-10 23:54:12 +00:00
|
|
|
(setf (nth 2 info) (org-babel-process-params (nth 2 info))))
|
|
|
|
(setf (nth 2 info) (org-babel-generate-file-param name (nth 2 info)))
|
|
|
|
info))))
|
|
|
|
|
2020-09-06 03:39:08 +00:00
|
|
|
(defun org-babel--expand-body (info)
|
2023-08-04 08:33:18 +00:00
|
|
|
"Expand noweb references in src block and remove any coderefs.
|
|
|
|
The src block is defined by its INFO, as returned by
|
|
|
|
`org-babel-get-src-block-info'."
|
2020-09-06 03:39:08 +00:00
|
|
|
(let ((coderef (nth 6 info))
|
|
|
|
(expand
|
|
|
|
(if (org-babel-noweb-p (nth 2 info) :eval)
|
|
|
|
(org-babel-expand-noweb-references info)
|
|
|
|
(nth 1 info))))
|
|
|
|
(if (not coderef) expand
|
|
|
|
(replace-regexp-in-string
|
|
|
|
(org-src-coderef-regexp coderef) "" expand nil nil 1))))
|
|
|
|
|
2020-09-29 21:11:59 +00:00
|
|
|
(defun org-babel--file-desc (params result)
|
2023-08-05 12:09:59 +00:00
|
|
|
"Retrieve description for file link result of evaluation.
|
|
|
|
PARAMS is header argument values. RESULT is the file link as returned
|
|
|
|
by the code block.
|
|
|
|
|
|
|
|
When `:file-desc' header argument is provided use its value or
|
|
|
|
duplicate RESULT in the description.
|
|
|
|
|
|
|
|
When `:file-desc' is missing, return nil."
|
2020-09-29 21:11:59 +00:00
|
|
|
(pcase (assq :file-desc params)
|
|
|
|
(`nil nil)
|
|
|
|
(`(:file-desc) result)
|
2021-09-26 12:44:21 +00:00
|
|
|
(`(:file-desc . ,(and (pred stringp) val)) val)))
|
2020-09-29 21:11:59 +00:00
|
|
|
|
2021-09-29 12:17:04 +00:00
|
|
|
(defvar *this*) ; Dynamically bound in `org-babel-execute-src-block'
|
|
|
|
; and `org-babel-read'
|
|
|
|
|
2012-10-02 07:55:42 +00:00
|
|
|
;;;###autoload
|
2022-09-17 09:39:16 +00:00
|
|
|
(defun org-babel-execute-src-block (&optional arg info params executor-type)
|
2022-07-21 10:54:30 +00:00
|
|
|
"Execute the current source code block and return the result.
|
2010-07-13 23:20:08 +00:00
|
|
|
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
|
2022-09-17 09:39:16 +00:00
|
|
|
block.
|
|
|
|
|
|
|
|
EXECUTOR-TYPE is the type of the org element responsible for the
|
|
|
|
execution of the source block. If not provided then informed
|
|
|
|
guess will be made."
|
2009-05-21 14:22:24 +00:00
|
|
|
(interactive)
|
2013-06-25 13:55:32 +00:00
|
|
|
(let* ((org-babel-current-src-block-location
|
2022-09-17 09:39:16 +00:00
|
|
|
(or org-babel-current-src-block-location
|
|
|
|
(nth 5 info)
|
|
|
|
(org-babel-where-is-src-block-head)))
|
|
|
|
(info (if info (copy-tree info) (org-babel-get-src-block-info)))
|
|
|
|
(executor-type
|
|
|
|
(or executor-type
|
|
|
|
;; If `executor-type' is unset, then we will make an
|
|
|
|
;; informed guess.
|
2022-11-01 02:12:54 +00:00
|
|
|
(pcase (and
|
|
|
|
;; When executing virtual src block, no location
|
|
|
|
;; is known.
|
|
|
|
org-babel-current-src-block-location
|
|
|
|
(char-after org-babel-current-src-block-location))
|
2022-09-17 09:39:16 +00:00
|
|
|
(?s 'inline-src-block)
|
|
|
|
(?c 'inline-babel-call)
|
|
|
|
(?# (pcase (char-after (+ 2 org-babel-current-src-block-location))
|
|
|
|
(?b 'src-block)
|
|
|
|
(?c 'call-block)
|
|
|
|
(_ 'unknown)))
|
|
|
|
(_ 'unknown)))))
|
2016-06-21 12:42:17 +00:00
|
|
|
;; Merge PARAMS with INFO before considering source block
|
|
|
|
;; evaluation since both could disagree.
|
2015-10-29 19:34:10 +00:00
|
|
|
(cl-callf org-babel-merge-params (nth 2 info) params)
|
|
|
|
(when (org-babel-check-evaluate info)
|
|
|
|
(cl-callf org-babel-process-params (nth 2 info))
|
|
|
|
(let* ((params (nth 2 info))
|
2016-06-21 12:42:17 +00:00
|
|
|
(cache (let ((c (cdr (assq :cache params))))
|
|
|
|
(and (not arg) c (string= "yes" c))))
|
2018-06-23 21:04:45 +00:00
|
|
|
(new-hash (and cache (org-babel-sha1-hash info :eval)))
|
2016-06-21 12:42:17 +00:00
|
|
|
(old-hash (and cache (org-babel-current-result-hash)))
|
|
|
|
(current-cache (and new-hash (equal new-hash old-hash))))
|
2013-03-09 17:14:03 +00:00
|
|
|
(cond
|
2016-06-21 12:42:17 +00:00
|
|
|
(current-cache
|
|
|
|
(save-excursion ;Return cached result.
|
2013-03-09 17:14:03 +00:00
|
|
|
(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)))
|
2021-12-12 07:31:35 +00:00
|
|
|
(message (format "Cached: %s"
|
|
|
|
(replace-regexp-in-string "%" "%%" (format "%S" result))))
|
2016-01-25 15:11:31 +00:00
|
|
|
result)))
|
2015-10-29 19:34:10 +00:00
|
|
|
((org-babel-confirm-evaluate info)
|
2013-03-09 00:34:09 +00:00
|
|
|
(let* ((lang (nth 0 info))
|
2016-06-21 12:42:17 +00:00
|
|
|
(result-params (cdr (assq :result-params params)))
|
2020-09-06 03:39:08 +00:00
|
|
|
(body (org-babel--expand-body info))
|
2016-06-21 12:42:17 +00:00
|
|
|
(dir (cdr (assq :dir params)))
|
2019-03-02 04:11:47 +00:00
|
|
|
(mkdirp (cdr (assq :mkdirp params)))
|
2013-03-09 00:34:09 +00:00
|
|
|
(default-directory
|
2019-04-25 08:36:40 +00:00
|
|
|
(cond
|
|
|
|
((not dir) default-directory)
|
|
|
|
((member mkdirp '("no" "nil" nil))
|
|
|
|
(file-name-as-directory (expand-file-name dir)))
|
|
|
|
(t
|
|
|
|
(let ((d (file-name-as-directory (expand-file-name dir))))
|
|
|
|
(make-directory d 'parents)
|
|
|
|
d))))
|
2016-02-14 15:20:39 +00:00
|
|
|
(cmd (intern (concat "org-babel-execute:" lang)))
|
2022-09-17 09:53:01 +00:00
|
|
|
result exec-start-time)
|
2016-02-14 15:20:39 +00:00
|
|
|
(unless (fboundp cmd)
|
|
|
|
(error "No org-babel-execute function for %s!" lang))
|
2022-10-06 11:43:46 +00:00
|
|
|
(message "Executing %s %s %s..."
|
2016-02-14 15:20:39 +00:00
|
|
|
(capitalize lang)
|
2022-09-17 09:39:16 +00:00
|
|
|
(pcase executor-type
|
|
|
|
('src-block "code block")
|
|
|
|
('inline-src-block "inline code block")
|
|
|
|
('babel-call "call")
|
|
|
|
('inline-babel-call "inline call")
|
|
|
|
(e (symbol-name e)))
|
2016-06-21 12:42:17 +00:00
|
|
|
(let ((name (nth 4 info)))
|
2022-09-13 10:55:06 +00:00
|
|
|
(if name
|
|
|
|
(format "(%s)" name)
|
2022-11-01 02:12:54 +00:00
|
|
|
(format "at position %S" (nth 5 info)))))
|
2022-09-17 09:53:01 +00:00
|
|
|
(setq exec-start-time (current-time)
|
|
|
|
result
|
2022-10-29 04:43:03 +00:00
|
|
|
(let ((r (save-current-buffer (funcall cmd body params))))
|
2022-07-21 10:54:30 +00:00
|
|
|
(if (and (eq (cdr (assq :result-type params)) 'value)
|
|
|
|
(or (member "vector" result-params)
|
|
|
|
(member "table" result-params))
|
|
|
|
(not (listp r)))
|
|
|
|
(list (list r))
|
|
|
|
r)))
|
|
|
|
(let ((file (and (member "file" result-params)
|
|
|
|
(cdr (assq :file params)))))
|
|
|
|
;; If non-empty result and :file then write to :file.
|
|
|
|
(when file
|
|
|
|
;; If `:results' are special types like `link' or
|
|
|
|
;; `graphics', don't write result to `:file'. Only
|
|
|
|
;; insert a link to `:file'.
|
|
|
|
(when (and result
|
|
|
|
(not (or (member "link" result-params)
|
|
|
|
(member "graphics" result-params))))
|
|
|
|
(with-temp-file file
|
|
|
|
(insert (org-babel-format-result
|
|
|
|
result
|
|
|
|
(cdr (assq :sep params)))))
|
|
|
|
;; Set file permissions if header argument
|
|
|
|
;; `:file-mode' is provided.
|
|
|
|
(when (assq :file-mode params)
|
|
|
|
(set-file-modes file (cdr (assq :file-mode params)))))
|
|
|
|
(setq result file))
|
|
|
|
;; Possibly perform post process provided its
|
|
|
|
;; appropriate. Dynamically bind "*this*" to the
|
|
|
|
;; actual results of the block.
|
|
|
|
(let ((post (cdr (assq :post params))))
|
|
|
|
(when post
|
|
|
|
(let ((*this* (if (not file) result
|
|
|
|
(org-babel-result-to-file
|
|
|
|
file
|
|
|
|
(org-babel--file-desc params result)
|
|
|
|
'attachment))))
|
|
|
|
(setq result (org-babel-ref-resolve post))
|
|
|
|
(when file
|
|
|
|
(setq result-params (remove "file" result-params))))))
|
2022-11-24 21:10:29 +00:00
|
|
|
(unless (member "none" result-params)
|
2022-07-21 10:54:30 +00:00
|
|
|
(org-babel-insert-result
|
2023-07-28 09:11:31 +00:00
|
|
|
result result-params info
|
|
|
|
;; append/prepend cannot handle hash as we accumulate
|
|
|
|
;; multiple outputs together.
|
|
|
|
(when (member "replace" result-params) new-hash)
|
|
|
|
lang
|
2022-09-17 09:53:01 +00:00
|
|
|
(time-subtract (current-time) exec-start-time))))
|
2016-02-14 15:20:39 +00:00
|
|
|
(run-hooks 'org-babel-after-execute-hook)
|
|
|
|
result)))))))
|
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
|
2023-08-11 11:22:28 +00:00
|
|
|
org-babel-expand-body:lang function.
|
|
|
|
|
|
|
|
VAR-LINES is a list of lines that define variable environment. These
|
|
|
|
lines will be added after `:prologue' parameter and before BODY."
|
2016-09-22 17:45:15 +00:00
|
|
|
(let ((pro (cdr (assq :prologue params)))
|
|
|
|
(epi (cdr (assq :epilogue params))))
|
2013-06-22 19:52:35 +00:00
|
|
|
(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)
|
2023-08-12 09:06:12 +00:00
|
|
|
"Expand the current source code block or block specified by INFO.
|
|
|
|
INFO is the output of `org-babel-get-src-block-info'.
|
|
|
|
PARAMS defines inherited header arguments.
|
|
|
|
|
2010-07-13 23:20:08 +00:00
|
|
|
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))))))
|
2016-06-23 12:34:40 +00:00
|
|
|
(if (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
|
|
|
|
2012-04-10 23:03:37 +00:00
|
|
|
(defun org-babel-combine-header-arg-lists (original &rest others)
|
2023-08-13 10:35:53 +00:00
|
|
|
"Combine ORIGINAL and OTHERS lists of header argument names and arguments."
|
2012-04-10 23:03:37 +00:00
|
|
|
(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
|
2015-11-06 12:04:20 +00:00
|
|
|
(cons arg-pair (cl-remove-if
|
2012-04-10 23:03:37 +00:00
|
|
|
(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))
|
2021-05-05 15:54:36 +00:00
|
|
|
(<= (org-string-distance header name) too-close)
|
2012-01-23 18:07:27 +00:00
|
|
|
(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)
|
2023-08-14 11:59:11 +00:00
|
|
|
"Insert a header argument and its value.
|
|
|
|
HEADER-ARG and VALUE, when provided, are the header argument name and
|
|
|
|
its value. When HEADER-ARG or VALUE are nil, offer interactive
|
|
|
|
completion from lists of common args and values."
|
2011-10-08 22:31:50 +00:00
|
|
|
(interactive)
|
2022-10-18 15:34:18 +00:00
|
|
|
(let* ((info (org-babel-get-src-block-info 'no-eval))
|
2013-10-06 15:05:02 +00:00
|
|
|
(lang (car info))
|
2016-01-28 16:11:48 +00:00
|
|
|
(begin (nth 5 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
|
2016-06-20 12:35:16 +00:00
|
|
|
(when (boundp lang-headers) (eval lang-headers t))))
|
2013-10-06 15:05:02 +00:00
|
|
|
(header-arg (or header-arg
|
2015-12-22 13:49:23 +00:00
|
|
|
(completing-read
|
2013-10-06 15:05:02 +00:00
|
|
|
"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)
|
2015-12-22 13:49:23 +00:00
|
|
|
(let ((arg (completing-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)
|
2022-09-06 12:50:59 +00:00
|
|
|
(goto-char (line-end-position))
|
2013-10-06 15:05:02 +00:00
|
|
|
(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)))
|
2016-06-20 12:35:16 +00:00
|
|
|
(lang-headers (when (boundp lang-headers-var) (eval lang-headers-var t)))
|
2012-04-10 23:03:37 +00:00
|
|
|
(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)))
|
|
|
|
|
2022-01-16 07:07:25 +00:00
|
|
|
(add-hook 'org-cycle-tab-first-hook 'org-babel-header-arg-expand)
|
2012-04-10 23:03:37 +00:00
|
|
|
|
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.
|
2023-08-15 11:50:58 +00:00
|
|
|
When optional argument INFO is non-nil, use source block defined in
|
|
|
|
INFO, as returned by `org-babel-get-src-block-info'.
|
|
|
|
|
2010-07-13 23:20:08 +00:00
|
|
|
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)))))
|
2016-09-22 17:45:15 +00:00
|
|
|
(session (cdr (assq :session params)))
|
|
|
|
(dir (cdr (assq :dir params)))
|
2010-08-05 04:42:54 +00:00
|
|
|
(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)
|
2023-08-16 10:32:06 +00:00
|
|
|
"Initiate session for current code block or the block defined by INFO.
|
|
|
|
If called with a prefix argument ARG, then resolve any variable
|
2010-10-29 19:43:56 +00:00
|
|
|
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))
|
2016-09-22 17:45:15 +00:00
|
|
|
(session (cdr (assq :session params)))
|
|
|
|
(dir (cdr (assq :dir params)))
|
2010-03-13 17:57:23 +00:00
|
|
|
(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))))
|
2016-09-03 01:45:27 +00:00
|
|
|
(when (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))
|
2016-06-21 13:24:06 +00:00
|
|
|
(with-temp-buffer (insert (org-trim body))
|
2010-04-17 20:03:30 +00:00
|
|
|
(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)
|
2023-08-16 10:32:06 +00:00
|
|
|
"Switch to the session of the current code block or block defined by INFO.
|
2012-08-11 17:10:44 +00:00
|
|
|
Uses `org-babel-initiate-session' to start the session. If called
|
2023-08-16 10:32:06 +00:00
|
|
|
with a prefix argument ARG, then this is passed on to
|
2010-08-18 18:07:13 +00:00
|
|
|
`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)
|
2023-08-16 10:32:06 +00:00
|
|
|
"Switch to code buffer and display session.
|
|
|
|
Prefix argument ARG is passed to `org-babel-switch-to-session'."
|
2010-10-16 18:14:20 +00:00
|
|
|
(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."
|
2018-02-01 14:40:51 +00:00
|
|
|
(declare (debug (body)))
|
|
|
|
`(let* ((element (org-element-at-point))
|
|
|
|
;; This function is not supposed to move point. However,
|
|
|
|
;; `org-edit-src-code' always moves point back into the
|
|
|
|
;; source block. It is problematic if the point was before
|
|
|
|
;; the code, e.g., on block's opening line. In this case,
|
|
|
|
;; we want to restore this location after executing BODY.
|
|
|
|
(outside-position
|
|
|
|
(and (<= (line-beginning-position)
|
2023-05-03 14:26:41 +00:00
|
|
|
(org-element-post-affiliated element))
|
2018-02-01 14:40:51 +00:00
|
|
|
(point-marker)))
|
|
|
|
(org-src-window-setup 'switch-invisibly))
|
|
|
|
(when (and (org-babel-where-is-src-block-head element)
|
2014-05-15 09:50:06 +00:00
|
|
|
(org-edit-src-code))
|
2010-09-04 17:36:48 +00:00
|
|
|
(unwind-protect (progn ,@body)
|
2018-02-01 14:40:51 +00:00
|
|
|
(org-edit-src-exit)
|
|
|
|
(when outside-position (goto-char outside-position)))
|
2010-08-18 03:40:53 +00:00
|
|
|
t)))
|
2010-08-17 20:46:51 +00:00
|
|
|
|
|
|
|
(defun org-babel-do-key-sequence-in-edit-buffer (key)
|
2023-08-17 12:54:20 +00:00
|
|
|
"Read key sequence KEY and execute the command in edit buffer.
|
2010-08-17 20:46:51 +00:00
|
|
|
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
|
2016-08-23 20:13:56 +00:00
|
|
|
Org code block according to the effect of TAB in the language
|
|
|
|
major mode buffer. For languages that support interactive
|
|
|
|
sessions, this can be used to send code from the Org buffer
|
|
|
|
to the session for evaluation using the native major mode
|
2010-08-17 20:46:51 +00:00
|
|
|
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))))))
|
|
|
|
|
2018-11-26 23:04:41 +00:00
|
|
|
(defvar org-link-bracket-re)
|
2012-10-02 07:55:42 +00:00
|
|
|
|
2013-09-08 10:41:05 +00:00
|
|
|
(defun org-babel-active-location-p ()
|
2023-08-04 08:33:01 +00:00
|
|
|
"Return non-nil, when at executable element."
|
2023-05-16 10:41:53 +00:00
|
|
|
(org-element-type-p
|
|
|
|
(save-match-data (org-element-context))
|
|
|
|
'(babel-call inline-babel-call inline-src-block src-block)))
|
2013-09-08 10:41:05 +00:00
|
|
|
|
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)
|
2018-07-05 11:13:07 +00:00
|
|
|
"Open results of source block at point.
|
|
|
|
|
|
|
|
If `point' is on a source 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")
|
2022-10-18 15:34:18 +00:00
|
|
|
(pcase (org-babel-get-src-block-info 'no-eval)
|
2018-07-05 11:13:07 +00:00
|
|
|
(`(,_ ,_ ,arguments ,_ ,_ ,start ,_)
|
|
|
|
(save-excursion
|
|
|
|
;; Go to the results, if there aren't any then run the block.
|
|
|
|
(goto-char start)
|
|
|
|
(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)
|
|
|
|
(skip-chars-forward " \r\t\n")
|
|
|
|
;; Open the results.
|
2018-11-26 23:04:41 +00:00
|
|
|
(if (looking-at org-link-bracket-re) (org-open-at-point)
|
2018-07-05 11:13:07 +00:00
|
|
|
(let ((r (org-babel-format-result (org-babel-read-result)
|
|
|
|
(cdr (assq :sep arguments)))))
|
|
|
|
(pop-to-buffer (get-buffer-create "*Org Babel Results*"))
|
|
|
|
(erase-buffer)
|
|
|
|
(insert r)))
|
|
|
|
t))
|
|
|
|
(_ nil)))
|
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"
|
2021-02-12 21:08:01 +00:00
|
|
|
(declare (indent 1) (debug t))
|
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))))
|
|
|
|
|
2011-08-01 21:45:58 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defmacro org-babel-map-inline-src-blocks (file &rest body)
|
2016-02-10 21:47:09 +00:00
|
|
|
"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."
|
2016-02-10 21:47:09 +00:00
|
|
|
(declare (indent 1) (debug (form body)))
|
|
|
|
(org-with-gensyms (datum end point tempvar to-be-removed visitedp)
|
2014-12-14 08:39:08 +00:00
|
|
|
`(let* ((case-fold-search t)
|
|
|
|
(,tempvar ,file)
|
2016-02-10 21:47:09 +00:00
|
|
|
(,visitedp (or (null ,tempvar)
|
2011-01-25 17:15:47 +00:00
|
|
|
(get-file-buffer (expand-file-name ,tempvar))))
|
2016-02-10 21:47:09 +00:00
|
|
|
(,point (point))
|
|
|
|
,to-be-removed)
|
2011-01-25 17:15:47 +00:00
|
|
|
(save-window-excursion
|
|
|
|
(when ,tempvar (find-file ,tempvar))
|
2016-02-10 21:47:09 +00:00
|
|
|
(setq ,to-be-removed (current-buffer))
|
2011-01-25 17:15:47 +00:00
|
|
|
(goto-char (point-min))
|
2016-02-10 21:47:09 +00:00
|
|
|
(while (re-search-forward "src_\\S-" nil t)
|
|
|
|
(let ((,datum (save-match-data (org-element-context))))
|
2023-05-16 10:41:53 +00:00
|
|
|
(when (org-element-type-p ,datum 'inline-src-block)
|
2016-02-10 21:47:09 +00:00
|
|
|
(goto-char (match-beginning 0))
|
2023-05-03 14:26:41 +00:00
|
|
|
(let ((,end (copy-marker (org-element-end ,datum))))
|
2016-02-10 21:47:09 +00:00
|
|
|
,@body
|
|
|
|
(goto-char ,end)
|
|
|
|
(set-marker ,end nil))))))
|
|
|
|
(unless ,visitedp (kill-buffer ,to-be-removed))
|
|
|
|
(goto-char ,point))))
|
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."
|
2016-02-10 21:47:09 +00:00
|
|
|
(declare (indent 1) (debug (form body)))
|
|
|
|
(org-with-gensyms (datum end point tempvar to-be-removed visitedp)
|
|
|
|
`(let* ((case-fold-search t)
|
|
|
|
(,tempvar ,file)
|
|
|
|
(,visitedp (or (null ,tempvar)
|
2011-12-17 00:32:38 +00:00
|
|
|
(get-file-buffer (expand-file-name ,tempvar))))
|
2016-02-10 21:47:09 +00:00
|
|
|
(,point (point))
|
|
|
|
,to-be-removed)
|
2011-12-17 00:32:38 +00:00
|
|
|
(save-window-excursion
|
|
|
|
(when ,tempvar (find-file ,tempvar))
|
2016-02-10 21:47:09 +00:00
|
|
|
(setq ,to-be-removed (current-buffer))
|
2011-12-17 00:32:38 +00:00
|
|
|
(goto-char (point-min))
|
2016-02-10 21:47:09 +00:00
|
|
|
(while (re-search-forward "call_\\S-\\|^[ \t]*#\\+CALL:" nil t)
|
|
|
|
(let ((,datum (save-match-data (org-element-context))))
|
2023-05-16 10:41:53 +00:00
|
|
|
(when (org-element-type-p ,datum '(babel-call inline-babel-call))
|
2016-02-10 21:47:09 +00:00
|
|
|
(goto-char (match-beginning 0))
|
2023-05-03 14:26:41 +00:00
|
|
|
(let ((,end (copy-marker (org-element-end ,datum))))
|
2016-02-10 21:47:09 +00:00
|
|
|
,@body
|
|
|
|
(goto-char ,end)
|
|
|
|
(set-marker ,end nil))))))
|
|
|
|
(unless ,visitedp (kill-buffer ,to-be-removed))
|
|
|
|
(goto-char ,point))))
|
2011-12-17 00:32:38 +00:00
|
|
|
|
2012-01-13 01:11:52 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defmacro org-babel-map-executables (file &rest body)
|
2016-02-10 21:47:09 +00:00
|
|
|
"Evaluate BODY forms on each active Babel code in FILE.
|
|
|
|
If FILE is nil evaluate BODY forms on source blocks in current
|
|
|
|
buffer."
|
|
|
|
(declare (indent 1) (debug (form body)))
|
|
|
|
(org-with-gensyms (datum end point tempvar to-be-removed visitedp)
|
|
|
|
`(let* ((case-fold-search t)
|
|
|
|
(,tempvar ,file)
|
|
|
|
(,visitedp (or (null ,tempvar)
|
2012-01-13 01:11:52 +00:00
|
|
|
(get-file-buffer (expand-file-name ,tempvar))))
|
2016-02-10 21:47:09 +00:00
|
|
|
(,point (point))
|
|
|
|
,to-be-removed)
|
2012-01-13 01:11:52 +00:00
|
|
|
(save-window-excursion
|
|
|
|
(when ,tempvar (find-file ,tempvar))
|
2016-02-10 21:47:09 +00:00
|
|
|
(setq ,to-be-removed (current-buffer))
|
2012-01-13 01:11:52 +00:00
|
|
|
(goto-char (point-min))
|
2016-02-10 21:47:09 +00:00
|
|
|
(while (re-search-forward
|
|
|
|
"\\(call\\|src\\)_\\|^[ \t]*#\\+\\(BEGIN_SRC\\|CALL:\\)" nil t)
|
|
|
|
(let ((,datum (save-match-data (org-element-context))))
|
2023-05-16 10:41:53 +00:00
|
|
|
(when (org-element-type-p
|
|
|
|
,datum
|
|
|
|
'(babel-call inline-babel-call inline-src-block src-block))
|
2016-02-10 21:47:09 +00:00
|
|
|
(goto-char (match-beginning 0))
|
2023-05-03 14:26:41 +00:00
|
|
|
(let ((,end (copy-marker (org-element-end ,datum))))
|
2016-02-10 21:47:09 +00:00
|
|
|
,@body
|
|
|
|
(goto-char ,end)
|
|
|
|
(set-marker ,end nil))))))
|
|
|
|
(unless ,visitedp (kill-buffer ,to-be-removed))
|
|
|
|
(goto-char ,point))))
|
2012-01-13 01:11:52 +00:00
|
|
|
|
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.
|
2023-08-18 10:15:10 +00:00
|
|
|
Prefix argument ARG is passed to `org-babel-execute-src-block'.
|
2010-07-13 23:20:08 +00:00
|
|
|
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
|
2023-05-16 10:41:53 +00:00
|
|
|
(if (org-element-type-p
|
|
|
|
(org-element-context) '(babel-call inline-babel-call))
|
2012-01-13 01:11:52 +00:00
|
|
|
(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
|
2023-08-19 09:47:53 +00:00
|
|
|
the current subtree, passing over the prefix argument ARG."
|
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
|
2018-06-23 21:04:45 +00:00
|
|
|
(defun org-babel-sha1-hash (&optional info context)
|
|
|
|
"Generate a sha1 hash based on the value of INFO.
|
|
|
|
CONTEXT specifies the context of evaluation. It can be `:eval',
|
|
|
|
`:export', `:tangle'. A nil value means `:eval'."
|
2009-11-20 17:40:50 +00:00
|
|
|
(interactive)
|
2010-10-21 13:04:20 +00:00
|
|
|
(let ((print-level nil)
|
2018-06-23 21:04:45 +00:00
|
|
|
(info (or info (org-babel-get-src-block-info)))
|
|
|
|
(context (or context :eval)))
|
2010-10-21 13:04:20 +00:00
|
|
|
(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"
|
2022-11-22 02:06:24 +00:00
|
|
|
"discard" "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)
|
2022-11-22 02:06:24 +00:00
|
|
|
(not (consp v))
|
|
|
|
(= (length v) 0))))
|
2012-08-15 07:56:35 +00:00
|
|
|
(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))
|
2018-06-23 21:04:45 +00:00
|
|
|
(body (if (org-babel-noweb-p params context)
|
|
|
|
(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)
|
2022-11-22 02:06:24 +00:00
|
|
|
(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)))
|
2016-06-23 12:34:40 +00:00
|
|
|
(when (called-interactively-p 'interactive) (message hash))
|
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))))
|
2009-11-20 17:40:50 +00:00
|
|
|
|
2023-08-20 08:45:04 +00:00
|
|
|
(defun org-babel-current-result-hash (&optional _info)
|
2012-06-28 17:49:47 +00:00
|
|
|
"Return the current in-buffer hash."
|
2023-08-20 08:45:04 +00:00
|
|
|
(let ((result (org-babel-where-is-src-block-result nil)))
|
2016-01-28 23:29:59 +00:00
|
|
|
(when result
|
2020-05-13 13:43:55 +00:00
|
|
|
(org-with-point-at result
|
|
|
|
(let ((case-fold-search t)) (looking-at org-babel-result-regexp))
|
|
|
|
(match-string-no-properties 1)))))
|
2009-11-20 17:40:50 +00:00
|
|
|
|
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
|
2020-05-13 13:43:55 +00:00
|
|
|
(when (and (let ((case-fold-search t))
|
|
|
|
(re-search-forward org-babel-result-regexp nil t))
|
2016-02-03 23:03:34 +00:00
|
|
|
(match-string 1))
|
|
|
|
(let* ((start (match-beginning 1))
|
2009-11-18 06:15:04 +00:00
|
|
|
(hide-start (+ org-babel-hash-show start))
|
2016-02-03 23:03:34 +00:00
|
|
|
(end (match-end 1))
|
|
|
|
(hash (match-string 1))
|
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
|
2020-05-13 13:43:55 +00:00
|
|
|
(let ((case-fold-search t))
|
|
|
|
(while (and (not org-babel-hash-show-time)
|
|
|
|
(re-search-forward org-babel-result-regexp nil t))
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(org-babel-hide-hash)
|
|
|
|
(goto-char (match-end 0))))))
|
2021-02-12 21:08:01 +00:00
|
|
|
(add-hook 'org-mode-hook #'org-babel-hide-all-hashes)
|
2009-11-18 06:15:04 +00:00
|
|
|
|
|
|
|
(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.
|
2016-10-15 15:36:47 +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))))
|
|
|
|
|
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)))
|
2021-02-12 21:08:01 +00:00
|
|
|
(add-hook 'org-mode-hook #'org-babel-result-hide-spec)
|
2012-01-19 14:50:17 +00:00
|
|
|
|
|
|
|
(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
|
2020-05-13 13:43:55 +00:00
|
|
|
(let ((case-fold-search t))
|
|
|
|
(while (re-search-forward org-babel-result-regexp nil t)
|
|
|
|
(save-excursion (goto-char (match-beginning 0))
|
|
|
|
(org-babel-hide-result-toggle-maybe))))))
|
2012-01-19 14:50:17 +00:00
|
|
|
|
|
|
|
(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))
|
2020-05-13 13:43:55 +00:00
|
|
|
(and (org-match-line org-babel-result-regexp)
|
|
|
|
(progn (org-babel-hide-result-toggle) t))))
|
2012-01-19 14:50:17 +00:00
|
|
|
|
|
|
|
(defun org-babel-hide-result-toggle (&optional force)
|
2023-08-23 11:24:53 +00:00
|
|
|
"Toggle the visibility of the current result.
|
|
|
|
When FORCE is symbol `off', unconditionally display the result.
|
|
|
|
Otherwise, when FORCE is non-nil, unconditionally hide the result."
|
2012-01-19 14:50:17 +00:00
|
|
|
(interactive)
|
|
|
|
(save-excursion
|
2023-05-10 13:27:13 +00:00
|
|
|
(forward-line 0)
|
2020-05-13 13:43:55 +00:00
|
|
|
(let ((case-fold-search t))
|
|
|
|
(unless (re-search-forward org-babel-result-regexp nil t)
|
|
|
|
(error "Not looking at a result line")))
|
2023-05-10 13:27:13 +00:00
|
|
|
(let ((start (progn (forward-line 1) (1- (point))))
|
2020-05-13 13:43:55 +00:00
|
|
|
(end (progn
|
|
|
|
(while (looking-at org-babel-multi-line-header-regexp)
|
|
|
|
(forward-line 1))
|
|
|
|
(goto-char (1- (org-babel-result-end)))
|
|
|
|
(point)))
|
|
|
|
ov)
|
|
|
|
(if (memq t (mapcar (lambda (overlay)
|
|
|
|
(eq (overlay-get overlay 'invisible)
|
|
|
|
'org-babel-hide-result))
|
|
|
|
(overlays-at start)))
|
|
|
|
(when (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)))))
|
2012-01-19 14:50:17 +00:00
|
|
|
|
|
|
|
;; org-tab-after-check-for-cycling-hook
|
2022-01-16 07:07:25 +00:00
|
|
|
(add-hook 'org-cycle-tab-first-hook #'org-babel-hide-result-toggle-maybe)
|
2012-01-19 14:50:17 +00:00
|
|
|
;; Remove overlays when changing major mode
|
|
|
|
(add-hook 'org-mode-hook
|
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 10:18:00 +00:00
|
|
|
(lambda () (add-hook 'change-major-mode-hook
|
2021-09-29 07:22:47 +00:00
|
|
|
#'org-babel-show-result-all 'append 'local)))
|
2012-01-19 14:50:17 +00:00
|
|
|
|
2017-12-21 23:06:39 +00:00
|
|
|
(defun org-babel-params-from-properties (&optional lang no-eval)
|
|
|
|
"Retrieve source block parameters specified as properties.
|
|
|
|
|
|
|
|
LANG is the language of the source block, as a string. When
|
|
|
|
optional argument NO-EVAL is non-nil, do not evaluate Lisp values
|
|
|
|
in parameters.
|
|
|
|
|
|
|
|
Return a list of association lists of source block parameters
|
2013-06-20 15:53:56 +00:00
|
|
|
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
|
2017-12-21 23:06:39 +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
|
2017-12-23 14:56:53 +00:00
|
|
|
(org-entry-get (point) "header-args" 'inherit)
|
2017-12-21 23:06:39 +00:00
|
|
|
no-eval)
|
|
|
|
;; Language-specific header arguments at point of call.
|
|
|
|
(and lang
|
2015-06-17 09:55:57 +00:00
|
|
|
(org-babel-parse-header-arguments
|
2017-12-23 14:56:53 +00:00
|
|
|
(org-entry-get (point) (concat "header-args:" lang) 'inherit)
|
2017-12-21 23:06:39 +00:00
|
|
|
no-eval)))))
|
2009-08-01 21:43:37 +00:00
|
|
|
|
2011-10-21 17:15:06 +00:00
|
|
|
(defun org-babel-balanced-split (string alts)
|
|
|
|
"Split STRING on instances of ALTS.
|
2017-05-01 21:35:39 +00:00
|
|
|
ALTS is a character, or 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 instances of \"[ \t]:\", set ALTS to ((32 9) . 58)."
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert string)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(let ((splitp (lambda (past next)
|
|
|
|
;; Non-nil when there should be a split after NEXT
|
|
|
|
;; character. PAST is the character before NEXT.
|
|
|
|
(pcase alts
|
|
|
|
(`(,(and first (pred consp)) . ,(and second (pred consp)))
|
|
|
|
(and (memq past first) (memq next second)))
|
|
|
|
(`(,first . ,(and second (pred consp)))
|
|
|
|
(and (eq past first) (memq next second)))
|
|
|
|
(`(,(and first (pred consp)) . ,second)
|
|
|
|
(and (memq past first) (eq next second)))
|
|
|
|
(`(,first . ,second)
|
|
|
|
(and (eq past first) (eq next second)))
|
|
|
|
((pred (eq next)) t)
|
|
|
|
(_ nil))))
|
|
|
|
(partial nil)
|
|
|
|
(result nil))
|
|
|
|
(while (not (eobp))
|
|
|
|
(cond
|
|
|
|
((funcall splitp (char-before) (char-after))
|
|
|
|
;; There is a split after point. If ALTS is two-folds,
|
|
|
|
;; remove last parsed character as it belongs to ALTS.
|
|
|
|
(when (consp alts) (pop partial))
|
|
|
|
;; Include elements parsed so far in RESULTS and flush
|
|
|
|
;; partial parsing.
|
|
|
|
(when partial
|
|
|
|
(push (apply #'string (nreverse partial)) result)
|
|
|
|
(setq partial nil))
|
|
|
|
(forward-char))
|
|
|
|
((memq (char-after) '(?\( ?\[))
|
|
|
|
;; Include everything between balanced brackets.
|
|
|
|
(let* ((origin (point))
|
|
|
|
(after (char-after))
|
|
|
|
(openings (list after)))
|
|
|
|
(forward-char)
|
|
|
|
(while (and openings (re-search-forward "[]()]" nil t))
|
|
|
|
(pcase (char-before)
|
|
|
|
((and match (or ?\[ ?\()) (push match openings))
|
|
|
|
(?\] (when (eq ?\[ (car openings)) (pop openings)))
|
|
|
|
(_ (when (eq ?\( (car openings)) (pop openings)))))
|
|
|
|
(if (null openings)
|
|
|
|
(setq partial
|
|
|
|
(nconc (nreverse (string-to-list
|
|
|
|
(buffer-substring origin (point))))
|
|
|
|
partial))
|
|
|
|
;; Un-balanced bracket. Backtrack.
|
|
|
|
(push after partial)
|
|
|
|
(goto-char (1+ origin)))))
|
|
|
|
((and (eq ?\" (char-after)) (not (eq ?\\ (char-before))))
|
2017-05-08 09:25:17 +00:00
|
|
|
;; Include everything from current double quote to next
|
|
|
|
;; non-escaped double quote.
|
2017-05-01 21:35:39 +00:00
|
|
|
(let ((origin (point)))
|
2017-05-08 09:25:17 +00:00
|
|
|
(if (re-search-forward "[^\\]\"" nil t)
|
2017-05-01 21:35:39 +00:00
|
|
|
(setq partial
|
2017-05-08 09:25:17 +00:00
|
|
|
(nconc (nreverse (string-to-list
|
|
|
|
(buffer-substring origin (point))))
|
2017-05-01 21:35:39 +00:00
|
|
|
partial))
|
2017-05-08 09:25:17 +00:00
|
|
|
;; No closing double quote. Backtrack.
|
|
|
|
(push ?\" partial)
|
|
|
|
(forward-char))))
|
2017-05-01 21:35:39 +00:00
|
|
|
(t (push (char-after) partial)
|
|
|
|
(forward-char))))
|
|
|
|
;; Add pending parsing and return result.
|
|
|
|
(when partial (push (apply #'string (nreverse partial)) result))
|
|
|
|
(nreverse result))))
|
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)
|
2023-08-21 10:01:54 +00:00
|
|
|
"Join strings in LIST where CH is on either end of the strings.
|
|
|
|
This function will join list elements like \"a=\" \"2\" into \"a=2\"."
|
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
|
2015-11-06 12:04:20 +00:00
|
|
|
(cl-reduce (lambda (acc el)
|
2021-09-29 07:22:47 +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
|
|
|
|
2017-12-21 23:06:39 +00:00
|
|
|
(defun org-babel-parse-header-arguments (string &optional no-eval)
|
|
|
|
"Parse header arguments in STRING.
|
|
|
|
When optional argument NO-EVAL is non-nil, do not evaluate Lisp
|
|
|
|
in parameters. Return an alist."
|
|
|
|
(when (org-string-nw-p string)
|
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))
|
2017-12-21 23:06:39 +00:00
|
|
|
(org-babel-read (org-babel-chomp (match-string 2 arg))
|
|
|
|
no-eval))
|
2011-10-21 17:21:39 +00:00
|
|
|
(cons (intern (org-babel-chomp arg)) nil)))
|
2017-12-21 23:06:39 +00:00
|
|
|
(let ((raw (org-babel-balanced-split 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.
|
|
|
|
|
2023-08-24 10:27:17 +00:00
|
|
|
#+PROPERTY: var foo=1, bar=2
|
|
|
|
|
|
|
|
HEADER-ARGUMENTS is alist of all the arguments."
|
2011-10-21 17:15:06 +00:00
|
|
|
(let (results)
|
|
|
|
(mapc (lambda (pair)
|
|
|
|
(if (eq (car pair) :var)
|
2023-04-24 12:00:49 +00:00
|
|
|
(or
|
|
|
|
(mapcar (lambda (v) (push (cons :var (org-trim v)) results))
|
|
|
|
(org-babel-join-splits-near-ch
|
|
|
|
61 (org-babel-balanced-split (or (cdr pair) "") 32)))
|
|
|
|
(push `(:var) results))
|
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)
|
2015-10-30 11:35:45 +00:00
|
|
|
(if (consp el)
|
|
|
|
el
|
|
|
|
(org-babel-ref-parse el)))
|
2015-10-29 19:26:11 +00:00
|
|
|
(org-babel--get-vars params)))
|
2016-09-22 17:45:15 +00:00
|
|
|
(vars-and-names (if (and (assq :colname-names params)
|
|
|
|
(assq :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
|
2016-09-22 17:45:15 +00:00
|
|
|
(cdr (assq :hlines params))
|
|
|
|
(cdr (assq :colnames params))
|
|
|
|
(cdr (assq :rownames params)))))
|
|
|
|
(raw-result (or (cdr (assq :results params)) ""))
|
2016-03-16 23:23:02 +00:00
|
|
|
(result-params (delete-dups
|
|
|
|
(append
|
|
|
|
(split-string (if (stringp raw-result)
|
|
|
|
raw-result
|
2023-01-02 07:49:11 +00:00
|
|
|
;; FIXME: Arbitrary code evaluation.
|
2016-06-20 12:35:16 +00:00
|
|
|
(eval raw-result t)))
|
2016-09-22 17:45:15 +00:00
|
|
|
(cdr (assq :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
|
2016-09-22 17:45:15 +00:00
|
|
|
(cons :colname-names (or (cdr (assq :colname-names params))
|
2011-04-04 17:28:45 +00:00
|
|
|
(cadr vars-and-names)))
|
2016-07-25 14:34:48 +00:00
|
|
|
(cons :rowname-names (or (cdr (assq :rowname-names params))
|
|
|
|
(cl-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-11-06 12:04:20 +00:00
|
|
|
(cl-remove-if
|
2015-10-29 13:31:28 +00:00
|
|
|
(lambda (x) (memq (car x) '(:colname-names :rowname-names :result-params
|
2021-09-29 07:22:47 +00:00
|
|
|
:result-type :var)))
|
2015-10-29 13:31:28 +00:00
|
|
|
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."
|
2016-09-25 15:29:06 +00:00
|
|
|
(if (eq '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)
|
2020-02-18 21:57:37 +00:00
|
|
|
row))
|
|
|
|
table)
|
2010-04-19 13:26:02 +00:00
|
|
|
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)
|
2021-05-20 11:01:06 +00:00
|
|
|
(when (proper-list-p (cdr var))
|
2010-04-20 05:33:47 +00:00
|
|
|
(when (and (not (equal colnames "no"))
|
2021-09-27 03:24:23 +00:00
|
|
|
;; Compatibility note: avoid `length>', which
|
|
|
|
;; isn't available until Emacs 28.
|
|
|
|
(or colnames (and (> (length (cdr var)) 1)
|
2021-05-20 11:01:06 +00:00
|
|
|
(eq (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
|
2021-09-16 10:32:43 +00:00
|
|
|
to the table for reinsertion to `org-mode'."
|
2010-04-19 13:26:02 +00:00
|
|
|
(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
|
2023-08-04 08:33:33 +00:00
|
|
|
`match-data' relatively to `org-babel-src-block-regexp', which see.
|
2022-10-25 09:38:35 +00:00
|
|
|
If the point is not on a source block or within blank lines after an
|
|
|
|
src block, then return nil."
|
2016-01-31 10:36:52 +00:00
|
|
|
(let ((element (or src-block (org-element-at-point))))
|
2023-05-16 10:41:53 +00:00
|
|
|
(when (org-element-type-p element 'src-block)
|
2023-05-03 14:26:41 +00:00
|
|
|
(let ((end (org-element-end element)))
|
2015-01-13 16:16:45 +00:00
|
|
|
(org-with-wide-buffer
|
|
|
|
;; Ensure point is not on a blank line after the block.
|
2023-05-10 13:27:13 +00:00
|
|
|
(forward-line 0)
|
2015-01-13 16:16:45 +00:00
|
|
|
(skip-chars-forward " \r\t\n" end)
|
|
|
|
(when (< (point) end)
|
2023-05-03 14:26:41 +00:00
|
|
|
(prog1 (goto-char (org-element-post-affiliated element))
|
2015-01-13 16:16:45 +00:00
|
|
|
(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)))
|
2021-09-29 07:22:47 +00:00
|
|
|
(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)
|
2023-08-24 10:27:17 +00:00
|
|
|
"Go to a source-code block with NAME."
|
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)
|
2016-01-28 10:18:50 +00:00
|
|
|
(all-block-names (org-babel-src-block-names)))
|
2015-12-22 13:49:23 +00:00
|
|
|
(list (completing-read
|
2016-01-28 10:18:50 +00:00
|
|
|
"source-block name: " all-block-names nil t
|
|
|
|
(let* ((context (org-element-context))
|
2016-06-14 16:35:03 +00:00
|
|
|
(type (org-element-type context))
|
|
|
|
(noweb-ref
|
|
|
|
(and (memq type '(inline-src-block src-block))
|
|
|
|
(org-in-regexp (org-babel-noweb-wrap)))))
|
2016-01-28 10:18:50 +00:00
|
|
|
(cond
|
2016-06-14 16:35:03 +00:00
|
|
|
(noweb-ref
|
|
|
|
(buffer-substring
|
|
|
|
(+ (car noweb-ref) (length org-babel-noweb-wrap-start))
|
|
|
|
(- (cdr noweb-ref) (length org-babel-noweb-wrap-end))))
|
2016-01-28 10:18:50 +00:00
|
|
|
((memq type '(babel-call inline-babel-call)) ;#+CALL:
|
|
|
|
(org-element-property :call context))
|
2016-06-14 16:35:03 +00:00
|
|
|
((car (org-element-property :results context))) ;#+RESULTS:
|
2016-01-28 10:18:50 +00:00
|
|
|
((let ((symbol (thing-at-point 'symbol))) ;Symbol.
|
2016-06-14 16:35:03 +00:00
|
|
|
(and symbol
|
|
|
|
(member-ignore-case symbol all-block-names)
|
2016-01-28 10:18:50 +00:00
|
|
|
symbol)))
|
|
|
|
(t "")))))))
|
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
|
2016-01-28 10:18:50 +00:00
|
|
|
;; Taken from `org-open-at-point'.
|
2022-01-16 07:07:25 +00:00
|
|
|
(progn (org-mark-ring-push) (goto-char point) (org-fold-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))
|
2017-08-13 17:01:41 +00:00
|
|
|
(let ((regexp (org-babel-named-src-block-regexp-for-name name)))
|
|
|
|
(or (and (looking-at regexp)
|
|
|
|
(progn (goto-char (match-beginning 1))
|
|
|
|
(line-beginning-position)))
|
2017-08-25 19:59:28 +00:00
|
|
|
(ignore-errors (org-next-block 1 nil regexp))))))
|
2009-06-13 22:43:24 +00:00
|
|
|
|
2010-07-12 04:35:58 +00:00
|
|
|
(defun org-babel-src-block-names (&optional file)
|
2019-10-20 10:12:27 +00:00
|
|
|
"Return the names of source blocks in FILE or the current buffer."
|
2017-11-28 22:57:18 +00:00
|
|
|
(with-current-buffer (if file (find-file-noselect file) (current-buffer))
|
|
|
|
(org-with-point-at 1
|
|
|
|
(let ((regexp "^[ \t]*#\\+begin_src ")
|
|
|
|
(case-fold-search t)
|
|
|
|
(names nil))
|
|
|
|
(while (re-search-forward regexp nil t)
|
|
|
|
(let ((element (org-element-at-point)))
|
2023-05-16 10:41:53 +00:00
|
|
|
(when (org-element-type-p element 'src-block)
|
2017-11-28 22:57:18 +00:00
|
|
|
(let ((name (org-element-property :name element)))
|
|
|
|
(when name (push name names))))))
|
|
|
|
names))))
|
2010-07-12 04:35:58 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-babel-goto-named-result (name)
|
2023-08-24 10:27:17 +00:00
|
|
|
"Go to a result with NAME."
|
2010-07-12 04:35:58 +00:00
|
|
|
(interactive
|
|
|
|
(let ((completion-ignore-case t))
|
2015-12-22 13:49:23 +00:00
|
|
|
(list (completing-read "Source-block name: "
|
|
|
|
(org-babel-result-names) nil t))))
|
2010-07-12 04:35:58 +00:00
|
|
|
(let ((point (org-babel-find-named-result name)))
|
|
|
|
(if point
|
|
|
|
;; taken from `org-open-at-point'
|
2022-01-16 07:07:25 +00:00
|
|
|
(progn (goto-char point) (org-fold-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
|
|
|
|
2016-01-28 23:29:59 +00:00
|
|
|
(defun org-babel-find-named-result (name)
|
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
|
2016-01-28 23:29:59 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
(let ((case-fold-search t)
|
|
|
|
(re (format "^[ \t]*#\\+%s.*?:[ \t]*%s[ \t]*$"
|
|
|
|
org-babel-results-keyword
|
|
|
|
(regexp-quote name))))
|
|
|
|
(catch :found
|
|
|
|
(while (re-search-forward re nil t)
|
|
|
|
(let ((element (org-element-at-point)))
|
2023-05-16 10:41:53 +00:00
|
|
|
(when (or (org-element-type-p element 'keyword)
|
2016-01-28 23:29:59 +00:00
|
|
|
(< (point)
|
2023-05-03 14:26:41 +00:00
|
|
|
(org-element-post-affiliated element)))
|
2016-01-28 23:29:59 +00:00
|
|
|
(throw :found (line-beginning-position)))))))))
|
2009-05-21 13:40:04 +00:00
|
|
|
|
2010-07-12 04:35:58 +00:00
|
|
|
(defun org-babel-result-names (&optional file)
|
2019-10-20 10:12:27 +00:00
|
|
|
"Return the names of results in FILE or the current buffer."
|
2010-07-12 04:35:58 +00:00
|
|
|
(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)
|
2016-02-03 23:03:34 +00:00
|
|
|
(setq names (cons (match-string-no-properties 9) 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 ()
|
2018-09-20 09:23:49 +00:00
|
|
|
"Mark current source 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.
|
2023-08-25 11:26:44 +00:00
|
|
|
|
|
|
|
With prefix argument ARG, also create a new heading at point.
|
|
|
|
|
2010-09-19 20:47:49 +00:00
|
|
|
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
|
2022-10-25 09:38:35 +00:00
|
|
|
region is not active then the point is demarcated.
|
|
|
|
|
|
|
|
When called within blank lines after a code block, create a new code
|
|
|
|
block of the same language with the previous."
|
2010-09-19 20:47:49 +00:00
|
|
|
(interactive "P")
|
2022-10-18 15:34:18 +00:00
|
|
|
(let* ((info (org-babel-get-src-block-info 'no-eval))
|
2015-01-13 16:18:12 +00:00
|
|
|
(start (org-babel-where-is-src-block-head))
|
2022-10-25 09:38:35 +00:00
|
|
|
;; `start' will be nil when within space lines after src block.
|
2015-01-13 16:18:12 +00:00
|
|
|
(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) ?*) " "))
|
2020-05-25 09:51:57 +00:00
|
|
|
(upper-case-p (and block
|
2015-01-13 16:18:12 +00:00
|
|
|
(let (case-fold-search)
|
2023-08-18 08:00:13 +00:00
|
|
|
(string-match-p "#\\+BEGIN_SRC" block)))))
|
2022-10-25 09:38:35 +00:00
|
|
|
(if (and info start) ;; At src block, but not within blank lines after it.
|
2010-09-19 20:47:49 +00:00
|
|
|
(mapc
|
|
|
|
(lambda (place)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char place)
|
|
|
|
(let ((lang (nth 0 info))
|
2022-10-04 07:21:20 +00:00
|
|
|
(indent (make-string (org-current-text-indentation) ?\s)))
|
2010-09-21 12:44:17 +00:00
|
|
|
(when (string-match "^[[:space:]]*$"
|
2022-08-23 02:54:57 +00:00
|
|
|
(buffer-substring (line-beginning-position)
|
|
|
|
(line-end-position)))
|
|
|
|
(delete-region (line-beginning-position) (line-end-position)))
|
2011-09-04 23:06:07 +00:00
|
|
|
(insert (concat
|
2022-10-25 09:38:35 +00:00
|
|
|
(if (looking-at "^") "" "\n")
|
|
|
|
indent (if upper-case-p "#+END_SRC\n" "#+end_src\n")
|
|
|
|
(if arg stars indent) "\n"
|
|
|
|
indent (if upper-case-p "#+BEGIN_SRC " "#+begin_src ")
|
|
|
|
lang
|
|
|
|
(if (> (length headers) 1)
|
2011-09-04 23:06:07 +00:00
|
|
|
(concat " " headers) headers)
|
2022-10-25 09:38:35 +00:00
|
|
|
(if (looking-at "[\n\r]")
|
2011-09-04 23:06:07 +00:00
|
|
|
""
|
|
|
|
(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))
|
2022-10-25 09:38:35 +00:00
|
|
|
(lang (or (car info) ; Reuse language from previous block.
|
|
|
|
(completing-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") "")
|
2020-05-25 09:51:57 +00:00
|
|
|
(if upper-case-p "#+BEGIN_SRC " "#+begin_src ")
|
|
|
|
lang "\n" body
|
2010-09-21 12:44:17 +00:00
|
|
|
(if (or (= (length body) 0)
|
2016-08-24 15:05:54 +00:00
|
|
|
(string-suffix-p "\r" body)
|
2020-05-25 09:51:57 +00:00
|
|
|
(string-suffix-p "\n" body))
|
|
|
|
""
|
|
|
|
"\n")
|
|
|
|
(if upper-case-p "#+END_SRC\n" "#+end_src\n")))
|
|
|
|
(goto-char start)
|
|
|
|
(move-end-of-line 1)))))
|
2010-09-19 20:47:49 +00:00
|
|
|
|
2016-02-03 23:26:38 +00:00
|
|
|
(defun org-babel--insert-results-keyword (name hash)
|
|
|
|
"Insert RESULTS keyword with NAME value at point.
|
|
|
|
If NAME is nil, results are anonymous. HASH is a string used as
|
|
|
|
the results hash, or nil. Leave point before the keyword."
|
|
|
|
(save-excursion (insert "\n")) ;open line to indent.
|
|
|
|
(org-indent-line)
|
|
|
|
(delete-char 1)
|
|
|
|
(insert (concat "#+" org-babel-results-keyword
|
|
|
|
(cond ((not hash) nil)
|
|
|
|
(org-babel-hash-show-time
|
|
|
|
(format "[%s %s]"
|
2020-05-13 13:13:14 +00:00
|
|
|
(format-time-string "(%F %T)")
|
2016-02-03 23:26:38 +00:00
|
|
|
hash))
|
|
|
|
(t (format "[%s]" hash)))
|
|
|
|
":"
|
|
|
|
(when name (concat " " name))
|
2016-10-07 21:45:08 +00:00
|
|
|
"\n"))
|
|
|
|
;; Make sure results are going to be followed by at least one blank
|
|
|
|
;; line so they do not get merged with the next element, e.g.,
|
|
|
|
;;
|
|
|
|
;; #+results:
|
|
|
|
;; : 1
|
|
|
|
;;
|
|
|
|
;; : fixed-width area, unrelated to the above.
|
|
|
|
(unless (looking-at "^[ \t]*$") (save-excursion (insert "\n")))
|
2023-05-10 13:27:13 +00:00
|
|
|
(forward-line -1)
|
2016-02-03 23:26:38 +00:00
|
|
|
(when hash (org-babel-hide-hash)))
|
|
|
|
|
|
|
|
(defun org-babel--clear-results-maybe (hash)
|
|
|
|
"Clear results when hash doesn't match HASH.
|
|
|
|
|
|
|
|
When results hash does not match HASH, remove RESULTS keyword at
|
|
|
|
point, along with related contents. Do nothing if HASH is nil.
|
|
|
|
|
|
|
|
Return a non-nil value if results were cleared. In this case,
|
|
|
|
leave point where new results should be inserted."
|
|
|
|
(when hash
|
2020-05-13 13:43:55 +00:00
|
|
|
(let ((case-fold-search t)) (looking-at org-babel-result-regexp))
|
2016-02-03 23:26:38 +00:00
|
|
|
(unless (string= (match-string 1) hash)
|
|
|
|
(let* ((e (org-element-at-point))
|
2023-05-03 14:26:41 +00:00
|
|
|
(post (copy-marker (org-element-post-affiliated e))))
|
2016-02-03 23:26:38 +00:00
|
|
|
;; Delete contents.
|
|
|
|
(delete-region post
|
|
|
|
(save-excursion
|
2023-05-03 14:26:41 +00:00
|
|
|
(goto-char (org-element-end e))
|
2016-02-03 23:26:38 +00:00
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
(line-beginning-position 2)))
|
|
|
|
;; Delete RESULT keyword. However, if RESULTS keyword is
|
|
|
|
;; orphaned, ignore this part. The deletion above already
|
|
|
|
;; took care of it.
|
|
|
|
(unless (= (point) post)
|
|
|
|
(delete-region (line-beginning-position)
|
|
|
|
(line-beginning-position 2)))
|
|
|
|
(goto-char post)
|
2016-10-01 08:30:53 +00:00
|
|
|
(set-marker post nil)
|
|
|
|
t))))
|
2016-02-03 23:26:38 +00:00
|
|
|
|
|
|
|
(defun org-babel-where-is-src-block-result (&optional insert _info hash)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Find where the current source block results begin.
|
2016-02-03 23:26:38 +00:00
|
|
|
|
2010-07-13 23:20:08 +00:00
|
|
|
Return the point at the beginning of the result of the current
|
2016-02-03 23:26:38 +00:00
|
|
|
source block, specifically at the beginning of the results line.
|
|
|
|
|
|
|
|
If no result exists for this block return nil, unless optional
|
|
|
|
argument INSERT is non-nil. In this case, create a results line
|
|
|
|
following the source block and return the position at its
|
2016-02-19 22:52:38 +00:00
|
|
|
beginning. In the case of inline code, remove the results part
|
|
|
|
instead.
|
2016-02-03 23:26:38 +00:00
|
|
|
|
|
|
|
If optional argument HASH is a string, remove contents related to
|
|
|
|
RESULTS keyword if its hash is different. Then update the latter
|
|
|
|
to HASH."
|
|
|
|
(let ((context (org-element-context)))
|
|
|
|
(catch :found
|
2012-10-24 15:23:20 +00:00
|
|
|
(org-with-wide-buffer
|
2016-02-03 23:26:38 +00:00
|
|
|
(pcase (org-element-type context)
|
|
|
|
((or `inline-babel-call `inline-src-block)
|
|
|
|
;; Results for inline objects are located right after them.
|
|
|
|
;; There is no RESULTS line to insert either.
|
2023-08-16 08:07:20 +00:00
|
|
|
(let ((limit (or (org-element-contents-end (org-element-parent context))
|
|
|
|
(org-element-end (org-element-parent context)))))
|
2023-05-03 14:26:41 +00:00
|
|
|
(goto-char (org-element-end context))
|
2016-02-18 22:12:33 +00:00
|
|
|
(skip-chars-forward " \t\n" limit)
|
|
|
|
(throw :found
|
2016-02-19 22:52:38 +00:00
|
|
|
(and
|
|
|
|
(< (point) limit)
|
|
|
|
(let ((result (org-element-context)))
|
2023-05-16 10:41:53 +00:00
|
|
|
(and (org-element-type-p result 'macro)
|
2016-02-19 22:52:38 +00:00
|
|
|
(string= (org-element-property :key result)
|
|
|
|
"results")
|
|
|
|
(if (not insert) (point)
|
|
|
|
(delete-region
|
|
|
|
(point)
|
|
|
|
(progn
|
2023-05-03 14:26:41 +00:00
|
|
|
(goto-char (org-element-end result))
|
2016-02-19 22:52:38 +00:00
|
|
|
(skip-chars-backward " \t")
|
|
|
|
(point)))
|
|
|
|
(point))))))))
|
2016-02-03 23:26:38 +00:00
|
|
|
((or `babel-call `src-block)
|
|
|
|
(let* ((name (org-element-property :name context))
|
|
|
|
(named-results (and name (org-babel-find-named-result name))))
|
2023-05-03 14:26:41 +00:00
|
|
|
(goto-char (or named-results (org-element-end context)))
|
2016-02-03 23:26:38 +00:00
|
|
|
(cond
|
|
|
|
;; Existing results named after the current source.
|
|
|
|
(named-results
|
|
|
|
(when (org-babel--clear-results-maybe hash)
|
|
|
|
(org-babel--insert-results-keyword name hash))
|
|
|
|
(throw :found (point)))
|
|
|
|
;; Named results expect but none to be found.
|
|
|
|
(name)
|
|
|
|
;; No possible anonymous results at the very end of
|
2016-02-25 13:53:00 +00:00
|
|
|
;; buffer or outside CONTEXT parent.
|
|
|
|
((eq (point)
|
2023-05-03 12:56:35 +00:00
|
|
|
(or (pcase (org-element-type (org-element-parent context))
|
2023-05-03 14:26:41 +00:00
|
|
|
((or `section `org-data)
|
|
|
|
(org-element-end (org-element-parent context)))
|
|
|
|
(_ (org-element-contents-end
|
|
|
|
(org-element-parent context))))
|
2016-02-25 13:53:00 +00:00
|
|
|
(point-max))))
|
2016-02-03 23:26:38 +00:00
|
|
|
;; Check if next element is an anonymous result below
|
|
|
|
;; the current block.
|
2016-02-25 17:03:30 +00:00
|
|
|
((let* ((next (org-element-at-point))
|
2016-02-03 23:26:38 +00:00
|
|
|
(end (save-excursion
|
|
|
|
(goto-char
|
2023-05-03 14:26:41 +00:00
|
|
|
(org-element-post-affiliated next))
|
2016-02-03 23:26:38 +00:00
|
|
|
(line-end-position)))
|
|
|
|
(empty-result-re (concat org-babel-result-regexp "$"))
|
|
|
|
(case-fold-search t))
|
|
|
|
(re-search-forward empty-result-re end t))
|
2023-05-10 13:27:13 +00:00
|
|
|
(forward-line 0)
|
2016-02-03 23:26:38 +00:00
|
|
|
(when (org-babel--clear-results-maybe hash)
|
|
|
|
(org-babel--insert-results-keyword nil hash))
|
|
|
|
(throw :found (point))))))
|
|
|
|
;; Ignore other elements.
|
|
|
|
(_ (throw :found nil))))
|
|
|
|
;; No result found. Insert a RESULTS keyword below element, if
|
|
|
|
;; appropriate. In this case, ensure there is an empty line
|
|
|
|
;; after the previous element.
|
|
|
|
(when insert
|
|
|
|
(save-excursion
|
2023-05-03 14:26:41 +00:00
|
|
|
(goto-char (min (org-element-end context) (point-max)))
|
2016-02-03 23:26:38 +00:00
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
(forward-line)
|
2016-10-07 21:45:08 +00:00
|
|
|
(unless (bolp) (insert "\n"))
|
|
|
|
(insert "\n")
|
2016-02-03 23:26:38 +00:00
|
|
|
(org-babel--insert-results-keyword
|
|
|
|
(org-element-property :name context) hash)
|
|
|
|
(point))))))
|
2009-05-21 13:40:04 +00:00
|
|
|
|
2015-11-05 14:44:22 +00:00
|
|
|
(defun org-babel-read-element (element)
|
|
|
|
"Read ELEMENT into emacs-lisp.
|
|
|
|
Return nil if ELEMENT cannot be read."
|
|
|
|
(org-with-wide-buffer
|
2023-05-03 14:26:41 +00:00
|
|
|
(goto-char (org-element-post-affiliated element))
|
2015-11-05 14:44:22 +00:00
|
|
|
(pcase (org-element-type element)
|
|
|
|
(`fixed-width
|
2016-06-21 13:24:06 +00:00
|
|
|
(let ((v (org-trim (org-element-property :value element))))
|
2016-09-03 00:52:27 +00:00
|
|
|
(or (org-babel--string-to-number v) v)))
|
2015-11-05 14:44:22 +00:00
|
|
|
(`table (org-babel-read-table))
|
|
|
|
(`plain-list (org-babel-read-list))
|
2022-08-13 18:49:27 +00:00
|
|
|
((or `example-block `src-block)
|
2016-02-10 21:58:00 +00:00
|
|
|
(let ((v (org-element-property :value element)))
|
2023-07-13 08:51:15 +00:00
|
|
|
(if (org-src-preserve-indentation-p element) v
|
2016-02-10 21:58:00 +00:00
|
|
|
(org-remove-indentation v))))
|
|
|
|
(`export-block
|
2015-11-05 14:44:22 +00:00
|
|
|
(org-remove-indentation (org-element-property :value element)))
|
|
|
|
(`paragraph
|
|
|
|
;; Treat paragraphs containing a single link specially.
|
|
|
|
(skip-chars-forward " \t")
|
2018-11-26 23:04:41 +00:00
|
|
|
(if (and (looking-at org-link-bracket-re)
|
2015-11-05 14:44:22 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
(skip-chars-forward " \r\t\n")
|
2023-05-03 14:26:41 +00:00
|
|
|
(<= (org-element-end element)
|
2015-11-05 14:44:22 +00:00
|
|
|
(point))))
|
|
|
|
(org-babel-read-link)
|
|
|
|
(buffer-substring-no-properties
|
2023-05-03 14:26:41 +00:00
|
|
|
(org-element-contents-begin element)
|
|
|
|
(org-element-contents-end element))))
|
2015-11-06 22:33:45 +00:00
|
|
|
((or `center-block `quote-block `verse-block `special-block)
|
2015-11-05 14:44:22 +00:00
|
|
|
(org-remove-indentation
|
|
|
|
(buffer-substring-no-properties
|
2023-05-03 14:26:41 +00:00
|
|
|
(org-element-contents-begin element)
|
|
|
|
(org-element-contents-end element))))
|
2015-11-05 14:44:22 +00:00
|
|
|
(_ nil))))
|
|
|
|
|
2009-07-25 02:52:55 +00:00
|
|
|
(defun org-babel-read-result ()
|
2016-02-10 21:58:00 +00:00
|
|
|
"Read the result at point into emacs-lisp."
|
|
|
|
(and (not (save-excursion
|
2023-05-10 13:27:13 +00:00
|
|
|
(forward-line 0)
|
|
|
|
(looking-at-p "[ \t]*$")))
|
2016-02-10 21:58:00 +00:00
|
|
|
(org-babel-read-element (org-element-at-point))))
|
2009-07-25 02:52:55 +00:00
|
|
|
|
|
|
|
(defun org-babel-read-table ()
|
2016-02-10 21:58:00 +00:00
|
|
|
"Read the table at point into emacs-lisp."
|
2009-07-25 02:52:55 +00:00
|
|
|
(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 ()
|
2022-11-15 05:52:04 +00:00
|
|
|
"Read the list at point into emacs-lisp.
|
|
|
|
|
|
|
|
Return the list of strings representing top level items:
|
|
|
|
|
|
|
|
(item1 item2 ...)
|
|
|
|
|
2022-11-30 02:22:05 +00:00
|
|
|
Only consider top level items. See Info node
|
|
|
|
`(org)Environment of a Code Block'."
|
2022-11-15 05:52:04 +00:00
|
|
|
(mapcar (lambda (el) (org-babel-read (car el) 'inhibit-lisp-eval))
|
2015-12-02 22:30:54 +00:00
|
|
|
(cdr (org-list-to-lisp))))
|
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 ()
|
2016-02-10 21:58:00 +00:00
|
|
|
"Read the link at point into emacs-lisp.
|
2010-07-13 23:20:08 +00:00
|
|
|
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)
|
2018-11-26 23:04:41 +00:00
|
|
|
(raw (and (looking-at org-link-bracket-re)
|
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)
|
2023-08-26 12:06:20 +00:00
|
|
|
"Format RESULT for writing to file.
|
|
|
|
When RESULT is a list, write it as a table, use tab or SEP as column
|
|
|
|
separator."
|
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
|
|
|
|
2022-09-17 09:53:01 +00:00
|
|
|
(defun org-babel-insert-result (result &optional result-params info hash lang exec-time)
|
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
|
2022-09-17 09:53:01 +00:00
|
|
|
not allowed. When EXEC-TIME is provided it may be included in a
|
|
|
|
generated message. With optional argument RESULT-PARAMS controls
|
2015-01-29 20:05:31 +00:00
|
|
|
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
|
|
|
|
2016-08-23 20:13:56 +00:00
|
|
|
silent -- no results are inserted into the Org buffer but
|
2012-11-16 15:40:46 +00:00
|
|
|
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
|
|
|
|
2021-08-15 19:13:51 +00:00
|
|
|
none ---- no results are inserted into the Org buffer nor
|
2023-08-04 08:33:33 +00:00
|
|
|
echoed to the minibuffer. They are not processed into
|
2021-08-15 19:13:51 +00:00
|
|
|
Emacs-lisp objects at all.
|
|
|
|
|
2009-08-24 17:35:59 +00:00
|
|
|
file ---- the results are interpreted as a file path, and are
|
2016-08-23 20:13:56 +00:00
|
|
|
inserted into the buffer using the Org file syntax.
|
2009-08-24 17:35:59 +00:00
|
|
|
|
2016-08-23 20:13:56 +00:00
|
|
|
list ---- the results are interpreted as an Org list.
|
2010-11-17 23:42:52 +00:00
|
|
|
|
2016-08-23 20:13:56 +00:00
|
|
|
raw ----- results are added directly to the Org file. This is
|
|
|
|
a good option if you code block will output Org
|
2009-08-18 23:55:10 +00:00
|
|
|
formatted text.
|
|
|
|
|
2016-08-23 20:13:56 +00:00
|
|
|
drawer -- results are added directly to the Org 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-02-03 15:16:54 +00:00
|
|
|
html ---- results are added inside of a #+BEGIN_EXPORT HTML block
|
|
|
|
or html export snippet depending on whether the current
|
2015-01-29 20:05:31 +00:00
|
|
|
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-02-03 15:16:54 +00:00
|
|
|
latex --- results are added inside of a #+BEGIN_EXPORT 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
|
2018-09-20 09:23:49 +00:00
|
|
|
allowed for inline source blocks.
|
2015-01-29 20:05:31 +00:00
|
|
|
|
|
|
|
table --- the results are rendered as a table. This option not
|
2018-09-20 09:23:49 +00:00
|
|
|
allowed for inline source blocks.
|
2015-01-29 20:05:31 +00:00
|
|
|
|
|
|
|
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."
|
2016-02-19 23:06:14 +00:00
|
|
|
(cond ((stringp result)
|
|
|
|
(setq result (org-no-properties result))
|
|
|
|
(when (member "file" result-params)
|
2022-06-10 07:01:37 +00:00
|
|
|
(setq result
|
|
|
|
(org-babel-result-to-file
|
|
|
|
result
|
|
|
|
(org-babel--file-desc (nth 2 info) result)
|
|
|
|
'attachment))))
|
2016-02-19 23:06:14 +00:00
|
|
|
((listp result))
|
|
|
|
(t (setq result (format "%S" result))))
|
2022-06-10 07:01:37 +00:00
|
|
|
|
2010-09-07 22:58:39 +00:00
|
|
|
(if (and result-params (member "silent" result-params))
|
2016-02-19 23:06:14 +00:00
|
|
|
(progn (message (replace-regexp-in-string "%" "%%" (format "%S" result)))
|
|
|
|
result)
|
|
|
|
(let ((inline (let ((context (org-element-context)))
|
2023-05-16 10:41:53 +00:00
|
|
|
(and (org-element-type-p
|
|
|
|
context '(inline-babel-call inline-src-block))
|
2016-02-19 23:06:14 +00:00
|
|
|
context))))
|
|
|
|
(when inline
|
|
|
|
(let ((warning
|
|
|
|
(or (and (member "table" result-params) "`:results table'")
|
2023-08-16 08:04:14 +00:00
|
|
|
(and (member "drawer" result-params) "`:results drawer'")
|
2022-09-01 13:15:11 +00:00
|
|
|
(and result (listp result) "list result")
|
|
|
|
(and result (string-match-p "\n." result) "multiline result")
|
2016-02-19 23:06:14 +00:00
|
|
|
(and (member "list" result-params) "`:results list'"))))
|
|
|
|
(when warning
|
|
|
|
(user-error "Inline error: %s cannot be used" warning))))
|
|
|
|
(save-excursion
|
|
|
|
(let* ((visible-beg (point-min-marker))
|
|
|
|
(visible-end (copy-marker (point-max) t))
|
|
|
|
(existing-result (org-babel-where-is-src-block-result t nil hash))
|
|
|
|
(results-switches (cdr (assq :results_switches (nth 2 info))))
|
|
|
|
;; When results exist outside of the current visible
|
|
|
|
;; region of the buffer, be sure to widen buffer to
|
|
|
|
;; update them.
|
|
|
|
(outside-scope (and existing-result
|
|
|
|
(buffer-narrowed-p)
|
|
|
|
(or (> visible-beg existing-result)
|
|
|
|
(<= visible-end existing-result))))
|
|
|
|
beg end indent)
|
|
|
|
;; Ensure non-inline results end in a newline.
|
|
|
|
(when (and (org-string-nw-p result)
|
|
|
|
(not inline)
|
|
|
|
(not (string-equal (substring result -1) "\n")))
|
|
|
|
(setq result (concat result "\n")))
|
|
|
|
(unwind-protect
|
|
|
|
(progn
|
|
|
|
(when outside-scope (widen))
|
|
|
|
(if existing-result (goto-char existing-result)
|
2023-05-03 14:26:41 +00:00
|
|
|
(goto-char (org-element-end inline))
|
2016-02-19 23:06:14 +00:00
|
|
|
(skip-chars-backward " \t"))
|
|
|
|
(unless inline
|
2018-05-08 23:26:31 +00:00
|
|
|
(setq indent (current-indentation))
|
2016-02-19 23:06:14 +00:00
|
|
|
(forward-line 1))
|
|
|
|
(setq beg (point))
|
2012-10-24 15:23:20 +00:00
|
|
|
(cond
|
2016-02-19 23:06:14 +00:00
|
|
|
(inline
|
|
|
|
;; Make sure new results are separated from the
|
|
|
|
;; source code by one space.
|
|
|
|
(unless existing-result
|
|
|
|
(insert " ")
|
|
|
|
(setq beg (point))))
|
|
|
|
((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)))
|
2023-04-09 13:27:28 +00:00
|
|
|
;; ((member "prepend" result-params)) ; already there
|
2023-04-27 20:38:35 +00:00
|
|
|
)
|
2016-02-19 23:06:14 +00:00
|
|
|
(setq results-switches
|
|
|
|
(if results-switches (concat " " results-switches) ""))
|
2017-08-13 14:20:20 +00:00
|
|
|
(let ((wrap
|
|
|
|
(lambda (start finish &optional no-escape no-newlines
|
2021-09-29 07:22:47 +00:00
|
|
|
inline-start inline-finish)
|
2017-08-13 14:20:20 +00:00
|
|
|
(when inline
|
|
|
|
(setq start inline-start)
|
|
|
|
(setq finish inline-finish)
|
|
|
|
(setq no-newlines t))
|
2019-08-22 08:03:56 +00:00
|
|
|
(let ((before-finish (copy-marker end)))
|
2017-08-13 14:20:20 +00:00
|
|
|
(goto-char end)
|
|
|
|
(insert (concat finish (unless no-newlines "\n")))
|
|
|
|
(goto-char beg)
|
|
|
|
(insert (concat start (unless no-newlines "\n")))
|
|
|
|
(unless no-escape
|
|
|
|
(org-escape-code-in-region
|
|
|
|
(min (point) before-finish) before-finish))
|
|
|
|
(goto-char end))))
|
2016-02-19 23:06:14 +00:00
|
|
|
(tabulablep
|
|
|
|
(lambda (r)
|
|
|
|
;; Non-nil when result R can be turned into
|
|
|
|
;; a table.
|
2018-07-10 01:46:33 +00:00
|
|
|
(and (proper-list-p r)
|
2016-02-19 23:06:14 +00:00
|
|
|
(cl-every
|
2018-07-10 01:46:33 +00:00
|
|
|
(lambda (e) (or (atom e) (proper-list-p e)))
|
2016-02-19 23:06:14 +00:00
|
|
|
result)))))
|
|
|
|
;; insert results based on type
|
|
|
|
(cond
|
|
|
|
;; Do nothing for an empty result.
|
|
|
|
((null result))
|
|
|
|
;; Insert a list if preferred.
|
|
|
|
((member "list" result-params)
|
|
|
|
(insert
|
2016-06-21 13:24:06 +00:00
|
|
|
(org-trim
|
2022-01-09 08:12:48 +00:00
|
|
|
(org-list-to-org
|
2022-12-25 11:20:48 +00:00
|
|
|
;; We arbitrarily choose to format non-strings
|
|
|
|
;; as %S.
|
2016-02-19 23:06:14 +00:00
|
|
|
(cons 'unordered
|
|
|
|
(mapcar
|
|
|
|
(lambda (e)
|
2022-12-18 11:04:57 +00:00
|
|
|
(cond
|
|
|
|
((stringp e) (list e))
|
|
|
|
((listp e)
|
2022-12-25 11:20:48 +00:00
|
|
|
(mapcar
|
|
|
|
(lambda (x)
|
|
|
|
(if (stringp x) x (format "%S" x)))
|
|
|
|
e))
|
2022-12-18 11:04:57 +00:00
|
|
|
(t (list (format "%S" e)))))
|
2016-02-19 23:06:14 +00:00
|
|
|
(if (listp result) result
|
|
|
|
(split-string result "\n" t))))
|
|
|
|
'(:splicep nil :istart "- " :iend "\n")))
|
|
|
|
"\n"))
|
|
|
|
;; Try hard to print RESULT as a table. Give up if
|
|
|
|
;; it contains an improper list.
|
|
|
|
((funcall tabulablep result)
|
|
|
|
(goto-char beg)
|
|
|
|
(insert (concat (orgtbl-to-orgtbl
|
|
|
|
(if (cl-every
|
|
|
|
(lambda (e)
|
|
|
|
(or (eq e 'hline) (listp e)))
|
|
|
|
result)
|
|
|
|
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)))
|
|
|
|
((member "file" result-params)
|
|
|
|
(when inline
|
|
|
|
(setq result (org-macro-escape-arguments result)))
|
|
|
|
(insert result))
|
|
|
|
((and inline (not (member "raw" result-params)))
|
|
|
|
(insert (org-macro-escape-arguments
|
|
|
|
(org-babel-chomp result "\n"))))
|
|
|
|
(t (goto-char beg) (insert result)))
|
2017-08-13 14:20:20 +00:00
|
|
|
(setq end (copy-marker (point) t))
|
2020-04-06 23:42:35 +00:00
|
|
|
;; Possibly wrap result.
|
2016-02-19 23:06:14 +00:00
|
|
|
(cond
|
2016-09-22 17:45:15 +00:00
|
|
|
((assq :wrap (nth 2 info))
|
2020-04-06 23:42:35 +00:00
|
|
|
(let* ((full (or (cdr (assq :wrap (nth 2 info))) "results"))
|
|
|
|
(split (split-string full))
|
|
|
|
(type (car split))
|
|
|
|
(opening-line (concat "#+begin_" full))
|
|
|
|
(closing-line (concat "#+end_" type)))
|
|
|
|
(cond
|
|
|
|
;; Escape contents from "export" wrap. Wrap
|
|
|
|
;; inline results within an export snippet with
|
|
|
|
;; appropriate value.
|
2022-10-04 21:42:27 +00:00
|
|
|
((org-string-equal-ignore-case type "export")
|
2020-04-06 23:42:35 +00:00
|
|
|
(let ((backend (pcase split
|
|
|
|
(`(,_) "none")
|
|
|
|
(`(,_ ,b . ,_) b))))
|
|
|
|
(funcall wrap
|
|
|
|
opening-line closing-line
|
|
|
|
nil nil
|
|
|
|
(format "{{{results(@@%s:"
|
|
|
|
backend) "@@)}}}")))
|
|
|
|
;; Escape contents from "example" wrap. Mark
|
|
|
|
;; inline results as verbatim.
|
2022-10-04 21:42:27 +00:00
|
|
|
((org-string-equal-ignore-case type "example")
|
2020-04-06 23:42:35 +00:00
|
|
|
(funcall wrap
|
|
|
|
opening-line closing-line
|
|
|
|
nil nil
|
|
|
|
"{{{results(=" "=)}}}"))
|
|
|
|
;; Escape contents from "src" wrap. Mark
|
|
|
|
;; inline results as inline source code.
|
2022-10-04 21:42:27 +00:00
|
|
|
((org-string-equal-ignore-case type "src")
|
2020-04-06 23:42:35 +00:00
|
|
|
(let ((inline-open
|
|
|
|
(pcase split
|
|
|
|
(`(,_)
|
|
|
|
"{{{results(src_none{")
|
|
|
|
(`(,_ ,language)
|
|
|
|
(format "{{{results(src_%s{" language))
|
|
|
|
(`(,_ ,language . ,rest)
|
|
|
|
(let ((r (mapconcat #'identity rest " ")))
|
|
|
|
(format "{{{results(src_%s[%s]{"
|
|
|
|
language r))))))
|
|
|
|
(funcall wrap
|
|
|
|
opening-line closing-line
|
|
|
|
nil nil
|
|
|
|
inline-open "})}}}")))
|
|
|
|
;; Do not escape contents in non-verbatim
|
|
|
|
;; blocks. Return plain inline results.
|
|
|
|
(t
|
|
|
|
(funcall wrap
|
|
|
|
opening-line closing-line
|
|
|
|
t nil
|
|
|
|
"{{{results(" ")}}}")))))
|
2016-02-19 23:06:14 +00:00
|
|
|
((member "html" result-params)
|
2017-12-10 22:05:32 +00:00
|
|
|
(funcall wrap "#+begin_export html" "#+end_export" nil nil
|
2016-02-19 23:06:14 +00:00
|
|
|
"{{{results(@@html:" "@@)}}}"))
|
|
|
|
((member "latex" result-params)
|
2017-12-10 22:05:32 +00:00
|
|
|
(funcall wrap "#+begin_export latex" "#+end_export" nil nil
|
2016-02-19 23:06:14 +00:00
|
|
|
"{{{results(@@latex:" "@@)}}}"))
|
|
|
|
((member "org" result-params)
|
2016-09-03 01:45:27 +00:00
|
|
|
(goto-char beg) (when (org-at-table-p) (org-cycle))
|
2017-12-10 22:05:32 +00:00
|
|
|
(funcall wrap "#+begin_src org" "#+end_src" nil nil
|
2016-02-19 23:06:14 +00:00
|
|
|
"{{{results(src_org{" "})}}}"))
|
|
|
|
((member "code" result-params)
|
|
|
|
(let ((lang (or lang "none")))
|
2017-12-10 22:05:32 +00:00
|
|
|
(funcall wrap (format "#+begin_src %s%s" lang results-switches)
|
|
|
|
"#+end_src" nil nil
|
2016-02-19 23:06:14 +00:00
|
|
|
(format "{{{results(src_%s[%s]{" lang results-switches)
|
|
|
|
"})}}}")))
|
|
|
|
((member "raw" result-params)
|
2016-09-03 01:45:27 +00:00
|
|
|
(goto-char beg) (when (org-at-table-p) (org-cycle)))
|
2016-02-19 23:06:14 +00:00
|
|
|
((or (member "drawer" result-params)
|
|
|
|
;; Stay backward compatible with <7.9.2
|
|
|
|
(member "wrap" result-params))
|
2016-09-03 01:45:27 +00:00
|
|
|
(goto-char beg) (when (org-at-table-p) (org-cycle))
|
2017-12-10 22:05:32 +00:00
|
|
|
(funcall wrap ":results:" ":end:" 'no-escape nil
|
2016-02-19 23:06:14 +00:00
|
|
|
"{{{results(" ")}}}"))
|
|
|
|
((and inline (member "file" result-params))
|
|
|
|
(funcall wrap nil nil nil nil "{{{results(" ")}}}"))
|
|
|
|
((and (not (funcall tabulablep result))
|
|
|
|
(not (member "file" result-params)))
|
|
|
|
(let ((org-babel-inline-result-wrap
|
2017-08-13 14:20:20 +00:00
|
|
|
;; Hard code {{{results(...)}}} on top of
|
|
|
|
;; customization.
|
2016-02-19 23:06:14 +00:00
|
|
|
(format "{{{results(%s)}}}"
|
|
|
|
org-babel-inline-result-wrap)))
|
2017-08-13 14:20:20 +00:00
|
|
|
(org-babel-examplify-region
|
|
|
|
beg end results-switches inline)))))
|
2016-02-19 23:06:14 +00:00
|
|
|
;; Possibly indent results in par with #+results line.
|
|
|
|
(when (and (not inline) (numberp 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))
|
2022-09-17 09:53:01 +00:00
|
|
|
(let ((time-info
|
|
|
|
;; Only show the time when something other than
|
|
|
|
;; 0s will be shown, i.e. check if the time is at
|
|
|
|
;; least half of the displayed precision.
|
|
|
|
(if (and exec-time (> (float-time exec-time) 0.05))
|
|
|
|
(format " (took %.1fs)" (float-time exec-time))
|
|
|
|
"")))
|
|
|
|
(if (null result)
|
|
|
|
(if (member "value" result-params)
|
|
|
|
(message "Code block returned no value%s." time-info)
|
|
|
|
(message "Code block produced no output%s." time-info))
|
|
|
|
(message "Code block evaluation complete%s." time-info))))
|
2022-11-06 12:57:40 +00:00
|
|
|
(when end (set-marker end nil))
|
2016-02-19 23:06:14 +00:00
|
|
|
(when outside-scope (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)
|
2020-05-13 13:43:55 +00:00
|
|
|
(let ((location (org-babel-where-is-src-block-result nil info))
|
|
|
|
(case-fold-search t))
|
2009-11-20 17:40:50 +00:00
|
|
|
(when location
|
|
|
|
(save-excursion
|
2013-09-20 21:07:15 +00:00
|
|
|
(goto-char location)
|
2020-02-20 14:45:44 +00:00
|
|
|
(when (looking-at org-babel-result-regexp)
|
2013-09-20 21:07:15 +00:00
|
|
|
(delete-region
|
2017-11-25 20:07:52 +00:00
|
|
|
(if keep-keyword (line-beginning-position 2)
|
|
|
|
(save-excursion
|
|
|
|
(skip-chars-backward " \r\t\n")
|
|
|
|
(line-beginning-position 2)))
|
|
|
|
(progn (forward-line) (org-babel-result-end))))))))
|
2009-06-14 00:07:03 +00:00
|
|
|
|
2016-02-10 15:06:41 +00:00
|
|
|
(defun org-babel-remove-inline-result (&optional datum)
|
2015-01-29 20:05:31 +00:00
|
|
|
"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.
|
2016-02-18 22:12:33 +00:00
|
|
|
Leading white space is trimmed."
|
2015-01-31 03:27:54 +00:00
|
|
|
(interactive)
|
2016-02-18 22:12:33 +00:00
|
|
|
(let* ((el (or datum (org-element-context))))
|
2023-05-16 10:41:53 +00:00
|
|
|
(when (org-element-type-p el '(inline-src-block inline-babel-call))
|
2015-01-29 20:05:31 +00:00
|
|
|
(org-with-wide-buffer
|
2023-05-03 14:26:41 +00:00
|
|
|
(goto-char (org-element-end el))
|
2016-02-18 22:12:33 +00:00
|
|
|
(skip-chars-backward " \t")
|
|
|
|
(let ((result (save-excursion
|
|
|
|
(skip-chars-forward
|
|
|
|
" \t\n"
|
2023-05-03 14:26:41 +00:00
|
|
|
(org-element-contents-end
|
|
|
|
(org-element-parent el)))
|
2016-02-18 22:12:33 +00:00
|
|
|
(org-element-context))))
|
2023-05-16 10:41:53 +00:00
|
|
|
(when (and (org-element-type-p result 'macro)
|
2016-02-18 22:12:33 +00:00
|
|
|
(string= (org-element-property :key result) "results"))
|
2016-02-10 15:06:41 +00:00
|
|
|
(delete-region ; And leading whitespace.
|
2016-02-18 22:12:33 +00:00
|
|
|
(point)
|
2023-05-03 14:26:41 +00:00
|
|
|
(progn (goto-char (org-element-end result))
|
2016-02-18 22:12:33 +00:00
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
(point)))))))))
|
2015-01-29 20:05:31 +00:00
|
|
|
|
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."
|
2017-11-25 20:07:52 +00:00
|
|
|
(cond ((looking-at-p "^[ \t]*$") (point)) ;no result
|
2018-11-26 23:04:41 +00:00
|
|
|
((looking-at-p (format "^[ \t]*%s[ \t]*$" org-link-bracket-re))
|
2017-11-25 20:07:52 +00:00
|
|
|
(line-beginning-position 2))
|
2017-11-27 22:23:04 +00:00
|
|
|
(t
|
|
|
|
(let ((element (org-element-at-point)))
|
2023-05-16 10:41:53 +00:00
|
|
|
(if (org-element-type-p
|
|
|
|
element
|
|
|
|
;; Possible results types.
|
|
|
|
'(drawer example-block export-block fixed-width
|
|
|
|
special-block src-block item plain-list table
|
|
|
|
latex-environment))
|
2017-11-27 22:23:04 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char (min (point-max) ;for narrowed buffers
|
2023-05-03 14:26:41 +00:00
|
|
|
(org-element-end element)))
|
2017-11-27 22:23:04 +00:00
|
|
|
(skip-chars-backward " \r\t\n")
|
|
|
|
(line-beginning-position 2))
|
|
|
|
(point))))))
|
2009-02-23 06:19:34 +00:00
|
|
|
|
2022-06-10 07:01:37 +00:00
|
|
|
(defun org-babel-result-to-file (result &optional description type)
|
2017-12-31 14:48:09 +00:00
|
|
|
"Convert RESULT into an Org link with optional DESCRIPTION.
|
2010-07-13 23:20:08 +00:00
|
|
|
If the `default-directory' is different from the containing
|
2022-06-10 07:01:37 +00:00
|
|
|
file's directory then expand relative links.
|
|
|
|
|
2022-07-25 19:54:49 +00:00
|
|
|
If the optional TYPE is passed as `attachment' and the path is a
|
2022-06-10 07:01:37 +00:00
|
|
|
descendant of the DEFAULT-DIRECTORY, the generated link will be
|
|
|
|
specified as an an \"attachment:\" style link."
|
2012-03-31 14:04:31 +00:00
|
|
|
(when (stringp result)
|
2022-06-10 07:01:37 +00:00
|
|
|
(let* ((result-file-name (expand-file-name result))
|
|
|
|
(base-file-name (buffer-file-name (buffer-base-buffer)))
|
2023-07-17 09:04:05 +00:00
|
|
|
(base-directory (and base-file-name
|
2022-06-10 07:01:37 +00:00
|
|
|
(file-name-directory base-file-name)))
|
|
|
|
(same-directory?
|
|
|
|
(and base-file-name
|
|
|
|
(not (string= (expand-file-name default-directory)
|
2022-12-10 21:52:42 +00:00
|
|
|
(expand-file-name
|
|
|
|
base-directory)))))
|
2022-06-10 07:01:37 +00:00
|
|
|
(request-attachment (eq type 'attachment))
|
|
|
|
(attach-dir (let* ((default-directory base-directory)
|
|
|
|
(dir (org-attach-dir nil t)))
|
|
|
|
(when dir
|
|
|
|
(expand-file-name dir))))
|
|
|
|
(in-attach-dir (and request-attachment
|
|
|
|
attach-dir
|
|
|
|
(string-prefix-p
|
|
|
|
attach-dir
|
|
|
|
result-file-name))))
|
|
|
|
(format "[[%s:%s]%s]"
|
|
|
|
(pcase type
|
|
|
|
((and 'attachment (guard in-attach-dir)) "attachment")
|
|
|
|
(_ "file"))
|
|
|
|
(if (and request-attachment in-attach-dir)
|
2022-12-07 11:13:49 +00:00
|
|
|
(file-relative-name
|
|
|
|
result-file-name
|
|
|
|
(file-name-as-directory attach-dir))
|
2022-06-10 07:01:37 +00:00
|
|
|
(if (and default-directory
|
|
|
|
base-file-name same-directory?)
|
|
|
|
(if (eq org-link-file-path-type 'adaptive)
|
|
|
|
(file-relative-name
|
|
|
|
result-file-name
|
|
|
|
(file-name-directory
|
|
|
|
base-file-name))
|
|
|
|
result-file-name)
|
|
|
|
result))
|
2018-03-06 06:41:20 +00:00
|
|
|
(if description (concat "[" description "]") "")))))
|
2009-05-22 22:38:51 +00:00
|
|
|
|
2016-02-18 22:12:33 +00:00
|
|
|
(defun org-babel-examplify-region (beg end &optional results-switches inline)
|
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")
|
2016-02-18 22:12:33 +00:00
|
|
|
(let ((maybe-cap
|
|
|
|
(lambda (str)
|
2017-01-25 04:54:58 +00:00
|
|
|
(if org-babel-uppercase-example-markers (upcase str) str))))
|
2016-02-18 22:12:33 +00:00
|
|
|
(if inline
|
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
|
2016-02-18 22:12:33 +00:00
|
|
|
(delete-and-extract-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)
|
2016-06-20 12:35:16 +00:00
|
|
|
(dotimes (_ size)
|
2023-05-10 13:27:13 +00:00
|
|
|
(forward-line 0) (insert ": ") (forward-line 1)))
|
2011-01-27 18:31:47 +00:00
|
|
|
(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")))
|
2017-03-01 21:19:04 +00:00
|
|
|
(let ((p (point)))
|
|
|
|
(if (markerp end) (goto-char end) (forward-char (- end beg)))
|
|
|
|
(org-escape-code-in-region p (point)))
|
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)))
|
2023-05-16 10:41:53 +00:00
|
|
|
(unless (org-element-type-p element 'src-block)
|
2016-01-31 10:36:52 +00:00
|
|
|
(error "Not in a source block"))
|
|
|
|
(goto-char (org-babel-where-is-src-block-head element))
|
2022-10-04 07:21:20 +00:00
|
|
|
(let* ((ind (org-current-text-indentation))
|
2016-01-31 10:36:52 +00:00
|
|
|
(body-start (line-beginning-position 2))
|
|
|
|
(body (org-element-normalize-string
|
2023-07-13 08:51:15 +00:00
|
|
|
(if (org-src-preserve-indentation-p element) new-body
|
2016-01-31 10:36:52 +00:00
|
|
|
(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
|
2023-05-03 14:26:41 +00:00
|
|
|
(goto-char (org-element-end element))
|
2016-01-31 10:36:52 +00:00
|
|
|
(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))
|
2016-09-23 10:18:24 +00:00
|
|
|
(cdr (assq 'results org-babel-common-header-args-w-values))))
|
2012-08-10 15:44:45 +00:00
|
|
|
(exports-exclusive-groups
|
|
|
|
(mapcar (lambda (group) (mapcar #'symbol-name group))
|
2016-09-23 10:18:24 +00:00
|
|
|
(cdr (assq 'exports org-babel-common-header-args-w-values))))
|
2016-06-20 12:35:16 +00:00
|
|
|
(merge
|
|
|
|
(lambda (exclusive-groups &rest result-params)
|
|
|
|
;; Maintain exclusivity of mutually exclusive parameters,
|
|
|
|
;; as defined in EXCLUSIVE-GROUPS while merging lists in
|
|
|
|
;; RESULT-PARAMS.
|
|
|
|
(let (output)
|
|
|
|
(dolist (new-params result-params (delete-dups output))
|
|
|
|
(dolist (new-param new-params)
|
|
|
|
(dolist (exclusive-group exclusive-groups)
|
|
|
|
(when (member new-param exclusive-group)
|
|
|
|
(setq output (cl-remove-if
|
|
|
|
(lambda (o) (member o exclusive-group))
|
|
|
|
output))))
|
|
|
|
(push new-param output))))))
|
|
|
|
(variable-index 0) ;Handle positional arguments.
|
|
|
|
clearnames
|
|
|
|
params ;Final parameters list.
|
|
|
|
;; Some keywords accept multiple values. We need to treat
|
|
|
|
;; them specially.
|
|
|
|
vars results exports)
|
|
|
|
(dolist (plist plists)
|
|
|
|
(dolist (pair plist)
|
|
|
|
(pcase pair
|
|
|
|
(`(:var . ,value)
|
|
|
|
(let ((name (cond
|
2022-06-28 03:41:02 +00:00
|
|
|
;; Default header arguments can accept lambda
|
|
|
|
;; functions. We uniquely identify the var
|
|
|
|
;; according to the full string contents of
|
|
|
|
;; the lambda function.
|
|
|
|
((functionp value) value)
|
2016-06-20 12:35:16 +00:00
|
|
|
((listp value) (car value))
|
|
|
|
((string-match "^\\([^= \f\t\n\r\v]+\\)[ \t]*=" value)
|
|
|
|
(intern (match-string 1 value)))
|
|
|
|
(t nil))))
|
|
|
|
(cond
|
|
|
|
(name
|
|
|
|
(setq vars
|
|
|
|
(append (if (not (assoc name vars)) vars
|
|
|
|
(push name clearnames)
|
|
|
|
(cl-remove-if (lambda (p) (equal name (car p)))
|
|
|
|
vars))
|
|
|
|
(list (cons name pair)))))
|
|
|
|
((and vars (nth variable-index vars))
|
|
|
|
;; If no name is given and we already have named
|
|
|
|
;; variables then assign to named variables in order.
|
|
|
|
(let ((name (car (nth variable-index vars))))
|
|
|
|
;; Clear out colnames and rownames for replace vars.
|
|
|
|
(push name clearnames)
|
|
|
|
(setf (cddr (nth variable-index vars))
|
|
|
|
(concat (symbol-name name) "=" value))
|
|
|
|
(cl-incf variable-index)))
|
|
|
|
(t (error "Variable \"%s\" must be assigned a default value"
|
|
|
|
(cdr pair))))))
|
|
|
|
(`(:results . ,value)
|
|
|
|
(setq results (funcall merge
|
|
|
|
results-exclusive-groups
|
|
|
|
results
|
|
|
|
(split-string
|
2021-09-29 12:05:10 +00:00
|
|
|
(cond ((stringp value) value)
|
|
|
|
((functionp value) (funcall value))
|
2023-01-02 07:49:11 +00:00
|
|
|
;; FIXME: Arbitrary code evaluation.
|
2021-09-29 12:05:10 +00:00
|
|
|
(t (eval value t)))))))
|
2016-06-20 12:35:16 +00:00
|
|
|
(`(:exports . ,value)
|
|
|
|
(setq exports (funcall merge
|
|
|
|
exports-exclusive-groups
|
|
|
|
exports
|
2022-06-10 07:01:37 +00:00
|
|
|
(split-string
|
2021-09-29 12:05:10 +00:00
|
|
|
(cond ((and value (functionp value)) (funcall value))
|
|
|
|
(value value)
|
|
|
|
(t ""))))))
|
2022-06-10 07:01:37 +00:00
|
|
|
((or '(:dir . attach) '(:dir . "'attach"))
|
|
|
|
(unless (org-attach-dir nil t)
|
|
|
|
(error "No attachment directory for element (add :ID: or :DIR: property)"))
|
|
|
|
(setq params (append
|
|
|
|
`((:dir . ,(org-attach-dir nil t))
|
|
|
|
(:mkdirp . "yes"))
|
|
|
|
(assq-delete-all :dir (assq-delete-all :mkdir params)))))
|
2016-06-20 12:35:16 +00:00
|
|
|
;; Regular keywords: any value overwrites the previous one.
|
|
|
|
(_ (setq params (cons pair (assq-delete-all (car pair) params)))))))
|
|
|
|
;; Handle `:var' and clear out colnames and rownames for replaced
|
|
|
|
;; variables.
|
|
|
|
(setq params (nconc (mapcar (lambda (v) (cons :var (cddr v))) vars)
|
|
|
|
params))
|
|
|
|
(dolist (name clearnames)
|
|
|
|
(dolist (param '(:colname-names :rowname-names))
|
|
|
|
(when (assq param params)
|
|
|
|
(setf (cdr (assq param params))
|
|
|
|
(cl-remove-if (lambda (pair) (equal name (car pair)))
|
|
|
|
(cdr (assq param params))))
|
|
|
|
(setq params
|
|
|
|
(cl-remove-if (lambda (pair) (and (equal (car pair) param)
|
2020-08-28 18:05:59 +00:00
|
|
|
(null (cdr pair))))
|
2016-06-20 12:35:16 +00:00
|
|
|
params)))))
|
|
|
|
;; Handle other special keywords, which accept multiple values.
|
|
|
|
(setq params (nconc (list (cons :results (mapconcat #'identity results " "))
|
|
|
|
(cons :exports (mapconcat #'identity exports " ")))
|
|
|
|
params))
|
|
|
|
;; Return merged params.
|
2020-08-28 18:05:59 +00:00
|
|
|
(org-babel-eval-headers params)))
|
2009-06-15 16:22:36 +00:00
|
|
|
|
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."
|
2016-06-20 12:35:16 +00:00
|
|
|
(let ((allowed-values (cl-case context
|
2022-11-06 20:08:06 +00:00
|
|
|
(:tangle '("yes" "tangle" "no-export" "strip-export" "strip-tangle"))
|
|
|
|
(:eval '("yes" "no-export" "strip-export" "eval" "strip-tangle"))
|
|
|
|
(:export '("yes" "strip-tangle")))))
|
2016-06-20 12:35:16 +00:00
|
|
|
(cl-some (lambda (v) (member v allowed-values))
|
|
|
|
(split-string (or (cdr (assq :noweb params)) "")))))
|
2012-03-19 20:38:12 +00:00
|
|
|
|
2022-02-07 12:31:15 +00:00
|
|
|
(defvar org-babel-expand-noweb-references--cache nil
|
|
|
|
"Noweb reference cache used during expansion.")
|
|
|
|
(defvar org-babel-expand-noweb-references--cache-buffer nil
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
|
|
|
"Cons (BUFFER . MODIFIED-TICK) for cached noweb references.
|
2022-08-20 06:27:17 +00:00
|
|
|
See `org-babel-expand-noweb-references--cache'.")
|
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)))
|
2022-10-18 15:34:18 +00:00
|
|
|
(info (or info (org-babel-get-src-block-info 'no-eval)))
|
2010-06-13 01:26:08 +00:00
|
|
|
(lang (nth 0 info))
|
|
|
|
(body (nth 1 info))
|
2020-01-08 22:08:47 +00:00
|
|
|
(comment (string= "noweb" (cdr (assq :comments (nth 2 info)))))
|
2021-09-06 16:45:42 +00:00
|
|
|
(noweb-prefix (let ((v (assq :noweb-prefix (nth 2 info))))
|
|
|
|
(or (not v)
|
|
|
|
(and (org-not-nil (cdr v))
|
|
|
|
(not (equal (cdr v) "no"))))))
|
2020-09-15 04:07:03 +00:00
|
|
|
(noweb-re (format "\\(.*?\\)\\(%s\\)"
|
2020-01-12 10:38:04 +00:00
|
|
|
(with-current-buffer parent-buffer
|
2022-02-07 12:31:15 +00:00
|
|
|
(org-babel-noweb-wrap)))))
|
|
|
|
(unless (equal (cons parent-buffer
|
|
|
|
(with-current-buffer parent-buffer
|
|
|
|
(buffer-chars-modified-tick)))
|
|
|
|
org-babel-expand-noweb-references--cache-buffer)
|
|
|
|
(setq org-babel-expand-noweb-references--cache nil
|
|
|
|
org-babel-expand-noweb-references--cache-buffer
|
|
|
|
(cons parent-buffer
|
|
|
|
(with-current-buffer parent-buffer
|
|
|
|
(buffer-chars-modified-tick)))))
|
|
|
|
(cl-macrolet ((c-wrap
|
|
|
|
(s)
|
|
|
|
;; Comment string S, according to LANG mode. Return new
|
|
|
|
;; string.
|
|
|
|
`(unless org-babel-tangle-uncomment-comments
|
|
|
|
(with-temp-buffer
|
|
|
|
(funcall (org-src-get-lang-mode lang))
|
|
|
|
(comment-region (point)
|
|
|
|
(progn (insert ,s) (point)))
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
(expand-body
|
|
|
|
(i)
|
|
|
|
;; Expand body of code represented by block info I.
|
|
|
|
`(let ((b (if (org-babel-noweb-p (nth 2 ,i) :eval)
|
|
|
|
(org-babel-expand-noweb-references ,i)
|
|
|
|
(nth 1 ,i))))
|
|
|
|
(if (not comment) b
|
|
|
|
(let ((cs (org-babel-tangle-comment-links ,i)))
|
|
|
|
(concat (c-wrap (car cs)) "\n"
|
|
|
|
b "\n"
|
|
|
|
(c-wrap (cadr cs)))))))
|
|
|
|
(expand-references
|
|
|
|
(ref)
|
|
|
|
`(pcase (gethash ,ref org-babel-expand-noweb-references--cache)
|
|
|
|
(`(,last . ,previous)
|
|
|
|
;; Ignore separator for last block.
|
|
|
|
(let ((strings (list (expand-body last))))
|
|
|
|
(dolist (i previous)
|
|
|
|
(let ((parameters (nth 2 i)))
|
|
|
|
;; Since we're operating in reverse order, first
|
|
|
|
;; push separator, then body.
|
|
|
|
(push (or (cdr (assq :noweb-sep parameters)) "\n")
|
|
|
|
strings)
|
|
|
|
(push (expand-body i) strings)))
|
|
|
|
(mapconcat #'identity strings "")))
|
|
|
|
;; Raise an error about missing reference, or return the
|
|
|
|
;; empty string.
|
|
|
|
((guard (or org-babel-noweb-error-all-langs
|
|
|
|
(member lang org-babel-noweb-error-langs)))
|
|
|
|
(error "Cannot resolve %s (see `org-babel-noweb-error-langs')"
|
|
|
|
(org-babel-noweb-wrap ,ref)))
|
|
|
|
(_ ""))))
|
|
|
|
(replace-regexp-in-string
|
|
|
|
noweb-re
|
|
|
|
(lambda (m)
|
|
|
|
(with-current-buffer parent-buffer
|
|
|
|
(save-match-data
|
|
|
|
(let* ((prefix (match-string 1 m))
|
|
|
|
(id (match-string 3 m))
|
|
|
|
(evaluate (string-match-p "(.*)" id))
|
|
|
|
(expansion
|
|
|
|
(cond
|
|
|
|
(evaluate
|
|
|
|
(prog1
|
|
|
|
(let ((raw (org-babel-ref-resolve id)))
|
|
|
|
(if (stringp raw) raw (format "%S" raw)))
|
|
|
|
;; Evaluation can potentially modify the buffer
|
|
|
|
;; and invalidate the cache: reset it.
|
|
|
|
(unless (equal org-babel-expand-noweb-references--cache-buffer
|
|
|
|
(cons parent-buffer
|
|
|
|
(buffer-chars-modified-tick)))
|
|
|
|
(setq org-babel-expand-noweb-references--cache nil
|
|
|
|
org-babel-expand-noweb-references--cache-buffer
|
|
|
|
(cons parent-buffer
|
|
|
|
(with-current-buffer parent-buffer
|
|
|
|
(buffer-chars-modified-tick)))))))
|
|
|
|
;; Already cached.
|
|
|
|
((and (hash-table-p org-babel-expand-noweb-references--cache)
|
|
|
|
(gethash id org-babel-expand-noweb-references--cache))
|
|
|
|
(expand-references id))
|
|
|
|
;; Return the contents of headlines literally.
|
|
|
|
((org-babel-ref-goto-headline-id id)
|
|
|
|
(org-babel-ref-headline-body))
|
|
|
|
;; Look for a source block named SOURCE-NAME. If
|
|
|
|
;; found, assume it is unique; do not look after
|
|
|
|
;; `:noweb-ref' header argument.
|
|
|
|
((org-with-point-at 1
|
|
|
|
(let ((r (org-babel-named-src-block-regexp-for-name id)))
|
|
|
|
(and (re-search-forward r nil t)
|
|
|
|
(not (org-in-commented-heading-p))
|
|
|
|
(let ((info (org-babel-get-src-block-info t)))
|
|
|
|
(unless (hash-table-p org-babel-expand-noweb-references--cache)
|
|
|
|
(setq org-babel-expand-noweb-references--cache (make-hash-table :test #'equal)))
|
|
|
|
(push info (gethash id org-babel-expand-noweb-references--cache))
|
|
|
|
(expand-body info))))))
|
|
|
|
;; Retrieve from the Library of Babel.
|
|
|
|
((nth 2 (assoc-string id org-babel-library-of-babel)))
|
|
|
|
;; All Noweb references were cached in a previous
|
|
|
|
;; run. Yet, ID is not in cache (see the above
|
|
|
|
;; condition). Process missing reference in
|
|
|
|
;; `expand-references'.
|
2022-09-17 07:39:02 +00:00
|
|
|
((and (hash-table-p org-babel-expand-noweb-references--cache)
|
|
|
|
(gethash 'buffer-processed org-babel-expand-noweb-references--cache))
|
2022-02-07 12:31:15 +00:00
|
|
|
(expand-references id))
|
|
|
|
;; Though luck. We go into the long process of
|
|
|
|
;; checking each source block and expand those
|
|
|
|
;; with a matching Noweb reference. Since we're
|
|
|
|
;; going to visit all source blocks in the
|
|
|
|
;; document, cache information about them as well.
|
|
|
|
(t
|
|
|
|
(setq org-babel-expand-noweb-references--cache (make-hash-table :test #'equal))
|
|
|
|
(org-with-wide-buffer
|
|
|
|
(org-babel-map-src-blocks nil
|
|
|
|
(if (org-in-commented-heading-p)
|
|
|
|
(org-forward-heading-same-level nil t)
|
|
|
|
(let* ((info (org-babel-get-src-block-info t))
|
|
|
|
(ref (cdr (assq :noweb-ref (nth 2 info)))))
|
|
|
|
(push info (gethash ref org-babel-expand-noweb-references--cache))))))
|
2022-09-17 07:39:02 +00:00
|
|
|
(puthash 'buffer-processed t org-babel-expand-noweb-references--cache)
|
2022-02-07 12:31:15 +00:00
|
|
|
(expand-references id)))))
|
|
|
|
;; Interpose PREFIX between every line.
|
|
|
|
(if noweb-prefix
|
|
|
|
(mapconcat #'identity
|
|
|
|
(split-string expansion "[\n\r]")
|
|
|
|
(concat "\n" prefix))
|
|
|
|
expansion)))))
|
|
|
|
body t t 2))))
|
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))))
|
2016-05-26 14:11:06 +00:00
|
|
|
(cl-case ch
|
2015-01-16 22:47:32 +00:00
|
|
|
(?\[ (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
|
2022-10-12 11:46:14 +00:00
|
|
|
((and (>= (length str) 2)
|
2015-01-16 22:47:32 +00:00
|
|
|
(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.
|
2021-09-16 10:32:43 +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."
|
2017-05-01 13:33:09 +00:00
|
|
|
(cond ((not (org-string-nw-p cell)) cell)
|
|
|
|
((org-babel--string-to-number cell))
|
|
|
|
((and (not inhibit-lisp-eval)
|
|
|
|
(or (memq (string-to-char cell) '(?\( ?' ?` ?\[))
|
|
|
|
(string= cell "*this*")))
|
2023-01-02 07:49:11 +00:00
|
|
|
;; FIXME: Arbitrary code evaluation.
|
|
|
|
(eval (read cell) t))
|
2022-10-23 06:38:10 +00:00
|
|
|
((save-match-data
|
2022-10-23 07:33:24 +00:00
|
|
|
(and (string-match "^[[:space:]]*\"\\(.*\\)\"[[:space:]]*$" cell)
|
2022-10-23 06:38:10 +00:00
|
|
|
(not (string-match "[^\\]\"" (match-string 1 cell)))))
|
|
|
|
(read cell))
|
2017-05-01 13:33:09 +00:00
|
|
|
(t (org-no-properties cell))))
|
2009-05-08 23:20:05 +00:00
|
|
|
|
2016-09-03 00:52:27 +00:00
|
|
|
(defun org-babel--string-to-number (string)
|
|
|
|
"If STRING represents a number return its value.
|
|
|
|
Otherwise return nil."
|
2020-09-06 20:41:21 +00:00
|
|
|
(unless (or (string-match-p "\\s-" (org-trim string))
|
2020-12-18 13:35:09 +00:00
|
|
|
(not (string-match-p "^[0-9e.+ -]+$" string)))
|
2020-02-19 09:55:36 +00:00
|
|
|
(let ((interned-string (ignore-errors (read string))))
|
|
|
|
(when (numberp interned-string)
|
|
|
|
interned-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.
|
2023-03-07 13:03:02 +00:00
|
|
|
If the table is trivial, then return it as a scalar.
|
|
|
|
SEPARATOR is passed to `org-table-convert-region', which see."
|
2020-05-21 04:16:40 +00:00
|
|
|
(let ((result
|
|
|
|
(with-temp-buffer
|
|
|
|
(condition-case err
|
|
|
|
(progn
|
2020-08-29 17:22:48 +00:00
|
|
|
(insert-file-contents file-name)
|
2020-05-21 04:16:40 +00:00
|
|
|
(delete-file file-name)
|
2020-08-29 17:22:48 +00:00
|
|
|
(let ((pmax (point-max)))
|
|
|
|
;; If the file was empty, don't bother trying to
|
|
|
|
;; convert the table.
|
|
|
|
(when (> pmax 1)
|
2022-11-20 05:19:43 +00:00
|
|
|
(org-table-convert-region (point-min) pmax separator)
|
2020-08-29 17:22:48 +00:00
|
|
|
(delq nil
|
|
|
|
(mapcar (lambda (row)
|
|
|
|
(and (not (eq row 'hline))
|
|
|
|
(mapcar #'org-babel-string-read row)))
|
|
|
|
(org-table-to-lisp))))))
|
2020-05-21 04:16:40 +00:00
|
|
|
(error
|
|
|
|
(display-warning 'org-babel
|
|
|
|
(format "Error reading results: %S" err)
|
|
|
|
:error)
|
|
|
|
nil)))))
|
|
|
|
(pcase result
|
|
|
|
(`((,scalar)) scalar)
|
|
|
|
(`((,_ ,_ . ,_)) result)
|
|
|
|
(`(,scalar) scalar)
|
|
|
|
(_ 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)
|
2022-10-23 06:30:57 +00:00
|
|
|
(string-match "^[[:space:]]*\"\\(.+\\)\"[[:space:]]*$" cell)
|
2009-06-12 00:04:42 +00:00
|
|
|
(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))
|
|
|
|
|
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
|
2019-09-20 22:27:53 +00:00
|
|
|
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
|
|
|
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
|
|
|
(defvar org-babel-temporary-directory
|
|
|
|
(unless noninteractive
|
|
|
|
(make-temp-file "babel-" t))
|
|
|
|
"Directory to hold temporary files created to execute code blocks.
|
2010-09-30 13:31:14 +00:00
|
|
|
Used by `org-babel-temp-file'. This directory will be removed on
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
|
|
|
Emacs shutdown.")
|
|
|
|
|
|
|
|
(defvar org-babel-temporary-stable-directory
|
|
|
|
(unless noninteractive
|
|
|
|
(let (dir)
|
|
|
|
(while (or (not dir) (file-exists-p dir))
|
|
|
|
(setq dir (expand-file-name
|
|
|
|
(format "babel-stable-%d" (random 1000))
|
2023-01-18 09:16:19 +00:00
|
|
|
temporary-file-directory)))
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
|
|
|
(make-directory dir)
|
|
|
|
dir))
|
|
|
|
"Directory to hold temporary files created to execute code blocks.
|
2021-12-12 07:31:35 +00:00
|
|
|
Used by `org-babel-temp-file'. This directory will be removed on
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
|
|
|
Emacs shutdown.")
|
2021-12-12 07:31:35 +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."
|
2021-02-12 21:08:01 +00:00
|
|
|
(declare (indent 1) (debug t))
|
2013-04-07 12:49:15 +00:00
|
|
|
(org-with-gensyms (params)
|
|
|
|
`(let ((,params ,result-params))
|
2022-11-22 02:06:24 +00:00
|
|
|
(unless (member "discard" ,params)
|
|
|
|
(if (or (member "scalar" ,params)
|
|
|
|
(member "verbatim" ,params)
|
|
|
|
(member "html" ,params)
|
|
|
|
(member "code" ,params)
|
|
|
|
(member "pp" ,params)
|
|
|
|
(member "file" ,params)
|
|
|
|
(and (or (member "output" ,params)
|
|
|
|
(member "raw" ,params)
|
|
|
|
(member "org" ,params)
|
|
|
|
(member "drawer" ,params))
|
|
|
|
(not (member "table" ,params))))
|
|
|
|
,scalar-form
|
|
|
|
,@table-forms)))))
|
2012-11-19 01:02:09 +00:00
|
|
|
|
2022-10-09 04:26:37 +00:00
|
|
|
(defmacro org-babel-temp-directory ()
|
|
|
|
"Return temporary directory suitable for `default-directory'."
|
|
|
|
`(if (file-remote-p default-directory)
|
2022-10-23 03:49:00 +00:00
|
|
|
(concat (file-remote-p default-directory)
|
|
|
|
org-babel-remote-temporary-directory)
|
2022-10-09 04:26:37 +00:00
|
|
|
(or (and org-babel-temporary-directory
|
|
|
|
(file-exists-p org-babel-temporary-directory)
|
|
|
|
org-babel-temporary-directory)
|
|
|
|
temporary-file-directory)))
|
|
|
|
|
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
|
2023-08-04 08:33:33 +00:00
|
|
|
value of function `temporary-file-directory' temporarily set to the
|
|
|
|
value of `org-babel-temporary-directory'."
|
2022-10-23 03:49:00 +00:00
|
|
|
(make-temp-file
|
|
|
|
(concat (file-name-as-directory (org-babel-temp-directory)) prefix)
|
|
|
|
nil
|
|
|
|
suffix))
|
|
|
|
|
|
|
|
(defmacro org-babel-temp-stable-directory ()
|
|
|
|
"Return temporary stable directory."
|
|
|
|
`(let ((org-babel-temporary-directory org-babel-temporary-stable-directory))
|
|
|
|
(org-babel-temp-directory)))
|
2010-09-30 13:31:14 +00:00
|
|
|
|
2021-12-12 07:31:35 +00:00
|
|
|
(defun org-babel-temp-stable-file (data prefix &optional suffix)
|
|
|
|
"Create a temporary file in the `org-babel-remove-temporary-stable-directory'.
|
|
|
|
The file name is stable with respect to DATA. The file name is
|
|
|
|
constructed like the following: PREFIXDATAhashSUFFIX."
|
2022-10-23 03:49:00 +00:00
|
|
|
(let ((path
|
|
|
|
(format
|
|
|
|
"%s%s%s%s"
|
|
|
|
(file-name-as-directory (org-babel-temp-stable-directory))
|
|
|
|
prefix
|
2023-03-29 13:10:19 +00:00
|
|
|
(org-sxhash-safe data)
|
2022-10-23 03:49:00 +00:00
|
|
|
(or suffix ""))))
|
|
|
|
;; Create file.
|
|
|
|
(with-temp-file path)
|
|
|
|
;; Return it.
|
|
|
|
path))
|
2021-12-12 07:31:35 +00:00
|
|
|
|
2010-09-30 13:31:14 +00:00
|
|
|
(defun org-babel-remove-temporary-directory ()
|
|
|
|
"Remove `org-babel-temporary-directory' on Emacs shutdown."
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
|
|
|
(when (and org-babel-temporary-directory
|
2010-10-01 20:07:58 +00:00
|
|
|
(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)))
|
|
|
|
(directory-files org-babel-temporary-directory 'full
|
2020-04-14 10:17:40 +00:00
|
|
|
directory-files-no-dot-files-regexp))
|
2010-12-08 10:11:49 +00:00
|
|
|
(delete-directory org-babel-temporary-directory))
|
|
|
|
(error
|
|
|
|
(message "Failed to remove temporary Org-babel directory %s"
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
|
|
|
(or org-babel-temporary-directory
|
|
|
|
"[directory not defined]"))))))
|
2010-09-30 13:31:14 +00:00
|
|
|
|
2021-12-12 07:31:35 +00:00
|
|
|
(defun org-babel-remove-temporary-stable-directory ()
|
|
|
|
"Remove `org-babel-temporary-stable-directory' and on Emacs shutdown."
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
|
|
|
(when (and org-babel-temporary-stable-directory
|
2021-12-12 07:31:35 +00:00
|
|
|
(file-exists-p org-babel-temporary-stable-directory))
|
|
|
|
(let ((org-babel-temporary-directory
|
|
|
|
org-babel-temporary-stable-directory))
|
|
|
|
(org-babel-remove-temporary-directory))))
|
|
|
|
|
2021-02-12 21:08:01 +00:00
|
|
|
(add-hook 'kill-emacs-hook #'org-babel-remove-temporary-directory)
|
2021-12-12 07:31:35 +00:00
|
|
|
(add-hook 'kill-emacs-hook #'org-babel-remove-temporary-stable-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))
|
2021-09-29 07:22:47 +00:00
|
|
|
(funcall (cdr entry) (cdr pair)))
|
2013-10-28 19:39:31 +00:00
|
|
|
((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))
|
2021-09-29 07:22:47 +00:00
|
|
|
(file-ext-cons (assq :file-ext params))
|
|
|
|
(file-ext (cdr-safe file-ext-cons))
|
|
|
|
(dir (cdr-safe (assq :output-dir params)))
|
|
|
|
fname)
|
2014-04-22 19:13:48 +00:00
|
|
|
;; 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
|
|
|
|
|
|
|
(defun org-babel-graphical-output-file (params)
|
2016-06-20 12:41:04 +00:00
|
|
|
"File where a babel block should send graphical output, per PARAMS.
|
|
|
|
Return nil if no graphical output is expected. Raise an error if
|
|
|
|
the output file is ill-defined."
|
|
|
|
(let ((file (cdr (assq :file params))))
|
|
|
|
(cond (file (and (member "graphics" (cdr (assq :result-params params)))
|
|
|
|
file))
|
|
|
|
((assq :file-ext params)
|
|
|
|
(user-error ":file-ext given but no :file generated; did you forget \
|
|
|
|
to name a block?"))
|
|
|
|
(t (user-error "No :file header argument given; cannot create \
|
|
|
|
graphical result")))))
|
2014-04-22 18:54:55 +00:00
|
|
|
|
2016-02-14 15:14:30 +00:00
|
|
|
(defun org-babel-make-language-alias (new old)
|
|
|
|
"Make source blocks of type NEW aliases for those of type OLD.
|
|
|
|
|
|
|
|
NEW and OLD should be strings. This function should be called
|
|
|
|
after the babel API for OLD-type source blocks is fully defined.
|
|
|
|
|
|
|
|
Callers of this function will probably want to add an entry to
|
|
|
|
`org-src-lang-modes' as well."
|
|
|
|
(dolist (fn '("execute" "expand-body" "prep-session"
|
2019-03-19 11:17:34 +00:00
|
|
|
"variable-assignments" "load-session"
|
|
|
|
"edit-prep"))
|
2016-02-14 15:14:30 +00:00
|
|
|
(let ((sym (intern-soft (concat "org-babel-" fn ":" old))))
|
|
|
|
(when (and sym (fboundp sym))
|
|
|
|
(defalias (intern (concat "org-babel-" fn ":" new)) sym))))
|
|
|
|
;; Technically we don't need a `dolist' for just one variable, but
|
|
|
|
;; we keep it for symmetry/ease of future expansion.
|
|
|
|
(dolist (var '("default-header-args"))
|
|
|
|
(let ((sym (intern-soft (concat "org-babel-" var ":" old))))
|
|
|
|
(when (and sym (boundp sym))
|
|
|
|
(defvaralias (intern (concat "org-babel-" var ":" new)) sym)))))
|
|
|
|
|
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
|