ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
org-mode/lisp/ob-octave.el

269 lines
9.5 KiB
EmacsLisp
Raw Normal View History

Activate lexical binding in some libraries * lisp/ob-C.el (org-babel-prep-session:C): (org-babel-load-session:C): * lisp/ob-J.el: (org-babel-expand-body:J): (org-babel-execute:J): * lisp/ob-R.el: (org-babel-expand-body:R): * lisp/ob-abc.el: (org-babel-execute:abc): (org-babel-prep-session:abc): * lisp/ob-asymptote.el: (org-babel-execute:asymptote): (org-babel-prep-session:asymptote): * lisp/ob-awk.el: (org-babel-expand-body:awk): * lisp/ob-calc.el: (org-babel-expand-body:calc): * lisp/ob-clojure.el: * lisp/ob-comint.el: (org-babel-comint-in-buffer): (org-babel-comint-with-output): (org-babel-comint-eval-invisibly-and-wait-for-file): * lisp/ob-coq.el: * lisp/ob-css.el: (org-babel-execute:css): (org-babel-prep-session:css): * lisp/ob-ditaa.el: (org-babel-execute:ditaa): (org-babel-prep-session:ditaa): * lisp/ob-dot.el: (org-babel-execute:dot): (org-babel-prep-session:dot): * lisp/ob-ebnf.el: * lisp/ob-emacs-lisp.el: * lisp/ob-eval.el: * lisp/ob-forth.el: * lisp/ob-fortran.el: (org-babel-execute:fortran): (org-babel-prep-session:fortran): (org-babel-load-session:fortran): * lisp/ob-gnuplot.el: (org-babel-expand-body:gnuplot): (org-babel-prep-session:gnuplot): (org-babel-gnuplot-initiate-session): * lisp/ob-groovy.el: (org-babel-prep-session:groovy): (org-babel-groovy-initiate-session): * lisp/ob-haskell.el: (org-babel-haskell-initiate-session): * lisp/ob-io.el: (org-babel-prep-session:io): (org-babel-io-initiate-session): * lisp/ob-java.el: (org-babel-execute:java): * lisp/ob-js.el: * lisp/ob-keys.el: * lisp/ob-latex.el: (org-babel-prep-session:latex): * lisp/ob-ledger.el: (org-babel-execute:ledger): (org-babel-prep-session:ledger): * lisp/ob-lilypond.el: (org-babel-lilypond-commands): (org-babel-lilypond-process-basic): (org-babel-prep-session:lilypond): (org-babel-lilypond-parse-line-num): * lisp/ob-lisp.el: * lisp/ob-makefile.el: (org-babel-execute:makefile): (org-babel-prep-session:makefile): * lisp/ob-matlab.el: * lisp/ob-maxima.el: (org-babel-prep-session:maxima): * lisp/ob-mscgen.el: (org-babel-prep-session:mscgen): * lisp/ob-ocaml.el: (org-babel-execute:ocaml): (org-babel-prep-session:ocaml): * lisp/ob-octave.el: (org-babel-execute:octave): (org-babel-octave-initiate-session): * lisp/ob-org.el: (org-babel-prep-session:org): * lisp/ob-perl.el: (org-babel-prep-session:perl): (org-babel-perl--var-to-perl): (org-babel-perl-initiate-session): * lisp/ob-picolisp.el: (org-babel-expand-body:picolisp): (org-babel-execute:picolisp): * lisp/ob-plantuml.el: (org-babel-execute:plantuml): (org-babel-prep-session:plantuml): * lisp/ob-processing.el: (org-babel-prep-session:processing): * lisp/ob-python.el: (org-babel-python-initiate-session): * lisp/ob-ref.el: (org-babel-ref-resolve): * lisp/ob-ruby.el: (org-babel-ruby-initiate-session): * lisp/ob-sass.el: (org-babel-execute:sass): (org-babel-prep-session:sass): * lisp/ob-scala.el: (org-babel-execute:scala): (org-babel-prep-session:scala): (org-babel-scala-initiate-session): * lisp/ob-scheme.el: * lisp/ob-screen.el: (org-babel-prep-session:screen): (org-babel-screen-session-write-temp-file): (org-babel-screen-test): * lisp/ob.el: * lisp/org-colview.el: (org-columns-todo): (org-columns-set-tags-or-toggle): (org-columns-new): (org-columns-uncompile-format): (org-agenda-colview-summarize): * lisp/org-footnote.el: (electric-indent-mode): * lisp/org-indent.el: (org-indent-refresh-maybe): * lisp/org-list.el: * lisp/org-macro.el: (org-macro--collect-macros): * lisp/org-src.el: * lisp/org-table.el: (sort-fold-case): (org-table-create): (org-table-field-info): (org-table-transpose-table-at-point): (org-table-remove-rectangle-highlight): (orgtbl-create-or-convert-from-region): (org-define-lookup-function): * lisp/ox-ascii.el: (org-ascii-format-drawer-function): (org-ascii--has-caption-p): (org-ascii-bold): (org-ascii-center-block): (org-ascii-clock): (org-ascii-code): (org-ascii-dynamic-block): (org-ascii-entity): (org-ascii-example-block): (org-ascii-export-snippet): (org-ascii-export-block): (org-ascii-fixed-width): (org-ascii-footnote-reference): (org-ascii-horizontal-rule): (org-ascii-inline-src-block): (org-ascii-format-inlinetask-default): (org-ascii-italic): (org-ascii-keyword): (org-ascii-latex-environment): (org-ascii-latex-fragment): (org-ascii-line-break): (org-ascii-node-property): (org-ascii-planning): (org-ascii-quote-block): (org-ascii-radio-target): (org-ascii-special-block): (org-ascii-src-block): (org-ascii-statistics-cookie): (org-ascii-subscript): (org-ascii-superscript): (org-ascii-strike-through): (org-ascii-timestamp): (org-ascii-underline): (org-ascii-verbatim): (org-ascii-verse-block): (org-ascii-filter-headline-blank-lines): (org-ascii-filter-paragraph-spacing): (org-ascii-filter-comment-spacing): Use lexical binding.
2015-10-25 20:56:00 -04:00
;;; ob-octave.el --- Babel Functions for Octave and Matlab -*- lexical-binding: t; -*-
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
Update copyright year to 2022
2022-01-01 15:10:55 -05:00
;; Copyright (C) 2010-2022 Free Software Foundation, Inc.
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
Prefer "website" to "homepage" Emacs now advises using "website" (instead of "homepage") and consequently to use the "URL" comment header instead of "Homepage". * README: * README_ELPA: * doc/org-guide.org (Creating Footnotes): * doc/org-manual.org (Creating Footnotes): * etc/styles/README (URL): Prefer "website" to "homepage". * lisp/*.el: * mk/org-fixup.el: Replace the "Homepage" header comment with "URL".
2021-09-26 03:44:29 -04:00
;; URL: https://orgmode.org
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
babel: assigning copyright to the FSF for babel language files
2010-06-25 12:32:35 -04:00
;; This file is part of GNU Emacs.
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
babel: assigning copyright to the FSF for babel language files
2010-06-25 12:32:35 -04:00
;; GNU Emacs is free software: you can redistribute it and/or modify
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
;; it under the terms of the GNU General Public License as published by
babel: assigning copyright to the FSF for babel language files
2010-06-25 12:32:35 -04:00
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
babel: Add octave and matlab support
2010-03-18 14:45:39 -04: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.
babel: assigning copyright to the FSF for babel language files
2010-06-25 12:32:35 -04:00
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
;; You should have received a copy of the GNU General Public License
Backport commit bc511a64f from Emacs Prefer HTTPS to FTP and HTTP in documentation bc511a64f6da9ab51acc7c8865e80c4a4cb655c2 Paul Eggert Wed Sep 13 15:54:37 2017 -0700
2017-09-13 18:52:52 -04:00
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
;;; Commentary:
;;; Requirements:
;; octave
;; octave-mode.el and octave-inf.el come with GNU emacs
;;; Code:
Assert all the Org files to load the same Org version * lisp/org-compat.el (org-assert-version): New macro comparing Org version at compile time and laod time. Add `org-assert-version' call to all files: * lisp/org-macs.el: * lisp/org-crypt.el: * lisp/org-ctags.el: * lisp/org-cycle.el: * lisp/org-datetree.el: * lisp/org-duration.el: * lisp/org-element.el (avl-tree): * lisp/org-entities.el: * lisp/org-faces.el: * lisp/org-feed.el: * lisp/org-fold-core.el: * lisp/org-fold.el: * lisp/org-footnote.el: * lisp/org-goto.el: * lisp/org-habit.el: * lisp/org-id.el: * lisp/org-indent.el: * lisp/org-inlinetask.el: * lisp/org-keys.el: * lisp/org-lint.el: * lisp/org-list.el: * lisp/org-macro.el: * lisp/org-mobile.el: * lisp/org-mouse.el: * lisp/org-num.el: * lisp/org-pcomplete.el: * lisp/org-persist.el: * lisp/org-plot.el: * lisp/org-protocol.el: * lisp/org-refile.el: * lisp/org-src.el: * lisp/org-table.el: * lisp/org-tempo.el: * lisp/org-timer.el: * lisp/org.el: * lisp/ox-ascii.el: * lisp/ox-beamer.el: * lisp/ox-html.el: * lisp/ox-icalendar.el: * lisp/ox-koma-letter.el: * lisp/ox-latex.el: * lisp/ox-man.el: * lisp/ox-md.el: * lisp/ox-odt.el: * lisp/ox-org.el: * lisp/ox-publish.el: * lisp/ox-texinfo.el: * lisp/ox.el:
2022-08-04 09:53:05 -04:00
(require 'org-macs)
(org-assert-version)
updating require and provide boilerplate for new ob* files
2010-06-11 19:02:42 -04:00
(require 'ob)
Update declare-function calls for functions that have moved. In cases where functions have moved from org.el into org-macs.el, it is often possible to replace declare-function by (require 'org-macs)
2018-05-09 20:04:12 -04:00
(require 'org-macs)
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
ext: prefix on external file names
2010-07-04 11:24:08 -04:00
(declare-function matlab-shell "ext:matlab-mode")
(declare-function matlab-shell-run-region "ext:matlab-mode")
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(defvar org-babel-default-header-args:matlab '())
babel: ensuring each language defined (possibly empty) default header arguments this makes customization easier when users can assume that org-babel-default-header-args:foo will exist for every language
2010-06-25 13:12:54 -04:00
(defvar org-babel-default-header-args:octave '())
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(defvar org-babel-matlab-shell-command "matlab -nosplash"
Finished editing Babel docstrings
2010-07-13 19:20:08 -04:00
"Shell command to run matlab as an external process.")
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(defvar org-babel-octave-shell-command "octave -q"
Finished editing Babel docstrings
2010-07-13 19:20:08 -04:00
"Shell command to run octave as an external process.")
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(defvar org-babel-matlab-with-emacs-link nil
Finished editing Babel docstrings
2010-07-13 19:20:08 -04:00
"If non-nil use matlab-shell-run-region for session evaluation.
Various minor docfixes found by checkdoc
2021-09-16 06:32:43 -04:00
This will use EmacsLink if (matlab-with-emacs-link) evaluates
to a non-nil value.")
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(defvar org-babel-matlab-emacs-link-wrapper-method
Massive code clean-up. Delete trailing whitespaces. Indent all sexps correctly. Sentences end with double spaces.
2012-08-11 13:10:44 -04:00
"%s
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
if ischar(ans), fid = fopen('%s', 'w'); fprintf(fid, '%%s\\n', ans); fclose(fid);
else, save -ascii %s ans
end
delete('%s')
")
babel: updated ob-octave.el to work with the new ob-eval.el functions Note, the session based evaluation has *not* be updated, mainly because I don't have a working octave install with which to test the changes.
2010-07-04 16:48:41 -04:00
(defvar org-babel-octave-wrapper-method
"%s
ob-octave: Fix octave :results value parsing * lisp/ob-octave.el (org-babel-octave-wrapper-method): Use fdisp instead of fprintf. Reported-by: Alexandre Duret-Lutz <adl@lrde.epita.fr> Link: https://orgmode.org/list/217078597.347872.1639979694777@email.ionos.de
2022-10-29 01:48:45 -04:00
if ischar(ans), fid = fopen('%s', 'w'); fdisp(fid, ans); fclose(fid);
babel: octave/matlab: use dlmwrite to write delimited text 2010-08-03 Dan Davison <davison@stats.ox.ac.uk> * ob-octave.el (org-babel-octave-wrapper-method): use dlmwrite to write delimited text instead of save -ascii (org-babel-octave-import-elisp-from-file): specify that data written to file is tab-delimited
2010-08-03 23:54:24 -04:00
else, dlmwrite('%s', ans, '\\t')
babel: updated ob-octave.el to work with the new ob-eval.el functions Note, the session based evaluation has *not* be updated, mainly because I don't have a working octave install with which to test the changes.
2010-07-04 16:48:41 -04:00
end")
Backport commit 284c470 from Emacs master branch Backslash cleanup in Elisp source files 284c470ef752967fcd8bae6a450dc138462b1e49 Paul Eggert Thu Sep 17 16:09:39 2015 -0700
2015-09-17 19:08:20 -04:00
(defvar org-babel-octave-eoe-indicator "'org_babel_eoe'")
babel: updated ob-octave.el to work with the new ob-eval.el functions Note, the session based evaluation has *not* be updated, mainly because I don't have a working octave install with which to test the changes.
2010-07-04 16:48:41 -04:00
(defvar org-babel-octave-eoe-output "ans = org_babel_eoe")
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(defun org-babel-execute:matlab (body params)
Finished editing Babel docstrings
2010-07-13 19:20:08 -04:00
"Execute a block of matlab code with Babel."
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(org-babel-execute:octave body params 'matlab))
babel: matlab/octave: only (require 'matlab) when necessary 2010-08-01 Dan Davison <davison@stats.ox.ac.uk> * ob-octave.el only (require 'matlab) when necessary (org-babel-octave-initiate-session) (require) octave-inf or matlab as appropriate (org-babel-execute:matlab): remove (require) (org-babel-prep-session:matlab): remove (require) (org-babel-matlab-initiate-session): remove (require)
2010-08-01 14:34:28 -04:00
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(defun org-babel-execute:octave (body params &optional matlabp)
Finished editing Babel docstrings
2010-07-13 19:20:08 -04:00
"Execute a block of octave code with Babel."
babel:removing calls to ob-process-params, and updating use of results * lisp/ob-C.el (org-babel-C-execute): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-R.el (org-babel-execute:R): removing call to org-babel-process-params which should no longer be called from within a language file (org-babel-R-variable-assignments): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-asymptote.el (org-babel-execute:asymptote): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-clojure.el (org-babel-execute:clojure): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-dot.el (org-babel-execute:dot): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): removing call to org-babel-process-params which should no longer be called from within a language file (org-babel-execute:emacs-lisp): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-haskell.el (org-babel-execute:haskell): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-js.el (org-babel-execute:js): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-lisp.el (org-babel-execute:lisp): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-ocaml.el (org-babel-execute:ocaml): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-octave.el (org-babel-execute:octave): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-perl.el (org-babel-execute:perl): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-python.el (org-babel-execute:python): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-ruby.el (org-babel-execute:ruby): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-scheme.el (org-babel-execute:scheme): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-screen.el (org-babel-execute:screen): removing call to org-babel-process-params which should no longer be called from within a language file (org-babel-prep-session:screen): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-sh.el (org-babel-execute:sh): removing call to org-babel-process-params which should no longer be called from within a language file * lisp/ob-sql.el (org-babel-execute:sql): removing call to org-babel-process-params which should no longer be called from within a language file * ob-haskell.el (org-babel-execute:haskell): Remove reference to processed params * ob-clojure.el (org-babel-execute:clojure): Remove reference to processed params * ob-R.el (org-babel-execute:R): Remove reference to processed params
2010-10-21 07:52:24 -04:00
(let* ((session
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(funcall (intern (format "org-babel-%s-initiate-session"
(if matlabp "matlab" "octave")))
Use assq instead of assoc for :keywords * lisp/ob-C.el (org-babel-C-execute): * lisp/ob-J.el (org-babel-execute:J): * lisp/ob-R.el (org-babel-edit-prep:R): (org-babel-expand-body:R): (org-babel-execute:R): (org-babel-variable-assignments:R): (org-babel-R-initiate-session): * lisp/ob-abc.el (org-babel-execute:abc): * lisp/ob-asymptote.el (org-babel-execute:asymptote): * lisp/ob-awk.el (org-babel-execute:awk): * lisp/ob-clojure.el (org-babel-expand-body:clojure): (org-babel-execute:clojure): * lisp/ob-core.el (org-babel-expand-body:generic): (org-babel-load-in-session): (org-babel-initiate-session): (org-babel-open-src-block-result): (org-babel-process-params): (org-babel-insert-result): (org-babel-expand-noweb-references): * lisp/ob-ditaa.el (org-babel-execute:ditaa): * lisp/ob-dot.el (org-babel-execute:dot): * lisp/ob-ebnf.el (org-babel-execute:ebnf): * lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): (org-babel-execute:emacs-lisp): * lisp/ob-exp.el (org-babel-exp-process-buffer): (org-babel-exp-do-export): (org-babel-exp-code): * lisp/ob-forth.el (org-babel-execute:forth): * lisp/ob-fortran.el (org-babel-execute:fortran): * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): (org-babel-expand-body:gnuplot): (org-babel-execute:gnuplot): * lisp/ob-groovy.el (org-babel-execute:groovy): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-execute:io): * lisp/ob-java.el (org-babel-execute:java): * lisp/ob-js.el (org-babel-execute:js): * lisp/ob-latex.el (org-babel-execute:latex): * lisp/ob-ledger.el (org-babel-execute:ledger): * lisp/ob-lilypond.el (org-babel-lilypond-process-basic): * lisp/ob-lisp.el (org-babel-expand-body:lisp): (org-babel-execute:lisp): * lisp/ob-lua.el (org-babel-execute:lua): * lisp/ob-maxima.el (org-babel-execute:maxima): * lisp/ob-mscgen.el (org-babel-execute:mscgen): * lisp/ob-ocaml.el (org-babel-execute:ocaml): * lisp/ob-octave.el (org-babel-execute:octave): * lisp/ob-org.el (org-babel-execute:org): * lisp/ob-perl.el (org-babel-execute:perl): * lisp/ob-picolisp.el (org-babel-execute:picolisp): * lisp/ob-plantuml.el (org-babel-execute:plantuml): * lisp/ob-python.el (org-babel-execute:python): * lisp/ob-ruby.el (org-babel-execute:ruby): * lisp/ob-sass.el (org-babel-execute:sass): * lisp/ob-scala.el (org-babel-execute:scala): * lisp/ob-scheme.el (org-babel-execute:scheme): * lisp/ob-screen.el (org-babel-execute:screen): (org-babel-prep-session:screen): * lisp/ob-shell.el (org-babel-execute:shell): (org-babel-variable-assignments:shell): (org-babel-sh-evaluate): * lisp/ob-shen.el (org-babel-execute:shen): * lisp/ob-sql.el (org-babel-execute:sql): * lisp/ob-sqlite.el (org-babel-execute:sqlite): * lisp/ob-tangle.el (org-babel-tangle): (org-babel-tangle-single-block): * lisp/org-src.el (org-src-associate-babel-session): * lisp/org.el (org-next-link): Use `assq' instead of `assoc' with :keyword keys.
2016-09-22 13:45:15 -04:00
(cdr (assq :session params)) params))
(result-type (cdr (assq :result-type params)))
babel: octave and matlab: New variable assignment and expansion scheme * ob-octave.el (org-babel-execute:octave): Use generic expansion function (org-babel-variable-assignments:octave): Change name of function (org-babel-variable-assignments:matlab): New defalias (org-babel-prep-session:octave): Change name of function (org-babel-expand-body:matlab): Delete function (org-babel-expand-body:octave): Delete function
2010-10-21 07:18:43 -04:00
(full-body
(org-babel-expand-body:generic
body params (org-babel-variable-assignments:octave params)))
babel: fixes for commit 08e2596 * lisp/ob-core.el (org-babel-graphical-output-file): Use `user-error' instead of `error'. * lisp/ob-maxima.el (org-babel-execute:maxima, org-babel-maxima-expand): * lisp/ob-octave.el (org-babel-execute:octave): Guard `org-babel-graphical-output-file' with `ignore-errors'.
2014-05-15 23:26:30 -04:00
(gfx-file (ignore-errors (org-babel-graphical-output-file params)))
babel: updated ob-octave.el to work with the new ob-eval.el functions Note, the session based evaluation has *not* be updated, mainly because I don't have a working octave install with which to test the changes.
2010-07-04 16:48:41 -04:00
(result (org-babel-octave-evaluate
ob-octave.el: Add graphical output * lisp/ob-octave.el: add graphical output to png file * testing/examples/ob-octave-test.org: add a test for graphical output, and a test for session
2011-12-16 14:12:39 -05:00
session
babel: fixes for commit 08e2596 * lisp/ob-core.el (org-babel-graphical-output-file): Use `user-error' instead of `error'. * lisp/ob-maxima.el (org-babel-execute:maxima, org-babel-maxima-expand): * lisp/ob-octave.el (org-babel-execute:octave): Guard `org-babel-graphical-output-file' with `ignore-errors'.
2014-05-15 23:26:30 -04:00
(if gfx-file
ob-octave.el: Add graphical output * lisp/ob-octave.el: add graphical output to png file * testing/examples/ob-octave-test.org: add a test for graphical output, and a test for session
2011-12-16 14:12:39 -05:00
(mapconcat 'identity
(list
"set (0, \"defaultfigurevisible\", \"off\");"
full-body
babel: fixes for commit 08e2596 * lisp/ob-core.el (org-babel-graphical-output-file): Use `user-error' instead of `error'. * lisp/ob-maxima.el (org-babel-execute:maxima, org-babel-maxima-expand): * lisp/ob-octave.el (org-babel-execute:octave): Guard `org-babel-graphical-output-file' with `ignore-errors'.
2014-05-15 23:26:30 -04:00
(format "print -dpng %s" gfx-file))
ob-octave.el: Add graphical output * lisp/ob-octave.el: add graphical output to png file * testing/examples/ob-octave-test.org: add a test for graphical output, and a test for session
2011-12-16 14:12:39 -05:00
"\n")
full-body)
result-type matlabp)))
babel: fixes for commit 08e2596 * lisp/ob-core.el (org-babel-graphical-output-file): Use `user-error' instead of `error'. * lisp/ob-maxima.el (org-babel-execute:maxima, org-babel-maxima-expand): * lisp/ob-octave.el (org-babel-execute:octave): Guard `org-babel-graphical-output-file' with `ignore-errors'.
2014-05-15 23:26:30 -04:00
(if gfx-file
ob-octave.el: Add graphical output * lisp/ob-octave.el: add graphical output to png file * testing/examples/ob-octave-test.org: add a test for graphical output, and a test for session
2011-12-16 14:12:39 -05:00
nil
(org-babel-reassemble-table
result
(org-babel-pick-name
Use assq instead of assoc for :keywords * lisp/ob-C.el (org-babel-C-execute): * lisp/ob-J.el (org-babel-execute:J): * lisp/ob-R.el (org-babel-edit-prep:R): (org-babel-expand-body:R): (org-babel-execute:R): (org-babel-variable-assignments:R): (org-babel-R-initiate-session): * lisp/ob-abc.el (org-babel-execute:abc): * lisp/ob-asymptote.el (org-babel-execute:asymptote): * lisp/ob-awk.el (org-babel-execute:awk): * lisp/ob-clojure.el (org-babel-expand-body:clojure): (org-babel-execute:clojure): * lisp/ob-core.el (org-babel-expand-body:generic): (org-babel-load-in-session): (org-babel-initiate-session): (org-babel-open-src-block-result): (org-babel-process-params): (org-babel-insert-result): (org-babel-expand-noweb-references): * lisp/ob-ditaa.el (org-babel-execute:ditaa): * lisp/ob-dot.el (org-babel-execute:dot): * lisp/ob-ebnf.el (org-babel-execute:ebnf): * lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): (org-babel-execute:emacs-lisp): * lisp/ob-exp.el (org-babel-exp-process-buffer): (org-babel-exp-do-export): (org-babel-exp-code): * lisp/ob-forth.el (org-babel-execute:forth): * lisp/ob-fortran.el (org-babel-execute:fortran): * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): (org-babel-expand-body:gnuplot): (org-babel-execute:gnuplot): * lisp/ob-groovy.el (org-babel-execute:groovy): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-execute:io): * lisp/ob-java.el (org-babel-execute:java): * lisp/ob-js.el (org-babel-execute:js): * lisp/ob-latex.el (org-babel-execute:latex): * lisp/ob-ledger.el (org-babel-execute:ledger): * lisp/ob-lilypond.el (org-babel-lilypond-process-basic): * lisp/ob-lisp.el (org-babel-expand-body:lisp): (org-babel-execute:lisp): * lisp/ob-lua.el (org-babel-execute:lua): * lisp/ob-maxima.el (org-babel-execute:maxima): * lisp/ob-mscgen.el (org-babel-execute:mscgen): * lisp/ob-ocaml.el (org-babel-execute:ocaml): * lisp/ob-octave.el (org-babel-execute:octave): * lisp/ob-org.el (org-babel-execute:org): * lisp/ob-perl.el (org-babel-execute:perl): * lisp/ob-picolisp.el (org-babel-execute:picolisp): * lisp/ob-plantuml.el (org-babel-execute:plantuml): * lisp/ob-python.el (org-babel-execute:python): * lisp/ob-ruby.el (org-babel-execute:ruby): * lisp/ob-sass.el (org-babel-execute:sass): * lisp/ob-scala.el (org-babel-execute:scala): * lisp/ob-scheme.el (org-babel-execute:scheme): * lisp/ob-screen.el (org-babel-execute:screen): (org-babel-prep-session:screen): * lisp/ob-shell.el (org-babel-execute:shell): (org-babel-variable-assignments:shell): (org-babel-sh-evaluate): * lisp/ob-shen.el (org-babel-execute:shen): * lisp/ob-sql.el (org-babel-execute:sql): * lisp/ob-sqlite.el (org-babel-execute:sqlite): * lisp/ob-tangle.el (org-babel-tangle): (org-babel-tangle-single-block): * lisp/org-src.el (org-src-associate-babel-session): * lisp/org.el (org-next-link): Use `assq' instead of `assoc' with :keyword keys.
2016-09-22 13:45:15 -04:00
(cdr (assq :colname-names params)) (cdr (assq :colnames params)))
ob-octave.el: Add graphical output * lisp/ob-octave.el: add graphical output to png file * testing/examples/ob-octave-test.org: add a test for graphical output, and a test for session
2011-12-16 14:12:39 -05:00
(org-babel-pick-name
Use assq instead of assoc for :keywords * lisp/ob-C.el (org-babel-C-execute): * lisp/ob-J.el (org-babel-execute:J): * lisp/ob-R.el (org-babel-edit-prep:R): (org-babel-expand-body:R): (org-babel-execute:R): (org-babel-variable-assignments:R): (org-babel-R-initiate-session): * lisp/ob-abc.el (org-babel-execute:abc): * lisp/ob-asymptote.el (org-babel-execute:asymptote): * lisp/ob-awk.el (org-babel-execute:awk): * lisp/ob-clojure.el (org-babel-expand-body:clojure): (org-babel-execute:clojure): * lisp/ob-core.el (org-babel-expand-body:generic): (org-babel-load-in-session): (org-babel-initiate-session): (org-babel-open-src-block-result): (org-babel-process-params): (org-babel-insert-result): (org-babel-expand-noweb-references): * lisp/ob-ditaa.el (org-babel-execute:ditaa): * lisp/ob-dot.el (org-babel-execute:dot): * lisp/ob-ebnf.el (org-babel-execute:ebnf): * lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): (org-babel-execute:emacs-lisp): * lisp/ob-exp.el (org-babel-exp-process-buffer): (org-babel-exp-do-export): (org-babel-exp-code): * lisp/ob-forth.el (org-babel-execute:forth): * lisp/ob-fortran.el (org-babel-execute:fortran): * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): (org-babel-expand-body:gnuplot): (org-babel-execute:gnuplot): * lisp/ob-groovy.el (org-babel-execute:groovy): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-execute:io): * lisp/ob-java.el (org-babel-execute:java): * lisp/ob-js.el (org-babel-execute:js): * lisp/ob-latex.el (org-babel-execute:latex): * lisp/ob-ledger.el (org-babel-execute:ledger): * lisp/ob-lilypond.el (org-babel-lilypond-process-basic): * lisp/ob-lisp.el (org-babel-expand-body:lisp): (org-babel-execute:lisp): * lisp/ob-lua.el (org-babel-execute:lua): * lisp/ob-maxima.el (org-babel-execute:maxima): * lisp/ob-mscgen.el (org-babel-execute:mscgen): * lisp/ob-ocaml.el (org-babel-execute:ocaml): * lisp/ob-octave.el (org-babel-execute:octave): * lisp/ob-org.el (org-babel-execute:org): * lisp/ob-perl.el (org-babel-execute:perl): * lisp/ob-picolisp.el (org-babel-execute:picolisp): * lisp/ob-plantuml.el (org-babel-execute:plantuml): * lisp/ob-python.el (org-babel-execute:python): * lisp/ob-ruby.el (org-babel-execute:ruby): * lisp/ob-sass.el (org-babel-execute:sass): * lisp/ob-scala.el (org-babel-execute:scala): * lisp/ob-scheme.el (org-babel-execute:scheme): * lisp/ob-screen.el (org-babel-execute:screen): (org-babel-prep-session:screen): * lisp/ob-shell.el (org-babel-execute:shell): (org-babel-variable-assignments:shell): (org-babel-sh-evaluate): * lisp/ob-shen.el (org-babel-execute:shen): * lisp/ob-sql.el (org-babel-execute:sql): * lisp/ob-sqlite.el (org-babel-execute:sqlite): * lisp/ob-tangle.el (org-babel-tangle): (org-babel-tangle-single-block): * lisp/org-src.el (org-src-associate-babel-session): * lisp/org.el (org-next-link): Use `assq' instead of `assoc' with :keyword keys.
2016-09-22 13:45:15 -04:00
(cdr (assq :rowname-names params)) (cdr (assq :rownames params)))))))
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(defun org-babel-prep-session:matlab (session params)
"Prepare SESSION according to PARAMS."
(org-babel-prep-session:octave session params 'matlab))
babel: matlab/octave: only (require 'matlab) when necessary 2010-08-01 Dan Davison <davison@stats.ox.ac.uk> * ob-octave.el only (require 'matlab) when necessary (org-babel-octave-initiate-session) (require) octave-inf or matlab as appropriate (org-babel-execute:matlab): remove (require) (org-babel-prep-session:matlab): remove (require) (org-babel-matlab-initiate-session): remove (require)
2010-08-01 14:34:28 -04:00
babel: octave and matlab: New variable assignment and expansion scheme * ob-octave.el (org-babel-execute:octave): Use generic expansion function (org-babel-variable-assignments:octave): Change name of function (org-babel-variable-assignments:matlab): New defalias (org-babel-prep-session:octave): Change name of function (org-babel-expand-body:matlab): Delete function (org-babel-expand-body:octave): Delete function
2010-10-21 07:18:43 -04:00
(defun org-babel-variable-assignments:octave (params)
Add punctuation at the end of the first line of docstrings. Code cleanup.
2012-07-30 04:08:15 -04:00
"Return list of octave statements assigning the block's variables."
babel: octave: Fix variable assignments made by `org-babel-prep-session:octave' * ob-octave.el (org-babel-expand-body:octave): Refactor: break variable assignment part out into a separate function (org-babel-octave-variable-assignments): New function constructing list of variable assignment statements (org-babel-prep-session:octave): Use new function `org-babel-octave-variable-assignments' instead of previous (incorrect) variable assignment code.
2010-10-14 16:56:41 -04:00
(mapcar
(lambda (pair)
ob-octave: do not echo variables to STDOUT -- Thanks to Eric S Fraga
2011-03-31 01:28:59 -04:00
(format "%s=%s;"
babel: octave: Fix variable assignments made by `org-babel-prep-session:octave' * ob-octave.el (org-babel-expand-body:octave): Refactor: break variable assignment part out into a separate function (org-babel-octave-variable-assignments): New function constructing list of variable assignment statements (org-babel-prep-session:octave): Use new function `org-babel-octave-variable-assignments' instead of previous (incorrect) variable assignment code.
2010-10-14 16:56:41 -04:00
(car pair)
(org-babel-octave-var-to-octave (cdr pair))))
babel: small change in API. * lisp/ob-core.el (org-babel--get-vars): New function. (org-babel-get-header): Delete. * lisp/ob-C.el (org-babel-C-expand-C): (org-babel-C-expand-D): * lisp/ob-R.el (org-babel-variable-assignments:R): * lisp/ob-abc.el (org-babel-expand-body:abc): * lisp/ob-asymptote.el (org-babel-variable-assignments:asymptote): * lisp/ob-awk.el (org-babel-execute:awk): * lisp/ob-calc.el (org-babel-execute:calc): * lisp/ob-clojure.el (org-babel-expand-body:clojure): * lisp/ob-dot.el (org-babel-expand-body:dot): * lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): * lisp/ob-fortran.el (org-babel-expand-body:fortran): (org-babel-fortran-ensure-main-wrap): * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): * lisp/ob-haskell.el (org-babel-variable-assignments:haskell): * lisp/ob-js.el (org-babel-variable-assignments:js): * lisp/ob-latex.el (org-babel-expand-body:latex): * lisp/ob-lilypond.el (org-babel-expand-body:lilypond): * lisp/ob-lisp.el (org-babel-expand-body:lisp): * lisp/ob-maxima.el (org-babel-maxima-expand): * lisp/ob-ocaml.el (org-babel-variable-assignments:ocaml): * lisp/ob-octave.el (org-babel-variable-assignments:octave): * lisp/ob-org.el (org-babel-expand-body:org): * lisp/ob-perl.el (org-babel-variable-assignments:perl): * lisp/ob-picolisp.el (org-babel-expand-body:picolisp): * lisp/ob-processing.el (org-babel-variable-assignments:processing): * lisp/ob-python.el (org-babel-variable-assignments:python): * lisp/ob-ruby.el (org-babel-variable-assignments:ruby): * lisp/ob-scheme.el (org-babel-expand-body:scheme): * lisp/ob-shell.el (org-babel-variable-assignments:shell): * lisp/ob-shen.el (org-babel-expand-body:shen): * lisp/ob-sql.el (org-babel-expand-body:sql): * lisp/ob-sqlite.el (org-babel-expand-body:sqlite): Adapt to change. * etc/ORG-NEWS: Document change.
2015-10-29 15:26:11 -04:00
(org-babel--get-vars params)))
babel: octave: Fix variable assignments made by `org-babel-prep-session:octave' * ob-octave.el (org-babel-expand-body:octave): Refactor: break variable assignment part out into a separate function (org-babel-octave-variable-assignments): New function constructing list of variable assignment statements (org-babel-prep-session:octave): Use new function `org-babel-octave-variable-assignments' instead of previous (incorrect) variable assignment code.
2010-10-14 16:56:41 -04:00
babel: octave and matlab: New variable assignment and expansion scheme * ob-octave.el (org-babel-execute:octave): Use generic expansion function (org-babel-variable-assignments:octave): Change name of function (org-babel-variable-assignments:matlab): New defalias (org-babel-prep-session:octave): Change name of function (org-babel-expand-body:matlab): Delete function (org-babel-expand-body:octave): Delete function
2010-10-21 07:18:43 -04:00
(defalias 'org-babel-variable-assignments:matlab
'org-babel-variable-assignments:octave)
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(defun org-babel-octave-var-to-octave (var)
Finished editing Babel docstrings
2010-07-13 19:20:08 -04:00
"Convert an emacs-lisp value into an octave variable.
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
Converts an emacs-lisp variable into a string of octave code
specifying a variable of the same value."
(if (listp var)
From: Juan <Pechiar@computer.org> Hi, I'm starting to work with ob-octave and found several problems: The first, for which I have a fix (see patch below) is that octave's output was passed on as a string instead of being interpreted as a table: [diff removed] Now this works: 8<------------------------------------------------------------ #+source: test_output #+begin_src octave :results value vector [[1 2 3];[4 5 6]] #+end_src #+results: test_output | 1.00000000e+00 | 2.00000000e+00 | 3.00000000e+00 | | 4.00000000e+00 | 5.00000000e+00 | 6.00000000e+00 | 8<------------------------------------------------------------ (before the patch you'd get a single table element with something like "1 2 3\n 4 5 6\n" inside). The second problem is that if I use octave table output as input to another block, it gets interpreted as a string instead of a vector: 8<------------------------------------------------------------ #+results: test_output | 1.25000000e+00 | #+source: check_input #+begin_src octave :var input=test_output() :results output ischar( input ) size( input ) #+end_src #+results: check_input : input = 1.25000000e+00 : ans = 1 : ans = : 1 14 8<------------------------------------------------------------ This has to do with the EXP notation. The 'e+00' suffix makes the whole table into a string. The problem is with "%S" in the formatting inside org-babel-octave-var-to-octave. The following patch seems to fix it (and makes it possible to work with complex numbers inside the tables):: [diff removed] A third problem is with org-babel-octave-var-to-octave. For example: : (org-babel-octave-var-to-octave '( ( 1 2 3 ) ( 4 5 6 ) )) : -> "[[1, 2, 3], [4, 5, 6]]" This is not a 2x3 matrix, but a 1x6 vector: : octave-3.2.3:1> [[1,2,3],[4,5,6]] : ans = : 1 2 3 4 5 6 a semicolon ';' or '\n' is needed between rows instead of a comma. To sum up: - 2 patches for prepare-session and importing the results back as org-tables (I don't know if these patches break anything). - 1 problem with matrix notation in org-babel-octave-var-to-octave. I'll try to provide a patch for this today. 2010-08-01 Juan Pechiar <Pechiar@computer.org> * ob-octave.el (org-babel-octave-evaluate-external-process): use `org-babel-octave-import-elisp-from-file' instead of `org-babel-eval-read-file'. (org-babel-octave-var-to-octave): separate matrix rows with ';', and use '%s' as format specifier instead of '%S'
2010-08-01 18:09:24 -04:00
(concat "[" (mapconcat #'org-babel-octave-var-to-octave var
(if (listp (car var)) "; " ",")) "]")
Add string input variables to ob-octave.el. Add tests for ob-octave.el
2011-11-08 16:19:04 -05:00
(cond
((stringp var)
Backport commit 284c470 from Emacs master branch Backslash cleanup in Elisp source files 284c470ef752967fcd8bae6a450dc138462b1e49 Paul Eggert Thu Sep 17 16:09:39 2015 -0700
2015-09-17 19:08:20 -04:00
(format "'%s'" var))
Add string input variables to ob-octave.el. Add tests for ob-octave.el
2011-11-08 16:19:04 -05:00
(t
(format "%s" var)))))
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(defun org-babel-prep-session:octave (session params &optional matlabp)
"Prepare SESSION according to the header arguments specified in PARAMS."
(let* ((session (org-babel-octave-initiate-session session params matlabp))
babel: octave and matlab: New variable assignment and expansion scheme * ob-octave.el (org-babel-execute:octave): Use generic expansion function (org-babel-variable-assignments:octave): Change name of function (org-babel-variable-assignments:matlab): New defalias (org-babel-prep-session:octave): Change name of function (org-babel-expand-body:matlab): Delete function (org-babel-expand-body:octave): Delete function
2010-10-21 07:18:43 -04:00
(var-lines (org-babel-variable-assignments:octave params)))
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(org-babel-comint-in-buffer session
(mapc (lambda (var)
Xemacs incompatibilities Carsten Dominik <carsten.dominik@gmail.com> writes: > On May 17, 2010, at 4:39 PM, Michael Sperber wrote: > >> In particular, fixing the require won't be enough: org-babel-python.el >> uses `run-python' and interacts with the inferior Python, whereas >> python-mode.el defines `py-shell'. >> >> Should I try to abstract over the differences? > > Yes, this would be much appreciated. (I think, Eric or Dan?) OK, I've attached a patch that makes `org-babel-python' work on XEmacs. Most of the issues are pure XEmacs issues. Notes: - XEmacs doesn't have [[:digit:]] - I hope to rectify this in the future, but it seems there's no downside in this particular case to replacing by [0-9]. - XEmacs doesn't have `move-end-of-line', but does have `end-of-line'. I don't understand the intent of having both of these, but the code seems fine with `end-of-line'. - It seems there are way too few `require's throughout org-babel. I don't know if it's OK to add the ones I needed. - `org-babel-python-evaluate' looked broken as-is: It doesn't use the `body' argument properly, the result is (I think) processed in the wrong order and not properly split into lines. I've fixed all these, but a review is probably in order.
2010-05-24 15:22:50 -04:00
(end-of-line 1) (insert var) (comint-send-input nil t)
Tiny formatting fixes * lisp/ox.el (org-export-table-dimensions): * lisp/ox-texinfo.el (org-texinfo-template): * lisp/ox-md.el (org-md-link): * lisp/ox-icalendar.el (org-icalendar-use-UTC-date-time-p): * lisp/ox-ascii.el (org-ascii-fixed-width): * lisp/org.el (org-context): * lisp/org-table.el (org-table-eval-formula) (org-table-export): * lisp/org-refile.el: * lisp/org-plot.el (org-plot/gnuplot-to-grid-data): * lisp/org-num.el (org-num): * lisp/org-mouse.el (org-mouse-popup-global-menu) (org-mouse-context-menu): * lisp/org-macro.el (org-macro): * lisp/org-lint.el (org-lint): * lisp/org-keys.el (org-keys): * lisp/org-duration.el: * lisp/org-clock.el (org-clock-get-last-clock-out-time) (org-clock-update-mode-line, org-find-open-clocks): * lisp/org-agenda.el (org-diary) (org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item) (org-agenda-highlight-todo, org-cmp-alpha) (org-agenda-filter-by-category): * lisp/ol.el (org-link-expand-abbrev, ol): * lisp/ol-docview.el (ol-docview): * lisp/ol-bibtex.el (org-execute-file-search-in-bibtex) (org-bibtex, org-bibtex-read): * lisp/ol-bbdb.el (org-bbdb-anniversary-description): * lisp/ob-tangle.el (org-babel-tangle-jump-to-org): * lisp/ob-table.el (org-babel-table-truncate-at-newline): * lisp/ob-stan.el: * lisp/ob-sqlite.el (org-babel-sqlite-table-or-scalar): * lisp/ob-sql.el: * lisp/ob-shen.el: * lisp/ob-shell.el (org-babel-prep-session:shell) (org-babel-prep-session:shell): * lisp/ob-sed.el (org-babel-execute:sed) (org-babel-execute:sed): * lisp/ob-screen.el: * lisp/ob-sass.el: * lisp/ob-ruby.el (org-babel-prep-session:ruby) (org-babel-prep-session:ruby): * lisp/ob-ref.el (org-babel-ref-resolve, ob-ref): * lisp/ob-python.el (org-babel-prep-session:python) (org-babel-prep-session:python): * lisp/ob-plantuml.el: * lisp/ob-picolisp.el: * lisp/ob-perl.el: * lisp/ob-org.el: * lisp/ob-octave.el (org-babel-prep-session:octave) (org-babel-prep-session:octave) (org-babel-octave-evaluate-session): * lisp/ob-ocaml.el: * lisp/ob-mscgen.el (org-babel-execute:mscgen) (org-babel-execute:mscgen): * lisp/ob-maxima.el: (ob-maxima): * lisp/ob-matlab.el: * lisp/ob-makefile.el: * lisp/ob-lua.el (org-babel-prep-session:lua) (org-babel-prep-session:lua): * lisp/ob-lisp.el: * lisp/ob-ledger.el: * lisp/ob-latex.el (org-babel-expand-body:latex) (org-babel-expand-body:latex, ob-latex): * lisp/ob-js.el: * lisp/ob-java.el: * lisp/ob-io.el (org-babel-prep-session:io) (org-babel-prep-session:io): * lisp/ob-hledger.el: * lisp/ob-haskell.el: * lisp/ob-groovy.el (org-babel-groovy-wrapper-method) (org-babel-groovy-evaluate): * lisp/ob-gnuplot.el: * lisp/ob-fortran.el (org-babel-expand-body:fortran) (org-babel-expand-body:fortran): * lisp/ob-forth.el (org-babel-forth-session-execute): * lisp/ob-exp.el (ob-exp): * lisp/ob-eval.el: * lisp/ob-emacs-lisp.el: * lisp/ob-ebnf.el: * lisp/ob-dot.el: * lisp/ob-ditaa.el: * lisp/ob-css.el: * lisp/ob-core.el (org-babel-put-rownames): * lisp/ob-coq.el: * lisp/ob-comint.el: * lisp/ob-calc.el: * lisp/ob-awk.el: * lisp/ob-asymptote.el: * lisp/ob-abc.el: * lisp/ob-R.el (org-babel-prep-session:R): Formatting fixes.
2020-02-18 16:57:37 -05:00
(org-babel-comint-wait-for-output session))
var-lines))
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
session))
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(defun org-babel-matlab-initiate-session (&optional session params)
Finished editing Babel docstrings
2010-07-13 19:20:08 -04:00
"Create a matlab inferior process buffer.
If there is not a current inferior-process-buffer in SESSION then
Massive code clean-up. Delete trailing whitespaces. Indent all sexps correctly. Sentences end with double spaces.
2012-08-11 13:10:44 -04:00
create. Return the initialized session."
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(org-babel-octave-initiate-session session params 'matlab))
babel: matlab/octave: only (require 'matlab) when necessary 2010-08-01 Dan Davison <davison@stats.ox.ac.uk> * ob-octave.el only (require 'matlab) when necessary (org-babel-octave-initiate-session) (require) octave-inf or matlab as appropriate (org-babel-execute:matlab): remove (require) (org-babel-prep-session:matlab): remove (require) (org-babel-matlab-initiate-session): remove (require)
2010-08-01 14:34:28 -04:00
Activate lexical binding in some libraries * lisp/ob-C.el (org-babel-prep-session:C): (org-babel-load-session:C): * lisp/ob-J.el: (org-babel-expand-body:J): (org-babel-execute:J): * lisp/ob-R.el: (org-babel-expand-body:R): * lisp/ob-abc.el: (org-babel-execute:abc): (org-babel-prep-session:abc): * lisp/ob-asymptote.el: (org-babel-execute:asymptote): (org-babel-prep-session:asymptote): * lisp/ob-awk.el: (org-babel-expand-body:awk): * lisp/ob-calc.el: (org-babel-expand-body:calc): * lisp/ob-clojure.el: * lisp/ob-comint.el: (org-babel-comint-in-buffer): (org-babel-comint-with-output): (org-babel-comint-eval-invisibly-and-wait-for-file): * lisp/ob-coq.el: * lisp/ob-css.el: (org-babel-execute:css): (org-babel-prep-session:css): * lisp/ob-ditaa.el: (org-babel-execute:ditaa): (org-babel-prep-session:ditaa): * lisp/ob-dot.el: (org-babel-execute:dot): (org-babel-prep-session:dot): * lisp/ob-ebnf.el: * lisp/ob-emacs-lisp.el: * lisp/ob-eval.el: * lisp/ob-forth.el: * lisp/ob-fortran.el: (org-babel-execute:fortran): (org-babel-prep-session:fortran): (org-babel-load-session:fortran): * lisp/ob-gnuplot.el: (org-babel-expand-body:gnuplot): (org-babel-prep-session:gnuplot): (org-babel-gnuplot-initiate-session): * lisp/ob-groovy.el: (org-babel-prep-session:groovy): (org-babel-groovy-initiate-session): * lisp/ob-haskell.el: (org-babel-haskell-initiate-session): * lisp/ob-io.el: (org-babel-prep-session:io): (org-babel-io-initiate-session): * lisp/ob-java.el: (org-babel-execute:java): * lisp/ob-js.el: * lisp/ob-keys.el: * lisp/ob-latex.el: (org-babel-prep-session:latex): * lisp/ob-ledger.el: (org-babel-execute:ledger): (org-babel-prep-session:ledger): * lisp/ob-lilypond.el: (org-babel-lilypond-commands): (org-babel-lilypond-process-basic): (org-babel-prep-session:lilypond): (org-babel-lilypond-parse-line-num): * lisp/ob-lisp.el: * lisp/ob-makefile.el: (org-babel-execute:makefile): (org-babel-prep-session:makefile): * lisp/ob-matlab.el: * lisp/ob-maxima.el: (org-babel-prep-session:maxima): * lisp/ob-mscgen.el: (org-babel-prep-session:mscgen): * lisp/ob-ocaml.el: (org-babel-execute:ocaml): (org-babel-prep-session:ocaml): * lisp/ob-octave.el: (org-babel-execute:octave): (org-babel-octave-initiate-session): * lisp/ob-org.el: (org-babel-prep-session:org): * lisp/ob-perl.el: (org-babel-prep-session:perl): (org-babel-perl--var-to-perl): (org-babel-perl-initiate-session): * lisp/ob-picolisp.el: (org-babel-expand-body:picolisp): (org-babel-execute:picolisp): * lisp/ob-plantuml.el: (org-babel-execute:plantuml): (org-babel-prep-session:plantuml): * lisp/ob-processing.el: (org-babel-prep-session:processing): * lisp/ob-python.el: (org-babel-python-initiate-session): * lisp/ob-ref.el: (org-babel-ref-resolve): * lisp/ob-ruby.el: (org-babel-ruby-initiate-session): * lisp/ob-sass.el: (org-babel-execute:sass): (org-babel-prep-session:sass): * lisp/ob-scala.el: (org-babel-execute:scala): (org-babel-prep-session:scala): (org-babel-scala-initiate-session): * lisp/ob-scheme.el: * lisp/ob-screen.el: (org-babel-prep-session:screen): (org-babel-screen-session-write-temp-file): (org-babel-screen-test): * lisp/ob.el: * lisp/org-colview.el: (org-columns-todo): (org-columns-set-tags-or-toggle): (org-columns-new): (org-columns-uncompile-format): (org-agenda-colview-summarize): * lisp/org-footnote.el: (electric-indent-mode): * lisp/org-indent.el: (org-indent-refresh-maybe): * lisp/org-list.el: * lisp/org-macro.el: (org-macro--collect-macros): * lisp/org-src.el: * lisp/org-table.el: (sort-fold-case): (org-table-create): (org-table-field-info): (org-table-transpose-table-at-point): (org-table-remove-rectangle-highlight): (orgtbl-create-or-convert-from-region): (org-define-lookup-function): * lisp/ox-ascii.el: (org-ascii-format-drawer-function): (org-ascii--has-caption-p): (org-ascii-bold): (org-ascii-center-block): (org-ascii-clock): (org-ascii-code): (org-ascii-dynamic-block): (org-ascii-entity): (org-ascii-example-block): (org-ascii-export-snippet): (org-ascii-export-block): (org-ascii-fixed-width): (org-ascii-footnote-reference): (org-ascii-horizontal-rule): (org-ascii-inline-src-block): (org-ascii-format-inlinetask-default): (org-ascii-italic): (org-ascii-keyword): (org-ascii-latex-environment): (org-ascii-latex-fragment): (org-ascii-line-break): (org-ascii-node-property): (org-ascii-planning): (org-ascii-quote-block): (org-ascii-radio-target): (org-ascii-special-block): (org-ascii-src-block): (org-ascii-statistics-cookie): (org-ascii-subscript): (org-ascii-superscript): (org-ascii-strike-through): (org-ascii-timestamp): (org-ascii-underline): (org-ascii-verbatim): (org-ascii-verse-block): (org-ascii-filter-headline-blank-lines): (org-ascii-filter-paragraph-spacing): (org-ascii-filter-comment-spacing): Use lexical binding.
2015-10-25 20:56:00 -04:00
(defun org-babel-octave-initiate-session (&optional session _params matlabp)
Finished editing Babel docstrings
2010-07-13 19:20:08 -04:00
"Create an octave inferior process buffer.
If there is not a current inferior-process-buffer in SESSION then
Massive code clean-up. Delete trailing whitespaces. Indent all sexps correctly. Sentences end with double spaces.
2012-08-11 13:10:44 -04:00
create. Return the initialized session."
ob-octave: Emacs 24.4 will ditch octave-inf in favor for octave * lisp/ob-octave.el (org-babel-octave-initiate-session): If octave-inf can't be loaded, try octave instead before giving up. Emacs 24.3.50 and upwards replaces octave-inf with just plain octave.
2013-05-19 14:49:38 -04:00
(if matlabp (require 'matlab) (or (require 'octave-inf nil 'noerror)
(require 'octave)))
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(unless (string= session "none")
babel: updated ob-octave.el to work with the new ob-eval.el functions Note, the session based evaluation has *not* be updated, mainly because I don't have a working octave install with which to test the changes.
2010-07-04 16:48:41 -04:00
(let ((session (or session
(if matlabp "*Inferior Matlab*" "*Inferior Octave*"))))
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(if (org-babel-comint-buffer-livep session) session
(save-window-excursion
babel: matlab: don't try matlab-shell if using emacs link
2010-04-30 16:47:07 -04:00
(if matlabp (unless org-babel-matlab-with-emacs-link (matlab-shell))
(run-octave))
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(rename-buffer (if (bufferp session) (buffer-name session)
babel: updated ob-octave.el to work with the new ob-eval.el functions Note, the session based evaluation has *not* be updated, mainly because I don't have a working octave install with which to test the changes.
2010-07-04 16:48:41 -04:00
(if (stringp session) session (buffer-name))))
(current-buffer))))))
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(defun org-babel-octave-evaluate
*el: Fix indentation
2021-09-29 03:22:47 -04:00
(session body result-type &optional matlabp)
Finished editing Babel docstrings
2010-07-13 19:20:08 -04:00
"Pass BODY to the octave process in SESSION.
Protect remaining apostrophes in docstrings Protect apostrophes not covered by the last backport. Convert expressions like '(...) to \\='(...) and symbols written as 'name to `name'. (In addition to ensuring the correct display, the latter also improves consistency with many Org docstrings.) If these aren't protected, Emacs 25 may display them as curved quotes in the help buffer, depending on the value of text-quoting-style.
2015-09-21 00:24:12 -04:00
If RESULT-TYPE equals `output' then return the outputs of the
statements in BODY, if RESULT-TYPE equals `value' then return the
Finished editing Babel docstrings
2010-07-13 19:20:08 -04:00
value of the last statement in BODY, as elisp."
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(if session
babel: updated ob-octave.el to work with the new ob-eval.el functions Note, the session based evaluation has *not* be updated, mainly because I don't have a working octave install with which to test the changes.
2010-07-04 16:48:41 -04:00
(org-babel-octave-evaluate-session session body result-type matlabp)
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(org-babel-octave-evaluate-external-process body result-type matlabp)))
(defun org-babel-octave-evaluate-external-process (body result-type matlabp)
ensuring the existence of a complete first sentence in the documentation of each babel function
2010-06-11 20:12:15 -04:00
"Evaluate BODY in an external octave process."
babel: updated ob-octave.el to work with the new ob-eval.el functions Note, the session based evaluation has *not* be updated, mainly because I don't have a working octave install with which to test the changes.
2010-07-04 16:48:41 -04:00
(let ((cmd (if matlabp
org-babel-matlab-shell-command
org-babel-octave-shell-command)))
Silence byte-compiler * lisp/ob-core.el (org-babel-process-params): Silence byte-compiler. * lisp/ob-groovy.el (org-babel-groovy-evaluate): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-io-evaluate): * lisp/ob-octave.el (org-babel-octave-evaluate-external-process): (org-babel-octave-evaluate-session): * lisp/ob-perl.el (org-babel-perl-evaluate): * lisp/ob-python.el (org-babel-python-evaluate-external-process): (org-babel-python-evaluate-session): * lisp/ob-ruby.el (org-babel-ruby-pp-wrapper-method): (org-babel-ruby-evaluate): * lisp/ob-scala.el: * lisp/ob-tangle.el: (org-babel-tangle-collect-blocks): * lisp/org-agenda.el (org-agenda-get-category-icon): (org-agenda-todo-yesterday): * lisp/org-bbdb.el (org-bbdb-anniv-extract-date): (org-bbdb-make-anniv-hash): (org-bbdb-anniversaries-future): * lisp/org-bibtex.el (org-bibtex-fleshout): (org-bibtex-read): (org-bibtex-write): * lisp/org-capture.el (org-capture-set-target-location): (org-capture-get-indirect-buffer): (org-mks): * lisp/org-clock.el (org-clock--oldest-date): (org-clock-resolve): (org-clock-sum): (org-clock-special-range): (org-clocktable-steps): * lisp/org-ctags.el (org-ctags-create-tags): * lisp/org-element.el (org-element--interpret-affiliated-keywords): (org-element--cache-shift-positions): (org-element--cache-sync): (org-element--cache-submit-request): * lisp/org-habit.el (org-habit-parse-todo): * lisp/org-inlinetask.el (org-inlinetask-hide-tasks): * lisp/org-lint.el (org-lint--generate-reports): * lisp/org-mouse.el (org-mouse-get-context): * lisp/org-plot.el (org-plot/gnuplot-to-grid-data): (org-plot/gnuplot): * lisp/ox-ascii.el (org-ascii--current-text-width): (org-ascii--current-justification): (org-ascii--build-caption): (org-ascii--checkbox): (org-ascii-item): * lisp/ox-html.el (org-html-footnote-section): * lisp/ox-latex.el (org-latex--make-option-string): * lisp/ox-odt.el (org-odt-toc): (org-odt-add-automatic-style): (org-odt-format-label): (org-odt-link--inline-image): (org-odt--render-image/formula): (org-odt--enumerable-image-p): (org-odt--enumerable-latex-image-p): (org-odt--enumerable-formula-p): (org-odt-do-format-code): (org-odt-table-cell): Silence byte-compiler.
2016-07-25 10:34:48 -04:00
(pcase result-type
(`output (org-babel-eval cmd body))
(`value (let ((tmp-file (org-babel-temp-file "octave-")))
*el: Fix indentation
2021-09-29 03:22:47 -04:00
(org-babel-eval
cmd
(format org-babel-octave-wrapper-method body
(org-babel-process-file-name tmp-file 'noquote)
(org-babel-process-file-name tmp-file 'noquote)))
(org-babel-octave-import-elisp-from-file tmp-file))))))
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(defun org-babel-octave-evaluate-session
Silence byte-compiler * lisp/ob-core.el (org-babel-process-params): Silence byte-compiler. * lisp/ob-groovy.el (org-babel-groovy-evaluate): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-io-evaluate): * lisp/ob-octave.el (org-babel-octave-evaluate-external-process): (org-babel-octave-evaluate-session): * lisp/ob-perl.el (org-babel-perl-evaluate): * lisp/ob-python.el (org-babel-python-evaluate-external-process): (org-babel-python-evaluate-session): * lisp/ob-ruby.el (org-babel-ruby-pp-wrapper-method): (org-babel-ruby-evaluate): * lisp/ob-scala.el: * lisp/ob-tangle.el: (org-babel-tangle-collect-blocks): * lisp/org-agenda.el (org-agenda-get-category-icon): (org-agenda-todo-yesterday): * lisp/org-bbdb.el (org-bbdb-anniv-extract-date): (org-bbdb-make-anniv-hash): (org-bbdb-anniversaries-future): * lisp/org-bibtex.el (org-bibtex-fleshout): (org-bibtex-read): (org-bibtex-write): * lisp/org-capture.el (org-capture-set-target-location): (org-capture-get-indirect-buffer): (org-mks): * lisp/org-clock.el (org-clock--oldest-date): (org-clock-resolve): (org-clock-sum): (org-clock-special-range): (org-clocktable-steps): * lisp/org-ctags.el (org-ctags-create-tags): * lisp/org-element.el (org-element--interpret-affiliated-keywords): (org-element--cache-shift-positions): (org-element--cache-sync): (org-element--cache-submit-request): * lisp/org-habit.el (org-habit-parse-todo): * lisp/org-inlinetask.el (org-inlinetask-hide-tasks): * lisp/org-lint.el (org-lint--generate-reports): * lisp/org-mouse.el (org-mouse-get-context): * lisp/org-plot.el (org-plot/gnuplot-to-grid-data): (org-plot/gnuplot): * lisp/ox-ascii.el (org-ascii--current-text-width): (org-ascii--current-justification): (org-ascii--build-caption): (org-ascii--checkbox): (org-ascii-item): * lisp/ox-html.el (org-html-footnote-section): * lisp/ox-latex.el (org-latex--make-option-string): * lisp/ox-odt.el (org-odt-toc): (org-odt-add-automatic-style): (org-odt-format-label): (org-odt-link--inline-image): (org-odt--render-image/formula): (org-odt--enumerable-image-p): (org-odt--enumerable-latex-image-p): (org-odt--enumerable-formula-p): (org-odt-do-format-code): (org-odt-table-cell): Silence byte-compiler.
2016-07-25 10:34:48 -04:00
(session body result-type &optional matlabp)
ensuring the existence of a complete first sentence in the documentation of each babel function
2010-06-11 20:12:15 -04:00
"Evaluate BODY in SESSION."
babel: Make temp file names consistent * ob-scheme.el (org-babel-execute:scheme): Alter temp file name * ob-ruby.el (org-babel-ruby-evaluate): Alter temp file name * ob-python.el (org-babel-python-evaluate-external-process): Alter temp file name * ob-perl.el (org-babel-perl-evaluate): Alter temp file name * ob-octave.el (org-babel-octave-evaluate-session): Alter temp file name (org-babel-octave-import-elisp-from-file): Alter temp file name * ob-ledger.el (org-babel-execute:ledger): Alter temp file name * ob-gnuplot.el (org-babel-gnuplot-process-vars): Alter temp file name (org-babel-execute:gnuplot): Alter temp file name
2010-09-20 19:38:31 -04:00
(let* ((tmp-file (org-babel-temp-file (if matlabp "matlab-" "octave-")))
Babel now cleans up any temporary files created using org-babel-temp-file * lisp/ob.el (org-babel-temporary-directory): variable to hold the value of the Babel temporary directory (org-babel-temp-file): replacement for make-temp-file with cleanup on exit of Emacs (org-babel-remove-temporary-directory): cleanup function run on exit of Emacs (kill-emacs-hook): now includes babel cleanup function * lisp/ob-C.el (org-babel-C-execute): using org-babel-temp-file instead of make-temp-file * lisp/ob-R.el (org-babel-R-assign-elisp): using `org-babel-temp-file' instead of `make-temp-file' (org-babel-R-evaluate-external-process): using `org-babel-temp-file' instead of `make-temp-file' (org-babel-R-evaluate-session): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-asymptote.el (org-babel-execute:asymptote): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-clojure.el (org-babel-clojure-evaluate-external-process): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-ditaa.el (org-babel-execute:ditaa): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-dot.el (org-babel-execute:dot): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): using `org-babel-temp-file' instead of `make-temp-file' (org-babel-execute:gnuplot): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-haskell.el (org-babel-load-session:haskell): using `org-babel-temp-file' instead of `make-temp-file' (org-babel-haskell-export-to-lhs): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-latex.el (org-babel-execute:latex): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-ledger.el (org-babel-execute:ledger): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-lisp.el (org-babel-execute:lisp): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-octave.el (org-babel-octave-evaluate-external-process): using `org-babel-temp-file' instead of `make-temp-file' (org-babel-octave-evaluate-session): using `org-babel-temp-file' instead of `make-temp-file' (org-babel-octave-import-elisp-from-file): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-perl.el (org-babel-perl-evaluate): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-python.el (org-babel-python-evaluate): using `org-babel-temp-file' instead of `make-temp-file' using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-ruby.el (org-babel-ruby-evaluate): using `org-babel-temp-file' instead of `make-temp-file' using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-sass.el (org-babel-execute:sass): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-sh.el (org-babel-sh-evaluate): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-sql.el (org-babel-execute:sql): using `org-babel-temp-file' instead of `make-temp-file' * lisp/ob-sqlite.el (org-babel-execute:sqlite): using `org-babel-temp-file' instead of `make-temp-file' (org-babel-sqlite-expand-vars): using `org-babel-temp-file' instead of `make-temp-file'
2010-08-25 16:43:07 -04:00
(wait-file (org-babel-temp-file "matlab-emacs-link-wait-signal-"))
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(full-body
Silence byte-compiler * lisp/ob-core.el (org-babel-process-params): Silence byte-compiler. * lisp/ob-groovy.el (org-babel-groovy-evaluate): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-io-evaluate): * lisp/ob-octave.el (org-babel-octave-evaluate-external-process): (org-babel-octave-evaluate-session): * lisp/ob-perl.el (org-babel-perl-evaluate): * lisp/ob-python.el (org-babel-python-evaluate-external-process): (org-babel-python-evaluate-session): * lisp/ob-ruby.el (org-babel-ruby-pp-wrapper-method): (org-babel-ruby-evaluate): * lisp/ob-scala.el: * lisp/ob-tangle.el: (org-babel-tangle-collect-blocks): * lisp/org-agenda.el (org-agenda-get-category-icon): (org-agenda-todo-yesterday): * lisp/org-bbdb.el (org-bbdb-anniv-extract-date): (org-bbdb-make-anniv-hash): (org-bbdb-anniversaries-future): * lisp/org-bibtex.el (org-bibtex-fleshout): (org-bibtex-read): (org-bibtex-write): * lisp/org-capture.el (org-capture-set-target-location): (org-capture-get-indirect-buffer): (org-mks): * lisp/org-clock.el (org-clock--oldest-date): (org-clock-resolve): (org-clock-sum): (org-clock-special-range): (org-clocktable-steps): * lisp/org-ctags.el (org-ctags-create-tags): * lisp/org-element.el (org-element--interpret-affiliated-keywords): (org-element--cache-shift-positions): (org-element--cache-sync): (org-element--cache-submit-request): * lisp/org-habit.el (org-habit-parse-todo): * lisp/org-inlinetask.el (org-inlinetask-hide-tasks): * lisp/org-lint.el (org-lint--generate-reports): * lisp/org-mouse.el (org-mouse-get-context): * lisp/org-plot.el (org-plot/gnuplot-to-grid-data): (org-plot/gnuplot): * lisp/ox-ascii.el (org-ascii--current-text-width): (org-ascii--current-justification): (org-ascii--build-caption): (org-ascii--checkbox): (org-ascii-item): * lisp/ox-html.el (org-html-footnote-section): * lisp/ox-latex.el (org-latex--make-option-string): * lisp/ox-odt.el (org-odt-toc): (org-odt-add-automatic-style): (org-odt-format-label): (org-odt-link--inline-image): (org-odt--render-image/formula): (org-odt--enumerable-image-p): (org-odt--enumerable-latex-image-p): (org-odt--enumerable-formula-p): (org-odt-do-format-code): (org-odt-table-cell): Silence byte-compiler.
2016-07-25 10:34:48 -04:00
(pcase result-type
(`output
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
(mapconcat
#'org-babel-chomp
(list body org-babel-octave-eoe-indicator) "\n"))
Silence byte-compiler * lisp/ob-core.el (org-babel-process-params): Silence byte-compiler. * lisp/ob-groovy.el (org-babel-groovy-evaluate): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-io-evaluate): * lisp/ob-octave.el (org-babel-octave-evaluate-external-process): (org-babel-octave-evaluate-session): * lisp/ob-perl.el (org-babel-perl-evaluate): * lisp/ob-python.el (org-babel-python-evaluate-external-process): (org-babel-python-evaluate-session): * lisp/ob-ruby.el (org-babel-ruby-pp-wrapper-method): (org-babel-ruby-evaluate): * lisp/ob-scala.el: * lisp/ob-tangle.el: (org-babel-tangle-collect-blocks): * lisp/org-agenda.el (org-agenda-get-category-icon): (org-agenda-todo-yesterday): * lisp/org-bbdb.el (org-bbdb-anniv-extract-date): (org-bbdb-make-anniv-hash): (org-bbdb-anniversaries-future): * lisp/org-bibtex.el (org-bibtex-fleshout): (org-bibtex-read): (org-bibtex-write): * lisp/org-capture.el (org-capture-set-target-location): (org-capture-get-indirect-buffer): (org-mks): * lisp/org-clock.el (org-clock--oldest-date): (org-clock-resolve): (org-clock-sum): (org-clock-special-range): (org-clocktable-steps): * lisp/org-ctags.el (org-ctags-create-tags): * lisp/org-element.el (org-element--interpret-affiliated-keywords): (org-element--cache-shift-positions): (org-element--cache-sync): (org-element--cache-submit-request): * lisp/org-habit.el (org-habit-parse-todo): * lisp/org-inlinetask.el (org-inlinetask-hide-tasks): * lisp/org-lint.el (org-lint--generate-reports): * lisp/org-mouse.el (org-mouse-get-context): * lisp/org-plot.el (org-plot/gnuplot-to-grid-data): (org-plot/gnuplot): * lisp/ox-ascii.el (org-ascii--current-text-width): (org-ascii--current-justification): (org-ascii--build-caption): (org-ascii--checkbox): (org-ascii-item): * lisp/ox-html.el (org-html-footnote-section): * lisp/ox-latex.el (org-latex--make-option-string): * lisp/ox-odt.el (org-odt-toc): (org-odt-add-automatic-style): (org-odt-format-label): (org-odt-link--inline-image): (org-odt--render-image/formula): (org-odt--enumerable-image-p): (org-odt--enumerable-latex-image-p): (org-odt--enumerable-formula-p): (org-odt-do-format-code): (org-odt-table-cell): Silence byte-compiler.
2016-07-25 10:34:48 -04:00
(`value
babel: matlab: detect end of evaluation under Emacs Link Currently, this uses the presence of a temporary file to signal that Matlab Emacs Link evaluation is not yet complete. Emacs Link support added in collaboration with Christopher Long.
2010-05-03 21:43:23 -04:00
(if (and matlabp org-babel-matlab-with-emacs-link)
(concat
(format org-babel-matlab-emacs-link-wrapper-method
babel: New function to process file names for use in external processes * ob.el (org-babel-process-file-name): New function (org-babel-maybe-remote-file): Delete function * ob-sql.el (org-babel-execute:sql): Use org-babel-process-file-name * ob-scheme.el (org-babel-execute:scheme): Use org-babel-process-file-name * ob-sass.el (org-babel-execute:sass): Use org-babel-process-file-name * ob-ruby.el (org-babel-ruby-evaluate): Use org-babel-process-file-name * ob-python.el (org-babel-python-evaluate-external-process): Use org-babel-process-file-name (org-babel-python-evaluate-session): Use org-babel-process-file-name * ob-plantuml.el (org-babel-execute:plantuml): Use org-babel-process-file-name * ob-perl.el (org-babel-perl-evaluate): Use org-babel-process-file-name * ob-octave.el (org-babel-octave-evaluate-external-process): Use org-babel-process-file-name (org-babel-octave-evaluate-session): Use org-babel-process-file-name, don't use org-babel-maybe-remote-file * ob-lisp.el (org-babel-execute:lisp): Use org-babel-process-file-name * ob-ledger.el (org-babel-execute:ledger): Use org-babel-process-file-name * ob-js.el (org-babel-execute:js): Use org-babel-process-file-name * ob-haskell.el (org-babel-haskell-export-to-lhs): Use org-babel-process-file-name * ob-gnuplot.el (org-babel-execute:gnuplot): Use org-babel-process-file-name * ob-eval.el (org-babel-eval-read-file): Don't use org-babel-maybe-remote-file * ob-dot.el (org-babel-execute:dot): Use org-babel-process-file-name * ob-ditaa.el (org-babel-execute:ditaa): Use org-babel-process-file-name * ob-clojure.el (org-babel-clojure-evaluate-external-process): Use org-babel-process-file-name * ob-asymptote.el (org-babel-execute:asymptote): Use org-babel-process-file-name * ob-R.el (org-babel-R-assign-elisp): Don't use org-babel-maybe-remote-file, use org-babel-process-file-name (org-babel-R-evaluate-external-process): Use org-babel-process-file-name (org-babel-R-evaluate-session): Use org-babel-process-file-name * ob-C.el (org-babel-C-execute): Use org-babel-process-file-name In addition to passing the file path through `expand-file-name', tramp-style remote file names are converted to conventional (local) file paths. The reason is that, if a tramp file name was in use in emacs, then the shell command will be executing on the remote machine in question. Further, by default the file name is passed through `shell-quote-argument'.
2010-09-22 16:40:14 -04:00
body
(org-babel-process-file-name tmp-file 'noquote)
(org-babel-process-file-name tmp-file 'noquote) wait-file) "\n")
babel: matlab: detect end of evaluation under Emacs Link Currently, this uses the presence of a temporary file to signal that Matlab Emacs Link evaluation is not yet complete. Emacs Link support added in collaboration with Christopher Long.
2010-05-03 21:43:23 -04:00
(mapconcat
#'org-babel-chomp
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-02 22:21:31 -04:00
(list (format org-babel-octave-wrapper-method
babel: New function to process file names for use in external processes * ob.el (org-babel-process-file-name): New function (org-babel-maybe-remote-file): Delete function * ob-sql.el (org-babel-execute:sql): Use org-babel-process-file-name * ob-scheme.el (org-babel-execute:scheme): Use org-babel-process-file-name * ob-sass.el (org-babel-execute:sass): Use org-babel-process-file-name * ob-ruby.el (org-babel-ruby-evaluate): Use org-babel-process-file-name * ob-python.el (org-babel-python-evaluate-external-process): Use org-babel-process-file-name (org-babel-python-evaluate-session): Use org-babel-process-file-name * ob-plantuml.el (org-babel-execute:plantuml): Use org-babel-process-file-name * ob-perl.el (org-babel-perl-evaluate): Use org-babel-process-file-name * ob-octave.el (org-babel-octave-evaluate-external-process): Use org-babel-process-file-name (org-babel-octave-evaluate-session): Use org-babel-process-file-name, don't use org-babel-maybe-remote-file * ob-lisp.el (org-babel-execute:lisp): Use org-babel-process-file-name * ob-ledger.el (org-babel-execute:ledger): Use org-babel-process-file-name * ob-js.el (org-babel-execute:js): Use org-babel-process-file-name * ob-haskell.el (org-babel-haskell-export-to-lhs): Use org-babel-process-file-name * ob-gnuplot.el (org-babel-execute:gnuplot): Use org-babel-process-file-name * ob-eval.el (org-babel-eval-read-file): Don't use org-babel-maybe-remote-file * ob-dot.el (org-babel-execute:dot): Use org-babel-process-file-name * ob-ditaa.el (org-babel-execute:ditaa): Use org-babel-process-file-name * ob-clojure.el (org-babel-clojure-evaluate-external-process): Use org-babel-process-file-name * ob-asymptote.el (org-babel-execute:asymptote): Use org-babel-process-file-name * ob-R.el (org-babel-R-assign-elisp): Don't use org-babel-maybe-remote-file, use org-babel-process-file-name (org-babel-R-evaluate-external-process): Use org-babel-process-file-name (org-babel-R-evaluate-session): Use org-babel-process-file-name * ob-C.el (org-babel-C-execute): Use org-babel-process-file-name In addition to passing the file path through `expand-file-name', tramp-style remote file names are converted to conventional (local) file paths. The reason is that, if a tramp file name was in use in emacs, then the shell command will be executing on the remote machine in question. Further, by default the file name is passed through `shell-quote-argument'.
2010-09-22 16:40:14 -04:00
body
(org-babel-process-file-name tmp-file 'noquote)
(org-babel-process-file-name tmp-file 'noquote))
babel: matlab: detect end of evaluation under Emacs Link Currently, this uses the presence of a temporary file to signal that Matlab Emacs Link evaluation is not yet complete. Emacs Link support added in collaboration with Christopher Long.
2010-05-03 21:43:23 -04:00
org-babel-octave-eoe-indicator) "\n")))))
babel: Allow EmacsLink to be used for matlab session evaluation To use EmacsLink, the user will need to set org-babel-matlab-with-emacs-link to a non-nil value, and also arrange that (matlab-with-emacs-link) evaluates to a non-nil value.
2010-03-18 21:04:25 -04:00
(raw (if (and matlabp org-babel-matlab-with-emacs-link)
(save-window-excursion
(with-temp-buffer
(insert full-body)
babel: matlab: detect end of evaluation under Emacs Link Currently, this uses the presence of a temporary file to signal that Matlab Emacs Link evaluation is not yet complete. Emacs Link support added in collaboration with Christopher Long.
2010-05-03 21:43:23 -04:00
(write-region "" 'ignored wait-file nil nil nil 'excl)
babel: Allow EmacsLink to be used for matlab session evaluation To use EmacsLink, the user will need to set org-babel-matlab-with-emacs-link to a non-nil value, and also arrange that (matlab-with-emacs-link) evaluates to a non-nil value.
2010-03-18 21:04:25 -04:00
(matlab-shell-run-region (point-min) (point-max))
babel: matlab: detect end of evaluation under Emacs Link Currently, this uses the presence of a temporary file to signal that Matlab Emacs Link evaluation is not yet complete. Emacs Link support added in collaboration with Christopher Long.
2010-05-03 21:43:23 -04:00
(message "Waiting for Matlab Emacs Link")
(while (file-exists-p wait-file) (sit-for 0.01))
babel: Allow EmacsLink to be used for matlab session evaluation To use EmacsLink, the user will need to set org-babel-matlab-with-emacs-link to a non-nil value, and also arrange that (matlab-with-emacs-link) evaluates to a non-nil value.
2010-03-18 21:04:25 -04:00
"")) ;; matlab-shell-run-region doesn't seem to
Massive code clean-up. Delete trailing whitespaces. Indent all sexps correctly. Sentences end with double spaces.
2012-08-11 13:10:44 -04:00
;; make *matlab* buffer contents easily
;; available, so :results output currently
;; won't work
babel: `org-babel-comint-with-output' no longer assumes `full-body' variable * lisp/babel/ob-comint.el (org-babel-comint-with-output): Fixed egregious oversight in which we were assuming that the `full-body' variable would be in scope at the time of macro execution. Thanks to the compiler for finding this bug. * lisp/babel/langs/ob-R.el (org-babel-R-evaluate): now using the fixed `org-babel-comint-with-output' macro * lisp/babel/langs/ob-haskell.el (org-babel-execute:haskell): now using the fixed `org-babel-comint-with-output' macro * lisp/babel/langs/ob-ocaml.el (org-babel-execute:ocaml): now using the fixed `org-babel-comint-with-output' macro * lisp/babel/langs/ob-octave.el (org-babel-octave-evaluate-session): now using the fixed `org-babel-comint-with-output' macro * lisp/babel/langs/ob-python.el (org-babel-python-evaluate): now using the fixed `org-babel-comint-with-output' macro * lisp/babel/langs/ob-ruby.el (org-babel-ruby-evaluate): now using the fixed `org-babel-comint-with-output' macro * lisp/babel/langs/ob-sh.el (org-babel-sh-evaluate): now using the fixed `org-babel-comint-with-output' macro
2010-06-12 18:57:38 -04:00
(org-babel-comint-with-output
remember the ob-comint-with-output is a macro
2010-06-14 20:00:49 -04:00
(session
(if matlabp
org-babel-octave-eoe-indicator
org-babel-octave-eoe-output)
t full-body)
Tiny formatting fixes * lisp/ox.el (org-export-table-dimensions): * lisp/ox-texinfo.el (org-texinfo-template): * lisp/ox-md.el (org-md-link): * lisp/ox-icalendar.el (org-icalendar-use-UTC-date-time-p): * lisp/ox-ascii.el (org-ascii-fixed-width): * lisp/org.el (org-context): * lisp/org-table.el (org-table-eval-formula) (org-table-export): * lisp/org-refile.el: * lisp/org-plot.el (org-plot/gnuplot-to-grid-data): * lisp/org-num.el (org-num): * lisp/org-mouse.el (org-mouse-popup-global-menu) (org-mouse-context-menu): * lisp/org-macro.el (org-macro): * lisp/org-lint.el (org-lint): * lisp/org-keys.el (org-keys): * lisp/org-duration.el: * lisp/org-clock.el (org-clock-get-last-clock-out-time) (org-clock-update-mode-line, org-find-open-clocks): * lisp/org-agenda.el (org-diary) (org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item) (org-agenda-highlight-todo, org-cmp-alpha) (org-agenda-filter-by-category): * lisp/ol.el (org-link-expand-abbrev, ol): * lisp/ol-docview.el (ol-docview): * lisp/ol-bibtex.el (org-execute-file-search-in-bibtex) (org-bibtex, org-bibtex-read): * lisp/ol-bbdb.el (org-bbdb-anniversary-description): * lisp/ob-tangle.el (org-babel-tangle-jump-to-org): * lisp/ob-table.el (org-babel-table-truncate-at-newline): * lisp/ob-stan.el: * lisp/ob-sqlite.el (org-babel-sqlite-table-or-scalar): * lisp/ob-sql.el: * lisp/ob-shen.el: * lisp/ob-shell.el (org-babel-prep-session:shell) (org-babel-prep-session:shell): * lisp/ob-sed.el (org-babel-execute:sed) (org-babel-execute:sed): * lisp/ob-screen.el: * lisp/ob-sass.el: * lisp/ob-ruby.el (org-babel-prep-session:ruby) (org-babel-prep-session:ruby): * lisp/ob-ref.el (org-babel-ref-resolve, ob-ref): * lisp/ob-python.el (org-babel-prep-session:python) (org-babel-prep-session:python): * lisp/ob-plantuml.el: * lisp/ob-picolisp.el: * lisp/ob-perl.el: * lisp/ob-org.el: * lisp/ob-octave.el (org-babel-prep-session:octave) (org-babel-prep-session:octave) (org-babel-octave-evaluate-session): * lisp/ob-ocaml.el: * lisp/ob-mscgen.el (org-babel-execute:mscgen) (org-babel-execute:mscgen): * lisp/ob-maxima.el: (ob-maxima): * lisp/ob-matlab.el: * lisp/ob-makefile.el: * lisp/ob-lua.el (org-babel-prep-session:lua) (org-babel-prep-session:lua): * lisp/ob-lisp.el: * lisp/ob-ledger.el: * lisp/ob-latex.el (org-babel-expand-body:latex) (org-babel-expand-body:latex, ob-latex): * lisp/ob-js.el: * lisp/ob-java.el: * lisp/ob-io.el (org-babel-prep-session:io) (org-babel-prep-session:io): * lisp/ob-hledger.el: * lisp/ob-haskell.el: * lisp/ob-groovy.el (org-babel-groovy-wrapper-method) (org-babel-groovy-evaluate): * lisp/ob-gnuplot.el: * lisp/ob-fortran.el (org-babel-expand-body:fortran) (org-babel-expand-body:fortran): * lisp/ob-forth.el (org-babel-forth-session-execute): * lisp/ob-exp.el (ob-exp): * lisp/ob-eval.el: * lisp/ob-emacs-lisp.el: * lisp/ob-ebnf.el: * lisp/ob-dot.el: * lisp/ob-ditaa.el: * lisp/ob-css.el: * lisp/ob-core.el (org-babel-put-rownames): * lisp/ob-coq.el: * lisp/ob-comint.el: * lisp/ob-calc.el: * lisp/ob-awk.el: * lisp/ob-asymptote.el: * lisp/ob-abc.el: * lisp/ob-R.el (org-babel-prep-session:R): Formatting fixes.
2020-02-18 16:57:37 -05:00
(insert full-body) (comint-send-input nil t))))
results)
Silence byte-compiler * lisp/ob-core.el (org-babel-process-params): Silence byte-compiler. * lisp/ob-groovy.el (org-babel-groovy-evaluate): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-io-evaluate): * lisp/ob-octave.el (org-babel-octave-evaluate-external-process): (org-babel-octave-evaluate-session): * lisp/ob-perl.el (org-babel-perl-evaluate): * lisp/ob-python.el (org-babel-python-evaluate-external-process): (org-babel-python-evaluate-session): * lisp/ob-ruby.el (org-babel-ruby-pp-wrapper-method): (org-babel-ruby-evaluate): * lisp/ob-scala.el: * lisp/ob-tangle.el: (org-babel-tangle-collect-blocks): * lisp/org-agenda.el (org-agenda-get-category-icon): (org-agenda-todo-yesterday): * lisp/org-bbdb.el (org-bbdb-anniv-extract-date): (org-bbdb-make-anniv-hash): (org-bbdb-anniversaries-future): * lisp/org-bibtex.el (org-bibtex-fleshout): (org-bibtex-read): (org-bibtex-write): * lisp/org-capture.el (org-capture-set-target-location): (org-capture-get-indirect-buffer): (org-mks): * lisp/org-clock.el (org-clock--oldest-date): (org-clock-resolve): (org-clock-sum): (org-clock-special-range): (org-clocktable-steps): * lisp/org-ctags.el (org-ctags-create-tags): * lisp/org-element.el (org-element--interpret-affiliated-keywords): (org-element--cache-shift-positions): (org-element--cache-sync): (org-element--cache-submit-request): * lisp/org-habit.el (org-habit-parse-todo): * lisp/org-inlinetask.el (org-inlinetask-hide-tasks): * lisp/org-lint.el (org-lint--generate-reports): * lisp/org-mouse.el (org-mouse-get-context): * lisp/org-plot.el (org-plot/gnuplot-to-grid-data): (org-plot/gnuplot): * lisp/ox-ascii.el (org-ascii--current-text-width): (org-ascii--current-justification): (org-ascii--build-caption): (org-ascii--checkbox): (org-ascii-item): * lisp/ox-html.el (org-html-footnote-section): * lisp/ox-latex.el (org-latex--make-option-string): * lisp/ox-odt.el (org-odt-toc): (org-odt-add-automatic-style): (org-odt-format-label): (org-odt-link--inline-image): (org-odt--render-image/formula): (org-odt--enumerable-image-p): (org-odt--enumerable-latex-image-p): (org-odt--enumerable-formula-p): (org-odt-do-format-code): (org-odt-table-cell): Silence byte-compiler.
2016-07-25 10:34:48 -04:00
(pcase result-type
(`value
babel: New function to process file names for use in external processes * ob.el (org-babel-process-file-name): New function (org-babel-maybe-remote-file): Delete function * ob-sql.el (org-babel-execute:sql): Use org-babel-process-file-name * ob-scheme.el (org-babel-execute:scheme): Use org-babel-process-file-name * ob-sass.el (org-babel-execute:sass): Use org-babel-process-file-name * ob-ruby.el (org-babel-ruby-evaluate): Use org-babel-process-file-name * ob-python.el (org-babel-python-evaluate-external-process): Use org-babel-process-file-name (org-babel-python-evaluate-session): Use org-babel-process-file-name * ob-plantuml.el (org-babel-execute:plantuml): Use org-babel-process-file-name * ob-perl.el (org-babel-perl-evaluate): Use org-babel-process-file-name * ob-octave.el (org-babel-octave-evaluate-external-process): Use org-babel-process-file-name (org-babel-octave-evaluate-session): Use org-babel-process-file-name, don't use org-babel-maybe-remote-file * ob-lisp.el (org-babel-execute:lisp): Use org-babel-process-file-name * ob-ledger.el (org-babel-execute:ledger): Use org-babel-process-file-name * ob-js.el (org-babel-execute:js): Use org-babel-process-file-name * ob-haskell.el (org-babel-haskell-export-to-lhs): Use org-babel-process-file-name * ob-gnuplot.el (org-babel-execute:gnuplot): Use org-babel-process-file-name * ob-eval.el (org-babel-eval-read-file): Don't use org-babel-maybe-remote-file * ob-dot.el (org-babel-execute:dot): Use org-babel-process-file-name * ob-ditaa.el (org-babel-execute:ditaa): Use org-babel-process-file-name * ob-clojure.el (org-babel-clojure-evaluate-external-process): Use org-babel-process-file-name * ob-asymptote.el (org-babel-execute:asymptote): Use org-babel-process-file-name * ob-R.el (org-babel-R-assign-elisp): Don't use org-babel-maybe-remote-file, use org-babel-process-file-name (org-babel-R-evaluate-external-process): Use org-babel-process-file-name (org-babel-R-evaluate-session): Use org-babel-process-file-name * ob-C.el (org-babel-C-execute): Use org-babel-process-file-name In addition to passing the file path through `expand-file-name', tramp-style remote file names are converted to conventional (local) file paths. The reason is that, if a tramp file name was in use in emacs, then the shell command will be executing on the remote machine in question. Further, by default the file name is passed through `shell-quote-argument'.
2010-09-22 16:40:14 -04:00
(org-babel-octave-import-elisp-from-file tmp-file))
Silence byte-compiler * lisp/ob-core.el (org-babel-process-params): Silence byte-compiler. * lisp/ob-groovy.el (org-babel-groovy-evaluate): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-io-evaluate): * lisp/ob-octave.el (org-babel-octave-evaluate-external-process): (org-babel-octave-evaluate-session): * lisp/ob-perl.el (org-babel-perl-evaluate): * lisp/ob-python.el (org-babel-python-evaluate-external-process): (org-babel-python-evaluate-session): * lisp/ob-ruby.el (org-babel-ruby-pp-wrapper-method): (org-babel-ruby-evaluate): * lisp/ob-scala.el: * lisp/ob-tangle.el: (org-babel-tangle-collect-blocks): * lisp/org-agenda.el (org-agenda-get-category-icon): (org-agenda-todo-yesterday): * lisp/org-bbdb.el (org-bbdb-anniv-extract-date): (org-bbdb-make-anniv-hash): (org-bbdb-anniversaries-future): * lisp/org-bibtex.el (org-bibtex-fleshout): (org-bibtex-read): (org-bibtex-write): * lisp/org-capture.el (org-capture-set-target-location): (org-capture-get-indirect-buffer): (org-mks): * lisp/org-clock.el (org-clock--oldest-date): (org-clock-resolve): (org-clock-sum): (org-clock-special-range): (org-clocktable-steps): * lisp/org-ctags.el (org-ctags-create-tags): * lisp/org-element.el (org-element--interpret-affiliated-keywords): (org-element--cache-shift-positions): (org-element--cache-sync): (org-element--cache-submit-request): * lisp/org-habit.el (org-habit-parse-todo): * lisp/org-inlinetask.el (org-inlinetask-hide-tasks): * lisp/org-lint.el (org-lint--generate-reports): * lisp/org-mouse.el (org-mouse-get-context): * lisp/org-plot.el (org-plot/gnuplot-to-grid-data): (org-plot/gnuplot): * lisp/ox-ascii.el (org-ascii--current-text-width): (org-ascii--current-justification): (org-ascii--build-caption): (org-ascii--checkbox): (org-ascii-item): * lisp/ox-html.el (org-html-footnote-section): * lisp/ox-latex.el (org-latex--make-option-string): * lisp/ox-odt.el (org-odt-toc): (org-odt-add-automatic-style): (org-odt-format-label): (org-odt-link--inline-image): (org-odt--render-image/formula): (org-odt--enumerable-image-p): (org-odt--enumerable-latex-image-p): (org-odt--enumerable-formula-p): (org-odt-do-format-code): (org-odt-table-cell): Silence byte-compiler.
2016-07-25 10:34:48 -04:00
(`output
(setq results
(if matlabp
Deprecate `org-babel-strip-quotes' in favor of `org-strip-quotes' * lisp/ob-core.el (org-babel-strip-quotes): Remove function. * lisp/org-macs.el (org-strip-quotes): New function. * lisp/org-compat.el (org-babel-strip-quotes): Alias for new function. * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-octave.el (org-babel-octave-evaluate-session): Use new function.
2018-10-06 03:40:33 -04:00
(cdr (reverse (delq "" (mapcar #'org-strip-quotes
(mapcar #'org-trim raw)))))
Silence byte-compiler * lisp/ob-core.el (org-babel-process-params): Silence byte-compiler. * lisp/ob-groovy.el (org-babel-groovy-evaluate): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-io-evaluate): * lisp/ob-octave.el (org-babel-octave-evaluate-external-process): (org-babel-octave-evaluate-session): * lisp/ob-perl.el (org-babel-perl-evaluate): * lisp/ob-python.el (org-babel-python-evaluate-external-process): (org-babel-python-evaluate-session): * lisp/ob-ruby.el (org-babel-ruby-pp-wrapper-method): (org-babel-ruby-evaluate): * lisp/ob-scala.el: * lisp/ob-tangle.el: (org-babel-tangle-collect-blocks): * lisp/org-agenda.el (org-agenda-get-category-icon): (org-agenda-todo-yesterday): * lisp/org-bbdb.el (org-bbdb-anniv-extract-date): (org-bbdb-make-anniv-hash): (org-bbdb-anniversaries-future): * lisp/org-bibtex.el (org-bibtex-fleshout): (org-bibtex-read): (org-bibtex-write): * lisp/org-capture.el (org-capture-set-target-location): (org-capture-get-indirect-buffer): (org-mks): * lisp/org-clock.el (org-clock--oldest-date): (org-clock-resolve): (org-clock-sum): (org-clock-special-range): (org-clocktable-steps): * lisp/org-ctags.el (org-ctags-create-tags): * lisp/org-element.el (org-element--interpret-affiliated-keywords): (org-element--cache-shift-positions): (org-element--cache-sync): (org-element--cache-submit-request): * lisp/org-habit.el (org-habit-parse-todo): * lisp/org-inlinetask.el (org-inlinetask-hide-tasks): * lisp/org-lint.el (org-lint--generate-reports): * lisp/org-mouse.el (org-mouse-get-context): * lisp/org-plot.el (org-plot/gnuplot-to-grid-data): (org-plot/gnuplot): * lisp/ox-ascii.el (org-ascii--current-text-width): (org-ascii--current-justification): (org-ascii--build-caption): (org-ascii--checkbox): (org-ascii-item): * lisp/ox-html.el (org-html-footnote-section): * lisp/ox-latex.el (org-latex--make-option-string): * lisp/ox-odt.el (org-odt-toc): (org-odt-add-automatic-style): (org-odt-format-label): (org-odt-link--inline-image): (org-odt--render-image/formula): (org-odt--enumerable-image-p): (org-odt--enumerable-latex-image-p): (org-odt--enumerable-formula-p): (org-odt-do-format-code): (org-odt-table-cell): Silence byte-compiler.
2016-07-25 10:34:48 -04:00
(cdr (member org-babel-octave-eoe-output
Deprecate `org-babel-strip-quotes' in favor of `org-strip-quotes' * lisp/ob-core.el (org-babel-strip-quotes): Remove function. * lisp/org-macs.el (org-strip-quotes): New function. * lisp/org-compat.el (org-babel-strip-quotes): Alias for new function. * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-octave.el (org-babel-octave-evaluate-session): Use new function.
2018-10-06 03:40:33 -04:00
(reverse (mapcar #'org-strip-quotes
(mapcar #'org-trim raw)))))))
Silence byte-compiler * lisp/ob-core.el (org-babel-process-params): Silence byte-compiler. * lisp/ob-groovy.el (org-babel-groovy-evaluate): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-io-evaluate): * lisp/ob-octave.el (org-babel-octave-evaluate-external-process): (org-babel-octave-evaluate-session): * lisp/ob-perl.el (org-babel-perl-evaluate): * lisp/ob-python.el (org-babel-python-evaluate-external-process): (org-babel-python-evaluate-session): * lisp/ob-ruby.el (org-babel-ruby-pp-wrapper-method): (org-babel-ruby-evaluate): * lisp/ob-scala.el: * lisp/ob-tangle.el: (org-babel-tangle-collect-blocks): * lisp/org-agenda.el (org-agenda-get-category-icon): (org-agenda-todo-yesterday): * lisp/org-bbdb.el (org-bbdb-anniv-extract-date): (org-bbdb-make-anniv-hash): (org-bbdb-anniversaries-future): * lisp/org-bibtex.el (org-bibtex-fleshout): (org-bibtex-read): (org-bibtex-write): * lisp/org-capture.el (org-capture-set-target-location): (org-capture-get-indirect-buffer): (org-mks): * lisp/org-clock.el (org-clock--oldest-date): (org-clock-resolve): (org-clock-sum): (org-clock-special-range): (org-clocktable-steps): * lisp/org-ctags.el (org-ctags-create-tags): * lisp/org-element.el (org-element--interpret-affiliated-keywords): (org-element--cache-shift-positions): (org-element--cache-sync): (org-element--cache-submit-request): * lisp/org-habit.el (org-habit-parse-todo): * lisp/org-inlinetask.el (org-inlinetask-hide-tasks): * lisp/org-lint.el (org-lint--generate-reports): * lisp/org-mouse.el (org-mouse-get-context): * lisp/org-plot.el (org-plot/gnuplot-to-grid-data): (org-plot/gnuplot): * lisp/ox-ascii.el (org-ascii--current-text-width): (org-ascii--current-justification): (org-ascii--build-caption): (org-ascii--checkbox): (org-ascii-item): * lisp/ox-html.el (org-html-footnote-section): * lisp/ox-latex.el (org-latex--make-option-string): * lisp/ox-odt.el (org-odt-toc): (org-odt-add-automatic-style): (org-odt-format-label): (org-odt-link--inline-image): (org-odt--render-image/formula): (org-odt--enumerable-image-p): (org-odt--enumerable-latex-image-p): (org-odt--enumerable-formula-p): (org-odt-do-format-code): (org-odt-table-cell): Silence byte-compiler.
2016-07-25 10:34:48 -04:00
(mapconcat #'identity (reverse results) "\n")))))
babel: Add octave and matlab support
2010-03-18 14:45:39 -04:00
babel: return string results from octave as strings Thanks to Darlan Cavalcante
2010-04-07 15:51:04 -04:00
(defun org-babel-octave-import-elisp-from-file (file-name)
Finished editing Babel docstrings
2010-07-13 19:20:08 -04:00
"Import data from FILE-NAME.
This removes initial blank and comment lines and then calls
`org-babel-import-elisp-from-file'."
babel: Make temp file names consistent * ob-scheme.el (org-babel-execute:scheme): Alter temp file name * ob-ruby.el (org-babel-ruby-evaluate): Alter temp file name * ob-python.el (org-babel-python-evaluate-external-process): Alter temp file name * ob-perl.el (org-babel-perl-evaluate): Alter temp file name * ob-octave.el (org-babel-octave-evaluate-session): Alter temp file name (org-babel-octave-import-elisp-from-file): Alter temp file name * ob-ledger.el (org-babel-execute:ledger): Alter temp file name * ob-gnuplot.el (org-babel-gnuplot-process-vars): Alter temp file name (org-babel-execute:gnuplot): Alter temp file name
2010-09-20 19:38:31 -04:00
(let ((temp-file (org-babel-temp-file "octave-matlab-")) beg end)
babel: return string results from octave as strings Thanks to Darlan Cavalcante
2010-04-07 15:51:04 -04:00
(with-temp-file temp-file
(insert-file-contents file-name)
(re-search-forward "^[ \t]*[^# \t]" nil t)
ob-*: single armed “if” -> “when” * lisp/ob-C.el (org-babel-C-val-to-base-type): * lisp/ob-comint.el (org-babel-comint-buffer-livep): * lisp/ob-fortran.el (org-babel-fortran-ensure-main-wrap): * lisp/ob-octave.el (org-babel-octave-import-elisp-from-file): * lisp/ob-scheme.el (org-babel-scheme-get-repl): Transform ‘if’ with no else branch to ‘when’ * lisp/ob-lua.el (org-babel-lua-evaluate-external-process): * lisp/ob-python.el (org-babel-python-evaluate-external-process): Simplify conditional logic slightly.
2018-05-09 20:14:24 -04:00
(when (< (setq beg (point-min))
Backport commit b7e867b84 from Emacs Make point-at-eol and point-at-bol obsolete b7e867b841f47dcff3aeaef9b5608a237386ce70 Stefan Kangas Tue Aug 23 04:54:57 2022 +0200 [ km: This was independently covered on the main branch with e73c5b7d0. I'm applying it here too for bookkeeping/traceability purposes. ]
2022-08-22 22:54:57 -04:00
(setq end (line-beginning-position)))
ob-*: single armed “if” -> “when” * lisp/ob-C.el (org-babel-C-val-to-base-type): * lisp/ob-comint.el (org-babel-comint-buffer-livep): * lisp/ob-fortran.el (org-babel-fortran-ensure-main-wrap): * lisp/ob-octave.el (org-babel-octave-import-elisp-from-file): * lisp/ob-scheme.el (org-babel-scheme-get-repl): Transform ‘if’ with no else branch to ‘when’ * lisp/ob-lua.el (org-babel-lua-evaluate-external-process): * lisp/ob-python.el (org-babel-python-evaluate-external-process): Simplify conditional logic slightly.
2018-05-09 20:14:24 -04:00
(delete-region beg end)))
babel: octave/matlab: use dlmwrite to write delimited text 2010-08-03 Dan Davison <davison@stats.ox.ac.uk> * ob-octave.el (org-babel-octave-wrapper-method): use dlmwrite to write delimited text instead of save -ascii (org-babel-octave-import-elisp-from-file): specify that data written to file is tab-delimited
2010-08-03 23:54:24 -04:00
(org-babel-import-elisp-from-file temp-file '(16))))
babel: return string results from octave as strings Thanks to Darlan Cavalcante
2010-04-07 15:51:04 -04:00
updating require and provide boilerplate for new ob* files
2010-06-11 19:02:42 -04:00
(provide 'ob-octave)
babel: assigning copyright to the FSF for babel language files
2010-06-25 12:32:35 -04:00
updating require and provide boilerplate for new ob* files
2010-06-11 19:02:42 -04:00
;;; ob-octave.el ends here