Merge branch 'master' into maint

This commit is contained in:
Carsten Dominik 2010-07-20 15:14:14 +02:00
commit 16e8fafe68
105 changed files with 378 additions and 13524 deletions

103
ChangeLog
View File

@ -1,103 +0,0 @@
2010-05-06 Carsten Dominik <carsten.dominik@gmail.com>
* Makefile (DOCFILES): Add pdflayout.sty
2010-04-28 Carsten Dominik <carsten.dominik@gmail.com>
* Document that lines with formatting cookies will be removed
automatically.
2010-04-18 Carsten Dominik <carsten.dominik@gmail.com>
* Makefile (BATCH): Write the BATCH command a bit more compact.
2010-04-05 Carsten Dominik <carsten.dominik@gmail.com>
* ORGWEBPAGE/Changes.org: More details on LaTeX headers.
2010-03-05 Carsten Dominik <carsten.dominik@gmail.com>
* Makefile: Process reference card using pdflayout.sty. Change
processing to use direct PDF processing with pdftex.
2009-12-03 Carsten Dominik <carsten.dominik@gmail.com>
* Makefile: Add org-docview.el
2009-11-01 Dan Davison <davison@stats.ox.ac.uk>
* org-exp-blocks.el: Modify split separator regexp to avoid empty
strings.
2009-10-21 James TD Smith <ahktenzero@mohorovi.cc>
* UTILITIES/x11idle.c: Add a small C program which outputs the X11
idle time
2009-09-16 Carsten Dominik <carsten.dominik@gmail.com>
* Makefile: Add dependencies for org-crypt.el.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
* ORGWEBPAGE/index.org: Document that Emacs 23.1 ships with
Org-mode 6.21b.
2009-08-03 Carsten Dominik <carsten.dominik@gmail.com>
* UTILITIES/mansplit.pl: Fix short contents.
* Makefile (LISPF): Add org-indent.el.
2009-07-07 Tassilo Horn <tassilo@member.fsf.org>
* org-gnus.el (org-gnus-store-link): Skip mbox specific first line
that cannot be parsed as header line. Bug reported by Andreas
Rottmann <a.rottmann@gmx.at> in <87zlblscr0.fsf@delenn.lan> on the
org mode list.
2009-06-17 Carsten Dominik <carsten.dominik@gmail.com>
* Makefile (LISPF): Add org-exp-blocks.el.
(lisp/org-exp-blocks.elc): Add dependencies for
org-exp-blocks.el.
2009-03-31 Carsten Dominik <carsten.dominik@gmail.com>
* Makefile (LISPF): Add org-inlinetask.el
(lisp/org-inlinetask.elc): No denpendencies.
2009-01-19 Carsten Dominik <carsten.dominik@gmail.com>
* Makefile (html_manual): Process the split html manual with the
new script.
* UTILITIES/mansplit.pl: New file.
2009-01-06 Carsten Dominik <carsten.dominik@gmail.com>
* Makefile (LISPF): Add org-footnote.el
2008-10-09 Carsten Dominik <dominik@science.uva.nl>
* Makefile (infodir): Change default path for info.
2008-09-24 Carsten Dominik <dominik@science.uva.nl>
* Makefile (install-info): Use the install-info program.
2008-09-17 Carsten Dominik <dominik@science.uva.nl>
* Makefile: Handle new file org-plot.el.
2008-09-08 Carsten Dominik <dominik@science.uva.nl>
* Makefile: Remove the unused MV macro.
2008-06-09 Carsten Dominik <dominik@science.uva.nl>
* Makefile: Allow prefix to be set on the command line.
2008-04-25 Carsten Dominik <dominik@science.uva.nl>
* Makefile (BATCH): Fix the path to the local lisp files.

View File

@ -164,7 +164,7 @@ INFOFILES = doc/org
SHELL = /bin/sh
# Additional distribution files
DISTFILES_extra= Makefile ChangeLog request-assign-future.txt contrib
DISTFILES_extra= Makefile request-assign-future.txt contrib
DISTFILES_xemacs= xemacs/noutline.el xemacs/ps-print-invisible.el xemacs/README
default: $(ELCFILES) $(ELCBFILES)

View File

