Merge branch 'master' into gnuplot

This commit is contained in:
Eric Schulte 2009-07-19 11:12:09 -06:00
commit 585f69d1f7
2 changed files with 5 additions and 2 deletions

View file

@ -92,7 +92,7 @@ called by `org-babel-execute-src-block' via multiple-value-bind."
(defvar org-babel-R-wrapper-method "main <- function ()\n{\n%s\n}
write.table(main(), file=\"%s\", sep=\"\\t\", na=\"nil\",row.names=FALSE, col.names=%s, quote=FALSE)")
(defun org-babel-R-evaluate (buffer body result-type colnames)
(defun org-babel-R-evaluate (buffer body result-type column-names-p)
"Pass BODY to the R process in BUFFER. If RESULT-TYPE equals
'output then return a list of the outputs of the statements in
BODY, if RESULT-TYPE equals 'value then return the value of the

View file

@ -2092,7 +2092,7 @@ This could probably be added to [[file:lisp/org-babel-script.el][org-babel-scrip
#+resname: implementing-ditaa
[[file:blue.png][blue.png]]
*** STARTED gnuplot [2/6]
*** STARTED gnuplot [2/7]
(see [[* file result types][file result types]])
#+PLOT: title:"Citas" ind:1 deps:(3) type:2d with:histograms set:"yrange [0:]"
@ -2125,6 +2125,9 @@ plot "data" using 1:2 with lines
the variable names should be replaced with the path to the files
**** DONE direct plotting w/o session
**** TODO gnuplot support for column/row names
This should be implemented along the lines of the [[* STARTED Column (and row) names of tables in R input/output][R-colname-support]].
**** TODO a =file= header argument
to specify a file holding the results