0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-23 23:10:45 +00:00
Commit graph

3698 commits

Author SHA1 Message Date
Dan Davison ee749f4d70 Bugfix:
I had made org-babel-get-src-block-name automatically check whether it
was on a lob line. I'm reverting that.
2009-07-11 03:04:41 -04:00
Dan Davison 0a6fa24cc5 bugfix: org-babel-parse-header-arguments was creating nonsense when passed an empty string. 2009-07-11 03:01:54 -04:00
Dan Davison af6af0b848 Tightening up org-babel-lob-one-liner-regexp. 2009-07-10 23:15:16 -04:00
Dan Davison 44adc98505 Enabling LoB to put results in buffer, and slowly moving towards more
unified concept of function calls.

Previously LoB calls were not able to produce results in the
buffer. These changes go some way to allowing them to do that. [There
are still some bugs to deal with]. That meant changing org-babel.el so
that there is a notion of the `source block name' for a LoB line, in
order to construct a #+resname (currently I've made the name the same
as the function call).

I'm also slowly moving towards unifying the notion of `function calls'
a bit more: I've changed the org-babel-lob-one-liner-regexp so that
instead of a monolithic match it now matches first the function name,
and second the function arguments in
parentheses. org-babel-lob-get-info makes that match, and although it
still concatenates them and returns the string, the two elements can
be accessed immediately afterwards using match-string. So that
situation is very similar to org-babel-get-src-block-name, whose
job (in this branch) is also to parse the function *name* and the
function *arguments*. In a few places in the code (esp. function
names), I think the word `info' should be replaced with `call' or
`function call', which I believe more accurately indicates what the
`info' is: a function definition, together with bound
arguments/references.

The function call syntax, i.e. function-name(arg1=ref1), originally
introduced for references (and thereby in LoB), and which I'm
proposing we use throughout, raises the question of default arguments,
and those being over-ridden by supplied arguments, as in e.g. python,
and R.
2009-07-10 22:59:10 -04:00
Dan Davison 42fe3144b7 Some more bugs / TODOs, and some unimportant changes. 2009-07-10 21:13:21 -04:00
Dan Davison eb7206f744 Fixing function call-style source block arguments.
style syntax. There still needs to be work done on the regexps for
recognising #+srcname lines possibly with/without parenthesised
arguments. This change makes org-babel-block-name return nil rather
than fail when it doesn't find a src block head (e.g. in a #+lob
line), which seems sensible.

The sbe test table is failing half-way down at `simple ruby
arrays'. For some reason it is making a mini table ("| |") to the
right hand, and point keeps jumping out of the table. My ability to
debug sbe-related stuff is hampered by me not understanding the
code (I need to learn about macros).
2009-07-10 18:38:12 -04:00
Dan Davison 41381781bb Using function call() style source block arguments.
This is a rough, first-pass implementation using some code from
org-babel-ref.el. If we do go with this idea, I think we can find a
better implementation, hopefully using the same code for parsing
`function calls' (parameterised source block calls), whether they are
made directly at a source block, or as a reference in another function
call, or as a LoB call.
2009-07-10 01:35:15 -04:00
Dan Davison c1b72bfba8 Trivial typo fixing 2009-07-10 01:20:56 -04:00
Carsten Dominik b62e7fc5a0 Fix problems with sub and superscript in LaTeX export 2009-07-09 06:29:51 +02:00
Carsten Dominik 7087902788 Fix bug in org-narrow-to-subtree, which could lead to clock errors
Bernt Hansen writes:

> I have a monthly repeated task (Archive tasks) that has lots of
> old clock time on it currently but has never been marked DONE
> since the creation of the property LAST_REPEAT_TIME.  If this
> task is clocking when Emacs exits and you restart emacs and
> answer Yes to continue the clock - the modeline has the total
> time for the parent task (151:04 instead of the total time for
> this task (5:04).  If I clock the task in again the modeline is
> correct.
2009-07-08 14:29:18 +02:00
Carsten Dominik 60d0e73b00 Fix logo stuff on website 2009-07-08 13:11:58 +02:00
Carsten Dominik aa9529a5ce Make publishing a little less noisy 2009-07-08 10:09:05 +02:00
Carsten Dominik 6355334c4b org-plot.el: fix bug 2009-07-08 07:50:48 +02:00
Carsten Dominik 9ec9d79adc org-plot: Allow prepending a user script 2009-07-08 07:01:00 +02:00
Bernt Hansen 3e24ccf646 Archive subtree and move to next visible task
This skips over blank lines preceeding the next task when archiving a task or
subtree.  This allows us to use a keyboard macro to remember the archive key
sequence incantation and skips to the next heading so we don't accidentally
archive the wrong task.

This fixes an issue with blank line handling.  Tasks which have blank lines
following them do not include the blank lines -- they are part of the following
task.  This moves the point forward to the next visible headline so that if we
repeat the archive operation it affects the following task and not the previous
one by mistake.
2009-07-08 06:51:20 +02:00
Dan Davison 4137ceb426 A few notes and a completed TODO 2009-07-08 00:28:45 -04:00
Dan Davison 2bddc5fdf8 Revert "Moving non-language specific code out of language-specific files."
This reverts commit 0f541a680d.

See commit note for parent commit. Both reversions made for same reason.
2009-07-08 00:13:07 -04:00
Dan Davison 9772adef3e Revert "Altering org-babel-execute:emacs-lisp in accordance with preceding changes."
This reverts commit d8001facab.

Going back to original plan of simply passing (cmd body params) to the org-babel-execute:LANG functions.

The benefit of this is that languages will have access to the full params list. A downside is that code parsing the
params list and referencing variables is currently duplicated across the languages, so perhaps we can aim to reduce
that code duplication at some point.
2009-07-08 00:06:14 -04:00
Dan Davison 5cbc2d3803 Using the new org-babel-merge-params function to combine default args with header args provided. 2009-07-07 23:57:49 -04:00
Dan Davison 060e013c90 Adding Dan's incipient worg document 2009-07-07 19:57:25 -04:00
Dan Davison 7e80d01571 Now we have a function for merging params lists, so in theory this reversion can be reverted.
Revert "Revert "making :results replace the default""

This reverts commit dc702a3152.
2009-07-07 19:48:19 -04:00
Dan Davison 9d79afb3b3 Merge branch 'working-on-combining-params' into results 2009-07-07 19:46:10 -04:00
Dan Davison 5280e5ea4f Attempt at a working version of the org-babel-merge-params function. 2009-07-07 19:44:27 -04:00
Carsten Dominik 79b70a7e66 Don't use next-line in lisp code if possible 2009-07-07 15:14:05 +02:00
Carsten Dominik 84c3b6f19b Make Org work better with visual line mode
Patch by Rudi Schlatte
2009-07-07 15:12:49 +02:00
Carsten Dominik 7b27bfdcee Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
Conflicts:
	lisp/org-publish.el
2009-07-07 15:05:42 +02:00
Carsten Dominik 67d2a22fb9 Publishing: Clean out timestamp directory with `C-u C-c C-e E'
When changing the publishing setup, old timestamp files can be left
behind.  Forcing publishing of all projects with `C-u C-c C-e E'
will remove all existing timestamp files.
2009-07-07 15:04:37 +02:00
Carsten Dominik a05628debc Publishing: Clean out timestamp directory with `C-u C-c C-e E'
When changing the publishing setup, old timestamp files can be left
behind.  Forcing publishing of all projects with `C-u C-c C-e E'
will remove all existing timestamp files.
2009-07-07 15:04:15 +02:00
Carsten Dominik 1768f325df Make bullet modification work for ordered lists as well 2009-07-07 13:52:17 +02:00
Carsten Dominik e5c2547bbe Fix typo in plain list demotion code
Reported by Rainer Stengele.
2009-07-07 13:31:55 +02:00
Carsten Dominik ac425d8bd2 Fix problem with GNUS mail header.
Patch by Andreas Rottmann and Tassilo Horn
2009-07-07 13:26:32 +02:00
Carsten Dominik 636c524df3 HTML export: Show UP and HOME links if defined
org-export-html-link-up and org-export-html-link-home are now also
inserted into normal HTML export, above the page title.
2009-07-07 13:20:25 +02:00
Carsten Dominik 697c1c3903 New org.css with better support for printing
Made by - of course - Sebastian Rose
2009-07-07 06:13:09 +02:00
Carsten Dominik a5491ec852 Fix typo 2009-07-07 06:08:36 +02:00
Eric Schulte 37569346f8 stole a couple of moments to add discussion and a new TODO 2009-07-06 19:36:44 -07:00
Carsten Dominik e16c5b7b64 Fix typos 2009-07-06 22:30:39 +02:00
Carsten Dominik 30d448b2e1 HTML export: More flexibility for preamble and postamble
Andreas Rottmann writes:

> Well, the subject says it all -- attached is a rough patch to
> allow more flexibility with the HTML export; I use it like this:
>
>    (defun rotty/homepage-preamble (opt-plist)
>      (insert "<div id=\"header\">")
>      (insert
>       "
>    <div id=\"navbar\">
>    <a class=\"menu\" href=\"/\">Home</a>
>    | <a class=\"menu\" href=\"/Writings.html\">Writings</a>
>    | <a class=\"menu\" href=\"/Software.html\">Software</a>
>    | <a class=\"menu\" href=\"/blog/\">Blog</a>
>    </div>
>    ")
>      (insert (format
>               "<h1 class=\"title\"><a href=\"/\">rotty</a> &gt; %s</h1>\n"
>               (plist-get opt-plist :title)))
>      (insert "</div>\n")
>      (insert "<div id=\"inner\">\n"))
2009-07-06 18:10:26 +02:00
Carsten Dominik c1d00fa463 Export: General mechanism for local settings
Many different people want to set many different variables in a
buffer-local way for export.  This cannot be done with file variables,
because the Org buffer is not current while the exporter is running.

Lots of variables can be set with the #+OPTIONS lines, but finding
abbreviations goes only so far.

Therefore we have now a general mechanism that can be used to bind
variables during export operations.

a line like:   #+BIND: variable value

will bind the variable to value.  For example,
the line

>>      #+OPTIONS: toc:nil

can now equivalently be written as

>>      #+BIND: org-export-with-toc nil
2009-07-06 17:00:03 +02:00
Carsten Dominik aa6654c9ce Examples: Untabify before re-inserting into Org
Leaving tabs in the code will mess up indentation in Org.
2009-07-06 16:08:49 +02:00
Carsten Dominik 280f8495ed Plain lists: Allow to force bullet type changes during demotion
Rainer Stengele writes:

> using org-mode for quite some time now I always look at
> operations (key sequences) I repeat a lot of times.
>
> A lot of times I start a list with an item and immediately
> indent the next item as subitem.
>
> From
>
> - item 1
> - subitem 11
>
> I go to
>
> - item 1
>  - subitem 11
>
> via "M-right". Then I always want to change the style of the
> subitem list to "*". I do this via "S-right-right".
>
> I wonder how others work. I would like to automatically have
> changed the subitem list type to "*" as soon as I indent via
> "Alt-right". Next indentation should go back to "-". etc.
>
> Maybe we could introduce a variable that sets the order of
> standard list item types, in my case: "- * - * - * - *" as
> in
>
>
> - item 1
>  * subitem 11
>    - subitem 111
>      * subitem 111
> ...
>
> very special I know but I try to reduce the keypressings as
> much as possible. Any other suggestions?

This commits adds the variable
`org-list-demote-modify-bullet' for this purpose.
2009-07-06 15:38:23 +02:00
Dan Davison d8001facab Altering org-babel-execute:emacs-lisp in accordance with preceding changes. 2009-07-05 23:09:28 -04:00
Dan Davison 0f541a680d Moving non-language specific code out of language-specific files.
Moved reference resolution out of language-specific files; changed
things so that we parse the header args list in org-babel.el, and
changed the argument list of the org-babel-execute:LANG functions
accordingly. In addition to hopefully resulting in easier maintenance,
this results in more streamlined org-babel-execute:LANG functions, and
hence less work to do when adding interpreters.
2009-07-05 22:36:51 -04:00
Dan Davison 6143bb7aad Streamlining/fiddling with org-babel-execute-src-block.
This includes an explicit implementation of the idea that no result is
returned in the case of :results output.
2009-07-05 21:57:42 -04:00
Dan Davison f7ea8ccb2e Added comment to org-babel-process-result explaining
results-processing changes and state they are currently in. Here's the
comment:

  You can see below the various fragments of results-processing
  code that were present in the language-specific files. Out of
  those fragments, I've moved the
  org-babel-python-table-or-results and
  org-babel-import-elisp-from-file functionality into the
  org-babel-*-evaluate functions. I think those should only be
  used in the :results value case, as in the 'output case we are
  not concerned with creating elisp versions of results.

  The rest of the functionality below, concerned with vectorising
  or scalarising results is commented out, has not yet been
  replaced, and may need to be reinstated in this function
2009-07-05 21:37:00 -04:00
Dan Davison dc702a3152 Revert "making :results replace the default"
This reverts commit a13cbf64b6.

I'm in favour of this change, but it seems that we need a more sophisticated way of combining plists before we can
change the default header args in this way. Otherwise, we get two entries for :results (one from the defaults and one
from the header args), whereas what we want is a single entry for :results with space-separated values.
2009-07-05 21:23:47 -04:00
Dan Davison df3b1b7223 Fixing results processing code.
When :results is 'value, the org-babel-LANG-evaluate functions are
responsible for returning an elisp representation of the *value* of
the block. This stage is maintained in the language-specific code
because different languages have different ways of doing it: python
and ruby use org-babel-LANG-table-or-string, whereas R and shell write
to file and then use org-babel-import-elisp-from-file. It could
however be put in the org-babel-execute:LANG function.
2009-07-05 21:23:17 -04:00
Dan Davison 9750226de7 Ruby version of previous commit.
Bug fix: I was missing out org-babel-table-or-string with external
    process evaluation (non-session).

    Also, I have renamed org-babel-ruby-table-or-results to org-babel-ruby-table-or-string.

    (the previous commit's message should have read org-babel-python-table-or-results...)
2009-07-05 19:59:24 -04:00
Dan Davison e45cf15b06 Bug fix: I was missing out org-babel-table-or-string with external
process evaluation (non-session).

Also, I have renamed org-babel-table-or-results to org-babel-table-or-string.
2009-07-05 19:55:54 -04:00
Dan Davison 6ade544674 Unimportant: output changes in org-babel.org 2009-07-05 19:40:31 -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