@ -117,6 +117,7 @@ a look at our [[http://orgmode.org/worg/org-quotes.php][collected quotes about O
#+ATTR_HTML: style="float:right;"
[[http://mobileorg.ncogni.to/][http://mobileorg.ncogni.to/images/screenshot-browse.png]]
- <2010-04-06 Tue>: Release 7.01
- <2010-06-06 Sun>: iPhone App [[http://mobileorg.ncogni.to/][MobileOrg]] version 1.3 introduces
DropBox support, for vastly easier setup.
- <2010-04-06 Tue>: Release 6.35
@ -167,14 +168,19 @@ and corresponding to the latest git version.
- The [[https://launchpad.net/~hexmode/+archive][Ubuntu package]] by Mark A. Hershberger.
* Documentation
** The Org manual
- Read the [[file:manual/index.html][manual online]].
** The Org guide and manual
- Read the [[file:manual/index.html][online compact guide]] or download it as a [[file:orgguide.pdf][PDF document]].
The compact guide is a 40-page introduction to Org mode. It
covers all features in a basic way and has links to in-depth
documentation in the manual and on the web.
- Read the [[file:manual/index.html][online manual]]. The manual covers the complete feature
set with all the bells and whistles, in a systematic way. The
main structure is identical to the guide, so it is easy to go
back and forth between basic and advanced documentation.
- You can also have the entire manual in a [[file:org.html][single monolithic file]].
- Download the manual as a [[file:org.pdf][PDF document]].
- Download the manual as a 200-page [[file:org.pdf][PDF document]].
- A [[http://hpcgi1.nifty.com/spen/index.cgi?OrgMode%2fManual][Japanese translation]] of the manual (version 4.60), by Takeshi
Okano.
- The Org-mode Guide is a compact version of the manual, with all
basic information. Read the [[file:guide/index.html][guide online]] or as a [[file:orgguide.pdf][PDF document]]
** Reference card
- Download the [[file:orgcard.pdf][Refcard]] for org-mode

View File

@ -1,7 +1,7 @@
The is a distribution of Org, a plain text notes and project planning
tool for Emacs.
The version of this release is: 7.01
The version of this release is: 7.01trans
The homepage of Org is at http://orgmode.org

View File

@ -27,7 +27,7 @@ $contents = <<EOF;
<li><a name="toc_Markup" href="Markup.html#Markup">11 Markup</a>
<li><a name="toc_Exporting" href="Exporting.html#Exporting">12 Exporting</a>
<li><a name="toc_Publishing" href="Publishing.html#Publishing">13 Publishing</a>
<li><a name="toc_Working-with-source-code" href="Working-with-source-code.html#Working-with-source-code">14 Source code</a>
<li><a name="toc_Working-With-Source-Code" href="Working-With-Source-Code.html#Working-With-Source-Code">14 Source code</a>
<li><a name="toc_Miscellaneous" href="Miscellaneous.html#Miscellaneous">15 Miscellaneous</a>
</li></ul>
</div>

View File

@ -27,7 +27,7 @@ $contents = <<EOF;
<li><a name="toc_Markup" href="Markup.html#Markup">11 Markup</a>
<li><a name="toc_Exporting" href="Exporting.html#Exporting">12 Exporting</a>
<li><a name="toc_Publishing" href="Publishing.html#Publishing">13 Publishing</a>
<li><a name="toc_Working-with-source-code" href="Working-with-source-code.html#Working-with-source-code">14 Source Code</a>
<li><a name="toc_Working-With-Source-Code" href="Working-With-Source-Code.html#Working-With-Source-Code">14 Source Code</a>
<li><a name="toc_Miscellaneous" href="Miscellaneous.html#Miscellaneous">15 Miscellaneous</a>
<li><a name="toc_Hacking" href="Hacking.html#Hacking">A Hacking</a>
<li><a name="toc_MobileOrg" href="MobileOrg.html#MobileOrg">B MobileOrg</a>

View File

@ -36,8 +36,10 @@ import re
from email.mime.text import MIMEText
notify_on_state_change = {
'Accepted': 'emacs-orgmode@gnu.org',
'RFC': 'emacs-orgmode@gnu.org'
'accepted': 'emacs-orgmode@gnu.org',
'rejected': 'emacs-orgmode@gnu.org',
'changes requested': 'emacs-orgmode@gnu.org',
'rfc': 'emacs-orgmode@gnu.org'
}
# Default Patchwork remote XML-RPC server URL
@ -131,8 +133,13 @@ def usage():
search [str] : Same as 'list'
view <ID> : View a patch
show <ID> : Same as view
update [-s state] [-c commit-ref] <ID>
: Update patch\n""")
update [-s state] [-c commit-ref] [-m email-comment] <ID>
: Update patch, send mail to mailing list if appropriate
branch <ID> : Create a topic branch t/patchNNN for this patch
: and update it to the current master
merge [-m email-comment] <ID>
: Merge the t/patchNNN topic branch into master
\n""")
sys.stderr.write("""\nFilter options for 'list' and 'search':
-s <state> : Filter by patch state (e.g., 'New', 'Accepted', etc.)
-p <project> : Filter by project name (see 'projects' for list)
@ -278,7 +285,7 @@ def action_apply(rpc, patch_id):
sys.exit(1)
def action_update_patch(rpc, patch_id, state = None, commit = None,
delegate_str = "", archived = False):
delegate_str = "", comment_str = "No comment", archived = False):
patch = rpc.patch_get(patch_id)
if patch == {}:
sys.stderr.write("Error getting information on patch ID %d\n" % \
@ -304,7 +311,7 @@ def action_update_patch(rpc, patch_id, state = None, commit = None,
sys.exit(1)
params['state'] = state_id
if state in notify_on_state_change:
if state.lower() in notify_on_state_change:
if not delegate_id:
sys.stderr.write("Error: Delete (-d) required for this update\n")
sys.exit(1)
@ -316,17 +323,26 @@ def action_update_patch(rpc, patch_id, state = None, commit = None,
cc_addr = '%s <%s>' % (submitter['name'], submitter['email'])
to_addr = notify_on_state_change[state]
longdesc = '''Patch %s (http://patchwork.newartisans.com/patch/%s/) is now %s.
orig_mail = rpc.patch_get_mbox(patch_id)
orig_mail = '> ' + orig_mail.replace('\n','\n> ')
longdesc = '''Patch %s (http://patchwork.newartisans.com/patch/%s/) is now "%s".
Maintaner comment: %s
This relates to the following submission:
http://mid.gmane.org/%s''' % \
(patch['id'], patch['id'], state, urllib.quote(patch['msgid']))
shortdesc = 'Patch %s %s' % (patch['id'], state)
http://mid.gmane.org/%s
Here is the original message containing the patch:
%s''' % \
(patch['id'], patch['id'], state, comment_str, urllib.quote(patch['msgid']), orig_mail)
shortdesc = '[%s] %s' % (state, patch['name'])
msg = MIMEText(longdesc)
msg['Subject'] = 'Patchwork: ' + shortdesc
msg['Subject'] = shortdesc
msg['From'] = from_addr
msg['To'] = to_addr
#msg['Cc'] = cc_addr
@ -431,7 +447,7 @@ def branch_with(patch_id, rpc, delegate_str):
print sha
def merge_with(patch_id, rpc, delegate_str):
def merge_with(patch_id, rpc, delegate_str, comment_str):
s = rpc.patch_get_mbox(patch_id)
if len(s) > 0:
print unicode(s).encode("utf-8")
@ -463,7 +479,7 @@ auth_actions = ['update', 'branch', 'merge']
def main():
try:
opts, args = getopt.getopt(sys.argv[2:], 's:p:w:d:n:c:h:')
opts, args = getopt.getopt(sys.argv[2:], 's:p:w:d:n:c:h:m:')
except getopt.GetoptError, err:
print str(err)
usage()
@ -506,6 +522,8 @@ def main():
commit_str = value
elif name == '-h':
hash_str = value
elif name == '-m':
comment_str = value
elif name == '-n':
try:
filt.add("max_count", int(value))
@ -585,7 +603,16 @@ def main():
sys.stderr.write("Invalid patch ID given\n")
sys.exit(1)
merge_with(patch_id, rpc, config.get('auth', 'username'))
merge_with(patch_id, rpc, config.get('auth', 'username'), comment_str)
elif action == 'test':
patch_id = patch_id or int(args[0])
patch = rpc.patch_get(patch_id)
s = rpc.patch_get_mbox(patch_id)
print "xxx %s xxx"
print "xxx %s xxx" % patch['name']
print "xxx %s xxx" % rpc.patch_get_mbox(patch_id)
elif action == 'view' or action == 'show':
try:
@ -624,7 +651,7 @@ def main():
sys.exit(1)
action_update_patch(rpc, patch_id, state = state_str,
commit = commit_str, delegate_str = delegate_str)
commit = commit_str, delegate_str = delegate_str, comment_str = comment_str)
else:
sys.stderr.write("Unknown action '%s'\n" % action)

View File

@ -28,6 +28,11 @@ if (not $only) {
$c1 = "perl -pi -e '$cmd' doc/org.texi";
system($c1);
print STDERR "doc/orgguide.texi\n";
$cmd = qq{s/^(\\\@set VERSION)\\s+(\\S+)[ \t]*\$/\$1 $version/;s/^(\\\@set DATE)\\s+(.*)\$/\$1 $date/;};
$c1 = "perl -pi -e '$cmd' doc/orgguide.texi";
system($c1);
print STDERR "doc/orgcard.tex\n";
$cmd = qq{s/^\\\\def\\\\orgversionnumber\\{\\S+\\}/\\\\def\\\\orgversionnumber{$version}/;s/\\\\def\\\\versionyear\\{\\S+\\}/\\\\def\\\\versionyear{$year}/;s/\\\\def\\\\year\\{\\S+\\}/\\\\def\\\\year{$year}/;};
$c1 = "perl -pi -e '$cmd' doc/orgcard.tex";

View File

@ -1,361 +0,0 @@
2010-05-11 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-git-link.el (org-git-open)
(org-git-create-git-link): expand file name.
2010-04-20 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-toc.el (org-toc-cycle-subtree)
(org-toc-restore-config): Use overlays-in/at.
* babel/lisp/org-babel.el (org-babel-hash-at-point)
(org-babel-hide-result-toggle): Use overlays-in/at.
2010-04-18 Carsten Dominik <carsten.dominik@gmail.com>
* babel/lisp/org-babel.el (org-babel-hide-hash): Use
`add-to-invisibility-spec'.
(org-babel-result-hide-spec): Use `add-to-invisibility-spec'.
* lisp/org-learn.el (require): `calendar' is now required already
by org.el on top level.
* lisp/org-toc.el (org-toc-cycle-subtree, org-toc-show)
(org-toc-restore-config): Use the normal overlay API.
* lisp/org-expiry.el (org-expiry-process-entry): Use the normal
overlay API.
* babel/lisp/org-babel.el (org-babel-hide-hash)
(org-babel-hash-at-point, org-babel-show-result-all)
(org-babel-hide-result-toggle): Use the normal overlay API.
2010-03-31 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-mac-iCal.el (org-mac-iCal): Snow Leopard
compatibility.
2010-02-20 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-git-link.el (org-git-store-link): Check if there is a
file name associated with the buffer.
2010-02-04 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-export-generic.el (org-export-generic): Provide.
2010-01-08 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-export-generic.el (org-export-generic): Close body
levels.
2009-11-20 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-export-generic.el (org-set-generic-type): Use `aput'.
* lisp/org-git-link.el (org-git-gitrepos-p): Make definition
XEmacs compatible.
2009-11-01 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-mac-iCal.el (omi-import-ics): Use `diary-file'
variable.
2009-10-22 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-registry.el (org-registry-assoc-all)
(org-registry-find-all): Clean rewrite
2009-10-19 James TD Smith <ahktenzero@mohorovi.cc>
* lisp/org-registry.el (org-registry-assoc-all): Stop this from
deleting the links it finds from the registry.
(org-registry-find-all): Add a new function which returns all
registry entries which satisfy a test function.
2009-10-02 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-special-blocks.el (org-special-blocks-ignore-regexp):
New variable.
(org-special-blocks-make-special-cookies): Use
`org-special-blocks-ignore-regexp'.
2009-09-16 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-invoice.el: New file.
2009-08-14 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-exp-bibtex.el (org-export-bibtex-preprocess): Use a
safer regular expression.
2009-08-07 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-track.el: New file.
2009-08-03 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-indent.el: File removed.
2009-07-21 Wes Hardaker <wjhns209@hardakers.net> (tiny change)
* lisp/org-export-generic.el (org-export-generic-format): Fix
compatibility issue with Emacs 23.
2009-07-12 James TD Smith <ahktenzero@mohorovi.cc>
* lisp/org-checklist.el (org-checklist): Add a custom group for
org-checklist. The options are all for the unchecked items export
function.
(org-checklist-export-time-format): Allow customising the
timestamp appended to the saved unchecked items list
(org-checklist-export-function): Allow customising the output
format for the unchecked items list.
(org-checklist-export-params): Options for the exporter.
(org-checklist-a2ps-params): Printing options.
(org-make-checklist-export): Use values from custom vars. Printing
is now controlled by the PRINT_EXPORT property in the entry, and
the user is only asked if it is missing. Pass the switches to
a2ps-buffer properly.
2009-06-20 Carsten Dominik <carsten.dominik@gmail.com>
* README: List new file org-export-generic.el
* lisp/org-export-generic.el: New file.
2009-05-10 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-exp-blocks.el (org-export-blocks-format-ditaa)
(org-export-blocks-format-dot): Support ditaa export also for the
docbook exporter.
2009-05-07 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-special-blocks.el: New file.
2009-04-08 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-choose.el (org-choose-get-fn-map-group): Fix bug with
level selection.
2009-04-01 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-exp-bibtex.el (org-export-bibtex-preprocess): Handle
multiple keys in a single \cite command.
2009-03-30 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-mtags.el: Fix copyright year.
2009-03-13 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-mtags.el (org-mtags-replace): Support literal docbook.
2009-03-12 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-exp-bibtex.el (org-export-bibtex-preprocess): Analyze
return value of the call to bibtex2html.
(org-export-bibtex-preprocess): Change Class to ID, there can only
be one.
(org-exp-bibtex-docites): Generalize the regexp looking for
citations.
2009-02-26 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org2rem.el: New version from Shatad Pratap.
2009-02-24 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-choose.el (org-choose-get-fn-map-group): Only check
true siblings.
2009-02-18 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-R.el: New file.
2009-02-13 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-choose.el (org-choose-get-fn-map-group): Require
`org-agenda'.
(cl): Require `cl' at runtime.
(org-choose-filter-one): Use `org-split-string' for consistency
accross Emacs version.
2009-02-12 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-choose.el ("org"): Use file name instead of feature for
`eval-after-load', this is XEmacs compatible.
2009-02-10 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-choose.el (org-choose-get-fn-map-group): Call
`org-up-heading-all' instead of `outline-up-heading-all', which
does not exist.
2009-02-04 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-depend.el (org-depend-act-on-sibling): New macro.
(org-depend-trigger-todo): Call `org-depend-act-on-sibling',
implement reacting on new keyword `chain-sibling-cheduled'.
2009-02-03 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-exp-blocks.el (org-exp-blocks): Provide this feature.
2009-01-16 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-depend.el (org-depend-block-todo): Set a tag when a
state change is blocked.
(org-depend-tag-blocked): New option.
2009-01-03 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-mtags.el (org-mtags-replace): Extend muse tags syntax
to cater for the new export switched in src and example tags.
(org-mtags-replace): Fix bugs in prefix processing.
(org-mtags-get-tag-and-attributes): Add local variable bindings.
2008-12-19 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-exp-blocks.el (org-export-blocks-format-ditaa): Catch
lines that have no space after the colon.
2008-12-08 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-browser-url.el: New file.
* lisp/org-registry.el (org-registry-before-first-heading-p):
Function renamed to `org-before-first-heading-p', and moved to
org.el.
2008-09-20 James TD Smith <ahktenzero@mohorovi.cc>
* lisp/org-checklist.el: New file.
2008-09-02 Carsten Dominik <dominik@science.uva.nl>
* lisp/org-mairix.el: Update to version 0.5.
2008-07-04 Christian Egli <christian.egli@alumni.ethz.ch>
* scripts/org2hpda: the default location of the diary file should
of course be ~/diary
2008-07-02 Carsten Dominik <dominik@science.uva.nl>
* lisp/org-mtags.el (org-mtags-replace): Allow prefix and prefix1
as options in the include directive.
2008-06-18 Christian Egli <christian.egli@alumni.ethz.ch>
* scripts/org2hpda (DIARY): Make the location of the diary file
configurable.
(all): reduce links to their destination, i.e. change
'[[http://foo][bar]]' to 'bar'
2008-05-28 Carsten Dominik <dominik@science.uva.nl>
* lisp/org-mtags.el (org-mtags-replace)
(org-mtags-supported-tags): Fixed typo in contents tag.
(org-mtags-replace): Fix but that could lead to an infinite loop
for a partial tag.
2008-05-19 Carsten Dominik <dominik@science.uva.nl>
* lisp/org-annotation-helper.el: Remove John Rakestraw from author
list, upon his request.
2008-05-17 Carsten Dominik <dominik@science.uva.nl>
* lisp/org-annotation-helper.el: New file.
2008-05-15 Carsten Dominik <dominik@science.uva.nl>
* lisp/org-id.el (org-id-include-domain): New option.
(org-id-new): Add the domain name to an ID if
`org-id-include-domain' is set.
2008-05-04 Jason Riedy <jason@acm.org>
* lisp/orgtbl-sqlinsert.el (orgtbl-to-sqlinsert): Use the
default fmt function, collect only the first header line for
field names, and don't call plist-get for the table name on
every line.
2008-04-15 Jason Riedy <jason@acm.org>
* lisp/orgtbl-sqlinsert.el: New file.
* README: Add to list.
2008-04-07 Carsten Dominik <dominik@science.uva.nl>
* lisp/org-iswitchb.el: File removed, because the functionality is
now in org.el, in the core.
* lisp/org-mew.el: File moved into the core.
2008-03-14 Carsten Dominik <dominik@science.uva.nl>
* lisp/org-depend.el: Add `provide' for the module system.
* lisp/org-man.el: Add `provide' for the module system.
* lisp/org-interactive-query.el: Renamed from org-iq.el.
2008-03-05 Bastien Guerry <bzg@altern.org>
* lisp/org-elisp-symbol.el (org-elisp-symbol-store-link):
Correctly handle function with no documentation.
2008-02-29 Tokuya Kameshima <kames@fa2.so-net.ne.jp>
* lisp/org-bookmark.el (org-bookmark-store-link): Use
`bookmark-all-names' instead of `bookmark-alist'.
2008-02-29 Bastien Guerry <bzg@altern.org>
* lisp/org-bookmark.el (org-bookmark-in-dired)
(org-bookmark-when-visiting-a-file)
(org-bookmark-use-first-bookmark): New options.
(org-bookmark-store-link): Behave according to options.
2008-02-29 Bastien Guerry <bzg@altern.org>
* lisp/org-mairix.el (org-mairix): Use `org-link' group.
2008-02-28 Bastien Guerry <bzg@altern.org>
* lisp/org-bookmark.el: New file.
2008-02-26 Carsten Dominik <dominik@science.uva.nl>
* lisp/org-id.el: New file.
2008-02-21 Carsten Dominik <dominik@science.uva.nl>
* lisp/org-screen.el: New file.
2008-02-17 Christian Egli <christian.egli@alumni.ethz.ch>
* scripts/org2hpda: Added a Makefile for generation of hipster pda
style printouts
2008-02-08 Phil Jackson <phil@shellarchive.co.uk>
* scripts/dir2org.zsh: New file.
2008-02-07 Phil Jackson <phil@shellarchive.co.uk>
* lisp/org-annotate-file.el: New file.
2008-02-07 Bastien Guerry <bzg@altern.org>
* Added org-expiry.el org-registry.el org-iswitchb.el org2rem.el
to CONTRIB/lisp/.
2008-02-07 Phil Jackson <phil@shellarchive.co.uk>
* lisp/org-irc.el: New file.
* ChangeLog: New file.

View File

@ -29,32 +29,31 @@ A collection of simple utility functions
* File I/O
** reading and writing files
Read the contents of the file at =path= into a string.
Read the contents of the file at =file=. The =:results vector= and
=:results scalar= header arguments can be used to read the contents of
file as either a table or a string.
#+srcname: read
#+begin_src emacs-lisp :var path=""
(with-temp-filebuffer path
(buffer-substring (point-min) (point-max)))
#+begin_src emacs-lisp :var file=""
(if (member "vector" result-params)
(with-temp-buffer
(org-table-import (expand-file-name file) nil)
(org-table-to-lisp))
(with-temp-buffer
(insert-file-contents (expand-file-name file))
(buffer-string)))
#+end_src
Read the lines of the file at =path= into a list.
#+srcname: read-lines
#+begin_src emacs-lisp :var path=""
(split-string
(with-temp-filebuffer path
(buffer-substring (point-min) (point-max))))
#+end_src
Write =data= to a file at =path=. If =data= is a list, then write it
Write =data= to a file at =file=. If =data= is a list, then write it
as a table in traditional Org-mode table syntax.
#+srcname: write
#+begin_src emacs-lisp :var data="" :var path=""
(with-temp-file path
#+begin_src emacs-lisp :var data="" :var file=""
(with-temp-file file
(org-babel-insert-result data))
nil
#+end_src
** remote files
**** json
Read local or remote file in [[http://www.json.org/][json]] format into emacs-lisp objects.
#+srcname: json
#+begin_src emacs-lisp :var file='() :var url='()
@ -72,13 +71,81 @@ Read local or remote file in [[http://www.json.org/][json]] format into emacs-li
(json-read))))
#+end_src
**** Google docs
The following code blocks make use of the [[http://code.google.com/p/googlecl/][googlecl]] Google command line
tool. This tool provides functionality for accessing Google services
from the command line, and the following code blocks use /googlecl/
for reading from and writing to Google docs with Org-mode code blocks.
****** read a document from Google docs
The =google= command seems to be throwing "Moved Temporarily" errors
when trying to download textual documents, but this is working fine
for spreadsheets.
#+source: gdoc-read
#+begin_src emacs-lisp :var title="example"
(let* ((format (if (member "vector" result-params) "csv" "txt"))
(file (concat title "." format))
(cmd (format "google docs get --format %S --title %S" format title)))
(message cmd) (message (shell-command-to-string cmd))
(prog1 (if (string= format "csv")
(with-temp-buffer
(org-table-import (shell-quote-argument file) nil)
(org-table-to-lisp))
(with-temp-buffer
(insert-file-contents (shell-quote-argument file))
(buffer-string)))
(delete-file file)))
#+end_src
For example, a line like the following can be used to read the
contents of a spreadsheet named =num-cells= into a table.
#+begin_src org
,#+call: gdoc-read(title="num-cells"") :results vector
#+end_src
A line like the following can be used to read the contents of a
document as a string.
#+begin_src org
,#+call: gdoc-read(title="loremi") :results scalar
#+end_src
****** write a document to a Google docs
Write =data= to a google document named =title=. If =data= is tabular
it will be saved to a spreadsheet, otherwise it will be saved as a
normal document.
#+source: gdoc-write
#+begin_src emacs-lisp :var title="babel-upload" :var data=fibs(n=10) :results silent
(let* ((format (if (listp data) "csv" "txt"))
(tmp-file (make-temp-file "org-babel-google-doc" nil (concat "." format)))
(cmd (format "google docs upload --title %S %S" title tmp-file)))
(with-temp-file tmp-file
(insert
(if (listp data)
(orgtbl-to-csv
data '(:fmt (lambda (el) (if (stringp el) el (format "%S" el)))))
(if (stringp data) data (format "%S" data)))))
(message cmd)
(prog1 (shell-command-to-string cmd) (delete-file tmp-file)))
#+end_src
example usage
#+begin_src org
,#+source: fibs
,#+begin_src emacs-lisp :var n=8
, (flet ((fib (m) (if (< m 2) 1 (+ (fib (- m 1)) (fib (- m 2))))))
, (mapcar (lambda (el) (list el (fib el))) (number-sequence 0 (- n 1))))
,#+end_src
,#+call: gdoc-write(title="fibs", data=fibs(n=10))
#+end_src
* Plotting code
** R
Plot column 2 (y axis) against column 1 (x axis). Columns 3 and beyond, if present, are ignored.
#+srcname: R-plot(data=R-plot-example-data)
#+begin_src R :session *R*
#+begin_src R
plot(data)
#+end_src

View File

@ -1,764 +0,0 @@
2010-06-03 Christian Egli <christian.egli@sbszh.ch>
* org.texi (TaskJuggler export): Added documentation for the
TaskJuggler exporter.
2010-05-19 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Column attributes): Document that the ":" operator
only adds hours and minutes, not seconds.
2010-05-17 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Refiling notes): Document the refile cache.
2010-05-16 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Special symbols): Document the key to dislpay
entities as UTF8 characters.
(In-buffer settings): Document the new keywords for pretty
entity display.
2010-05-15 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Tables in LaTeX export): Document the multicolumn
keyword.
2010-05-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (The date/time prompt): Document the new keys `C-v'
and `M-v'.
2010-05-08 Carsten Dominik <carsten.dominik@gmail.com>
* orgcard.tex: Document inline image toggling.
* org.texi (Handling links): Document inline image toggling.
2010-05-07 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Updating the table): Document new buffer-wide
table commands.
2010-04-26 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Conflicts): Document new work-around for windmove.el.
(Plain lists): Describe counter start cookies.
(External links): Add example for a doi link.
2010-04-23 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Plain lists): Document the commands to promote/demote
an item without affecting children.
2010-04-22 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Sitemap): Document sitemap sorting.
2010-04-12 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Repeated tasks): Document that the user can determine
the target state.
2010-04-07 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (LaTeX and PDF export): Add a footnote about xetex.
2010-04-05 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (LaTeX/PDF export commands): Section renamed and
moved.
2010-04-04 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Sectioning structure): Update.
(References): New use case for field coordinates.
2010-04-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (The export dispatcher): Renamed from ASCII export.
(Setting up the staging area): Document the availability of
encryption for MobileOrg.
2010-03-29 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Images and tables): Document how to reference labels.
2010-03-28 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Index entries): New section.
(Generating an index): New section.
2010-03-27 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Column width and alignment): Document that <N> now
means a fixed width, not a maximum width.
2010-03-26 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Publishing options): Document the :email option.
(Beamer class export): Fix bug in the BEAMER example.
2010-03-25 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Refiling notes): Document refile logging.
(In-buffer settings): Document refile logging keywords.
2010-03-17 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Drawers): Document `C-c C-z' command.
(Agenda commands): Mention the alternative key `C-c C-z'.
2010-03-15 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Special properties): Document the BLOCKED property.
2010-03-14 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (The spreadsheet): Mention the formula editor.
(References): Document field coordinates.
2010-03-05 Carsten Dominik <carsten.dominik@gmail.com>
* pdflayout.sty: New file.
2010-03-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Publishing action): Correct the documentation for the
publishing function.
2010-02-26 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (The date/time prompt): Document that we accept dates
like month/day/year.
(Cooperation): Document the changes in table.el support.
2010-02-25 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Faces for TODO keywords, Faces for TODO keywords)
(Priorities): Document the easy colors.
2010-02-19 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Visibility cycling): Document the new double prefix
arg for `org-reveal'.
2010-02-04 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Cooperation): Remember.el is part of Emacs.
2010-01-15 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Clean view): Mention that `wrap-prefix' is also set by
org-indent-mode.
2010-01-14 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Agenda commands): Add information about prefix args to
scheduling and deadline commands.
2010-01-05 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Search view): Point to the docstring of
`org-search-view' for more details.
2009-12-14 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Agenda commands): Document that `>' prompts for a
date.
2009-11-30 Tassilo Horn <tassilo@member.fsf.org>
* org.texi (Setting tags): Document variable
org-complete-tags-always-offer-all-agenda-tags.
2009-11-18 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Column attributes): Cross-reference special
properties.
2009-11-14 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Speed keys): New section.
2009-11-08 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Agenda commands): Document the new `i' command.
2009-11-09 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Inserting deadline/schedule): Document logging changes
of scheduling and deadline times stamps.
(In-buffer settings): Document the in-buffer keywords for logging
changes of scheduling and deadline times stamps.
2009-11-03 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Structure editing, Plain lists): Document indentation
cycling in empty entries with TAB.
2009-11-01 James TD Smith <ahktenzero@mohorovi.cc>
* org.texi (Column attributes): Add the new age summary operators.
Also, mention the fact you can only use one summary operator per
property.
2009-10-31 Carsten Dominik <carsten.dominik@gmail.com>
* orgcard.tex: Document the new archiving keys.
* org.texi (Archiving): Document the default archiving command.
(Moving subtrees): Document the new keys for archiving.
(Internal archiving): Fix incorrect key.
(Agenda commands): Document the TODO set switching commands.
(Agenda commands): Document the new archiving keys.
2009-10-24 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Clocking work time): Better description on how to save
and restore a clock.
(Resolving idle time): Mention the x11idle program to get true
idleness also under X11.
(Resolving idle time): Use @kbd instead of @key for normal
letters, because this is how he rest of the manual does this.
2009-10-19 John Wiegley <johnw@newartisans.com>
* org.texi (Tracking your habits): Added a new section in the
manual about how to track habits.
2009-10-18 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Pushing to MobileOrg): Mention that `org-directory'
should be set.
2009-10-17 John Wiegley <johnw@newartisans.com>
* org.texi (Resolving idle time): Added a section on how idle and
dangling clocks are resolved.
2009-10-14 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Agenda commands): Document that SPC is a filter for
any tag.
(Search view): Renamed from "Keyword search".
2009-10-04 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Cap): New chapter.
(Markup): New chapter.
2009-10-03 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Links in HTML export, Images in HTML export): Extend
the section titles.
(Images in HTML export): Document the align option.
(Text areas in HTML export): Extend the section title.
(Images in LaTeX export): Explain image placement in LaTeX.
* org.texi: Removed @Ie, @ie, @Eg, @eg macros.
2009-09-28 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Pushing to MobileOrg): Document `org-mobile-files'.
2009-09-26 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Processing LaTeX fragments): Document that the size of
images can be changes using the variable
`org-format-latex-options'.
2009-09-21 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (The date/time prompt, Timestamps): Be more accurate
over ISO format dates and times.
2009-09-18 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Visibility cycling): Document showeverything keyword.
(In-buffer settings): Document showeverything keyword.
2009-09-17 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Setting up the staging area): Fix the example.
2009-09-15 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (MobileOrg): New section.
(Agenda commands, Exporting Agenda Views): Document exporting the
agenda view to Org files.
2009-08-29 Carsten Dominik <carsten.dominik@gmail.com>
* orgcard.tex: Document new effort setting commands.
* org.texi (Effort estimates): Document new effort setting
commands.
2009-08-27 Carsten Dominik <carsten.dominik@gmail.com>
* orgcard.tex: Document the new keys for agenda time motion.
* org.texi (Agenda commands): Document the new keys fro agenda
time motion.
* orgcard.tex: Document the `E' key in the agenda.
* org.texi (Agenda commands): Document entry text mode.
2009-08-18 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Agenda commands): Improve documentation of the keys to
include inactive time stamps into the agenda view.
(Feedback): Document the new bug report command.
2009-08-14 Dan Davison <davison@stats.ox.ac.uk> (tiny change)
* org.texi (Structure editing): Added an index entry for the
sorting of subtrees.
2009-08-09 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Literal examples): Document that source code can be
exported to LaTeX using the listings package.
2009-08-04 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Publishing action): Improve documentation of file
names when publishing to the source directory.
2009-08-03 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Clean view): Document `org-indent-mode'.
2009-07-26 Bastien Guerry <bzg@altern.org>
* org.texi (Clocking work time): Add documentation for the
new :timetamp option when creating a clock report.
2009-07-26 Dan Griswold <dgriswol@rochester.rr.com> (tiny change)
* org.texi (Paragraphs): Fix many typos.
2009-07-25 Bastien Guerry <bzg@altern.org>
* org.texi (Plain lists): Remove duplicate explanation about the
`C-c *' command.
2009-07-23 Bastien Guerry <bzg@altern.org>
* org.texi (Literal examples): Update to reflect the new behavior
of the -n -r -k switches when exporting source code examples.
2009-07-21 Dan Davison <davison@stats.ox.ac.uk> (tiny change)
* org.texi (Structure editing): Add information about `C-c *',
converting a plain list into a list of Org items.
2009-07-20 Bastien Guerry <bzg@altern.org>
* org.texi (Remember): Small rephrasing of the paragraph
describing remember.el. Also mentioned that remember.el is part
of Emacs 23, not Emacs 22.
2009-07-17 Bastien Guerry <bzg@altern.org>
* org.texi (Clocking work time): Add documentation about
displaying the current clocking time against the effort estimate.
Also add a footnote about using `org-clock-in-prepare-hook' to add
an effort estimate on the fly, just before clocking it.
2009-07-03 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Footnotes): Document automatic renumbering and
sorting.
2009-07-02 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Agenda commands): Document new bulk commands.
2009-07-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Plain lists): Document new behavior of
`org-cycle-include-plain-lists'.
2009-06-30 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi: Hyphenation only in TeX.
2009-06-24 Carsten Dominik <carsten.dominik@gmail.com>
* orgcard.tex: Document bulk action.
* org.texi (Agenda commands): Document bulk action and remote
refiling.
2009-06-17 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Clocking work time): Document the key to update effort
estimates.
2009-06-02 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Clocking work time): Document the clock time display.
2009-05-27 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Structure editing, TODO basics): Document new
variables.
2009-05-21 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Column attributes): Document new colciew operators.
2009-05-20 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Publishing options): Document :xml-declaration.
2009-05-19 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Tracking TODO state changes): Document the
LOG_INTO_DRAWER property.
2009-05-16 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Literal examples): Document the new implementation for
editing source code.
2009-05-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Publishing action): Mention the new publishing
function, to publish an Org source file.
(Publishing links): Mention how to link to an Org source file.
2009-05-11 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Macro replacement): Document new macros.
2009-05-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Handling links): Document type-specific completion
when inserting links.
2009-05-06 Carsten Dominik <carsten.dominik@gmail.com>
* orgcard.tex: Document the key for sorting.
* org.texi (Structure editing, Plain lists): Improve documentation
on sorting.
2009-04-17 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Internal links): Document custom ids for links.
(Handling links): Document custom ids for links.
2009-04-14 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (CSS support): Document new class.
(Refiling notes): Document the possibility to create new nodes
during refiling.
2009-03-31 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Agenda commands): Document the "?" operator to find
tasks without effort setting.
2009-03-30 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Exporting agenda information): Section moved.
2009-03-27 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (RSS Feeds): New section.
2009-03-21 Carsten Dominik <carsten.dominik@gmail.com>
* orgcard.tex: Document M-e and M-a navigate
inside table field. Fix a number of typos.
* org.texi (Built-in table editor): Document M-e and M-a navigate
inside table field.
2009-03-19 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Stuck projects): Docment that projects identified as
un-stuck will still be searchd for stuck sub-projects.
2009-03-16 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Paragraphs): Document centering.
2009-03-14 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Creating timestamps, Agenda commands): Document new
behavior when changing time stamps.
2009-03-11 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Structure editing): Document the new command
`org-clone-subtree-with-time-shift'.
2009-03-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Publishing): Refresh this chapter.
2009-03-08 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Export options, Export options, In-buffer settings):
Document the new keywords.
2009-03-03 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Matching tags and properties): Collect all
documentation about tags/property matches here.
2009-03-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Setting tags): Document `org-tag-persistent-alist'.
2009-02-27 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Weekly/daily agenda): New section.
2009-02-22 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Orgstruct mode): Describe `orgstruct++-mode'.
(Drawers): Mention the LOGBOOK drawer.
2009-02-20 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Export options, Sectioning structure): Document the
#+LEATEX_HEADER in-buffer setting.
(Bugs): Section removed.
(Hooks): New section.
(Add-on packages): Moved here from old location.
(Context-sensitive commands): New section.
2009-02-19 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Setting tags): Document newline option.
* orgcard.tex: Document `C-c C-x o'.
* org.texi (TODO dependencies, Checkboxes): Document
`org-track-ordered-property-with-tag'.
2009-02-18 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Global TODO list, Matching tags and properties):
Mention more variables.
2009-02-15 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Checkboxes): Update to changed command behavior.
2009-02-12 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Tracking TODO state changes): Document storing state
change notes into a drawer.
(Agenda commands): Document the agenda command `z'.
(Tag searches, Clean view, Special agenda views): Document the
special interpretation of LEVEL when odd levels are used.
2009-02-11 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (CSS support): Document CSS classes for section numbers.
(Links, Images in HTML export): Better documentation of hot to set
attribute for images.
2009-02-05 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Clocking work time): Decoment how to make the clock
persist from one Emacs session to the next.
2009-01-30 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (TODO dependencies): Document TODO dependencies on
checkboxes.
2009-01-27 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (TODO dependencies): New section.
2009-01-26 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Plain lists, TODO basics, Priorities)
(Multiple sets in one file, Conflicts): Document interaction with
`shift-selection-mode'.
2009-01-24 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (References): Add information about remote references.
2009-01-21 Carsten Dominik <carsten.dominik@gmail.com>
* orgcard.tex: Document `C-c RET' in tables.
* org.texi (Built-in table editor): Document `C-c RET' in tables.
2009-01-20 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Math symbols, Quoting LaTeX code): Mention that simple
LaTeX macros survive LaTeX export.
(Images in LaTeX export): Show how to create a reference to a
figure.
(Sectioning structure): Document that the LaTeX class can be
specified in a property.
2009-01-19 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Text areas in HTML export): New section.
(External links): Add examples for text search and ID links.
2009-01-16 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Built-in table editor): Remove the descriptio of `C-c
C-q', it not longer works.
2009-01-09 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Literal examples): Document that a space must follow
the colon in short examples.
2009-01-08 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Relative timer): Document `org-timer-stop'.
2008-12-31 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Footnotes): New section.
(Footnote markup): Shorten section and refer to new Footnote
section.
2008-12-26 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Literal examples): Add documentation for line
numbering in and references to code examples.
(CSS support): Fix the description of default CSS styles.
2008-12-22 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Capturing column view): Document
"file:path/to/file.org" as an allowed value for the ID property of
a dynamic block copying column view.
2008-12-19 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (References): Document special last-row references.
2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi: Fix typos and grammatical issues.
2008-12-15 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Tables in LaTeX export): New section.
2008-12-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Images in LaTeX export): New section.
(Inlined images, Images in HTML export): Sections renamed.
2008-12-02 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Using the mapping API): Fix bug in mapping example.
(Publishing options): Make the list of properties complete again,
in correspondence to the variable `org-export-plist-vars'.
2008-11-29 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Property searches): Document new special values for
time comparisons.
2008-11-27 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Tag inheritance): Refine the description of tag
inheritance.
2008-11-25 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Project alist): Add info about the publishing sequence
of components.
(Effort estimates): Document the new relativer timer.
2008-11-24 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi: Re-apply the change to FDL 1.3.
2008-11-18 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Setting up Remember): Document `org-remember-mode'.
2008-11-14 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (External links): Document that bbdb links can use a
regular expression.
(External links): Document that elisp links can contain
interactive commands.
2008-11-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Clocking work time): Document the :formula property of
clock tables.
(Structure editing, Refiling notes): Document refiling regions.
2008-11-09 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (Agenda commands): Document the double-prefix version
of the `l' command in the agenda.
2008-11-05 Carsten Dominik <dominik@science.uva.nl>
* org.texi (Handling links): Explain the effect of a double prefix
arg to `C-c C-o'.
2008-11-02 Charles Sebold <csebold@gmail.com>
* org.texi (Org Plot): Add documentation for timefmt option.
2008-10-16 Carsten Dominik <dominik@science.uva.nl>
* org.texi (TODO basics): Add documentation for tag triggers.
2008-09-05 Carsten Dominik <dominik@science.uva.nl>
* org.texi (Creating timestamps): Fix documentation of the "C-c ."
command.
(Literal examples): Document using artist-mode for ASCII
drawings.
2008-06-13 Carsten Dominik <dominik@science.uva.nl>
* org.texi: Modify license to no longer include back- and front
cover matters.
2008-06-11 Carsten Dominik <dominik@science.uva.nl>
* org.texi (Using the mapping API): New section.
2008-04-15 Jason Riedy <jason@acm.org>
* org.texi (A LaTeX example): Note that fmt may be a one-argument
function, and efmt may be a two-argument function.
2008-04-15 Jason Riedy <jason@acm.org>
* org.texi (Radio tables): Document multiple destinations.
2008-04-15 Carsten Dominik <dominik@science.uva.nl>
* org.texi (Agenda column view): New section.
2008-04-08 Carsten Dominik <dominik@science.uva.nl>
* org.texi (Moving subtrees): Document archiving to the archive
sibling.
2008-04-04 Carsten Dominik <dominik@science.uva.nl>
* org.texi (Agenda commands): Document columns view in the agenda.
2008-04-03 Carsten Dominik <dominik@science.uva.nl>
* org.texi (Using the property API): Document the API for
multi-valued properties.

View File

@ -1,10 +1,10 @@
\input texinfo
@c %**start of header
@setfilename info/org
@setfilename ../../info/org
@settitle The Org Manual
@set VERSION 7.01
@set VERSION 7.01trans
@set DATE July 2010
@c Use proper quote and backtick for code sections in PDF output
@ -4755,9 +4755,10 @@ optional. The individual parts have the following meaning:
@{:min@} @r{Smallest time value in column.}
@{:max@} @r{Largest time value.}
@{:mean@} @r{Arithmetic mean of time values.}
@{@@min@} @r{Minimum age (in days/hours/mins/seconds).}
@{@@max@} @r{Maximum age (in days/hours/mins/seconds).}
@{@@mean@} @r{Arithmetic mean of ages (in days/hours/mins/seconds).}
@{@@min@} @r{Minimum age (in days/hours/mins/seconds).}
@{@@max@} @r{Maximum age (in days/hours/mins/seconds).}
@{@@mean@} @r{Arithmetic mean of ages (in days/hours/mins/seconds).}
@{est+@} @r{Add low-high estimates.}
@end example
@noindent
@ -4765,6 +4766,22 @@ Be aware that you can only have one summary type for any property you
include. Subsequent columns referencing the same property will all display the
same summary information.
The @code{est+} summary type requires further explanation. It is used for
combining estimates, expressed as low-high ranges. For example, instead
of estimating a particular task will take 5 days, you might estimate it as
5-6 days if you're fairly confident you know how much woark is required, or
1-10 days if you don't really know what needs to be done. Both ranges
average at 5.5 days, but the first represents a more predictable delivery.
When combining a set of such estimates, simply adding the lows and highs
produces an unrealistically wide result. Instead, @code{est+} adds the
statistical mean and variance of the sub-tasks, generating a final estimate
from the sum. For example, suppose you had ten tasks, each of which was
estimated at 0.5 to 2 days of work. Straight addition produces an estimate
of 5 to 20 days, representing what to expect if everything goes either
extremely well or extremely poorly. In contrast, @code{est+} estimates the
full job more realistically, at 10-15 days.
Here is an example for a complete columns definition, along with allowed
values.
@ -5933,6 +5950,7 @@ The following customization sets a default target file for notes, and defines
a global key@footnote{Please select your own key, @kbd{C-c c} is only a
suggestion.} for capturing new material.
@vindex org-default-notes-file
@example
(setq org-default-notes-file (concat org-directory "/notes.org"))
(define-key global-map "\C-cc" 'org-capture)
@ -6066,10 +6084,12 @@ Text to be inserted as it is.
@end table
@item target
Specification of where the captured item should be placed.
In Org-mode files, targets usually define a node. Entries will become
children of this node, other types will be added to the table or list in the
body of this node.
@vindex org-default-notes-file
Specification of where the captured item should be placed. In Org-mode
files, targets usually define a node. Entries will become children of this
node, other types will be added to the table or list in the body of this
node. Most target specifications contain a file name. If that file name is
the empty string, it defaults to @code{org-default-notes-file}.
Valid values are:
@table @code
@ -12387,7 +12407,7 @@ with the cursor at the beginning of a headline.
@node Code evaluation security, Customization, Speed keys, Miscellaneous
@section Code evaluation and security issues
Org provides tool to work with the code snippets, including evaluating them.
Org provides tools to work with the code snippets, including evaluating them.
Running code on your machine always comes with a security risk. Badly
written or malicious code can be executed on purpose or by accident. Org has
@ -12405,12 +12425,12 @@ Code evaluation can happen under the following circumstances:
@item Source code blocks
Source code blocks can be evaluated during export, or when pressing @kbd{C-c
C-c} in the block. The most important thing to realize here is that Org mode
files which contain code snippets are in a certain sense like executable
files which contain code snippets are, in a certain sense, like executable
files. So you should accept them and load them into Emacs only from trusted
sources - just like you would do with a program you install on your computer.
Make sure you know what you are doing before customizing the variables
which take of the default security brakes.
which take off the default security brakes.
@defopt org-confirm-babel-evaluate
When set to t user is queried before code block evaluation
@ -12418,7 +12438,7 @@ When set to t user is queried before code block evaluation
@item Following @code{shell} and @code{elisp} links
Org has two link types that can directly evaluate code (@pxref{External
links}). These links can be problematic because the code to be evaluated his
links}). These links can be problematic because the code to be evaluated is
not visible.
@defopt org-confirm-shell-link-function
@ -12428,12 +12448,6 @@ Function to queries user about shell link execution.
Functions to query user for Emacs Lisp link execution.
@end defopt
@item Following @code{shell} and @code{elisp} links
Org has two link types that can directly evaluate code (@pxref{External
links}). These links can be problematic because the code to be evaluated his
not visible. @b{Security advice:} Do not use these links, use source code
blocks which make the associated actions much more transparent.
@item Formulas in tables
Formulas in tables (@pxref{The spreadsheet}) are code that is evaluated
either by the @i{calc} interpreter, or by the @i{Emacs Lisp} interpreter.

View File

@ -1,5 +1,5 @@
% Reference Card for Org Mode
\def\orgversionnumber{7.01}
\def\orgversionnumber{7.01trans}
\def\versionyear{2010} % latest update
\def\year{2010} % latest copyright year

View File

@ -95,7 +95,7 @@ license to the document, as described in section 6 of the license.
@ifnottex
@node Top, Introduction, (dir), (dir)
@top Org Mode Manual
@top Org Mode Guide
@insertcopying
@end ifnottex

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research, R, statistics
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Joel Boehland
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Juan Pechiar
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Dan Davison, Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Benjamin Andresen
;; Keywords: literate programming, interactive shell
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -4,7 +4,7 @@
;; Author: John Wiegley <johnw@newartisans.com>
;; Keywords: org data task
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.
;;

View File

@ -7,7 +7,7 @@
;; Thomas Baumann <thomas dot baumann at ch dot tum dot de>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -2,7 +2,7 @@
;;
;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;;
;; Version: 7.01
;; Version: 7.01trans
;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
;; Keywords: org, wp, tex

View File

@ -5,7 +5,7 @@
;; Author: Bastien Guerry <bzg at altern dot org>
;; Carsten Dominik <carsten dot dominik at gmail dot com>
;; Keywords: org, wp, remember
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;
@ -289,7 +289,7 @@ calendar | %:type %:date"
(file :tag "Template file"))
(list :tag "Function"
(const :format "" function)
(file :tag "Template function")))
(function :tag "Template function")))
(plist :inline t
;; Give the most common options as checkboxes
:options (((const :format "%v " :prepend) (const t))
@ -651,6 +651,7 @@ already gone."
(defun org-capture-target-buffer (file)
"Get a buffer for FILE."
(setq file (or (org-string-nw-p file) org-default-notes-file))
(or (org-find-base-buffer-visiting file)
(find-file-noselect (expand-file-name file org-directory))))

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;
@ -917,7 +917,8 @@ around it."
("@max" max_age max (lambda (x) (- org-columns-time x)))
("@mean" mean_age
(lambda (&rest x) (/ (apply '+ x) (float (length x))))
(lambda (x) (- org-columns-time x))))
(lambda (x) (- org-columns-time x)))
("est+" estimate org-estimate-combine))
"Operator <-> format,function,calc map.
Used to compile/uncompile columns format and completing read in
interactive function `org-columns-new'.
@ -1206,6 +1207,7 @@ Don't set this, this is meant for dynamic scoping.")
(defun org-columns-number-to-string (n fmt &optional printf)
"Convert a computed column number to a string value, according to FMT."
(cond
((memq fmt '(estimate)) (org-estimate-print n printf))
((not (numberp n)) "")
((memq fmt '(add_times max_times min_times mean_times))
(let* ((h (floor n)) (m (floor (+ 0.5 (* 60 (- n h))))))
@ -1250,9 +1252,9 @@ Don't set this, this is meant for dynamic scoping.")
(setq sum (+ (string-to-number (pop l)) (/ sum 60))))
sum))
((memq fmt '(checkbox checkbox-n-of-m checkbox-percent))
(if (equal s "[X]") 1. 0.000001))
(t (string-to-number s)))
0))
(if (equal s "[X]") 1. 0.000001))
((memq fmt '(estimate)) (org-string-to-estimate s))
(t (string-to-number s)))))
(defun org-columns-uncompile-format (cfmt)
"Turn the compiled columns format back into a string representation."
@ -1692,6 +1694,41 @@ This will add overlays to the date lines, to show the summary for each day."
(format "%dd %02dh %02dm %02ds" days hours minutes seconds))
""))
(defun org-estimate-mean-and-var (v)
"Return the mean and variance of an estimate."
(let* ((low (float (car v)))
(high (float (cadr v)))
(mean (/ (+ low high) 2.0))
(var (/ (+ (expt (- mean low) 2.0) (expt (- high mean) 2.0)) 2.0)))
(list mean var)))
(defun org-estimate-combine (&rest el)
"Combine a list of estimates, using mean and variance.
The mean and variance of the result will be the sum of the means
and variances (respectively) of the individual estimates."
(let ((mean 0)
(var 0))
(mapc (lambda (e)
(let ((stats (org-estimate-mean-and-var e)))
(setq mean (+ mean (car stats)))
(setq var (+ var (cadr stats)))))
el)
(let ((stdev (sqrt var)))
(list (- mean stdev) (+ mean stdev)))))
(defun org-estimate-print (e &optional fmt)
"Prepare a string representation of an estimate.
This formats these numbers as two numbers with a \"-\" between them."
(if (null fmt) (set 'fmt "%.0f"))
(format "%s" (mapconcat (lambda (n) (format fmt n)) e "-")))
(defun org-string-to-estimate (s)
"Convert a string to an estimate.
The string should be two numbers joined with a \"-\"."
(if (string-match "\\(.*\\)-\\(.*\\)" s)
(list (string-to-number (match-string 1 s))
(string-to-number(match-string 2 s)))
(list (string-to-number s) (string-to-number s))))
(provide 'org-colview)
(provide 'org-colview-xemacs)

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;
@ -746,7 +746,8 @@ around it."
("@max" max_age max (lambda (x) (- org-columns-time x)))
("@mean" mean_age
(lambda (&rest x) (/ (apply '+ x) (float (length x))))
(lambda (x) (- org-columns-time x))))
(lambda (x) (- org-columns-time x)))
("est+" estimate org-estimate-combine))
"Operator <-> format,function,calc map.
Used to compile/uncompile columns format and completing read in
interactive function `org-columns-new'.
@ -1031,6 +1032,7 @@ Don't set this, this is meant for dynamic scoping.")
(defun org-columns-number-to-string (n fmt &optional printf)
"Convert a computed column number to a string value, according to FMT."
(cond
((memq fmt '(estimate)) (org-estimate-print n printf))
((not (numberp n)) "")
((memq fmt '(add_times max_times min_times mean_times))
(let* ((h (floor n)) (m (floor (+ 0.5 (* 60 (- n h))))))
@ -1054,28 +1056,30 @@ Don't set this, this is meant for dynamic scoping.")
(format "[%d/%d]" n m)
(format "[%d%%]"(floor (+ 0.5 (* 100. (/ (* 1.0 n) m)))))))
(defun org-columns-string-to-number (s fmt)
"Convert a column value to a number that can be used for column computing."
(if s
(cond
((memq fmt '(min_age max_age mean_age))
(cond ((string= s "") org-columns-time)
((string-match
"\\([0-9]+\\)d \\([0-9]+\\)h \\([0-9]+\\)m \\([0-9]+\\)s"
s)
(+ (* 60 (+ (* 60 (+ (* 24 (string-to-number (match-string 1 s)))
(string-to-number (match-string 2 s))))
(string-to-number (match-string 3 s))))
(string-to-number (match-string 4 s))))
(t (time-to-number-of-days (apply 'encode-time
(org-parse-time-string s t))))))
(cond ((string= s "") org-columns-time)
((string-match
"\\([0-9]+\\)d \\([0-9]+\\)h \\([0-9]+\\)m \\([0-9]+\\)s"
s)
(+ (* 60 (+ (* 60 (+ (* 24 (string-to-number (match-string 1 s)))
(string-to-number (match-string 2 s))))
(string-to-number (match-string 3 s))))
(string-to-number (match-string 4 s))))
(t (time-to-number-of-days (apply 'encode-time
(org-parse-time-string s t))))))
((string-match ":" s)
(let ((l (nreverse (org-split-string s ":"))) (sum 0.0))
(while l
(setq sum (+ (string-to-number (pop l)) (/ sum 60))))
sum))
(let ((l (nreverse (org-split-string s ":"))) (sum 0.0))
(while l
(setq sum (+ (string-to-number (pop l)) (/ sum 60))))
sum))
((memq fmt '(checkbox checkbox-n-of-m checkbox-percent))
(if (equal s "[X]") 1. 0.000001))
(if (equal s "[X]") 1. 0.000001))
((memq fmt '(estimate)) (org-string-to-estimate s))
(t (string-to-number s)))))
(defun org-columns-uncompile-format (cfmt)
@ -1491,6 +1495,41 @@ This will add overlays to the date lines, to show the summary for each day."
(format "%dd %02dh %02dm %02ds" days hours minutes seconds))
""))
(defun org-estimate-mean-and-var (v)
"Return the mean and variance of an estimate."
(let* ((low (float (car v)))
(high (float (cadr v)))
(mean (/ (+ low high) 2.0))
(var (/ (+ (expt (- mean low) 2.0) (expt (- high mean) 2.0)) 2.0)))
(list mean var)))
(defun org-estimate-combine (&rest el)
"Combine a list of estimates, using mean and variance.
The mean and variance of the result will be the sum of the means
and variances (respectively) of the individual estimates."
(let ((mean 0)
(var 0))
(mapc (lambda (e)
(let ((stats (org-estimate-mean-and-var e)))
(setq mean (+ mean (car stats)))
(setq var (+ var (cadr stats)))))
el)
(let ((stdev (sqrt var)))
(list (- mean stdev) (+ mean stdev)))))
(defun org-estimate-print (e &optional fmt)
"Prepare a string representation of an estimate.
This formats these numbers as two numbers with a \"-\" between them."
(if (null fmt) (set 'fmt "%.0f"))
(format "%s" (mapconcat (lambda (n) (format fmt n)) e "-")))
(defun org-string-to-estimate (s)
"Convert a string to an estimate.
The string should be two numbers joined with a \"-\"."
(if (string-match "\\(.*\\)-\\(.*\\)" s)
(list (string-to-number (match-string 1 s))
(string-to-number(match-string 2 s)))
(list (string-to-number s) (string-to-number s))))
(provide 'org-colview)

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -4,7 +4,7 @@
;; Emacs Lisp Archive Entry
;; Filename: org-crypt.el
;; Version: 7.01
;; Version: 7.01trans
;; Keywords: org-mode
;; Author: John Wiegley <johnw@gnu.org>
;; Maintainer: Peter Jones <pjones@pmade.com>

View File

@ -3,10 +3,10 @@
;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Paul Sexton <eeeickythump@gmail.com>
;; Version: 7.01
;; Version: 7.01trans
;; Keywords: org, wp
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -4,7 +4,7 @@
;;
;; Emacs Lisp Archive Entry
;; Filename: org-docbook.el
;; Version: 7.01
;; Version: 7.01trans
;; Author: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
;; Maintainer: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
;; Keywords: org, wp, docbook

View File

@ -5,7 +5,7 @@
;; Author: Jan Böcker <jan.boecker at jboecker dot de>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Ulf Stegemann <ulf at zeitform dot de>
;; Keywords: outlines, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -4,7 +4,7 @@
;; Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: Lennart Borgman (lennart O borgman A gmail O com)
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -7,7 +7,7 @@
;; Tassilo Horn <tassilo at member dot fsf dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: John Wiegley <johnw at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -4,7 +4,7 @@
;;
;; Author: Philip Jackson <emacs@shellarchive.co.uk>
;; Keywords: erc, irc, link, org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -4,7 +4,7 @@
;;
;; Emacs Lisp Archive Entry
;; Filename: org-latex.el
;; Version: 7.01
;; Version: 7.01trans
;; Author: Bastien Guerry <bzg AT altern DOT org>
;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
;; Keywords: org, wp, tex

View File

@ -7,7 +7,7 @@
;; Bastien Guerry <bzg AT altern DOT org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: John Wiegley <johnw@gnu.org>
;; Christopher Suckling <suckling at gmail dot com>
;; Version: 7.01
;; Version: 7.01trans
;; Keywords: outlines, hypermedia, calendar, wp
;; This file is part of GNU Emacs.

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;
@ -38,11 +38,18 @@
(defmacro declare-function (fn file &optional arglist fileonly))))
(declare-function org-add-props "org-compat" (string plist &rest props))
(declare-function org-string-match-p "org-compat" (&rest args))
(defmacro org-bound-and-true-p (var)
"Return the value of symbol VAR if it is bound, else nil."
`(and (boundp (quote ,var)) ,var))
(defun org-string-nw-p (s)
"Is S a string with a non-white character?"
(and (stringp s)
(org-string-match-p "\\S-" s)
s))
(defun org-not-nil (v)
"If V not nil, and also not the string \"nil\", then return V.
Otherwise return nil."

View File

@ -5,7 +5,7 @@
;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.

View File

@ -6,7 +6,7 @@
;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -4,7 +4,7 @@
;;
;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: Eric Schulte <schulte dot eric at gmail dot com>
;; Keywords: tables, plotting
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -9,7 +9,7 @@
;; Author: Ross Patterson <me AT rpatterson DOT net>
;; Maintainer: Sebastian Rose <sebastian_rose AT gmx DOT de>
;; Keywords: org, emacsclient, wp
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.
;;

View File

@ -5,7 +5,7 @@
;; Author: David O'Toole <dto@gnu.org>
;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
;; Keywords: hypermedia, outlines, wp
;; Version: 7.01
;; Version: 7.01trans
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -8,7 +8,7 @@
;; Dan Davison <davison at stats dot ox dot ac dot uk>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

View File

@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;
@ -453,7 +453,7 @@ nil When nil, the command tries to be smart and figure out the
(t 1))))
(goto-char beg)
(if (equal separator '(4))
(while (<= (point) end)
(while (< (point) end)
;; parse the csv stuff
(cond
((looking-at "^") (insert "| "))

View File

@ -4,7 +4,7 @@
;;
;; Emacs Lisp Archive Entry
;; Filename: org-taskjuggler.el
;; Version: 7.01
;; Version: 7.01trans
;; Author: Christian Egli
;; Maintainer: Christian Egli
;; Keywords: org, taskjuggler, project planning

View File

@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.01
;; Version: 7.01trans
;;
;; This file is part of GNU Emacs.
;;

Some files were not shown because too many files have changed in this diff Show More