Commit Graph

300 Commits

Author SHA1 Message Date
Dan Davison 017d46e50f Reinstated force-results-to-vector: passing all tests in table. 2009-07-17 14:37:43 -04:00
Dan Davison c05ac759ac Trivial: removing whitespace in org-babel.org; passing most tests now. 2009-07-17 14:00:32 -04:00
Eric Schulte 1f9f1564ec added task: take default values for header args from properties 2009-07-17 11:27:41 -06: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
Eric Schulte 1fa18830ab gnuplot is able to generate graphs, but needs much more work 2009-07-16 22:20:58 -06: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 3382a0ea8b New bug: emacs-lisp fails when reference is a literal number. 2009-07-16 16:24:50 -04:00
Dan Davison e49db4f3e6 New proposed tasks: make tangled files read-only, and fold source blocks on #+srcname line 2009-07-16 12:16:16 -04:00
Dan Davison 690ed664c6 Merging master into results.
In order to get new tangle load-file function. Had to resolve org-babel.org conflict manually and didn't know the 'proper' way to do so, so there may be weirdness in that file.
2009-07-16 01:28:15 -04:00
Eric Schulte d37d148d3f DONE singe-function tangling and loading elisp from literate org-mode file [3/3] 2009-07-14 21:55:50 -07:00
Eric Schulte 77c7fc81cc flesh out org-babel-load-file task statement 2009-07-14 21:55:11 -07:00
Eric Schulte cdd73500d6 DONE ensure that org-babel-tangle returns the path to the tangled file(s) 2009-07-14 21:52:27 -07:00
Eric Schulte 07c919cb31 fleshing out actual loading of tangled files 2009-07-14 21:52:10 -07:00
Eric Schulte 92f979cc88 fleshing out documentation for automatic tangling and loading of elisp 2009-07-14 21:52:06 -07:00
Eric Schulte 8694253c9f getting started on automatic loading of elisp from org-mode files 2009-07-14 20:21:08 -07:00
Dan Davison 213b045359 Updating main org file and tidying library-of-babel.org. 2009-07-11 23:59:51 -04:00
Dan Davison 42fe3144b7 Some more bugs / TODOs, and some unimportant changes. 2009-07-10 21:13:21 -04:00
Dan Davison ad6eaadd39 Unimportant changes to org-babel.org (need for these to be merged into
master branch)
2009-07-05 19:24:29 -04:00
Dan Davison adcfa3c54b Some todos/bug notes in org-babel.org 2009-06-30 20:46:51 -04:00
Eric Schulte b8f1d920f9 added "Getting Started" to org-babel.org preface 2009-06-26 11:45:05 -07:00
Dan Davison f8b331dd1c Blanking results fields in the Tests table 2009-06-26 10:38:14 -04:00
Dan Davison 6c34513c51 Added a 'Getting Started' section to org-babel.org with the necessary (require ...) line 2009-06-26 10:15:42 -04:00
Eric Schulte 4609674897 expanded/improved preface in org-babel.org 2009-06-25 01:14:51 -07:00
Eric Schulte e6a9f79eed added description of document to org-babel.org preface 2009-06-25 00:41:23 -07:00
Eric Schulte c6d7014fa8 adding introductory phrase 2009-06-24 22:46:01 -07:00
Eric Schulte d370fadcf2 added a "features" portion to the intro with info on sessions and results 2009-06-15 13:37:42 -07:00
Eric Schulte c678059deb passing all tests 2009-06-15 12:47:10 -07:00
Eric Schulte a5f6423a76 Merge branch 'jumping-to-source-blocks' 2009-06-15 12:43:23 -07:00
Eric Schulte aa5c9985bd fixed bug in ruby session evaluation 2009-06-15 12:30:36 -07:00
Eric Schulte 112c7d9236 fixed non-session variable assignment in R 2009-06-15 12:17:58 -07:00
Eric Schulte b8b8540892 some tests are failing with the new session :none stuff 2009-06-15 11:53:53 -07:00
Eric Schulte 82ecab19fb R is working with no session 2009-06-15 11:49:06 -07:00
Eric Schulte e2d3cc7830 shell commands are working 2009-06-15 11:29:25 -07:00
Eric Schulte f2aaba8ca6 adding support for python with :session none 2009-06-15 11:14:32 -07:00
Eric Schulte 2fd494477b cleaned up ruby 2009-06-15 10:54:14 -07:00
Eric Schulte 00365e1fbe ruby can now be run with NO session 2009-06-15 10:13:48 -07:00
Eric Schulte b60d873724 just getting started 2009-06-15 09:28:01 -07:00
Eric Schulte ec38cffff0 not yet working 2009-06-14 22:06:11 -07:00
Eric Schulte 7984724a2b expanding ** PROPOSED add =:none= session argument (for purely functional execution) 2009-06-14 18:57:41 -07:00
Eric Schulte e985ff2014 response to shell-prompt-regexp bug 2009-06-14 18:48:43 -07:00
Eric Schulte 623831ddab added util directory, including newest inf-ruby.el, should fix ruby bug 2009-06-14 18:42:44 -07:00
Dan Davison c89a69b266 Shell problem with escape chars in prompt is still there. 2009-06-14 19:29:34 -04:00
Eric Schulte 9040c8d246 re-organizing and re-categorizing TODOs under the task section 2009-06-14 12:36:46 -07:00
Eric Schulte 66d9bd1fb6 replies to new bugs 2009-06-14 12:22:11 -07:00
Eric Schulte 0866961436 Merge branch 'session' of git@github.com:eschulte/org-babel into session
Conflicts:
	lisp/langs/org-babel-sh.el
	org-babel.org
