ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DONE "multiple :results headers"

This commit is contained in:
Eric Schulte 2009-05-22 15:12:51 -07:00
parent bab1f2da00
commit d8734f7edb
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
litorgy/litorgy.el
View File

@ -245,13 +245,14 @@ replace - insert results after the source block replacing any
previously inserted results
silent -- no results are inserted"
(if insert (setq insert (split-string insert)))
(if (stringp result) ;; unless results are a list, ensure they're a string
(setq result (litorgy-clean-text-properties result))
(unless (listp result) (setq result (format "%S" result))))
(if (and insert (string-equal insert "replace")) (litorgy-remove-result))
(if (and insert (member "replace" insert)) (litorgy-remove-result))
(if (= (length result) 0)
(message "no result returned by source block")
(if (and insert (string-equal insert "silent"))
(if (and insert (member "silent" insert))
(progn (message (format "%S" result)) result)
(when (and (stringp result) ;; ensure results end in a newline
(not (or (string-equal (substring result -1) "\n")
@ -283,11 +284,11 @@ relies on `litorgy-insert-result'."
(save-excursion
(if (org-at-table-p)
(org-table-end)
(while (if (looking-at ": ")
(progn (while (looking-at ": ")
(forward-line 1)) t))
(forward-line 1))
(forward-line -1)
(if (while (if (looking-at ": ")
(progn (while (looking-at ": ")
(forward-line 1)) t))
(forward-line 1))
(forward-line -1))
(point))))))
(defun litorgy-examplize-region (beg end)

39
rorg.org
View File

@ -4,26 +4,6 @@
#+STARTUP: oddeven
* Tasks [13/25]
** TODO (simple caching) check for named results before source blocks
see the TODO comment in [[file:litorgy/litorgy-ref.el::TODO%20This%20should%20explicitly%20look%20for%20resname%20lines%20before][litorgy-ref.el#litorgy-ref-resolve-reference]]
** TODO name named results if source block is named
currently this isn't happening although it should be
** TODO command line execution
Allow source code blocks to be called form the command line. This
will be easy using the =sbe= function in [[file:litorgy/litorgy-table.el][litorgy-table.el]].
This will rely upon [[* resolve references to other buffers][resolve references to other buffers]].
** TODO resolve references to other buffers
This would allow source blocks to call upon tables, source-blocks,
and results in other buffers.
See...
- [[file:litorgy/litorgy-ref.el::TODO%20allow%20searching%20for%20names%20in%20other%20buffers][litorgy-ref.el:searching-in-other-buffers]]
- [[file:litorgy/litorgy.el::defun%20litorgy%20find%20named%20result%20name][litorgy.el#litorgy-find-named-result]]
** TODO results-type header (vector/file) [1/3]
In response to a point in Dan's email. We should allow the user to
force scalar or vector results. This could be done with a header
@ -71,6 +51,25 @@ the string path of their files, and can add =file= to their results
header.
*** TODO vector result types
** TODO (simple caching) check for named results before source blocks
see the TODO comment in [[file:litorgy/litorgy-ref.el::TODO%20This%20should%20explicitly%20look%20for%20resname%20lines%20before][litorgy-ref.el#litorgy-ref-resolve-reference]]
** TODO name named results if source block is named
currently this isn't happening although it should be
** TODO command line execution
Allow source code blocks to be called form the command line. This
will be easy using the =sbe= function in [[file:litorgy/litorgy-table.el][litorgy-table.el]].
This will rely upon [[* resolve references to other buffers][resolve references to other buffers]].
** TODO resolve references to other buffers
This would allow source blocks to call upon tables, source-blocks,
and results in other buffers.
See...
- [[file:litorgy/litorgy-ref.el::TODO%20allow%20searching%20for%20names%20in%20other%20buffers][litorgy-ref.el:searching-in-other-buffers]]
- [[file:litorgy/litorgy.el::defun%20litorgy%20find%20named%20result%20name][litorgy.el#litorgy-find-named-result]]
** TODO re-implement R evaluation using ess-command or ess-execute
I don't have any complaints with the current R evaluation code or