Eric Schulte
68bd53cf7c
Merge branch 'master' into investigation
...
Conflicts:
org-babel.org
2009-07-21 16:00:42 -06:00
Dan Davison
5d1ee80683
Adding tests of default args using lob evaulation.
2009-07-21 15:48:45 -04:00
Dan Davison
ad7b17c393
Moving nested evaluation from Tasks to Bugs
2009-07-21 15:48:14 -04:00
Eric Schulte
53c08df3ae
so it looks like regardless of the syntax used we're not overriding
...
the default argument values.
2009-07-21 12:22:59 -06:00
Eric Schulte
a58dd8e3af
bringing in o-b.org from evaluation branch
2009-07-21 12:15:38 -06:00
Eric Schulte
d4b7914f7c
DONE gnuplot [7/7]
2009-07-20 14:04:37 -06:00
Eric Schulte
85dc35656d
DONE gnuplot sessions
2009-07-20 13:33:53 -06:00
Eric Schulte
ed42f95106
DEFERRED header argument specifying 3D data
2009-07-20 13:20:06 -06:00
Eric Schulte
104f05ef5e
DONE helpers from org-plot.el
2009-07-20 13:10:28 -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
Dan Davison
4589aacb51
A couple of fixes to sketched-out parsing algorithm.
2009-07-20 01:33:40 -04:00
Dan Davison
5a5a4253c6
Some notes on possibly adding a recursive evaluation mechanism.
...
Currently we can't have nested function calls, and I think that a general fix for that would require going the standard route of constructing a parse tree and evaluating it recursively.
2009-07-20 01:24:33 -04:00
Eric Schulte
307c7667db
still working on gnuplot variable support
2009-07-19 16:40:28 -06:00
Dan Davison
a16a15ea80
Merging R-results into master.
2009-07-19 18:09:22 -04: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
Dan Davison
7ac2e0d45f
Using o-b-chomp rather than o-b-trim on R output.
...
This keeps columns of STDOUT correctly aligned.
2009-07-19 17:35:49 -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
Eric Schulte
006d6d1193
deferring more sophisticated gnuplot prebuilt helpers
2009-07-19 14:53:12 -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
bd1ff11b4e
Merge commit 'origin/master'
2009-07-19 13:58:03 -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
b57617bc53
Merge branch 'master' into gnuplot
2009-07-19 11:37:58 -06:00
Eric Schulte
1df8d69c7c
some minor additional discussion in o-b.org
2009-07-19 11:17:32 -06:00
Eric Schulte
585f69d1f7
Merge branch 'master' into gnuplot
2009-07-19 11:12:09 -06:00
Eric Schulte
c9752352ea
added task: "TODO gnuplot support for column/row names"
...
Adding support for column/row names (as currently being implemented
for R) on a language by language basis is definitely the right way to
handle this hline/header issue. I am going to try to do the same for
gnuplot.
2009-07-19 11:11:55 -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
7aafbb0cfc
Updating / adding discussion to o-b.org.
2009-07-19 01:45:38 -04:00
Dan Davison
daf3e210da
Updating o-b.org: two new R colname tests and graphics output discussion.
2009-07-19 01:08:45 -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
Eric Schulte
b8fad91406
Merge branch 'master' into gnuplot
2009-07-18 17:57:34 -06:00
Eric Schulte
2aa721a7dc
replacing gnuplot task documentation lost in a merge
2009-07-18 17:57:23 -06:00
Eric Schulte
6070566113
replacing gnuplot task documentation lost in a merge
2009-07-18 17:57:13 -06:00
Eric Schulte
a7e504870e
Merge branch 'master' into gnuplot
2009-07-18 17:52:48 -06:00
Dan Davison
1c5ac55881
Updating o-b.org, including a couple of new bugs.
2009-07-18 19:11:14 -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
Dan Davison
4b7eef1a31
Merge commit 'origin/master'
2009-07-18 16:53:11 -04:00
Dan Davison
efd48d4405
new bug: avoid stripping whitespace when :results output
2009-07-18 16:53:08 -04:00
Eric Schulte
7e05c4c63e
org-babel.org from master branch
2009-07-18 14:27:56 -06:00
Eric Schulte
62d6601b6e
Merge branch 'master' into gnuplot
...
Conflicts:
org-babel.org
moved org-babel-merge-results into anonymous function in flet
correctly handling exclusive :exports params
2009-07-18 14:27:16 -06:00