2009-06-14 12:16:17 -07:00
Eric Schulte 8360a676b9 passing all tests 2009-06-14 12:09:36 -07:00
Eric Schulte a85cadced8 *** DONE function to bring up inferior-process buffer [4/4] 2009-06-14 12:02:25 -07:00
Eric Schulte e962e83741 adding pop/prep session commands to org-babel-shell.el 2009-06-14 11:53:56 -07:00
Eric Schulte 88048186ac R know how to prep and pop-to sessions 2009-06-14 11:48:11 -07:00
Dan Davison 70cc6cb90f A couple of bug reports.
(1) Shell evaluation is broken by weird escape chars in prompt;
(2) ruby evaluation not working for me as run-ruby expects one argument on my system.

Also fixed a harmless copy-paste error and whitespace adjustment to shorten lines.
2009-06-14 14:38:15 -04:00
Eric Schulte 2212742c54 python can now pop-to-session 2009-06-14 11:34:06 -07:00
Eric Schulte d1bcb5e425 cleaned version of body is now added to kill ring 2009-06-14 11:10:09 -07:00
Eric Schulte 1b39a64fbe ruby blocks can now pop to session buffer (optionally evaluating header-args) 2009-06-14 11:08:12 -07:00
Eric Schulte 5e41083bfa adding ** TODO add =:none= session argument (for purely functional execution) 2009-06-14 10:32:10 -07:00
Eric Schulte 77c8f29968 ** DONE test failing forcing vector results with =test-forced-vector-results= ruby code block 2009-06-14 10:24:29 -07:00
Eric Schulte 0019cc9c14 all tests seem to be passing 2009-06-14 10:23:44 -07:00
Eric Schulte 3cd99d0c2f ** DONE defunct R sessions
turns out I just had to use inferior-ess-send-input instead of comint-send-input
2009-06-14 10:20:59 -07:00
Eric Schulte bf2b175ba8 fleshing out bug description 2009-06-14 10:05:26 -07:00
Eric Schulte 4a4046d73d adding two bugs...
** TODO defunct R sessions
** TODO test failing forcing vector results with =test-forced-vector-results= ruby code block
2009-06-14 09:22:31 -07:00
Eric Schulte d879ac0a12 seems to have passed all tests (I'm skeptical there still may be problems)
Specifically with the following two issues...
  1) hanging on R code blocks when we have multiple R sessions in play
  2) very occasionally the results of ruby code blocks are iffy

