Commit graph

288 commits

Author SHA1 Message Date
Eric Schulte 104f05ef5e DONE helpers from org-plot.el 2009-07-20 13:10:28 -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
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
Eric Schulte 01c6bd2b33 pulled the gnuplot variable processing out into it's own function 2009-07-19 15:30:40 -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
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 91301b8c29 Merge branch 'master' into gnuplot 2009-07-19 11:02:17 -06: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
Eric Schulte 4ff540bfd7 started bringing in options from org-plot 2009-07-18 18:05:11 -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
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 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 fcfe110fef correctly handling exclusive :exports params 2009-07-18 14:24:47 -06:00
Dan Davison 09675f518e Cherry-picking org-babel.org from examplizing-output. 2009-07-18 15:46:52 -04:00
Dan Davison 20e06fe86f Updating org-babel.org. 2009-07-18 15:40:15 -04:00
Dan Davison 802c5c5292 Updating org-babel.org. 2009-07-18 15:39:47 -04:00
Eric Schulte 61daf1e762 promoted to TODO: use example block for large amounts of stdout output? 2009-07-18 13:14:44 -06:00
Eric Schulte f0adc09a42 added discussion of: PROPOSED optional timestamp for output 2009-07-18 13:14:43 -06:00
Dan Davison cfb9092ede Revising bugs and tasks in org-babel.org 2009-07-18 14:02:22 -04:00
Dan Davison 24927c2a45 Minor changes to org-babel.org 2009-07-18 13:04:00 -04:00
Dan Davison ccc461ef54 Merging master into results. 2009-07-18 13:01:16 -04:00
Dan Davison 6cd9cb6924 Updating org-babel.org 2009-07-18 01:48:53 -04:00
Eric Schulte 58a427f70d agreeing with new tasks 2009-07-17 16:58:57 -06:00
Dan Davison b15beb63d2 Merging master into results to pick up new TODO. 2009-07-17 14:42:31 -04:00
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