tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Reverted tentative and hackish support for hline in R output. I have left a commented line and an unused function while I am thinking about this, and pending me learning git better. However I haven't yet reverted the ability of R to recognise hlines in var references, so the grades example still works. All sbe tests are passed.

Browse source
This commit is contained in:
Dan Davison 2009-06-03 12:09:52 -04:00
parent 21d01aea91
commit 02b265b2e3
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/org-babel-R.el
View file

@ -79,7 +79,7 @@ R process in `org-babel-R-buffer'."
`org-babel-R-buffer' as Emacs lisp." `org-babel-R-buffer' as Emacs lisp."
(let ((tmp-file (make-temp-file "org-babel-R")) result) (let ((tmp-file (make-temp-file "org-babel-R")) result)
(org-babel-R-input-command (org-babel-R-input-command
(format "write.table(%s(), file=\"%s\", sep=\"\\t\", na=\"nil\",row.names=FALSE, col.names=TRUE, quote=FALSE)" (format "write.table(%s(), file=\"%s\", sep=\"\\t\", na=\"nil\",row.names=FALSE, col.names=FALSE, quote=FALSE)"
func-name tmp-file)) func-name tmp-file))
(with-temp-buffer (with-temp-buffer
(condition-case nil (condition-case nil
@ -89,7 +89,8 @@ R process in `org-babel-R-buffer'."
(setq result (mapcar (lambda (row) (setq result (mapcar (lambda (row)
(mapcar #'org-babel-R-read row)) (mapcar #'org-babel-R-read row))
(org-table-to-lisp))) (org-table-to-lisp)))
(setq result (org-babel-R-set-header-row result))) ;; (setq result (org-babel-R-set-header-row result))
)
(error nil)) (error nil))
(if (null (cdr result)) ;; if result is trivial vector, then scalarize it (if (null (cdr result)) ;; if result is trivial vector, then scalarize it
(if (consp (car result)) (if (consp (car result))
@ -105,7 +106,14 @@ user-supplied column names, or (b) default column names added
automatically by R. In case (a), maintain the first row of the automatically by R. In case (a), maintain the first row of the
table as a header row and insert an hline. In case (b), remove table as a header row and insert an hline. In case (b), remove
the first row and return the org table without an hline." the first row and return the org table without an hline."
(if (string-equal (caar table) "V1") (if (or (string-equal (caar table) "V1")
(string-equal (caar table) "x"))
;; write.table(1, col.names=TRUE) makes a colname called "x". I
;; think shows that this approach is too much of a hack: we
;; can't take some totally different action just because we see
;; an "x" there that might or might not be a automatic name.
;; The first row looks like it contains default column names ;; The first row looks like it contains default column names
;; added by R. This condition could be improved so that it ;; added by R. This condition could be improved so that it
;; checks whether the first row is ("V1" "V2" ... "V$n") where ;; checks whether the first row is ("V1" "V2" ... "V$n") where