This whole session experience proves the general point that functional
code is easier to write and debug than code with state.
2009-06-14 09:18:42 -07:00
Eric Schulte f31b3b2af2 fixed problem with new ruby sessions sometimes not initializing 2009-06-14 09:12:19 -07:00
Eric Schulte 8931657abf adding bug: TODO ruby fails on first call to non-default session 2009-06-14 08:42:35 -07:00
Eric Schulte 0b75d89ccf fixed error parsing empty results from ruby 2009-06-14 08:41:52 -07:00
Eric Schulte 08f92aebe5 passing some session tests, but still failing some tests 2009-06-13 19:35:48 -07:00
Eric Schulte 391f677fc7 `org-babel-comint-with-output' is now robust to errors 2009-06-13 18:28:06 -07:00
Eric Schulte f4a1193a6e now using org-babel-comint-with-output in org-babel-python.el 2009-06-13 17:30:02 -07:00
Eric Schulte dd0392a4f2 extracted the "capture all output from comint session" behavior into a macro 2009-06-13 17:08:42 -07:00
Dan Davison 6f9985a749 Synching org-babel.org across branches 2009-06-13 19:01:06 -04:00
Eric Schulte 3b026b806e shell source blocks no longer hang 2009-06-13 14:49:57 -07:00
Eric Schulte 8ec719aefb passing all tests, but have a couple more tasks before merge
1) broke reading from #+resname lines
2) shell sometimes stalls indefinitely
3) need condition-case for safe removal of filter when C-g during execution
4) need to add tests for session behavior
2009-06-12 17:02:37 -07:00
Eric Schulte d261e178e9 passing all but one test 2009-06-12 16:50:53 -07:00
Eric Schulte 66162b2e4e more looking into the remaining errors 2009-06-12 16:42:56 -07:00
Eric Schulte b7c32fc5d8 passing almost all tests 2009-06-12 16:34:06 -07:00
Eric Schulte d41466e5bc now really passing all basic tests 2009-06-12 16:23:28 -07:00
Eric Schulte 8f9ae7314a now passing basic-ruby test 2009-06-12 16:08:51 -07:00
Eric Schulte 5675e56585 sessions are now working in R 2009-06-12 15:31:52 -07:00
Eric Schulte 9623b16914 fixed some weird long-prompt issues with shell comint buffer 2009-06-12 15:20:23 -07:00
Eric Schulte 2dea1ea367 shell is now handling multiple sessions 2009-06-12 14:56:30 -07:00
Eric Schulte f4798d3e83 python can now handle multiple sessions 2009-06-12 14:49:11 -07:00
Eric Schulte 368cdd2a3e brought in org-babel.org changes from master 2009-06-12 13:35:04 -07:00
Eric Schulte 8093091103 DONE rework evaluation lang-by-lang [4/4] 2009-06-12 13:10:33 -07:00
Eric Schulte 431715e6db shell support is pretty much working 2009-06-12 13:09:20 -07:00
Eric Schulte b64be81363 moving language-specific files into their own directory 2009-06-12 08:59:38 -07:00
Eric Schulte 1be99d1b35 python is basically up to snuff (needs more work on sessions) 2009-06-12 08:46:00 -07:00
Eric Schulte 190a66c6af ruby now respects the scalar/vector :results header arguments 2009-06-12 08:33:51 -07:00
Eric Schulte 82e7c86ea3 R evaluation is pretty much up to snuff 2009-06-12 08:29:21 -07:00
Eric Schulte 86e4597a7a R results now obey the scalar/vector :results header arguments 2009-06-12 08:10:54 -07:00
Eric Schulte e0dcbce75e evaluation is working in R capturing both outputs and values 2009-06-12 07:55:33 -07:00
Eric Schulte 005e682948 making progress bringing org-babel-R.el into the new evaluation schema 2009-06-11 17:04:42 -07:00
Eric Schulte 2c1b04eecb ruby is now working with sessions, output-based-results, and value(functional)-based-results 2009-06-11 15:34:34 -07:00
Eric Schulte 6698edbe83 finally think I'm on the right track for output vs. values, mostly working w/ruby
- moved ruby functions into their own buffer
  - removed org-babel-sessions.el
  - drastically scaled down org-babel-comint.el (may grow later if we
    find duplication between language buffers)
  - removed org-babel-script.el
  - adjusted org-babel-init.el to reflect new file layout

For the big breakthrough see `org-babel-ruby-evaluate' in
org-babel-ruby.el.  This will be the model upon which all future
language evaluations will be built.
2009-06-11 15:15:59 -07:00
Eric Schulte 8d0fd18933 working on org-babel-comint for automatically keeping a ring 2009-06-10 17:27:06 -07:00
Eric Schulte 9c70974391 started working on ruby 'script' execution 2009-06-09 16:33:36 -07:00
Eric Schulte f3da4d0321 functional results now working with org-babel-comint and org-babel-script 2009-06-09 16:10:43 -07:00
Eric Schulte 39d1674f30 org-babel-R is now able to assign variables 2009-06-09 15:28:59 -07:00
Eric Schulte d3f1d07066 org-babel-R can now run in 'script' mode 2009-06-09 15:02:01 -07:00
Eric Schulte ccddf78dca the script/functional return values should be handled by header arguments
also, an echo header (like in R) argument would probably be
 appropriate as well.
