Commit graph

250 commits

Author SHA1 Message Date
Eric Schulte 85dc35656d DONE gnuplot sessions 2009-07-20 13:33:53 -06:00
Eric Schulte e5b2e307fa removed the result-params from the let in org-babel-gnuplot,
keeping the vars line in the let for now because of the peculiar
  handling of the vars in gnuplot.
2009-07-20 13:10:11 -06:00
Eric Schulte 809462e3ee Merge branch 'master' into gnuplot
Conflicts:
	lisp/langs/org-babel-gnuplot.el

With respect to the conflict, I will try removing the lines you
mentioned before my next commit.
2009-07-20 13:07:29 -06:00
Eric Schulte c81479b161 added a :file header argument to gnuplot 2009-07-20 13:04:40 -06:00
Eric Schulte 307c7667db still working on gnuplot variable support 2009-07-19 16:40:28 -06:00
Dan Davison b766b094a0 Using temp function definition to tidy R evaluation code. 2009-07-19 18:03:33 -04:00
Eric Schulte 9bdddde454 gnuplot: switching to using user defined variables for handling variables
This will require gnuplot version 4.2 or up
2009-07-19 15:46:05 -06:00
Dan Davison 2b66de1c1b Reorganising R evaluation code.
With this change we avoid messing about extracting the output from the
comint buffer in the :results value case (the value has already been
written to file).
2009-07-19 17:45:00 -04:00
Eric Schulte 01c6bd2b33 pulled the gnuplot variable processing out into it's own function 2009-07-19 15:30:40 -06:00
Eric Schulte 20eec8d94b additional requirements and initialization for gnuplot 2009-07-19 15:01:47 -06:00
Dan Davison 162b522728 Fixing srcname function call regexps.
But still some improvement of this to be done (see bugs section).
2009-07-19 14:29:10 -04:00
Dan Davison aa1747b065 Quite a few revisions / additions to the tasks and bugs lists. 2009-07-19 13:56:38 -04:00
Dan Davison e4d14d41ec This should have been part of the parent commit (911e77a7c9) 2009-07-19 13:55:42 -04:00
Eric Schulte 585f69d1f7 Merge branch 'master' into gnuplot 2009-07-19 11:12:09 -06:00
Eric Schulte 28c3262848 fixed variable name in org-babel-R-evaluate 2009-07-19 11:06:44 -06:00
Eric Schulte 91301b8c29 Merge branch 'master' into gnuplot 2009-07-19 11:02:17 -06:00
Dan Davison 911e77a7c9 Code rearrangement: restrict R column names changes to org-babel-R.el.
On reflection this is (currently) R-specific functionality and should
not affect the code in org-babel.el.
2009-07-19 12:01:00 -04:00
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
Eric Schulte 4ff540bfd7 started bringing in options from org-plot 2009-07-18 18:05:11 -06: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