Commit graph

41 commits

Author SHA1 Message Date
Dan Davison 0d10946cff org-babel: nested calls inherit header args from enclosing scopes
And when merging header args, those from enclosing scopes take
precedence. For example, output to file from a source block is
implemented by (a) sending the output to file, and (b) having the
source block return the file name as its result. Before this change,
the file name returned could be set by a referenced source block (a
nested call), regardless of the value of the :file header arg of the
top-level source block.
2009-10-19 23:33:03 -04:00
Dan Davison 6c0c2039dd org-babel: make [:file filename] imply [:exports results]
Unless :exports is already none or both. This allows users to export
file output simply by adding a [:file filename] header arg.
2009-10-19 23:32:22 -04:00
Dan Davison 286bf35fe5 org-babel: bugfix: tighten up regexp
Prior to this, reference resolution could fail with quoted
strings. E.g. this didn't work:

\#+srcname: py-id(a=1)
\#+begin_src python
  a
\#+end_src

\#+lob: py-id(a="1")
2009-10-19 23:32:14 -04:00
Dan Davison 5219f4a410 org-babel: make org-babel-tangle-file interactive 2009-10-19 21:45:15 -04:00
Dan Davison 351f52192d org-babel: extend the way header args are taken from properties
This change allows org-file-properties to supply header args, and also
allows property inheritance if it has been enabled. Header-args
aquired from the item (or by inheritance) have precedence over those
aquired from org-file-properties.
2009-10-19 21:45:01 -04:00
Dan Davison 8ca34cba0b org-babel: alter R tangling defaults
Use "#!/usr/bin/env Rscript", and use ".R" instead of ".r".
2009-10-19 21:44:41 -04:00
Dan Davison 8b52bf09e0 org-babel: capture graphical output from R
If a [:file filename.ext] header arg is provided, then all graphical
output from the source block is captured on disk, and output of the
source block is a link to the resulting file, as with the
graphics-only languages such as gnuplot, ditaa, dot, asymptote. An
attempt is made to find a graphics device corresponding to the file
extension (currently .png, .jpg, .jpeg, .tiff, .bmp, .pdf, .ps,
.postscript are recognised); if that fails, png format output is
created.

Additionally, values for several arguments to the R graphics
device can be passed using header args:

:width :height :bg :units :pointsize
:antialias :quality :compression :res :type
:family :title :fonts :version :paper :encoding
:pagecentre :colormodel :useDingbats :horizontal

Arguments to the R graphics device that are not supported as header
args can be passed as a string in R argument syntax, using the header
arg :R-dev-args

An example block is (although both bg and fg can be passed directly as
header args)

\#+begin_src R :file z.pdf :width 8 :height 8 :R-dev-args bg="olivedrab", fg="hotpink"
  plot(matrix(rnorm(100), ncol=2), type="l")