2009-06-08 17:58:53 -07:00
Eric Schulte d724ca921a tweaking tasks for sessions and script/functional evaluation 2009-06-08 16:38:13 -07:00
Eric Schulte e6729c1cae even more thoughts on evaluation, results, models and options 2009-06-08 16:31:13 -07:00
Dan Davison 4446fd1f07 new TODO: figure out how to handle errors during evaluation 2009-06-06 21:29:35 -04:00
Dan Davison d0938cc70d More thoughts on scripting vs. functional approaches in org-babel 2009-06-06 21:21:21 -04:00
Eric Schulte c175d3ce0d playing with org-babel-script and comint buffers/functions 2009-06-03 17:37:50 -07:00
Eric Schulte 2a663b9e09 R is now using last output (with default session) and passing all tests 2009-06-03 15:59:27 -07:00
Eric Schulte 49db1e523c Merge branch 'master' into session
Conflicts:
	org-babel.org
2009-06-03 15:30:10 -07:00
Eric Schulte b1c103890c *even more* discussion of session implementation issues 2009-06-03 15:23:45 -07:00
Dan Davison 8ac2a7daa6 Added another multilingual example. One issue is that spaces in the string cause vector output. 2009-06-03 12:33:58 -04:00
Dan Davison 21d01aea91 Some notes on possible support for named fields / rows / columns in org-babel and supported languages. These are just preliminary and don't outline a solution. My feeling is that this will require a bit more thought to avoid being an unrigorous hack. 2009-06-03 11:32:24 -04:00
Eric Schulte bbf89dea08 fixed type in org-babel.org 2009-06-02 20:50:10 -07:00
Eric Schulte dccbe633c9 discuss complication of mixing functional and imperative block evaluation 2009-06-02 20:34:20 -07:00
Eric Schulte 517253a2d0 beginning to add sessions 2009-06-02 16:28:56 -07:00
Eric Schulte bba80bb837 working on sessions 2009-06-02 16:26:57 -07:00
Dan Davison 0df550d84c Minor updates and responses in the sessions planning subtree. 2009-06-02 16:45:31 -04:00
Eric Schulte 37758310e0 planning *session* task order, and separating "*Org Edit Src Example* buffer" tasks 2009-06-01 17:58:37 -07:00
Eric Schulte fcd5e8f272 fleshing out the *sessions* discussion and TODOs 2009-06-01 17:28:34 -07:00
Eric Schulte c38294d21f DONE Remove protective commas from # comments before evaluating 2009-06-01 16:56:59 -07:00
Dan Davison 8fef1f0509 More notes on sessions: need for header arg evaluation when we edit code, and need for removing protective commas 2009-06-01 15:14:35 -04:00
Dan Davison f03e3ed603 Further notes on org-babel session and ESS and *Org Edit Src Example* buffers. 2009-05-31 18:07:13 -04:00
Dan Davison ce96d45374 Added reminder/request that we bear ESS in mind when designing org-babel 'sessions' 2009-05-31 17:48:00 -04:00
Dan Davison e7f860cb19 Altered the python code in the chained references example. AIui the example was producing the correct answer (ruby class Array) but for the wrong reason (python was returning None) 2009-05-30 15:01:55 -04:00
Eric Schulte f87a673c9c replacing parts of org-babel lost in a merge
namely some extended discussion of environments and sessions under
  the "Create objects in top level (global) environment in R?" header
