Commit graph

232 commits

Author SHA1 Message Date
Dan Davison 8294122f8f Trying to retain whitespace in output results from R.
I don't believe this solves it, but chomp is more the right thing to
do than trim. I'd like to retain all the whitespace so that alignment
of columns is correct in stdout.
2009-07-19 01:47:37 -04:00
Dan Davison 062bc09d84 Adding support for column names (header line) when using R.
Unlike the other languages, it's central to R to be able to index
columns of a data frame d, either by d[,"columnname"] of d$columnname.

With this change, if colnames are present in the *input* from
org-babel, the corresponding R variable is *always* constructed with
the colnames.

In addition, with the :colnames header arg, the *output* to elisp/org
buffer contains the colnames separated from the rest of the table by
'hline. This behaviour is not default because other languages may
expect a simple table without the 'hline.
2009-07-19 01:07:07 -04:00
Dan Davison ef6668df61 Merging examplizing-output into master 2009-07-18 18:10:14 -04:00
Dan Davison bcfa3b95c7 Add ability to remove #+begin_example blocks of output. 2009-07-18 17:47:30 -04:00
Eric Schulte fcfe110fef correctly handling exclusive :exports params 2009-07-18 14:24:47 -06:00
Eric Schulte 44ff72261c moved org-babel-merge-results into anonymous function in flet 2009-07-18 14:24:46 -06:00
Dan Davison c2b255e0da Changing default min lines for block output to 10 2009-07-18 15:52:51 -04:00
Dan Davison 4dfe45cdf1 Trivial: function name change for clarification. 2009-07-18 15:39:00 -04:00
Dan Davison 04a4a4862e Using #+begin_example...#+end_example blocks for output. 2009-07-18 15:38:21 -04:00
Eric Schulte fdae720848 removed large block of lang-specific comments from org-babel.el
I assume that since all tests are passing we no longer need this old
code.  Either way we can always retrieve it from version control.
2009-07-17 22:10:43 -06:00
Eric Schulte 6661bb70d5 new default export parameters 2009-07-17 22:08:02 -06:00
Eric Schulte bda750be2f combination of :results parameters now takes mutually exclusive parameter groups into consideration 2009-07-17 22:06:37 -06:00
Eric Schulte 8408187f4a using org-babel-merge-params for inline header arguments 2009-07-17 21:36:47 -06:00
Dan Davison 83fc113e29 This was just an idea. We could do it but I'm reverting for now.
Revert "Make org-babel-tangle comment with ;;*."

This reverts commit c6b628d3ad.
2009-07-17 14:51:49 -04:00
Dan Davison 017d46e50f Reinstated force-results-to-vector: passing all tests in table. 2009-07-17 14:37:43 -04:00
Dan Davison 8c9d8b6c28 Don't attempt to remove result when :results silent. 2009-07-17 13:58:04 -04:00
Dan Davison 9ebb554527 o-b-merge-params function was not allowing whitespace around the '=' sign.
At some point it might be useful (to me at least) to clarify our rules
regarding whitespace, and make guidelines for using " \t\f\n\v\r" et
al (and [:space:]?).
2009-07-17 13:27:56 -04:00
Dan Davison 7eecca6db5 Reinstating a previous change that got lost in the last merge somehow. 2009-07-17 10:49:26 -04:00
Dan Davison 72ccd88c97 Merging master into results.
THis brings in the bugfix from 4f15280631, as well as gnuplot. The bugfix required manual resolution as it had already been partially addressed in this branch. Also, the interaction of the possibility of being on a #+lob line and the possiblity of being in the middle of an org-babel-exp-results call, meant I had to rearrange things a bit, so this commit has new changes in org-babel-where-is-src-block-result in addition to the merge.
2009-07-17 09:54:11 -04:00
Dan Davison 5d49db67ab Correcting up cut/paste mistakes made in manual conflict resolution. 2009-07-17 00:50:02 -04:00
Eric Schulte 1fa18830ab gnuplot is able to generate graphs, but needs much more work 2009-07-16 22:20:58 -06:00
Dan Davison 4f15280631 Bugfix: not assuming that we're in a source block when inserting result.
The o-b-insert-result code was assuming that we were in a source
block, where it could find the head, etc. However there are two
situations when this is not true LoB calls (although they can't output
results to buffer in this branch, they can in branch 'results'), and
org-babel-exp (which calls o-b-insert-result in an empty temp buffer).
2009-07-17 00:18:03 -04:00
Dan Davison 64a5c0e379 Merging master into results: required manual conflict resolution.
results had upgraded to using org-babel-merge-params (although
apparently not yet in org-babel-parse-inline-src-block-match).
2009-07-16 23:22:25 -04:00
Eric Schulte cdc46b8b74 added ability for languages to change their default header argument values 2009-07-16 18:52:31 -06:00
Eric Schulte 37d5edbad9 fleshing out the gnuplot task 2009-07-16 18:35:22 -06:00
Eric Schulte 5527d419a1 added support for ditaa source blocks 2009-07-16 18:23:19 -06:00
Eric Schulte 29d910c5e2 "file" results now correctly insert a file link 2009-07-16 18:17:51 -06:00
Eric Schulte b932d2ed76 ditaa evaluation is working (but still requires some more peripheral support) 2009-07-16 18:12:11 -06:00
Dan Davison 4fa9c162d9 More code streamlining: org-babel-execute:emacs-lisp. 2009-07-16 16:23:49 -04:00
Dan Davison d128662fa3 Eliminating duplicated code (take 2...).
This proposal for code tidying uses multiple-value-bind to satisfy:

1. The various parsed/resolved components of the param list (session,
   vars, result-type) are available in the org-babel-execute:LANG
   functions.
2. Those functions don't duplicate the code for parsing the params
   list and resolving references
3. The functions still have the params list available to them, should
   they need to implement language-specific behaviour using it.

If the org-babel-execute:LANG functions need to be called directly,
then that would now have to be via
(multiple-value-bind (session vars result-params result-type)
      (org-babel-process-params params) (funcall cmd body params))

as in org-babel-exp.el. (But is it actually necessary to by-pass
org-babel-execute-src-block?)
2009-07-16 16:21:07 -04:00
Dan Davison f74b084d99 Bringing org-babel-execute-[buffer/subtree] functions up-to-date. 2009-07-16 14:57:01 -04:00
Dan Davison c6b628d3ad Make org-babel-tangle comment with ;;*.
With a view to providing org-style folding with the outline-regexp
settings from Tassilo Horn / Michael Zeller / Sebastain Vauban.
2009-07-16 11:25:57 -04:00
Dan Davison 690ed664c6 Merging master into results.
In order to get new tangle load-file function. Had to resolve org-babel.org conflict manually and didn't know the 'proper' way to do so, so there may be weirdness in that file.
2009-07-16 01:28:15 -04:00
Dan Davison 2b273bce7d Different messages for :results output and value modes. 2009-07-16 01:16:49 -04:00
Eric Schulte f3050c17d6 removed debug statement 2009-07-15 17:52:28 -07:00
Dan Davison ad57e15afe Bugfix in org-babel-read (relevant to all branches).
I haven't managed to see why this is a 2. It breaks if cell is a
string of length 1. I'm changing it to a 1 (as it is in
org-collector.el), on the assumption that the 2 was erroneous.
2009-07-15 11:18:19 -04:00
Eric Schulte d37d148d3f DONE singe-function tangling and loading elisp from literate org-mode file [3/3] 2009-07-14 21:55:50 -07:00
Eric Schulte cdd73500d6 DONE ensure that org-babel-tangle returns the path to the tangled file(s) 2009-07-14 21:52:27 -07:00
Eric Schulte 07c919cb31 fleshing out actual loading of tangled files 2009-07-14 21:52:10 -07:00
Eric Schulte c3166dc093 now able to tangle files by language 2009-07-14 21:52:07 -07:00
Eric Schulte 8694253c9f getting started on automatic loading of elisp from org-mode files 2009-07-14 20:21:08 -07:00
Dan Davison c1f8de5eec Cosmetic changes only: shortening lines to fit my screen. 2009-07-11 23:59:04 -04:00
Dan Davison 08eba0ceea Bugfix: my regexp was not allowing whitespace inside function call. 2009-07-11 23:51:01 -04:00
Dan Davison a0e0fe17f4 A neutral bug (unnecessary, but no consequences I believe). 2009-07-11 23:49:51 -04:00
Dan Davison 21d058869d Bugfix in org-babel-read (relevant to all branches).
I haven't managed to see why this is a 2. It breaks if cell is a
string of length 1. I'm changing it to a 1 (as it is in
org-collector.el), on the assumption that the 2 was erroneous.
2009-07-11 22:45:57 -04:00
Dan Davison cd4c794af6 Bugfix: Use let* instead of let 2009-07-11 13:39:05 -04:00
Dan Davison f622d8d288 Bugfix: In org-babel-merge-params.
Using symbol instead of string so that assq-delete-all works. This
will break if a variable has a name that is not a valid elisp symbol
-- unlikely? Possible? Also, fixing the argument parsing regexp, which
had been very lazily written.
2009-07-11 03:07:37 -04:00
Dan Davison ee749f4d70 Bugfix:
I had made org-babel-get-src-block-name automatically check whether it
was on a lob line. I'm reverting that.
2009-07-11 03:04:41 -04:00
Dan Davison 0a6fa24cc5 bugfix: org-babel-parse-header-arguments was creating nonsense when passed an empty string. 2009-07-11 03:01:54 -04:00
Dan Davison af6af0b848 Tightening up org-babel-lob-one-liner-regexp. 2009-07-10 23:15:16 -04:00