\#+end_src
2009-10-19 21:44:28 -04:00
Eric Schulte 4d374b27d2 org-babel: :noweb header argument now expands noweb references before source-block evaluation 2009-10-19 12:12:19 -06:00
Eric Schulte 3db817fb02 org-babel: now supports pp results (emacs-lisp, ruby, python) 2009-10-18 16:18:34 -06:00
Eric Schulte c167a4ac32 org-babel: emacs-lisp now returns nothing when ":results output" 2009-10-18 16:18:27 -06:00
Eric Schulte 4abe8f7ea0 org-babel: added "table" results header argument as more readable alias for "vector" 2009-10-18 12:13:42 -06:00
Eric Schulte 28e6ff8d66 org-babel: adding python support (along the same lines as ruby) 2009-10-16 17:05:31 -06:00
Eric Schulte 770305a650 org-babel: adding ruby support for returning "code" results 2009-10-16 17:05:13 -06:00
Eric Schulte 430a3bf6ad org-babel: "code" results type for returning results in of source code syntax
This includes the required changes to org-babel.el and a
language-specific implementation for emacs-lisp.  The emacs-lisp
changes are from a patch by Benny Andresen.
2009-10-16 17:04:55 -06:00
Eric Schulte b0c1758c2a org-babel: dot improvements
for more information on the dot family of tools see
http://www.graphviz.org/
2009-10-14 16:03:40 -06:00
Eric Schulte 0444ca8661 org-babel: haskell lhs2tex export now responds to prefix argument 2009-10-09 11:44:27 -06:00
Dan Davison e079584e56 org-babel: make tangling honour org-src-preserve-indentation
This allows python code to be tangled (i.e. extracted) correctly by
org-babel-tangle. Previously, if e.g. methods of a class were in
separate blocks, then they would be incorrectly indented as top-level
functions in the tangled output.
2009-10-08 12:29:37 -04:00
Eric Schulte c0d54a9a6b org-babel: Haskell lhs export: ensure all \[begin|end]{code} statements start at the first column 2009-10-07 16:01:24 -06:00
Eric Schulte 27df66d8da org-babel: added :session to the header-arguments allowed in headline properties 2009-10-07 12:46:23 -06:00
Eric Schulte 407bf3b816 org-babel: haskell lhs export now displays errors and configurable org-babel-haskell-lhs2tex-command 2009-10-04 17:49:01 -06:00
Eric Schulte 63b360041f org-babel: org-babel-haskell can now export to .lhs literate Haskell
this commit adds the function `org-babel-haskell-export-to-lhs'

   for information on lhs see http://people.cs.uu.nl/andres/lhs2tex/
2009-10-04 16:41:45 -06:00
Benjamin Andresen ce4aad900a org-babel: add langs/org-babel-screen.el 2009-10-04 10:22:30 -06:00
Dan Davison fe5c0d96c6 org-babel: tightening up insertion of results
Previously, altering the name of a source block, followed by C-c C-c,
did not alter the name of the corresponding results.
2009-09-30 07:19:15 -06:00
Dan Davison ab7a58aaff org-babel: change regexp parsing of #+srcname line
One thing that was going wrong was that if #+srcname: was provided
with no subsequent name, the name was taken from the next line.
2009-09-30 07:19:14 -06:00
Dan Davison 92934c7c9b org-babel: allow #+lob line to be terminated by end-of-buffer 2009-09-30 07:19:13 -06:00
Dan Davison 10ea3ad10b org-babel: make :file header arg imply :results file 2009-09-28 18:55:41 -06:00
Dan Davison 7c32bc5672 org-babel: allow header args to be specified on #+lob line 2009-09-28 18:55:39 -06:00
Eric Schulte 3f1be49a04 adding org-babel-load-in-session-maybe bound to Meta-Up (currently only for Haskell) 2009-09-24 21:58:49 -06:00
Eric Schulte 0fa8a7feac fleshed out org-babel-haskell-prep-session (called with Meta-Down inside source block) 2009-09-24 21:58:48 -06:00
Eric Schulte 4cb3e3704e org-babel: cleaned up code that inserts results 2009-09-22 19:49:49 -06:00
Eric Schulte 63b0f3878e org-babel is better at evaluating indented code blocks 2009-09-16 19:33:10 -06:00
Eric Schulte a704ce4896 org-babel-asymptote now supports interactive viewing if the :file header argument is missing 2009-09-16 16:21:45 -06:00
Eric Schulte 8e87868df2 org-babel: asymptote maps to asy-mode in `org-src-lang-modes' and added requirements section to org-babel-asymptote.el 2009-09-16 10:54:43 -06:00
Eric Schulte 6ce74742b8 org-babel-execute:gnuplot no longer pops up a gnuplot window
also some whitespace-only indentation changes in org-babel.el
2009-09-14 20:22:56 -06:00
Eric Schulte dacd052bef brought in latest library-of-babel.org from worg 2009-09-13 21:15:17 -06:00
Eric Schulte 133aa88a06 renaming the org-babel-lisp file to org-babel-emacs-lisp 2009-09-13 10:07:31 -06:00
Eric Schulte 9c6309908f removing .gitignore from contrib/babel 2009-09-12 20:22:24 -06:00
Eric Schulte d5d8608a97 now respects the properties on export 2009-09-12 12:14:09 -06:00
Eric Schulte 2d2a2a1956 trimming down the size of contrib/babel 2009-09-12 11:39:38 -06:00
Eric Schulte eec9c235d0 moving/removing files, and updating paths 2009-09-11 13:56:14 -06:00
Eric Schulte c0554c7753 merging with the org-babel repository 2009-09-11 13:44:05 -06:00