2009-05-29 18:01:38 -07:00
Eric Schulte 2fe76cd094 adding discussion to PROPOSED conversion between org-babel and noweb (e.g. .Rnw) format 2009-05-29 17:45:25 -07:00
Eric Schulte 986fcb4652 DONE pass multiple reference arguments into R
This should be working, see the following example...

n + m

: 10
2009-05-29 16:45:03 -07:00
Dan Davison fe22667f78 proposed org-babel <-> noweb interconversions 2009-05-29 16:22:09 -04:00
Dan Davison 8deae3517b Trying to resolve conflict while understanding very little about git 2009-05-29 16:21:12 -04:00
Dan Davison 2adb00f678 proposed org-babel <-> noweb interconversions 2009-05-29 16:17:03 -04:00
Eric Schulte e8e24c024b added TODO fully purge org-babel-R of direct comint interaction 2009-05-27 19:01:29 -07:00
Eric Schulte c5a58ad6aa moving generalized comint functions to new file org-babel-comint.el 2009-05-27 19:00:13 -07:00
Eric Schulte a54c27ec91 attempts at improving sb snippet 2009-05-27 18:42:15 -07:00
Eric Schulte aca19b2efc added my session thoughts for global variables 2009-05-27 16:40:47 -07:00
Eric Schulte 906c524234 Merge branch 'master' of git@github.com:eschulte/org-babel
Conflicts:
	org-babel.org
2009-05-27 16:40:26 -07:00
Eric Schulte 2d1a5405d1 added task for improving the sb snippet 2009-05-27 16:33:22 -07:00
Dan Davison 5db027b3e1 Noted in hline TODO that plotting histogram in the grades example is blocked by not being able to deal with hline in the input table. (AIUI) 2009-05-26 19:40:47 -04:00
Dan Davison 57783f9ce2 A few new TODOS: deal with hlines in tables, how do we pass multiple args in R, and some extended wittering about scoping issues in R: basically I want to argue for not abandoning the Sweave-style mode where objects created in code blocks are persisten across different blocks. 2009-05-26 19:16:46 -04:00
Eric Schulte db9f189649 fixed bug: DONE R-code broke on "org-babel" rename 2009-05-25 19:23:30 -07:00
Eric Schulte aec7ec05d3 more fleshing out of the introduction 2009-05-25 18:20:32 -07:00
Eric Schulte b5174f5a7d misc changes 2009-05-25 15:13:56 -07:00
Eric Schulte 02634f7d85 tweaked grades example (need some R help in plotting histogram) 2009-05-24 15:47:21 -07:00
Eric Schulte 28c29ee51e added another example 2009-05-24 15:40:54 -07:00
Eric Schulte 9aa713be8c updated tag line 2009-05-24 14:10:03 -07:00
Eric Schulte 6614df037f now passing all tests with new name "org-babel" 2009-05-24 14:08:02 -07:00
Eric Schulte 9247200bb0 renaming the org-babel/ directory to the lisp/ directory 2009-05-24 13:56:20 -07:00
Eric Schulte 6451d2df1a more cleanup and removal of the term "litorgy" 2009-05-24 13:52:51 -07:00
Eric Schulte 36eb5751d8 re-organizing main org-babel.org file
- replacing litorgy with org-babel
  - splitting old requirements discussion into separate file
2009-05-24 13:48:29 -07:00
Eric Schulte 10bc87beac adding introduction (from litorgy.org) to main org-babel.org file 2009-05-24 13:43:56 -07:00
Eric Schulte 4136f27680 renamed main rorg.org to org-babel.org 2009-05-24 13:42:56 -07:00