From 0cc8d2e0cfd0b340acdcf8a31f6deb20706756fb Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Tue, 28 Apr 2015 10:12:28 +0200 Subject: [PATCH] - update helm to 20150426.2119 - update org to 20150427 Signed-off-by: Andreas Gerler --- bba.org | 13 +- elpa/async-20150412.2207/async-autoloads.el | 81 + elpa/async-20150412.2207/async-bytecomp.el | 149 + elpa/async-20150412.2207/async-pkg.el | 4 + elpa/async-20150412.2207/async.el | 292 + elpa/async-20150412.2207/dired-async.el | 310 + elpa/async-20150412.2207/smtpmail-async.el | 73 + .../emacs-helm.sh | 0 .../helm-adaptive.el | 0 .../helm-aliases.el | 0 .../helm-apt.el | 0 .../helm-autoloads.el | 156 +- .../helm-bookmark.el | 83 +- .../helm-buffers.el | 0 .../helm-color.el | 0 .../helm-command.el | 142 +- .../helm-config.el | 0 .../helm-dabbrev.el | 2 +- .../helm-elisp-package.el | 20 +- .../helm-elisp.el | 172 +- .../helm-elscreen.el | 0 .../helm-eshell.el | 4 +- .../helm-eval.el | 26 +- .../helm-external.el | 0 .../helm-files.el | 105 +- .../helm-font.el | 0 .../helm-grep.el | 23 +- .../helm-help.el | 8 +- .../helm-imenu.el | 0 .../helm-info.el | 0 .../helm-locate.el | 0 .../helm-man.el | 0 .../helm-match-plugin.el | 37 - .../helm-misc.el | 37 +- .../helm-mode.el | 73 +- .../helm-net.el | 0 .../helm-org.el | 13 +- .../helm-pkg.el | 2 +- .../helm-plugin.el | 0 .../helm-regexp.el | 75 +- .../helm-ring.el | 0 .../helm-semantic.el | 16 +- .../helm-source.el | 257 +- .../helm-sys.el | 0 .../helm-tags.el | 58 +- .../helm-utils.el | 2 +- .../helm.el | 18 +- elpa/org-20150427.signed | 1 + elpa/org-20150427/COPYING | 674 + elpa/org-20150427/README_ELPA | 41 + elpa/org-20150427/dir | 18 + .../etc/styles/OrgOdtContentTemplate.xml | 275 + elpa/org-20150427/etc/styles/OrgOdtStyles.xml | 841 + elpa/org-20150427/etc/styles/README | 36 + .../org-8.2.3c => elpa/org-20150427}/ob-C.el | 2 +- .../org-8.2.3c => elpa/org-20150427}/ob-R.el | 13 +- .../org-20150427}/ob-asymptote.el | 2 +- .../org-20150427}/ob-awk.el | 2 +- .../org-20150427}/ob-calc.el | 2 +- .../org-20150427}/ob-clojure.el | 2 +- .../org-20150427}/ob-comint.el | 2 +- .../org-20150427}/ob-core.el | 26 +- .../org-20150427}/ob-css.el | 2 +- .../org-20150427}/ob-ditaa.el | 2 +- .../org-20150427}/ob-dot.el | 2 +- .../org-20150427}/ob-emacs-lisp.el | 2 +- .../org-20150427}/ob-eval.el | 2 +- .../org-20150427}/ob-exp.el | 284 +- .../org-20150427}/ob-fortran.el | 2 +- .../org-20150427}/ob-gnuplot.el | 17 +- .../org-20150427}/ob-haskell.el | 3 +- .../org-8.2.3c => elpa/org-20150427}/ob-io.el | 2 +- .../org-20150427}/ob-java.el | 2 +- .../org-8.2.3c => elpa/org-20150427}/ob-js.el | 4 +- .../org-20150427}/ob-keys.el | 2 +- .../org-20150427}/ob-latex.el | 4 +- .../org-20150427}/ob-ledger.el | 2 +- .../org-20150427}/ob-lilypond.el | 232 +- .../org-20150427}/ob-lisp.el | 2 +- .../org-20150427}/ob-lob.el | 7 +- .../org-20150427}/ob-makefile.el | 5 +- .../org-20150427}/ob-matlab.el | 2 +- .../org-20150427}/ob-maxima.el | 5 +- .../org-20150427}/ob-mscgen.el | 2 +- .../org-20150427}/ob-ocaml.el | 2 +- .../org-20150427}/ob-octave.el | 2 +- .../org-20150427}/ob-org.el | 2 +- .../org-20150427}/ob-perl.el | 2 +- .../org-20150427}/ob-picolisp.el | 2 +- .../org-20150427}/ob-plantuml.el | 2 +- .../org-20150427}/ob-python.el | 16 +- .../org-20150427}/ob-ref.el | 6 +- .../org-20150427}/ob-ruby.el | 2 +- .../org-20150427}/ob-sass.el | 2 +- .../org-20150427}/ob-scala.el | 2 +- .../org-20150427}/ob-scheme.el | 5 +- .../org-20150427}/ob-screen.el | 6 +- .../org-8.2.3c => elpa/org-20150427}/ob-sh.el | 10 +- .../org-20150427}/ob-shen.el | 2 +- .../org-20150427}/ob-sql.el | 2 +- .../org-20150427}/ob-sqlite.el | 2 +- .../org-20150427}/ob-table.el | 14 +- .../org-20150427}/ob-tangle.el | 15 +- .../org-8.2.3c => elpa/org-20150427}/ob.el | 2 +- elpa/org-20150427/org | 21283 ++++++++++++++++ .../org-20150427}/org-agenda.el | 586 +- .../org-20150427}/org-archive.el | 2 +- .../org-20150427}/org-attach.el | 11 +- elpa/org-20150427/org-autoloads.el | 682 + .../org-20150427}/org-bbdb.el | 9 +- .../org-20150427}/org-bibtex.el | 17 +- .../org-20150427}/org-capture.el | 21 +- .../org-20150427}/org-clock.el | 64 +- .../org-20150427}/org-colview.el | 11 +- .../org-20150427}/org-compat.el | 32 +- .../org-20150427}/org-crypt.el | 12 +- .../org-20150427}/org-ctags.el | 2 +- .../org-20150427}/org-datetree.el | 2 +- .../org-20150427}/org-docview.el | 2 +- .../org-20150427}/org-element.el | 462 +- .../org-20150427}/org-entities.el | 14 +- .../org-20150427}/org-eshell.el | 2 +- .../org-20150427}/org-faces.el | 2 +- .../org-20150427}/org-feed.el | 2 +- .../org-20150427}/org-footnote.el | 2 +- .../org-20150427}/org-gnus.el | 2 +- .../org-20150427}/org-habit.el | 19 +- .../org-20150427}/org-id.el | 2 +- .../org-20150427}/org-indent.el | 2 +- .../org-20150427}/org-info.el | 2 +- .../org-20150427}/org-inlinetask.el | 5 +- .../org-20150427}/org-install.el | 0 .../org-20150427}/org-irc.el | 6 +- .../org-20150427}/org-list.el | 8 +- .../org-20150427}/org-loaddefs.el | 250 +- .../org-20150427}/org-macro.el | 2 +- .../org-20150427}/org-macs.el | 8 +- .../org-20150427}/org-mhe.el | 2 +- .../org-20150427}/org-mobile.el | 8 +- .../org-20150427}/org-mouse.el | 15 +- .../org-20150427}/org-pcomplete.el | 2 +- elpa/org-20150427/org-pkg.el | 3 + .../org-20150427}/org-plot.el | 9 +- .../org-20150427}/org-protocol.el | 2 +- .../org-20150427}/org-rmail.el | 10 +- .../org-20150427}/org-src.el | 82 +- .../org-20150427}/org-table.el | 27 +- .../org-20150427}/org-timer.el | 12 +- .../org-20150427}/org-version.el | 4 +- .../org-20150427}/org-w3m.el | 2 +- .../org-8.2.3c => elpa/org-20150427}/org.el | 1116 +- elpa/org-20150427/orgcard.pdf | Bin 0 -> 124864 bytes .../org-20150427}/ox-ascii.el | 177 +- .../org-20150427}/ox-beamer.el | 26 +- .../org-20150427}/ox-html.el | 304 +- .../org-20150427}/ox-icalendar.el | 41 +- .../org-20150427}/ox-latex.el | 129 +- .../org-20150427}/ox-man.el | 14 +- .../org-8.2.3c => elpa/org-20150427}/ox-md.el | 192 +- .../org-20150427}/ox-odt.el | 167 +- .../org-20150427}/ox-org.el | 66 +- .../org-20150427}/ox-publish.el | 74 +- .../org-20150427}/ox-texinfo.el | 1340 +- .../org-8.2.3c => elpa/org-20150427}/ox.el | 192 +- .../pkg-info-autoloads.el | 131 + elpa/pkg-info-20140610.630/pkg-info-pkg.el | 1 + elpa/pkg-info-20140610.630/pkg-info.el | 279 + xemacs-packages/lisp/org-8.2.3c/Makefile | 93 - 168 files changed, 29146 insertions(+), 3773 deletions(-) create mode 100644 elpa/async-20150412.2207/async-autoloads.el create mode 100644 elpa/async-20150412.2207/async-bytecomp.el create mode 100644 elpa/async-20150412.2207/async-pkg.el create mode 100644 elpa/async-20150412.2207/async.el create mode 100644 elpa/async-20150412.2207/dired-async.el create mode 100644 elpa/async-20150412.2207/smtpmail-async.el rename elpa/{helm-20150403.101 => helm-20150426.2119}/emacs-helm.sh (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-adaptive.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-aliases.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-apt.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-autoloads.el (86%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-bookmark.el (91%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-buffers.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-color.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-command.el (62%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-config.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-dabbrev.el (99%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-elisp-package.el (95%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-elisp.el (94%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-elscreen.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-eshell.el (99%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-eval.el (86%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-external.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-files.el (97%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-font.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-grep.el (98%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-help.el (99%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-imenu.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-info.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-locate.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-man.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-match-plugin.el (89%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-misc.el (93%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-mode.el (93%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-net.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-org.el (93%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-pkg.el (61%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-plugin.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-regexp.el (92%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-ring.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-semantic.el (99%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-source.el (81%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-sys.el (100%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-tags.el (87%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm-utils.el (99%) rename elpa/{helm-20150403.101 => helm-20150426.2119}/helm.el (99%) create mode 100644 elpa/org-20150427.signed create mode 100644 elpa/org-20150427/COPYING create mode 100644 elpa/org-20150427/README_ELPA create mode 100644 elpa/org-20150427/dir create mode 100644 elpa/org-20150427/etc/styles/OrgOdtContentTemplate.xml create mode 100644 elpa/org-20150427/etc/styles/OrgOdtStyles.xml create mode 100644 elpa/org-20150427/etc/styles/README rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-C.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-R.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-asymptote.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-awk.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-calc.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-clojure.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-comint.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-core.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-css.el (96%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-ditaa.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-dot.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-emacs-lisp.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-eval.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-exp.el (64%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-fortran.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-gnuplot.el (96%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-haskell.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-io.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-java.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-js.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-keys.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-latex.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-ledger.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-lilypond.el (61%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-lisp.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-lob.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-makefile.el (93%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-matlab.el (95%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-maxima.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-mscgen.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-ocaml.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-octave.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-org.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-perl.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-picolisp.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-plantuml.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-python.el (96%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-ref.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-ruby.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-sass.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-scala.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-scheme.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-screen.el (96%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-sh.el (96%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-shen.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-sql.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-sqlite.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-table.el (93%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob-tangle.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ob.el (95%) create mode 100644 elpa/org-20150427/org rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-agenda.el (96%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-archive.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-attach.el (98%) create mode 100644 elpa/org-20150427/org-autoloads.el rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-bbdb.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-bibtex.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-capture.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-clock.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-colview.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-compat.el (95%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-crypt.el (96%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-ctags.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-datetree.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-docview.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-element.el (94%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-entities.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-eshell.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-faces.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-feed.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-footnote.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-gnus.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-habit.el (95%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-id.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-indent.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-info.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-inlinetask.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-install.el (100%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-irc.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-list.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-loaddefs.el (92%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-macro.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-macs.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-mhe.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-mobile.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-mouse.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-pcomplete.el (99%) create mode 100644 elpa/org-20150427/org-pkg.el rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-plot.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-protocol.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-rmail.el (93%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-src.el (96%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-table.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-timer.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-version.el (87%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org-w3m.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/org.el (97%) create mode 100644 elpa/org-20150427/orgcard.pdf rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox-ascii.el (94%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox-beamer.el (98%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox-html.el (94%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox-icalendar.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox-latex.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox-man.el (99%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox-md.el (73%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox-odt.el (97%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox-org.el (81%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox-publish.el (96%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox-texinfo.el (58%) rename {xemacs-packages/lisp/org-8.2.3c => elpa/org-20150427}/ox.el (97%) create mode 100644 elpa/pkg-info-20140610.630/pkg-info-autoloads.el create mode 100644 elpa/pkg-info-20140610.630/pkg-info-pkg.el create mode 100644 elpa/pkg-info-20140610.630/pkg-info.el delete mode 100644 xemacs-packages/lisp/org-8.2.3c/Makefile diff --git a/bba.org b/bba.org index 7074bcc9..7d250561 100644 --- a/bba.org +++ b/bba.org @@ -30,7 +30,7 @@ To be precise, this is what's in the first part of my =~/.emacs.d/init.el= (what load-path)) - (add-to-list 'load-path "~/.emacs.d/xemacs-packages/lisp/org-8.2.3c") + (add-to-list 'load-path "~/.emacs/elpa/org-20150427") ;; (add-to-list 'load-path "~/elisp/org-mode/contrib/lisp") ;; Load the rest of the packages @@ -90,6 +90,15 @@ If you are in need enable debugging: #+END_SRC +*** async +#+BEGIN_SRC emacs-lisp + (if (>= emacs-major-version 24) + (progn + (add-to-list 'load-path "~/.emacs.d/elpa/async-20150412.2207") + (require 'async) + ) + ) +#+END_SRC *** [[http://www.emacswiki.org/emacs/ELPA][ELPA]] #+BEGIN_SRC emacs-lisp @@ -1287,7 +1296,7 @@ Some links you might check out: (if (>= emacs-major-version 24) (progn (add-to-list 'load-path - "~/.emacs.d/elpa/helm-20150403.101") + "~/.emacs.d/elpa/helm-20150426.2119") (require 'helm) (helm-mode 1) (global-set-key (kbd "M-y") 'helm-show-kill-ring) diff --git a/elpa/async-20150412.2207/async-autoloads.el b/elpa/async-20150412.2207/async-autoloads.el new file mode 100644 index 00000000..ef6d2102 --- /dev/null +++ b/elpa/async-20150412.2207/async-autoloads.el @@ -0,0 +1,81 @@ +;;; async-autoloads.el --- automatically extracted autoloads +;; +;;; Code: +(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) + +;;;### (autoloads nil "async" "async.el" (21822 1126 0 0)) +;;; Generated autoloads from async.el + +(autoload 'async-start-process "async" "\ +Start the executable PROGRAM asynchronously. See `async-start'. +PROGRAM is passed PROGRAM-ARGS, calling FINISH-FUNC with the +process object when done. If FINISH-FUNC is nil, the future +object will return the process object when the program is +finished. Set DEFAULT-DIRECTORY to change PROGRAM's current +working directory. + +\(fn NAME PROGRAM FINISH-FUNC &rest PROGRAM-ARGS)" nil nil) + +(autoload 'async-start "async" "\ +Execute START-FUNC (often a lambda) in a subordinate Emacs process. +When done, the return value is passed to FINISH-FUNC. Example: + + (async-start + ;; What to do in the child process + (lambda () + (message \"This is a test\") + (sleep-for 3) + 222) + + ;; What to do when it finishes + (lambda (result) + (message \"Async process done, result should be 222: %s\" + result))) + +If FINISH-FUNC is nil or missing, a future is returned that can +be inspected using `async-get', blocking until the value is +ready. Example: + + (let ((proc (async-start + ;; What to do in the child process + (lambda () + (message \"This is a test\") + (sleep-for 3) + 222)))) + + (message \"I'm going to do some work here\") ;; .... + + (message \"Waiting on async process, result should be 222: %s\" + (async-get proc))) + +If you don't want to use a callback, and you don't care about any +return value form the child process, pass the `ignore' symbol as +the second argument (if you don't, and never call `async-get', it +will leave *emacs* process buffers hanging around): + + (async-start + (lambda () + (delete-file \"a remote file on a slow link\" nil)) + 'ignore) + +Note: Even when FINISH-FUNC is present, a future is still +returned except that it yields no value (since the value is +passed to FINISH-FUNC). Call `async-get' on such a future always +returns nil. It can still be useful, however, as an argument to +`async-ready' or `async-wait'. + +\(fn START-FUNC &optional FINISH-FUNC)" nil t) + +;;;*** + +;;;### (autoloads nil nil ("async-bytecomp.el" "async-pkg.el" "dired-async.el" +;;;;;; "smtpmail-async.el") (21822 3160 168227 0)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; End: +;;; async-autoloads.el ends here diff --git a/elpa/async-20150412.2207/async-bytecomp.el b/elpa/async-20150412.2207/async-bytecomp.el new file mode 100644 index 00000000..047e6057 --- /dev/null +++ b/elpa/async-20150412.2207/async-bytecomp.el @@ -0,0 +1,149 @@ +;;; async-bytecomp.el --- Async functions to compile elisp files async + +;; Copyright (C) 2014 John Wiegley +;; Copyright (C) 2014 Thierry Volpiatto + +;; Authors: John Wiegley +;; Thierry Volpiatto + +;; Keywords: dired async byte-compile +;; X-URL: https://github.com/jwiegley/dired-async + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation; either version 2, or (at +;; your option) any later version. + +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Commentary: +;; +;; This package provide the `async-byte-recompile-directory' function +;; which allows, as the name says to recompile a directory outside of +;; your running emacs. +;; The benefit is your files will be compiled in a clean environment without +;; the old *.el files loaded. +;; Among other things, this fix a bug in package.el which recompile +;; the new files in the current environment with the old files loaded, creating +;; errors in most packages after upgrades. +;; +;; NB: This package is advicing the function `package--compile'. + +;;; Code: + +(require 'cl-lib) +(require 'async) + +(defcustom async-bytecomp-allowed-packages '(async helm) + "Packages in this list will be compiled asynchronously by `package--compile'. +All the dependencies of these packages will be compiled async too, +so no need to add dependencies to this list. +The value of this variable can also be a list with a single element, +the symbol `all', in this case packages are always compiled asynchronously." + :group 'async + :type '(repeat (choice symbol))) + +(defvar async-byte-compile-log-file "~/.emacs.d/async-bytecomp.log") + +(defun async-byte-recompile-directory (directory &optional quiet) + "Compile all *.el files in DIRECTORY asynchronously. +All *.elc files are systematically deleted before proceeding." + (cl-loop with dir = (directory-files directory t "\\.elc\\'") + unless dir return nil + for f in dir + when (file-exists-p f) do (delete-file f)) + ;; Ensure async is reloaded when async.elc is deleted. + ;; This happen when recompiling its own directory. + (load "async") + (let ((call-back + `(lambda (&optional ignore) + (if (file-exists-p async-byte-compile-log-file) + (let ((buf (get-buffer-create byte-compile-log-buffer)) + (n 0)) + (with-current-buffer buf + (goto-char (point-max)) + (let ((inhibit-read-only t)) + (insert-file-contents async-byte-compile-log-file) + (compilation-mode)) + (display-buffer buf) + (delete-file async-byte-compile-log-file) + (unless ,quiet + (save-excursion + (goto-char (point-min)) + (while (re-search-forward "^.*:Error:" nil t) + (cl-incf n))) + (if (> n 0) + (message "Failed to compile %d files in directory `%s'" n ,directory) + (message "Directory `%s' compiled asynchronously with warnings" ,directory))))) + (unless ,quiet + (message "Directory `%s' compiled asynchronously with success" ,directory)))))) + (async-start + `(lambda () + (require 'bytecomp) + ,(async-inject-variables "\\`\\(load-path\\)\\|byte\\'") + (let ((default-directory (file-name-as-directory ,directory)) + error-data) + (add-to-list 'load-path default-directory) + (byte-recompile-directory ,directory 0 t) + (when (get-buffer byte-compile-log-buffer) + (setq error-data (with-current-buffer byte-compile-log-buffer + (buffer-substring-no-properties (point-min) (point-max)))) + (unless (string= error-data "") + (with-temp-file ,async-byte-compile-log-file + (erase-buffer) + (insert error-data)))))) + call-back) + (message "Started compiling asynchronously directory %s" directory))) + +(defvar package-archive-contents) +(declare-function package-desc-reqs "package.el" (cl-x)) + +(defun async-bytecomp--get-package-deps (pkg &optional only) + (let* ((pkg-desc (cadr (assq pkg package-archive-contents))) + (direct-deps (cl-loop for p in (package-desc-reqs pkg-desc) + for name = (car p) + when (assq name package-archive-contents) + collect name)) + (indirect-deps (unless (eq only 'direct) + (delete-dups + (cl-loop for p in direct-deps append + (async-bytecomp--get-package-deps p)))))) + (cl-case only + (direct direct-deps) + (separate (list direct-deps indirect-deps)) + (indirect indirect-deps) + (t (delete-dups (append direct-deps indirect-deps)))))) + +(defun async-bytecomp-get-allowed-pkgs () + (when (and async-bytecomp-allowed-packages + (listp async-bytecomp-allowed-packages)) + (cl-loop for p in async-bytecomp-allowed-packages + append (async-bytecomp--get-package-deps p) into reqs + finally return + (delete-dups + (append async-bytecomp-allowed-packages reqs))))) + +(defadvice package--compile (around byte-compile-async activate) + (let ((cur-package (package-desc-name pkg-desc))) + (if (or (equal async-bytecomp-allowed-packages '(all)) + (memq cur-package (async-bytecomp-get-allowed-pkgs))) + (progn + (when (eq cur-package 'async) + (fmakunbound 'async-byte-recompile-directory)) + (package-activate-1 pkg-desc) + (load "async-bytecomp") ; emacs-24.3 don't reload new files. + (async-byte-recompile-directory (package-desc-dir pkg-desc) t)) + ad-do-it))) + + +(provide 'async-bytecomp) + +;;; async-bytecomp.el ends here diff --git a/elpa/async-20150412.2207/async-pkg.el b/elpa/async-20150412.2207/async-pkg.el new file mode 100644 index 00000000..7d1eb8b1 --- /dev/null +++ b/elpa/async-20150412.2207/async-pkg.el @@ -0,0 +1,4 @@ +(define-package "async" "20150412.2207" "Asynchronous processing in Emacs" 'nil) +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/async-20150412.2207/async.el b/elpa/async-20150412.2207/async.el new file mode 100644 index 00000000..be9c04e5 --- /dev/null +++ b/elpa/async-20150412.2207/async.el @@ -0,0 +1,292 @@ +;;; async --- Asynchronous processing in Emacs + +;; Copyright (C) 2012~2014 John Wiegley + +;; Author: John Wiegley +;; Created: 18 Jun 2012 + +;; Keywords: async +;; X-URL: https://github.com/jwiegley/emacs-async + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation; either version 2, or (at +;; your option) any later version. + +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Commentary: + +;; Adds the ability to call asynchronous functions and process with ease. See +;; the documentation for `async-start' and `async-start-process'. + +;;; Code: + +(defgroup async nil + "Simple asynchronous processing in Emacs" + :group 'emacs) + +(defvar async-debug nil) +(defvar async-send-over-pipe t) +(defvar async-in-child-emacs nil) +(defvar async-callback nil) +(defvar async-callback-for-process nil) +(defvar async-callback-value nil) +(defvar async-callback-value-set nil) +(defvar async-current-process nil) + +(defun async-inject-variables + (include-regexp &optional predicate exclude-regexp) + "Return a `setq' form that replicates part of the calling environment. +It sets the value for every variable matching INCLUDE-REGEXP and +also PREDICATE. It will not perform injection for any variable +matching EXCLUDE-REGEXP (if present). It is intended to be used +as follows: + + (async-start + `(lambda () + (require 'smtpmail) + (with-temp-buffer + (insert ,(buffer-substring-no-properties (point-min) (point-max))) + ;; Pass in the variable environment for smtpmail + ,(async-inject-variables \"\\`\\(smtpmail\\|\\(user-\\)?mail\\)-\") + (smtpmail-send-it))) + 'ignore)" + `(setq + ,@(let (bindings) + (mapatoms + (lambda (sym) + (if (and (boundp sym) + (or (null include-regexp) + (string-match include-regexp (symbol-name sym))) + (not (string-match + (or exclude-regexp "-syntax-table\\'") + (symbol-name sym)))) + (let ((value (symbol-value sym))) + (when (or (null predicate) + (funcall predicate sym)) + (setq bindings (cons `(quote ,value) bindings) + bindings (cons sym bindings))))))) + bindings))) + +(defalias 'async-inject-environment 'async-inject-variables) + +(defun async-handle-result (func result buf) + (if (null func) + (progn + (set (make-local-variable 'async-callback-value) result) + (set (make-local-variable 'async-callback-value-set) t)) + (unwind-protect + (if (and (listp result) + (eq 'async-signal (nth 0 result))) + (signal (car (nth 1 result)) + (cdr (nth 1 result))) + (funcall func result)) + (unless async-debug + (kill-buffer buf))))) + +(defun async-when-done (proc &optional change) + "Process sentinal used to retrieve the value from the child process." + (when (eq 'exit (process-status proc)) + (with-current-buffer (process-buffer proc) + (let ((async-current-process proc)) + (if (= 0 (process-exit-status proc)) + (if async-callback-for-process + (if async-callback + (prog1 + (funcall async-callback proc) + (unless async-debug + (kill-buffer (current-buffer)))) + (set (make-local-variable 'async-callback-value) proc) + (set (make-local-variable 'async-callback-value-set) t)) + (goto-char (point-max)) + (backward-sexp) + (async-handle-result async-callback (read (current-buffer)) + (current-buffer))) + (set (make-local-variable 'async-callback-value) + (list 'error + (format "Async process '%s' failed with exit code %d" + (process-name proc) (process-exit-status proc)))) + (set (make-local-variable 'async-callback-value-set) t)))))) + +(defun async--receive-sexp (&optional stream) + (let ((sexp (decode-coding-string (base64-decode-string + (read stream)) 'utf-8-unix))) + (if async-debug + (message "Received sexp {{{%s}}}" (pp-to-string sexp))) + (setq sexp (read sexp)) + (if async-debug + (message "Read sexp {{{%s}}}" (pp-to-string sexp))) + (eval sexp))) + +(defun async--insert-sexp (sexp) + (prin1 sexp (current-buffer)) + ;; Just in case the string we're sending might contain EOF + (encode-coding-region (point-min) (point-max) 'utf-8-unix) + (base64-encode-region (point-min) (point-max) t) + (goto-char (point-min)) (insert ?\") + (goto-char (point-max)) (insert ?\" ?\n)) + +(defun async--transmit-sexp (process sexp) + (with-temp-buffer + (if async-debug + (message "Transmitting sexp {{{%s}}}" (pp-to-string sexp))) + (async--insert-sexp sexp) + (process-send-region process (point-min) (point-max)))) + +(defun async-batch-invoke () + "Called from the child Emacs process' command-line." + (setq async-in-child-emacs t + debug-on-error async-debug) + (if debug-on-error + (prin1 (funcall + (async--receive-sexp (unless async-send-over-pipe + command-line-args-left)))) + (condition-case err + (prin1 (funcall + (async--receive-sexp (unless async-send-over-pipe + command-line-args-left)))) + (error + (prin1 (list 'async-signal err)))))) + +(defun async-ready (future) + "Query a FUTURE to see if the ready is ready -- i.e., if no blocking +would result from a call to `async-get' on that FUTURE." + (and (memq (process-status future) '(exit signal)) + (with-current-buffer (process-buffer future) + async-callback-value-set))) + +(defun async-wait (future) + "Wait for FUTURE to become ready." + (while (not (async-ready future)) + (sit-for 0.05))) + +(defun async-get (future) + "Get the value from an asynchronously function when it is ready. +FUTURE is returned by `async-start' or `async-start-process' when +its FINISH-FUNC is nil." + (async-wait future) + (with-current-buffer (process-buffer future) + (async-handle-result #'identity async-callback-value (current-buffer)))) + +(defun async-message-p (value) + "Return true of VALUE is an async.el message packet." + (and (listp value) + (plist-get value :async-message))) + +(defun async-send (&rest args) + "Send the given messages to the asychronous Emacs PROCESS." + (let ((args (append args '(:async-message t)))) + (if async-in-child-emacs + (if async-callback + (funcall async-callback args)) + (async--transmit-sexp (car args) (list 'quote (cdr args)))))) + +(defun async-receive (&rest args) + "Send the given messages to the asychronous Emacs PROCESS." + (async--receive-sexp)) + +;;;###autoload +(defun async-start-process (name program finish-func &rest program-args) + "Start the executable PROGRAM asynchronously. See `async-start'. +PROGRAM is passed PROGRAM-ARGS, calling FINISH-FUNC with the +process object when done. If FINISH-FUNC is nil, the future +object will return the process object when the program is +finished. Set DEFAULT-DIRECTORY to change PROGRAM's current +working directory." + (let* ((buf (generate-new-buffer (concat "*" name "*"))) + (proc (let ((process-connection-type nil)) + (apply #'start-process name buf program program-args)))) + (with-current-buffer buf + (set (make-local-variable 'async-callback) finish-func) + (set-process-sentinel proc #'async-when-done) + (unless (string= name "emacs") + (set (make-local-variable 'async-callback-for-process) t)) + proc))) + +;;;###autoload +(defmacro async-start (start-func &optional finish-func) + "Execute START-FUNC (often a lambda) in a subordinate Emacs process. +When done, the return value is passed to FINISH-FUNC. Example: + + (async-start + ;; What to do in the child process + (lambda () + (message \"This is a test\") + (sleep-for 3) + 222) + + ;; What to do when it finishes + (lambda (result) + (message \"Async process done, result should be 222: %s\" + result))) + +If FINISH-FUNC is nil or missing, a future is returned that can +be inspected using `async-get', blocking until the value is +ready. Example: + + (let ((proc (async-start + ;; What to do in the child process + (lambda () + (message \"This is a test\") + (sleep-for 3) + 222)))) + + (message \"I'm going to do some work here\") ;; .... + + (message \"Waiting on async process, result should be 222: %s\" + (async-get proc))) + +If you don't want to use a callback, and you don't care about any +return value form the child process, pass the `ignore' symbol as +the second argument (if you don't, and never call `async-get', it +will leave *emacs* process buffers hanging around): + + (async-start + (lambda () + (delete-file \"a remote file on a slow link\" nil)) + 'ignore) + +Note: Even when FINISH-FUNC is present, a future is still +returned except that it yields no value (since the value is +passed to FINISH-FUNC). Call `async-get' on such a future always +returns nil. It can still be useful, however, as an argument to +`async-ready' or `async-wait'." + (require 'find-func) + (let ((procvar (make-symbol "proc"))) + `(let* ((sexp ,start-func) + (,procvar + (async-start-process + "emacs" (file-truename + (expand-file-name invocation-name + invocation-directory)) + ,finish-func + "-Q" "-l" + ;; Using `locate-library' ensure we use the right file + ;; when the .elc have been deleted. + ,(locate-library "async") + "-batch" "-f" "async-batch-invoke" + (if async-send-over-pipe + "" + (with-temp-buffer + (async--insert-sexp (list 'quote sexp)) + (buffer-string)))))) + (if async-send-over-pipe + (async--transmit-sexp ,procvar (list 'quote sexp))) + ,procvar))) + +(defmacro async-sandbox(func) + "Evaluate FUNC in a separate Emacs process, synchronously." + `(async-get (async-start ,func))) + +(provide 'async) + +;;; async.el ends here diff --git a/elpa/async-20150412.2207/dired-async.el b/elpa/async-20150412.2207/dired-async.el new file mode 100644 index 00000000..59b1d986 --- /dev/null +++ b/elpa/async-20150412.2207/dired-async.el @@ -0,0 +1,310 @@ +;;; dired-async.el --- Copy/move/delete asynchronously in dired. + +;; Copyright (C) 2012~2014 John Wiegley +;; Copyright (C) 2012~2014 Thierry Volpiatto + +;; Authors: John Wiegley +;; Thierry Volpiatto + +;; Keywords: dired async network +;; X-URL: https://github.com/jwiegley/dired-async + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation; either version 2, or (at +;; your option) any later version. + +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Commentary: + +;; This file provide a redefinition of `dired-create-file' function, +;; which must be loaded *after* dired-aux.el, performs copies, +;; moves and all what is handled by `dired-create-file' in the background +;; using a slave Emacs process, by means of the async.el module. +;; To use it, put this in your .emacs: +;; +;; (eval-after-load "dired-aux" +;; '(require 'dired-async)) +;; +;; + +;;; Code: + +(require 'cl-lib) +(require 'dired-aux) +(require 'async) + +(eval-when-compile + (defvar async-callback)) +(defvar dired-async-operation nil) + +(defgroup dired-async nil + "Copy rename files asynchronously from dired." + :group 'dired) + +(defcustom dired-async-env-variables-regexp + "\\`\\(tramp-\\(default\\|connection\\|remote\\)\\|ange-ftp\\)-.*" + "Variables matching this regexp will be loaded on Child Emacs." + :type 'regexp + :group 'dired-async) + +(defcustom dired-async-message-function 'dired-async-mode-line-message + "Function to use to notify result when operation finish. +Should take same args as `message'." + :group 'dired-async + :type 'function) + +(defcustom dired-async-log-file "/tmp/dired-async.log" + "File use to communicate errors from Child Emacs to host Emacs." + :group 'dired-async + :type 'string) + +(defcustom dired-async-be-async t + "When non--nil make `dired-create-file' async. +This allow to turn off async features provided to this package." + :group 'dired-async + :type 'boolean) + +(defface dired-async-message + '((t (:foreground "yellow"))) + "Face used for mode-line message." + :group 'dired-async) + +(defface dired-async-mode-message + '((t (:background "Firebrick1"))) + "Face used for `dired-async-mode' lighter." + :group 'dired-async) + +(define-minor-mode dired-async-mode + "Notify mode-line that an async process run." + :group 'dired-async + :global t + :lighter (:eval (propertize (format " [%s Async job(s) running]" + (length (dired-async-processes))) + 'face 'dired-async-mode-message)) + (unless dired-async-mode + (let ((visible-bell t)) (ding)))) + +(defun dired-async-mode-line-message (text &rest args) + "Notify end of operation in `mode-line'." + (message nil) + (let ((mode-line-format (concat + " " (propertize + (if args + (apply #'format text args) + text) + 'face 'dired-async-message)))) + (force-mode-line-update) + (sit-for 3) + (force-mode-line-update))) + +(defun dired-async-processes () + (cl-loop for p in (process-list) + when (cl-loop for c in (process-command p) thereis + (string= "async-batch-invoke" c)) + collect p)) + +(defun dired-async-kill-process () + (interactive) + (let* ((processes (dired-async-processes)) + (proc (car (last processes)))) + (delete-process proc) + (unless (> (length processes) 1) + (dired-async-mode -1)))) + +(defun dired-async-after-file-create (len-flist) + "Callback function used for operation handled by `dired-create-file'." + (unless (dired-async-processes) + ;; Turn off mode-line notification + ;; only when last process end. + (dired-async-mode -1)) + (when dired-async-operation + (if (file-exists-p dired-async-log-file) + (progn + (pop-to-buffer (get-buffer-create "*dired async*")) + (erase-buffer) + (insert "Error: ") + (insert-file-contents dired-async-log-file) + (delete-file dired-async-log-file)) + (run-with-timer + 0.1 nil + dired-async-message-function "Asynchronous %s of %s file(s) on %s file(s) done" + (car dired-async-operation) (cadr dired-async-operation) len-flist)))) + +(defun dired-async-maybe-kill-ftp () + "Return a form to kill ftp process in child emacs." + (quote + (progn + (require 'cl-lib) + (let ((buf (cl-loop for b in (buffer-list) + thereis (and (string-match + "\\`\\*ftp.*" + (buffer-name b)) b)))) + (when buf (kill-buffer buf)))))) + +(defun dired-create-files (file-creator operation fn-list name-constructor + &optional marker-char) + "Create one or more new files from a list of existing files FN-LIST. +This function also handles querying the user, updating Dired +buffers, and displaying a success or failure message. + +FILE-CREATOR should be a function. It is called once for each +file in FN-LIST, and must create a new file, querying the user +and updating Dired buffers as necessary. It should accept three +arguments: the old file name, the new name, and an argument +OK-IF-ALREADY-EXISTS with the same meaning as in `copy-file'. + +OPERATION should be a capitalized string describing the operation +performed (e.g. `Copy'). It is used for error logging. + +FN-LIST is the list of files to copy (full absolute file names). + +NAME-CONSTRUCTOR should be a function accepting a single +argument, the name of an old file, and returning either the +corresponding new file name or nil to skip. + +Optional MARKER-CHAR is a character with which to mark every +newfile's entry, or t to use the current marker character if the +old file was marked." + (setq dired-async-operation nil) + (let (dired-create-files-failures failures async-fn-list + skipped (success-count 0) (total (length fn-list)) + (callback `(lambda (&optional ignore) + (dired-async-after-file-create ,(length fn-list))))) + (let (to overwrite-query + overwrite-backup-query) ; for dired-handle-overwrite + (dolist (from fn-list) + (setq to (funcall name-constructor from)) + (if (equal to from) + (progn + (setq to nil) + (dired-log "Cannot %s to same file: %s\n" + (downcase operation) from))) + (if (not to) + (setq skipped (cons (dired-make-relative from) skipped)) + (let* ((overwrite (file-exists-p to)) + (dired-overwrite-confirmed ; for dired-handle-overwrite + (and overwrite + (let ((help-form '(format "\ +Type SPC or `y' to overwrite file `%s', +DEL or `n' to skip to next, +ESC or `q' to not overwrite any of the remaining files, +`!' to overwrite all remaining files with no more questions." to))) + (dired-query 'overwrite-query + "Overwrite `%s'?" to)))) + ;; must determine if FROM is marked before file-creator + ;; gets a chance to delete it (in case of a move). + (actual-marker-char + (cond ((integerp marker-char) marker-char) + (marker-char (dired-file-marker from)) ; slow + (t nil)))) + ;; Handle the `dired-copy-file' file-creator specially + ;; When copying a directory to another directory or + ;; possibly to itself or one of its subdirectories. + ;; e.g "~/foo/" => "~/test/" + ;; or "~/foo/" =>"~/foo/" + ;; or "~/foo/ => ~/foo/bar/") + ;; In this case the 'name-constructor' have set the destination + ;; TO to "~/test/foo" because the old emacs23 behavior + ;; of `copy-directory' was to not create the subdirectory + ;; and instead copy the contents. + ;; With the new behavior of `copy-directory' + ;; (similar to the `cp' shell command) we don't + ;; need such a construction of the target directory, + ;; so modify the destination TO to "~/test/" instead of "~/test/foo/". + (let ((destname (file-name-directory to))) + (when (and (file-directory-p from) + (file-directory-p to) + (eq file-creator 'dired-copy-file)) + (setq to destname)) + ;; If DESTNAME is a subdirectory of FROM, not a symlink, + ;; and the method in use is copying, signal an error. + (and (eq t (car (file-attributes destname))) + (eq file-creator 'dired-copy-file) + (file-in-directory-p destname from) + (error "Cannot copy `%s' into its subdirectory `%s'" + from to))) + (if dired-async-be-async + (if overwrite + (or (and dired-overwrite-confirmed + (push (cons from to) async-fn-list)) + (progn + (push (dired-make-relative from) failures) + (dired-log "%s `%s' to `%s' failed" + operation from to))) + (push (cons from to) async-fn-list)) + (condition-case err + (progn + (funcall file-creator from to dired-overwrite-confirmed) + (if overwrite + ;; If we get here, file-creator hasn't been aborted + ;; and the old entry (if any) has to be deleted + ;; before adding the new entry. + (dired-remove-file to)) + (setq success-count (1+ success-count)) + (message "%s: %d of %d" operation success-count total) + (dired-add-file to actual-marker-char)) + (file-error ; FILE-CREATOR aborted + (progn + (push (dired-make-relative from) + failures) + (dired-log "%s `%s' to `%s' failed:\n%s\n" + operation from to err))))))))) + ;; Handle error happening in host emacs. + (cond + (dired-create-files-failures + (setq failures (nconc failures dired-create-files-failures)) + (dired-log-summary + (format "%s failed for %d file%s in %d requests" + operation (length failures) + (dired-plural-s (length failures)) + total) + failures)) + (failures + (dired-log-summary + (format "%s failed for %d of %d file%s" + operation (length failures) + total (dired-plural-s total)) + failures)) + (skipped + (dired-log-summary + (format "%s: %d of %d file%s skipped" + operation (length skipped) total + (dired-plural-s total)) + skipped)) + (t (message "%s: %s file%s" + operation success-count (dired-plural-s success-count)))) + ;; Start async process. + (when (and async-fn-list dired-async-be-async) + (async-start `(lambda () + (require 'cl-lib) (require 'dired-aux) (require 'dired-x) + ,(async-inject-variables dired-async-env-variables-regexp) + (condition-case err + (let ((dired-recursive-copies (quote always))) + (cl-loop for (f . d) in (quote ,async-fn-list) + do (funcall (quote ,file-creator) f d t))) + (file-error + (with-temp-file ,dired-async-log-file + (insert (format "%S" err))))) + ,(dired-async-maybe-kill-ftp)) + callback) + ;; Run mode-line notifications while process running. + (dired-async-mode 1) + (setq dired-async-operation (list operation (length async-fn-list))) + (message "%s proceeding asynchronously..." operation))) + (unless dired-async-be-async + (dired-move-to-filename))) + + +(provide 'dired-async) + +;;; dired-async.el ends here diff --git a/elpa/async-20150412.2207/smtpmail-async.el b/elpa/async-20150412.2207/smtpmail-async.el new file mode 100644 index 00000000..d487f930 --- /dev/null +++ b/elpa/async-20150412.2207/smtpmail-async.el @@ -0,0 +1,73 @@ +;;; smtpmail-async --- Send e-mail with smtpmail.el asynchronously + +;; Copyright (C) 2012~2014 John Wiegley + +;; Author: John Wiegley +;; Created: 18 Jun 2012 + +;; Keywords: email async +;; X-URL: https://github.com/jwiegley/emacs-async + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation; either version 2, or (at +;; your option) any later version. + +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Commentary: + +;; Send e-mail with smtpmail.el asynchronously. To use: +;; +;; (require 'smtpmail-async) +;; +;; (setq send-mail-function 'async-smtpmail-send-it +;; message-send-mail-function 'async-smtpmail-send-it) +;; +;; This assumes you already have smtpmail.el working. + +;;; Code: + +(defgroup smtpmail-async nil + "Send e-mail with smtpmail.el asynchronously" + :group 'smptmail) + +(require 'async) +(require 'smtpmail) +(require 'message) + +(defvar async-smtpmail-before-send-hook nil + "Hook running in the child emacs in `async-smtpmail-send-it'. +It is called just before calling `smtpmail-send-it'.") + +(defun async-smtpmail-send-it () + (let ((to (message-field-value "To")) + (buf-content (buffer-substring-no-properties + (point-min) (point-max)))) + (message "Delivering message to %s..." to) + (async-start + `(lambda () + (require 'smtpmail) + (with-temp-buffer + (insert ,buf-content) + (set-buffer-multibyte nil) + ;; Pass in the variable environment for smtpmail + ,(async-inject-variables + "\\`\\(smtpmail\\|async-smtpmail\\|\\(user-\\)?mail\\)-\\|auth-sources" + nil "\\`\\(mail-header-format-function\\|smtpmail-address-buffer\\|mail-mode-abbrev-table\\)") + (run-hooks 'async-smtpmail-before-send-hook) + (smtpmail-send-it))) + `(lambda (&optional ignore) + (message "Delivering message to %s...done" ,to))))) + +(provide 'smtpmail-async) + +;;; smtpmail-async.el ends here diff --git a/elpa/helm-20150403.101/emacs-helm.sh b/elpa/helm-20150426.2119/emacs-helm.sh similarity index 100% rename from elpa/helm-20150403.101/emacs-helm.sh rename to elpa/helm-20150426.2119/emacs-helm.sh diff --git a/elpa/helm-20150403.101/helm-adaptive.el b/elpa/helm-20150426.2119/helm-adaptive.el similarity index 100% rename from elpa/helm-20150403.101/helm-adaptive.el rename to elpa/helm-20150426.2119/helm-adaptive.el diff --git a/elpa/helm-20150403.101/helm-aliases.el b/elpa/helm-20150426.2119/helm-aliases.el similarity index 100% rename from elpa/helm-20150403.101/helm-aliases.el rename to elpa/helm-20150426.2119/helm-aliases.el diff --git a/elpa/helm-20150403.101/helm-apt.el b/elpa/helm-20150426.2119/helm-apt.el similarity index 100% rename from elpa/helm-20150403.101/helm-apt.el rename to elpa/helm-20150426.2119/helm-apt.el diff --git a/elpa/helm-20150403.101/helm-autoloads.el b/elpa/helm-20150426.2119/helm-autoloads.el similarity index 86% rename from elpa/helm-20150403.101/helm-autoloads.el rename to elpa/helm-20150426.2119/helm-autoloads.el index 33f8ba89..55c4fb3c 100644 --- a/elpa/helm-20150403.101/helm-autoloads.el +++ b/elpa/helm-20150426.2119/helm-autoloads.el @@ -1,11 +1,9 @@ ;;; helm-autoloads.el --- automatically extracted autoloads ;; ;;; Code: - +(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads (helm-other-buffer helm helm-debug-open-last-log -;;;;;; helm-define-key-with-subkeys helm-multi-key-defun helm-define-multi-key) -;;;;;; "helm" "helm.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm" "helm.el" (21822 2333 0 0)) ;;; Generated autoloads from helm.el (autoload 'helm-define-multi-key "helm" "\ @@ -186,8 +184,8 @@ Call `helm' with only ANY-SOURCES and ANY-BUFFER as args. ;;;*** -;;;### (autoloads (helm-reset-adaptive-history) "helm-adaptive" "helm-adaptive.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-adaptive.el (autoload 'helm-reset-adaptive-history "helm-adaptive" "\ @@ -198,8 +196,7 @@ Useful when you have a old or corrupted `helm-adaptive-history-file'. ;;;*** -;;;### (autoloads (helm-apt) "helm-apt" "helm-apt.el" (21792 6081 -;;;;;; 0 0)) +;;;### (autoloads nil "helm-apt" "helm-apt.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-apt.el (autoload 'helm-apt "helm-apt" "\ @@ -210,8 +207,8 @@ With a prefix arg reload cache. ;;;*** -;;;### (autoloads (helm-filtered-bookmarks helm-pp-bookmarks helm-bookmarks) -;;;;;; "helm-bookmark" "helm-bookmark.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-bookmark.el (autoload 'helm-bookmarks "helm-bookmark" "\ @@ -233,8 +230,8 @@ only if external library addressbook-bookmark.el is available. ;;;*** -;;;### (autoloads (helm-buffers-list) "helm-buffers" "helm-buffers.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-buffers.el (autoload 'helm-buffers-list "helm-buffers" "\ @@ -244,8 +241,8 @@ Preconfigured `helm' to list buffers. ;;;*** -;;;### (autoloads (helm-colors) "helm-color" "helm-color.el" (21792 -;;;;;; 6081 0 0)) +;;;### (autoloads nil "helm-color" "helm-color.el" (21822 2333 0 +;;;;;; 0)) ;;; Generated autoloads from helm-color.el (autoload 'helm-colors "helm-color" "\ @@ -255,8 +252,8 @@ Preconfigured `helm' for color. ;;;*** -;;;### (autoloads (helm-M-x) "helm-command" "helm-command.el" (21792 -;;;;;; 6081 0 0)) +;;;### (autoloads nil "helm-command" "helm-command.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-command.el (autoload 'helm-M-x "helm-command" "\ @@ -268,12 +265,12 @@ the prefix args if needed, are passed AFTER starting `helm-M-x'. You can get help on each command by persistent action. -\(fn)" t nil) +\(fn ARG &optional COMMAND-NAME)" t nil) ;;;*** -;;;### (autoloads (helm-configuration) "helm-config" "helm-config.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-config" "helm-config.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-config.el (autoload 'helm-configuration "helm-config" "\ @@ -283,8 +280,8 @@ Customize `helm'. ;;;*** -;;;### (autoloads (helm-dabbrev) "helm-dabbrev" "helm-dabbrev.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-dabbrev.el (autoload 'helm-dabbrev "helm-dabbrev" "\ @@ -294,10 +291,8 @@ Customize `helm'. ;;;*** -;;;### (autoloads (helm-complex-command-history helm-timers helm-locate-library -;;;;;; helm-manage-advice helm-apropos helm-lisp-completion-or-file-name-at-point -;;;;;; helm-lisp-indent helm-complete-file-name-at-point helm-lisp-completion-at-point) -;;;;;; "helm-elisp" "helm-elisp.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (21822 2333 0 +;;;;;; 0)) ;;; Generated autoloads from helm-elisp.el (autoload 'helm-lisp-completion-at-point "helm-elisp" "\ @@ -348,8 +343,8 @@ Preconfigured `helm' for timers. ;;;*** -;;;### (autoloads (helm-list-elisp-packages) "helm-elisp-package" -;;;;;; "helm-elisp-package.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm-elisp-package" "helm-elisp-package.el" +;;;;;; (21822 2333 0 0)) ;;; Generated autoloads from helm-elisp-package.el (autoload 'helm-list-elisp-packages "helm-elisp-package" "\ @@ -357,10 +352,15 @@ Preconfigured `helm' for timers. \(fn ARG)" t nil) +(autoload 'helm-list-elisp-packages-no-fetch "helm-elisp-package" "\ + + +\(fn)" t nil) + ;;;*** -;;;### (autoloads (helm-elscreen) "helm-elscreen" "helm-elscreen.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-elscreen.el (autoload 'helm-elscreen "helm-elscreen" "\ @@ -370,8 +370,8 @@ Preconfigured helm to list elscreen. ;;;*** -;;;### (autoloads (helm-eshell-history helm-esh-pcomplete) "helm-eshell" -;;;;;; "helm-eshell.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-eshell.el (autoload 'helm-esh-pcomplete "helm-eshell" "\ @@ -386,9 +386,7 @@ Preconfigured helm for eshell history. ;;;*** -;;;### (autoloads (helm-calcul-expression helm-eval-expression-with-eldoc -;;;;;; helm-eval-expression) "helm-eval" "helm-eval.el" (21792 6081 -;;;;;; 0 0)) +;;;### (autoloads nil "helm-eval" "helm-eval.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-eval.el (autoload 'helm-eval-expression "helm-eval" "\ @@ -408,8 +406,8 @@ Preconfigured helm for `helm-source-calculation-result'. ;;;*** -;;;### (autoloads (helm-run-external-command) "helm-external" "helm-external.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-external" "helm-external.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-external.el (autoload 'helm-run-external-command "helm-external" "\ @@ -422,9 +420,8 @@ You can set your own list of commands with ;;;*** -;;;### (autoloads (helm-recentf helm-multi-files helm-for-files helm-find-files -;;;;;; helm-find helm-browse-project) "helm-files" "helm-files.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-files" "helm-files.el" (21822 2333 0 +;;;;;; 0)) ;;; Generated autoloads from helm-files.el (autoload 'helm-browse-project "helm-files" "\ @@ -438,7 +435,7 @@ If the current directory is found in the cache, start `helm-browse-project-find-files' even with no prefix ARG. NOTE: The prefix ARG have no effect on the VCS controlled directories. -Need dependencies for VCS: +Needed dependencies for VCS: and . @@ -476,8 +473,7 @@ Preconfigured `helm' for `recentf'. ;;;*** -;;;### (autoloads (helm-ucs helm-select-xfont) "helm-font" "helm-font.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-font" "helm-font.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-font.el (autoload 'helm-select-xfont "helm-font" "\ @@ -492,12 +488,7 @@ Preconfigured helm for `ucs-names' math symbols. ;;;*** -;;;### (autoloads (helm-do-pdfgrep helm-do-zgrep helm-do-grep helm-grep-mode-jump-other-window -;;;;;; helm-grep-mode-jump-other-window-backward helm-grep-mode-jump-other-window-forward -;;;;;; helm-grep-mode-jump helm-gm-precedent-file helm-gm-next-file -;;;;;; helm-grep-mode helm-grep-run-save-buffer helm-goto-next-file -;;;;;; helm-goto-precedent-file) "helm-grep" "helm-grep.el" (21792 -;;;;;; 6081 0 0)) +;;;### (autoloads nil "helm-grep" "helm-grep.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-grep.el (autoload 'helm-goto-precedent-file "helm-grep" "\ @@ -579,14 +570,7 @@ Preconfigured helm for pdfgrep. ;;;*** -;;;### (autoloads (helm-describe-helm-attribute helm-kmacro-help -;;;;;; helm-semantic-help helm-color-help helm-imenu-help helm-M-x-help -;;;;;; helm-el-package-help helm-apt-help helm-top-help helm-moccur-help -;;;;;; helm-buffers-ido-virtual-help helm-esh-help helm-bookmark-help -;;;;;; helm-ucs-help helm-etags-help helm-pdfgrep-help helm-grep-help -;;;;;; helm-generic-file-help helm-read-file-name-help helm-ff-help -;;;;;; helm-buffer-help helm-help helm-documentation) "helm-help" -;;;;;; "helm-help.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm-help" "helm-help.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-help.el (autoload 'helm-documentation "helm-help" "\ @@ -758,8 +742,8 @@ HELM-ATTRIBUTE should be a symbol. ;;;*** -;;;### (autoloads (helm-imenu) "helm-imenu" "helm-imenu.el" (21792 -;;;;;; 6081 0 0)) +;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (21822 2333 0 +;;;;;; 0)) ;;; Generated autoloads from helm-imenu.el (autoload 'helm-imenu "helm-imenu" "\ @@ -769,8 +753,7 @@ Preconfigured `helm' for `imenu'. ;;;*** -;;;### (autoloads (helm-info-at-point) "helm-info" "helm-info.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-info" "helm-info.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-info.el (autoload 'helm-info-at-point "helm-info" "\ @@ -781,8 +764,8 @@ With a prefix-arg insert symbol at point. ;;;*** -;;;### (autoloads (helm-locate helm-locate-read-file-name) "helm-locate" -;;;;;; "helm-locate.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm-locate" "helm-locate.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-locate.el (autoload 'helm-locate-read-file-name "helm-locate" "\ @@ -810,8 +793,7 @@ Where db_path is a filename matched by ;;;*** -;;;### (autoloads (helm-man-woman) "helm-man" "helm-man.el" (21792 -;;;;;; 6081 0 0)) +;;;### (autoloads nil "helm-man" "helm-man.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-man.el (autoload 'helm-man-woman "helm-man" "\ @@ -822,10 +804,7 @@ With a prefix arg reinitialize the cache. ;;;*** -;;;### (autoloads (helm-comint-input-ring helm-minibuffer-history -;;;;;; helm-mini helm-stumpwm-commands helm-ratpoison-commands helm-insert-latex-math -;;;;;; helm-world-time helm-browse-menubar) "helm-misc" "helm-misc.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-misc" "helm-misc.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-misc.el (autoload 'helm-browse-menubar "helm-misc" "\ @@ -870,8 +849,7 @@ Predefined `helm' that provide completion of `comint' history. ;;;*** -;;;### (autoloads (helm-mode helm-comp-read) "helm-mode" "helm-mode.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-mode" "helm-mode.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-mode.el (autoload 'helm-comp-read "helm-mode" "\ @@ -993,8 +971,7 @@ Note: This mode is incompatible with Emacs23. ;;;*** -;;;### (autoloads (helm-wikipedia-suggest helm-yahoo-suggest helm-google-suggest -;;;;;; helm-surfraw) "helm-net" "helm-net.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm-net" "helm-net.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-net.el (autoload 'helm-surfraw "helm-net" "\ @@ -1019,9 +996,7 @@ Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest. ;;;*** -;;;### (autoloads (helm-org-capture-templates helm-org-in-buffer-headings -;;;;;; helm-org-agenda-files-headings) "helm-org" "helm-org.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-org" "helm-org.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-org.el (autoload 'helm-org-agenda-files-headings "helm-org" "\ @@ -1041,10 +1016,8 @@ Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest. ;;;*** -;;;### (autoloads (helm-multi-occur-from-isearch helm-multi-occur -;;;;;; helm-occur-from-isearch helm-occur helm-regexp helm-moccur-mode -;;;;;; helm-moccur-run-save-buffer) "helm-regexp" "helm-regexp.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-regexp.el (autoload 'helm-moccur-run-save-buffer "helm-regexp" "\ @@ -1099,9 +1072,7 @@ The prefix arg can be set before calling ;;;*** -;;;### (autoloads (helm-execute-kmacro helm-show-kill-ring helm-register -;;;;;; helm-all-mark-rings helm-global-mark-ring helm-mark-ring) -;;;;;; "helm-ring" "helm-ring.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm-ring" "helm-ring.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-ring.el (autoload 'helm-mark-ring "helm-ring" "\ @@ -1142,8 +1113,8 @@ This command is useful when used with persistent action. ;;;*** -;;;### (autoloads (helm-semantic-or-imenu helm-semantic) "helm-semantic" -;;;;;; "helm-semantic.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (21822 2333 +;;;;;; 0 0)) ;;; Generated autoloads from helm-semantic.el (autoload 'helm-semantic "helm-semantic" "\ @@ -1165,8 +1136,7 @@ Fill in the symbol at point by default. ;;;*** -;;;### (autoloads (helm-xrandr-set helm-list-emacs-process helm-top) -;;;;;; "helm-sys" "helm-sys.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm-sys" "helm-sys.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-sys.el (autoload 'helm-top "helm-sys" "\ @@ -1186,8 +1156,7 @@ Preconfigured `helm' for emacs process. ;;;*** -;;;### (autoloads (helm-etags-select) "helm-tags" "helm-tags.el" -;;;;;; (21792 6081 0 0)) +;;;### (autoloads nil "helm-tags" "helm-tags.el" (21822 2333 0 0)) ;;; Generated autoloads from helm-tags.el (autoload 'helm-etags-select "helm-tags" "\ @@ -1205,9 +1174,8 @@ This function aggregates three sources of tag files: ;;;*** -;;;### (autoloads (helm-yank-text-at-point helm-w32-shell-execute-open-file -;;;;;; helm-quit-and-find-file helm-display-all-sources helm-show-all-in-this-source-only) -;;;;;; "helm-utils" "helm-utils.el" (21792 6081 0 0)) +;;;### (autoloads nil "helm-utils" "helm-utils.el" (21822 2333 0 +;;;;;; 0)) ;;; Generated autoloads from helm-utils.el (autoload 'helm-show-all-in-this-source-only "helm-utils" "\ @@ -1243,16 +1211,14 @@ grabs the entire symbol. ;;;*** ;;;### (autoloads nil nil ("helm-aliases.el" "helm-match-plugin.el" -;;;;;; "helm-pkg.el" "helm-plugin.el" "helm-source.el") (21792 6081 -;;;;;; 828452 0)) +;;;;;; "helm-pkg.el" "helm-plugin.el" "helm-source.el") (21822 3132 +;;;;;; 761426 0)) ;;;*** -(provide 'helm-autoloads) ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 ;; End: ;;; helm-autoloads.el ends here diff --git a/elpa/helm-20150403.101/helm-bookmark.el b/elpa/helm-20150426.2119/helm-bookmark.el similarity index 91% rename from elpa/helm-20150403.101/helm-bookmark.el rename to elpa/helm-20150426.2119/helm-bookmark.el index 50fca7e7..5b5efe2b 100644 --- a/elpa/helm-20150403.101/helm-bookmark.el +++ b/elpa/helm-20150426.2119/helm-bookmark.el @@ -39,6 +39,22 @@ :group 'helm-bookmark :type 'boolean) +(defcustom helm-bookmark-default-filtered-sources + (append '(helm-source-bookmark-files&dirs + helm-source-bookmark-helm-find-files + helm-source-bookmark-info + helm-source-bookmark-gnus + helm-source-bookmark-man + helm-source-bookmark-images + helm-source-bookmark-w3m) + (and (locate-library "addressbook-bookmark") + (list 'helm-source-bookmark-addressbook)) + (list 'helm-source-bookmark-uncategorized + 'helm-source-bookmark-set)) + "List of sources to use in `helm-filtered-bookmarks'." + :group 'helm-bookmark + :type '(repeat (choice symbol))) + (defface helm-bookmark-info '((t (:foreground "green"))) @@ -258,6 +274,11 @@ This excludes bookmarks of a more specific kind (Info, Gnus, and W3m)." (isnonfile (equal filename helm-bookmark--non-file-filename))) (and filename (not isnonfile) (not (bookmark-get-handler bookmark))))) +(defun helm-bookmark-helm-find-files-p (bookmark) + "Return non-nil if BOOKMARK bookmarks a `helm-find-files' session. +BOOKMARK is a bookmark name or a bookmark record." + (eq (bookmark-get-handler bookmark) 'helm-ff-bookmark-jump)) + (defun helm-bookmark-addressbook-p (bookmark) "Return non--nil if BOOKMARK is a contact recorded with addressbook-bookmark. BOOKMARK is a bookmark name or a bookmark record." @@ -268,14 +289,16 @@ BOOKMARK is a bookmark name or a bookmark record." (defun helm-bookmark-uncategorized-bookmark-p (bookmark) "Return non--nil if BOOKMARK match no known category." - (and (not (helm-bookmark-addressbook-p bookmark)) - (not (helm-bookmark-gnus-bookmark-p bookmark)) - (not (helm-bookmark-w3m-bookmark-p bookmark)) - (not (helm-bookmark-woman-man-bookmark-p bookmark)) - (not (helm-bookmark-info-bookmark-p bookmark)) - (not (helm-bookmark-image-bookmark-p bookmark)) - (not (helm-bookmark-file-p bookmark)) - (not (helm-bookmark-addressbook-p bookmark)))) + (cl-loop for pred in '(helm-bookmark-addressbook-p + helm-bookmark-gnus-bookmark-p + helm-bookmark-w3m-bookmark-p + helm-bookmark-woman-man-bookmark-p + helm-bookmark-info-bookmark-p + helm-bookmark-image-bookmark-p + helm-bookmark-file-p + helm-bookmark-helm-find-files-p + helm-bookmark-addressbook-p) + never (funcall pred bookmark))) (defun helm-bookmark-filter-setup-alist (fn) "Return a filtered `bookmark-alist' sorted alphabetically." @@ -410,6 +433,19 @@ than `w3m-browse-url' use it." (helm-init-candidates-in-buffer 'global (helm-bookmark-local-files-setup-alist))))) +;;; Helm find files sessions. +;; +(defun helm-bookmark-helm-find-files-setup-alist () + "Specialized filter function for `helm-find-files' bookmarks." + (helm-bookmark-filter-setup-alist 'helm-bookmark-helm-find-files-p)) + +(defvar helm-source-bookmark-helm-find-files + (helm-make-source "Bookmark helm-find-files sessions" 'helm-source-filtered-bookmarks + :init (lambda () + (bookmark-maybe-load-default-file) + (helm-init-candidates-in-buffer + 'global (helm-bookmark-helm-find-files-setup-alist))))) + ;;; Uncategorized bookmarks ;; (defun helm-bookmark-uncategorized-setup-alist () @@ -526,6 +562,7 @@ Work both with standard Emacs bookmarks and bookmark-extensions.el." (let ((non-essential t)) (cl-loop for i in bookmarks for isfile = (bookmark-get-filename i) + for hff = (helm-bookmark-helm-find-files-p i) for handlerp = (and (fboundp 'bookmark-get-handler) (bookmark-get-handler i)) for isw3m = (and (fboundp 'helm-bookmark-w3m-bookmark-p) @@ -575,15 +612,16 @@ Work both with standard Emacs bookmarks and bookmark-extensions.el." (propertize trunc 'face 'helm-bookmark-addressbook)) ( ;; directories (and isfile - ;; This is needed because `non-essential' - ;; is not working on Emacs-24.2 and the behavior - ;; of tramp seems to have changed since previous - ;; versions (Need to reenter password even if a - ;; first connection have been established, - ;; probably when host is named differently - ;; i.e machine/localhost) - (not (file-remote-p isfile)) - (file-directory-p isfile)) + (or hff + ;; This is needed because `non-essential' + ;; is not working on Emacs-24.2 and the behavior + ;; of tramp seems to have changed since previous + ;; versions (Need to reenter password even if a + ;; first connection have been established, + ;; probably when host is named differently + ;; i.e machine/localhost) + (and (not (file-remote-p isfile)) + (file-directory-p isfile)))) (propertize trunc 'face 'helm-bookmark-directory 'help-echo isfile)) ( ;; regular files @@ -738,16 +776,7 @@ e.g prepended with *." Optional source `helm-source-bookmark-addressbook' is loaded only if external library addressbook-bookmark.el is available." (interactive) - (helm :sources (append '(helm-source-bookmark-files&dirs - helm-source-bookmark-info - helm-source-bookmark-gnus - helm-source-bookmark-man - helm-source-bookmark-images - helm-source-bookmark-w3m) - (and (locate-library "addressbook-bookmark") - (list 'helm-source-bookmark-addressbook)) - (list helm-source-bookmark-uncategorized - 'helm-source-bookmark-set)) + (helm :sources helm-bookmark-default-filtered-sources :prompt "Search Bookmark: " :buffer "*helm filtered bookmarks*" :default (list (thing-at-point 'symbol) diff --git a/elpa/helm-20150403.101/helm-buffers.el b/elpa/helm-20150426.2119/helm-buffers.el similarity index 100% rename from elpa/helm-20150403.101/helm-buffers.el rename to elpa/helm-20150426.2119/helm-buffers.el diff --git a/elpa/helm-20150403.101/helm-color.el b/elpa/helm-20150426.2119/helm-color.el similarity index 100% rename from elpa/helm-20150403.101/helm-color.el rename to elpa/helm-20150426.2119/helm-color.el diff --git a/elpa/helm-20150403.101/helm-command.el b/elpa/helm-20150426.2119/helm-command.el similarity index 62% rename from elpa/helm-20150403.101/helm-command.el rename to elpa/helm-20150426.2119/helm-command.el index ffafb3f9..e17d2a0b 100644 --- a/elpa/helm-20150403.101/helm-command.el +++ b/elpa/helm-20150426.2119/helm-command.el @@ -143,8 +143,80 @@ fuzzy matching is running its own sort function with a different algorithm." (with-helm-window (helm-display-mode-line (helm-get-current-source) 'force)))) +(defun helm-M-x-read-extended-command () + "Read command name to invoke in `helm-M-x'. +Helm completion is not provided when executing or defining +kbd macros." + (if (or defining-kbd-macro executing-kbd-macro) + (if helm-mode + (unwind-protect + (progn + (helm-mode -1) + (read-extended-command)) + (helm-mode 1)) + (read-extended-command)) + (let* (in-help + help-cand + (orig-fuzzy-sort-fn helm-fuzzy-sort-fn) + (helm-fuzzy-sort-fn (lambda (candidates source) + (funcall orig-fuzzy-sort-fn + candidates source 'real))) + (helm--mode-line-display-prefarg t) + (pers-help + #'(lambda (candidate) + (let ((hbuf (get-buffer (help-buffer)))) + (if (and in-help (string= candidate help-cand) + (null helm-persistent-action-use-special-display)) + (progn + ;; When M-x is started from a help buffer, + ;; Don't kill it as it is helm-current-buffer. + (unless (equal hbuf helm-current-buffer) + (kill-buffer hbuf) + (set-window-buffer (get-buffer-window hbuf) + helm-current-buffer)) + (setq in-help nil)) + (helm-describe-function candidate) + (setq in-help t)) + (setq help-cand candidate)))) + (tm (run-at-time 1 0.1 'helm-M-x--notify-prefix-arg))) + (setq extended-command-history + (cl-loop for i in extended-command-history + when (commandp (intern i)) + do (set-text-properties 0 (length i) nil i) + and collect i)) + (unwind-protect + (let ((msg "Error: Specifying a prefix arg before calling `helm-M-x'")) + (when current-prefix-arg + (ding) + (message "%s" msg) + (while (not (sit-for 1)) + (discard-input)) + (user-error msg)) + (setq current-prefix-arg nil) + (helm-comp-read + "M-x " obarray + :test 'commandp + :requires-pattern helm-M-x-requires-pattern + :name "Emacs Commands" + :buffer "*helm M-x*" + :persistent-action pers-help + :persistent-help "Describe this command" + :history extended-command-history + :reverse-history helm-M-x-reverse-history + :del-input nil + :mode-line helm-M-x-mode-line + :must-match t + :fuzzy helm-M-x-fuzzy-match + :nomark t + :keymap helm-M-x-map + :candidates-in-buffer t + :fc-transformer 'helm-M-x-transformer + :hist-fc-transformer 'helm-M-x-transformer-hist)) + (cancel-timer tm) + (setq helm--mode-line-display-prefarg nil))))) + ;;;###autoload -(defun helm-M-x () +(defun helm-M-x (arg &optional command-name) "Preconfigured `helm' for Emacs commands. It is `helm' replacement of regular `M-x' `execute-extended-command'. @@ -152,77 +224,25 @@ Unlike regular `M-x' emacs vanilla `execute-extended-command' command, the prefix args if needed, are passed AFTER starting `helm-M-x'. You can get help on each command by persistent action." - (interactive) - (let* ((history (cl-loop for i in extended-command-history - when (commandp (intern i)) - do (set-text-properties 0 (length i) nil i) - and collect i)) - command sym-com in-help help-cand - (orig-fuzzy-sort-fn helm-fuzzy-sort-fn) - (helm-fuzzy-sort-fn (lambda (candidates source) - (funcall orig-fuzzy-sort-fn candidates source 'real))) - (helm--mode-line-display-prefarg t) - (pers-help #'(lambda (candidate) - (let ((hbuf (get-buffer (help-buffer)))) - (if (and in-help (string= candidate help-cand) - (null helm-persistent-action-use-special-display)) - (progn - ;; When M-x is started from a help buffer, - ;; Don't kill it as it is helm-current-buffer. - (unless (equal hbuf helm-current-buffer) - (kill-buffer hbuf) - (set-window-buffer (get-buffer-window hbuf) - helm-current-buffer)) - (setq in-help nil)) - (helm-describe-function candidate) - (setq in-help t)) - (setq help-cand candidate)))) - (tm (run-at-time 1 0.1 'helm-M-x--notify-prefix-arg))) - (unwind-protect - (let ((msg "Error: Specifying a prefix arg before calling `helm-M-x'")) - (when current-prefix-arg - (ding) - (message "%s" msg) - (while (not (sit-for 1)) - (discard-input)) - (user-error msg)) - (setq current-prefix-arg nil) - (setq command (helm-comp-read - "M-x " obarray - :test 'commandp - :requires-pattern helm-M-x-requires-pattern - :name "Emacs Commands" - :buffer "*helm M-x*" - :persistent-action pers-help - :persistent-help "Describe this command" - :history history - :reverse-history helm-M-x-reverse-history - :del-input nil - :mode-line helm-M-x-mode-line - :must-match t - :fuzzy helm-M-x-fuzzy-match - :nomark t - :keymap helm-M-x-map - :candidates-in-buffer t - :fc-transformer 'helm-M-x-transformer - :hist-fc-transformer 'helm-M-x-transformer-hist))) - (cancel-timer tm) - (setq helm--mode-line-display-prefarg nil)) - (setq sym-com (intern command)) - (setq current-prefix-arg helm-current-prefix-arg) + (interactive (list current-prefix-arg (helm-M-x-read-extended-command))) + (let ((sym-com (and (stringp command-name) (intern-soft command-name)))) ;; Avoid having `this-command' set to *exit-minibuffer. (setq this-command sym-com ;; Handle C-x z (repeat) Issue #322 real-this-command sym-com) - (let ((prefix-arg current-prefix-arg)) + ;; If helm-M-x is called with regular emacs completion (kmacro) + ;; use the value of arg otherwise use helm-current-prefix-arg. + (let ((prefix-arg (or helm-current-prefix-arg arg))) ;; This ugly construct is to save history even on error. (unless helm-M-x-always-save-history (command-execute sym-com 'record)) (setq extended-command-history - (cons command (delete command history))) + (cons command-name + (delete command-name extended-command-history))) (when helm-M-x-always-save-history (command-execute sym-com 'record))))) + (provide 'helm-command) ;; Local Variables: diff --git a/elpa/helm-20150403.101/helm-config.el b/elpa/helm-20150426.2119/helm-config.el similarity index 100% rename from elpa/helm-20150403.101/helm-config.el rename to elpa/helm-20150426.2119/helm-config.el diff --git a/elpa/helm-20150403.101/helm-dabbrev.el b/elpa/helm-20150426.2119/helm-dabbrev.el similarity index 99% rename from elpa/helm-20150403.101/helm-dabbrev.el rename to elpa/helm-20150426.2119/helm-dabbrev.el index d9cb2872..d71f9a70 100644 --- a/elpa/helm-20150403.101/helm-dabbrev.el +++ b/elpa/helm-20150426.2119/helm-dabbrev.el @@ -106,7 +106,7 @@ but the initial search for all candidates in buffer(s)." (defvar helm-dabbrev--exclude-current-buffer-flag nil) (defvar helm-dabbrev--cache nil) (defvar helm-dabbrev--data nil) -(defvar helm-dabbrev--regexp "\\s-\\|\t\\|[(\[\{\"'`=<$;]\\|\\s\\\\|^") +(defvar helm-dabbrev--regexp "\\s-\\|\t\\|[(\[\{\"'`=<$;]\\|\\s\\\\|^\\|\\.") (cl-defstruct helm-dabbrev-info dabbrev limits iterator) diff --git a/elpa/helm-20150403.101/helm-elisp-package.el b/elpa/helm-20150426.2119/helm-elisp-package.el similarity index 95% rename from elpa/helm-20150403.101/helm-elisp-package.el rename to elpa/helm-20150426.2119/helm-elisp-package.el index 5afd362b..dfb33a30 100644 --- a/elpa/helm-20150403.101/helm-elisp-package.el +++ b/elpa/helm-20150426.2119/helm-elisp-package.el @@ -20,6 +20,18 @@ (require 'helm) (require 'package) +(defgroup helm-el-package nil + "helm elisp packages." + :group 'helm) + +(defcustom helm-el-package-initial-filter 'all + "Show only installed, upgraded or all packages at startup." + :group 'helm-el-package + :type '(radio :tag "Initial filter for elisp packages" + (const :tag "Show all packages" all) + (const :tag "Show installed packages" installed) + (const :tag "Show upgradable packages" upgrade))) + ;; internals vars (defvar helm-el-package--show-only 'all) (defvar helm-el-package--initialized-p nil) @@ -45,7 +57,7 @@ (setq helm-el-package--upgrades (helm-el-package-menu--find-upgrades)) (if helm-force-updating-p (message "Refreshing packages list done") - (setq helm-el-package--show-only 'all)) + (setq helm-el-package--show-only helm-el-package-initial-filter)) (kill-buffer "*Packages*")) (defun helm-el-package-describe (candidate) @@ -292,6 +304,12 @@ (helm :sources 'helm-source-list-el-package :buffer "*helm list packages*")) +;;;###autoload +(defun helm-list-elisp-packages-no-fetch () + (interactive) + (let ((helm-el-package--initialized-p t)) + (helm-list-elisp-packages nil))) + (provide 'helm-elisp-package) ;;; helm-elisp-package.el ends here diff --git a/elpa/helm-20150403.101/helm-elisp.el b/elpa/helm-20150426.2119/helm-elisp.el similarity index 94% rename from elpa/helm-20150403.101/helm-elisp.el rename to elpa/helm-20150426.2119/helm-elisp.el index 6c69411e..c7dc5813 100644 --- a/elpa/helm-20150403.101/helm-elisp.el +++ b/elpa/helm-20150426.2119/helm-elisp.el @@ -356,7 +356,7 @@ If SYM is not documented, return \"Not documented\"." (end-of-line) (search-backward tap (point-at-bol) t) (setq beg (point)) - (looking-back "[^'`( ]"))) + (looking-back "[^'`( ]" 1))) (expand-file-name (substring-no-properties tap)))) (end (point)) @@ -390,7 +390,7 @@ Filename completion happen if string start after or between a double quote." (if (and tap (save-excursion (end-of-line) (search-backward tap (point-at-bol) t) - (looking-back "[^'`( ]"))) + (looking-back "[^'`( ]" 1))) (helm-complete-file-name-at-point) (helm-lisp-completion-at-point)))) @@ -685,61 +685,6 @@ Filename completion happen if string start after or between a double quote." (coerce . helm-symbolify)) "Variable.") -(defun helm-btf--usable-p () - "Return t if current version of `backtrace-frame' accept 2 arguments." - (condition-case nil - (and (backtrace-frame 1 'condition-case) t) - (wrong-number-of-arguments nil))) - -(if (helm-btf--usable-p) ; Check if BTF accept more than one arg. - ;; Emacs 24.4. - (dont-compile - (defvar helm-sexp--last-sexp nil) - ;; This wont work compiled. - (defun helm-sexp-eval-1 () - (interactive) - (unwind-protect - (progn - ;; Trick called-interactively-p into thinking that `cand' is - ;; an interactive call, See `repeat-complex-command'. - (add-hook 'called-interactively-p-functions - #'helm-complex-command-history--called-interactively-skip) - (eval (read helm-sexp--last-sexp))) - (remove-hook 'called-interactively-p-functions - #'helm-complex-command-history--called-interactively-skip))) - - (defun helm-complex-command-history--called-interactively-skip (i _frame1 frame2) - (and (eq 'eval (cadr frame2)) - (eq 'helm-sexp-eval-1 - (cadr (backtrace-frame (+ i 2) #'called-interactively-p))) - 1)) - - (defun helm-sexp-eval (_candidate) - (call-interactively #'helm-sexp-eval-1))) - ;; Emacs 24.3 - (defun helm-sexp-eval (cand) - (let ((sexp (read cand))) - (condition-case err - (if (> (length (remove nil sexp)) 1) - (eval sexp) - (apply 'call-interactively sexp)) - (error (message "Evaluating gave an error: %S" err) - nil))))) - -(define-helm-type-attribute 'sexp - '((action - ("Eval" . (lambda (candidate) - (and (boundp 'helm-sexp--last-sexp) - (setq helm-sexp--last-sexp candidate)) - (run-with-timer 0.1 nil #'helm-sexp-eval candidate))) - ("Edit and eval" . - (lambda (cand) - (minibuffer-with-setup-hook - (lambda () (insert cand)) - (call-interactively #'eval-expression))))) - (persistent-action . helm-sexp-eval)) - "Sexp.") - (define-helm-type-attribute 'timer '((action ("Cancel Timer" . (lambda (_timer) @@ -756,27 +701,31 @@ Filename completion happen if string start after or between a double quote." ;;; Elisp Timers. ;; ;; -(defvar helm-source-absolute-time-timers - '((name . "Absolute Time Timers") - (candidates . timer-list) - (filtered-candidate-transformer - . (lambda (candidates _source) - (cl-loop for timer in candidates +(defclass helm-absolute-time-timers-class (helm-source-sync helm-type-timers) + ((candidates :initform timer-list) + (filtered-candidate-transformer + :initform + (lambda (candidates _source) + (cl-loop for timer in candidates collect (cons (helm-elisp--format-timer timer) timer)))) - (allow-dups) - (volatile) - (type . timer))) + (allow-dups :initform t) + (volatile :initform t))) + +(defvar helm-source-absolute-time-timers + (helm-make-source "Absolute Time Timers" 'helm-absolute-time-timers-class)) + +(defclass helm-idle-time-timers-class (helm-source-sync helm-type-timers) + ((candidates :initform timer-idle-list) + (allow-dups :initform t) + (volatile :initform t) + (filtered-candidate-transformer + :initform + (lambda (candidates _source) + (cl-loop for timer in candidates + collect (cons (helm-elisp--format-timer timer) timer)))))) (defvar helm-source-idle-time-timers - '((name . "Idle Time Timers") - (candidates . timer-idle-list) - (allow-dups) - (volatile) - (filtered-candidate-transformer - . (lambda (candidates _source) - (cl-loop for timer in candidates - collect (cons (helm-elisp--format-timer timer) timer)))) - (type . timer))) + (helm-make-source "Idle Time Timers" 'helm-idle-time-timers-class)) (defun helm-elisp--format-timer (timer) (format "%s repeat=%s %s(%s)" @@ -794,23 +743,74 @@ Filename completion happen if string start after or between a double quote." (defun helm-timers () "Preconfigured `helm' for timers." (interactive) - (helm-other-buffer '(helm-source-absolute-time-timers - helm-source-idle-time-timers) - "*helm timers*")) + (helm :sources '(helm-source-absolute-time-timers + helm-source-idle-time-timers) + :buffer "*helm timers*")) ;;; Complex command history ;; ;; +(defun helm-btf--usable-p () + "Return t if current version of `backtrace-frame' accept 2 arguments." + (condition-case nil + (and (backtrace-frame 1 'condition-case) t) + (wrong-number-of-arguments nil))) + +(if (helm-btf--usable-p) ; Check if BTF accept more than one arg. + ;; Emacs 24.4. + (dont-compile + (defvar helm-sexp--last-sexp nil) + ;; This wont work compiled. + (defun helm-sexp-eval-1 () + (interactive) + (unwind-protect + (progn + ;; Trick called-interactively-p into thinking that `cand' is + ;; an interactive call, See `repeat-complex-command'. + (add-hook 'called-interactively-p-functions + #'helm-complex-command-history--called-interactively-skip) + (eval (read helm-sexp--last-sexp))) + (remove-hook 'called-interactively-p-functions + #'helm-complex-command-history--called-interactively-skip))) + + (defun helm-complex-command-history--called-interactively-skip (i _frame1 frame2) + (and (eq 'eval (cadr frame2)) + (eq 'helm-sexp-eval-1 + (cadr (backtrace-frame (+ i 2) #'called-interactively-p))) + 1)) + + (defun helm-sexp-eval (_candidate) + (call-interactively #'helm-sexp-eval-1))) + ;; Emacs 24.3 + (defun helm-sexp-eval (cand) + (let ((sexp (read cand))) + (condition-case err + (if (> (length (remove nil sexp)) 1) + (eval sexp) + (apply 'call-interactively sexp)) + (error (message "Evaluating gave an error: %S" err) + nil))))) + (defvar helm-source-complex-command-history - '((name . "Complex Command History") - (candidates . (lambda () - ;; Use cdr to avoid adding - ;; `helm-complex-command-history' here. - (cl-loop for i in command-history - unless (equal i '(helm-complex-command-history)) - collect (prin1-to-string i)))) - (type . sexp))) + (helm-build-sync-source "Complex Command History" + :candidates (lambda () + ;; Use cdr to avoid adding + ;; `helm-complex-command-history' here. + (cl-loop for i in command-history + unless (equal i '(helm-complex-command-history)) + collect (prin1-to-string i))) + :action (helm-make-actions + "Eval" (lambda (candidate) + (and (boundp 'helm-sexp--last-sexp) + (setq helm-sexp--last-sexp candidate)) + (run-with-timer 0.1 nil #'helm-sexp-eval candidate)) + "Edit and eval" + (lambda (cand) + (minibuffer-with-setup-hook + (lambda () (insert cand)) + (call-interactively #'eval-expression)))) + :persistent-action #'helm-sexp-eval)) ;;;###autoload (defun helm-complex-command-history () diff --git a/elpa/helm-20150403.101/helm-elscreen.el b/elpa/helm-20150426.2119/helm-elscreen.el similarity index 100% rename from elpa/helm-20150403.101/helm-elscreen.el rename to elpa/helm-20150426.2119/helm-elscreen.el diff --git a/elpa/helm-20150403.101/helm-eshell.el b/elpa/helm-20150426.2119/helm-eshell.el similarity index 99% rename from elpa/helm-20150403.101/helm-eshell.el rename to elpa/helm-20150426.2119/helm-eshell.el index 3d85c3c8..7b164a0b 100644 --- a/elpa/helm-20150403.101/helm-eshell.el +++ b/elpa/helm-20150426.2119/helm-eshell.el @@ -178,7 +178,7 @@ The function that call this should set `helm-ec-target' to thing at point." (args (catch 'eshell-incomplete (eshell-parse-arguments beg end))) (target - (or (and (looking-back " ") " ") + (or (and (looking-back " " 1) " ") (buffer-substring-no-properties (save-excursion (eshell-backward-argument 1) (point)) @@ -232,7 +232,7 @@ The function that call this should set `helm-ec-target' to thing at point." :resume 'noresume :input input)) (when (and flag-empty - (looking-back " ")) + (looking-back " " 1)) (delete-char -1))))) (provide 'helm-eshell) diff --git a/elpa/helm-20150403.101/helm-eval.el b/elpa/helm-20150426.2119/helm-eval.el similarity index 86% rename from elpa/helm-20150403.101/helm-eval.el rename to elpa/helm-20150426.2119/helm-eval.el index 850cdf4f..183c570b 100644 --- a/elpa/helm-20150403.101/helm-eval.el +++ b/elpa/helm-20150426.2119/helm-eval.el @@ -38,10 +38,26 @@ Should take one arg: the string to display." :group 'helm-eval) -(declare-function eldoc-current-symbol "eldoc") -(declare-function eldoc-get-fnsym-args-string "eldoc" (sym &optional index)) -(declare-function eldoc-get-var-docstring "eldoc" (sym)) -(declare-function eldoc-fnsym-in-current-sexp "eldoc") +;;; Eldoc compatibility between emacs-24 and emacs-25 +;; +(if (require 'elisp-mode nil t) ; emacs-25 + ;; Maybe the eldoc functions have been + ;; already aliased by eldoc-eval. + (cl-loop for (f . a) in '((eldoc-current-symbol . + elisp--current-symbol) + (eldoc-fnsym-in-current-sexp . + elisp--fnsym-in-current-sexp) + (eldoc-get-fnsym-args-string . + elisp--get-fnsym-args-string) + (eldoc-get-var-docstring . + elisp--get-var-docstring)) + unless (fboundp f) + do (defalias f a)) + ;; Emacs-24. + (declare-function eldoc-current-symbol "eldoc") + (declare-function eldoc-get-fnsym-args-string "eldoc" (sym &optional index)) + (declare-function eldoc-get-var-docstring "eldoc" (sym)) + (declare-function eldoc-fnsym-in-current-sexp "eldoc")) ;;; Evaluation Result ;; @@ -102,7 +118,7 @@ Should take one arg: the string to display." (when (member buf helm-eldoc-active-minibuffers-list) (with-current-buffer buf (let* ((sym (save-excursion - (unless (looking-back ")\\|\"") + (unless (looking-back ")\\|\"" 1) (forward-char -1)) (eldoc-current-symbol))) (info-fn (eldoc-fnsym-in-current-sexp)) diff --git a/elpa/helm-20150403.101/helm-external.el b/elpa/helm-20150426.2119/helm-external.el similarity index 100% rename from elpa/helm-20150403.101/helm-external.el rename to elpa/helm-20150426.2119/helm-external.el diff --git a/elpa/helm-20150403.101/helm-files.el b/elpa/helm-20150426.2119/helm-files.el similarity index 97% rename from elpa/helm-20150403.101/helm-files.el rename to elpa/helm-20150426.2119/helm-files.el index a13fbc42..4a10a739 100644 --- a/elpa/helm-20150403.101/helm-files.el +++ b/elpa/helm-20150426.2119/helm-files.el @@ -231,6 +231,10 @@ I.e use the -path/ipath arguments of find instead of -name/iname." :group 'helm-files :type 'string) +(defcustom helm-find-files-bookmark-prefix "Helm-find-files: " + "bookmark name prefix of `helm-find-files' sessions." + :group 'helm-files + :type 'string) ;;; Faces ;; @@ -296,6 +300,7 @@ I.e use the -path/ipath arguments of find instead of -name/iname." (define-key map (kbd "C-]") 'helm-ff-run-toggle-basename) (define-key map (kbd "C-x C-f") 'helm-ff-run-locate) (define-key map (kbd "C-x C-d") 'helm-ff-run-browse-project) + (define-key map (kbd "C-x r m") 'helm-ff-bookmark-set) (define-key map (kbd "C-s") 'helm-ff-run-grep) (define-key map (kbd "M-g s") 'helm-ff-run-grep) (define-key map (kbd "M-g p") 'helm-ff-run-pdfgrep) @@ -415,7 +420,9 @@ Should not be used among other sources.") (setq helm-ff-auto-update-flag helm-ff-auto-update-initial-value) (setq helm-ff--auto-update-state - helm-ff-auto-update-flag))) + helm-ff-auto-update-flag) + (helm-set-local-variable 'bookmark-make-record-function + #'helm-ff-make-bookmark-record))) (candidates :initform 'helm-find-files-get-candidates) (filtered-candidate-transformer :initform 'helm-ff-sort-candidates) (filter-one-by-one :initform 'helm-ff-filter-candidate-one-by-one) @@ -474,6 +481,32 @@ Should not be used among other sources.") (before-init-hook :initform 'helm-find-files-before-init-hook) (after-init-hook :initform 'helm-find-files-after-init-hook))) +;; Bookmark handlers. +;; +(defun helm-ff-make-bookmark-record () + "The `bookmark-make-record-function' for `helm-find-files'." + (with-helm-buffer + `((filename . ,helm-ff-default-directory) + (presel . ,(helm-get-selection)) + (handler . helm-ff-bookmark-jump)))) + +(defun helm-ff-bookmark-jump (bookmark) + "bookmark handler for `helm-find-files'." + (let ((fname (bookmark-prop-get bookmark 'filename)) + (presel (bookmark-prop-get bookmark 'presel))) + (helm-find-files-1 fname (if helm-ff-transformer-show-only-basename + (helm-basename presel) + presel)))) + +(defun helm-ff-bookmark-set () + "Record `helm-find-files' session in bookmarks." + (interactive) + (with-helm-buffer + (bookmark-set + (concat helm-find-files-bookmark-prefix + (abbreviate-file-name helm-ff-default-directory)))) + (message "Helm find files session bookmarked! ")) + (defun helm-dwim-target-directory () "Return value of `default-directory' of buffer in other window. If there is only one window return the value ot `default-directory' @@ -486,7 +519,7 @@ for current buffer." (save-selected-window (other-window 1) default-directory) - (car helm-ff-history)))))) + (or (car-safe helm-ff-history) default-directory)))))) (defun helm-find-files-do-action (action) "Generic function for creating actions from `helm-source-find-files'. @@ -1315,7 +1348,8 @@ or when `helm-pattern' is equal to \"~/\"." ;; to allow user to do C-a / to start e.g ;; entering a tramp method e.g /sudo::. (not (string-match "\\`//" helm-pattern)) - (not (helm-ff-invalid-tramp-name-p))) + (not (helm-ff-invalid-tramp-name-p)) + (not (eq last-command 'helm-yank-text-at-point))) ;; Fix issue #542. (string= helm-pattern "~/")) (let* ((history-p (string= (assoc-default @@ -2766,6 +2800,21 @@ Set `recentf-max-saved-items' to a bigger value if default is too small.") ;; ;; Only hg and git are supported for now. (defvar helm--browse-project-cache (make-hash-table :test 'equal)) + +(defun helm-browse-project-get-buffers (root-directory) + (cl-loop for b in (helm-buffer-list) + for bf = (buffer-file-name (get-buffer b)) + when (and bf (file-in-directory-p bf root-directory)) + collect b)) + +(defun helm-browse-project-build-buffers-source (directory) + (helm-make-source "Buffers in project" 'helm-source-buffers + :header-name (lambda (name) + (format + "%s (%s)" + name (abbreviate-file-name directory))) + :buffer-list (lambda () (helm-browse-project-get-buffers directory)))) + (defun helm-browse-project-find-files (directory &optional refresh) (when refresh (remhash directory helm--browse-project-cache)) (unless (gethash directory helm--browse-project-cache) @@ -2773,25 +2822,26 @@ Set `recentf-max-saved-items' to a bigger value if default is too small.") directory :directories nil :path 'full :skip-subdirs t) helm--browse-project-cache)) - (helm :sources (helm-build-in-buffer-source "Browse project" - :data (gethash directory helm--browse-project-cache) - :header-name (lambda (name) - (format - "%s (%s)" - name (abbreviate-file-name directory))) - :match-part (lambda (c) - (if helm-ff-transformer-show-only-basename - (helm-basename c) c)) - :filter-one-by-one - (lambda (c) - (if helm-ff-transformer-show-only-basename - (cons (propertize (helm-basename c) - 'face 'helm-ff-file) - c) - (propertize c 'face 'helm-ff-file))) - :mode-line helm-generic-file-mode-line-string - :keymap helm-generic-files-map - :action (helm-actions-from-type-file)) + (helm :sources `(,(helm-browse-project-build-buffers-source directory) + ,(helm-build-in-buffer-source "Browse project" + :data (gethash directory helm--browse-project-cache) + :header-name (lambda (name) + (format + "%s (%s)" + name (abbreviate-file-name directory))) + :match-part (lambda (c) + (if helm-ff-transformer-show-only-basename + (helm-basename c) c)) + :filter-one-by-one + (lambda (c) + (if helm-ff-transformer-show-only-basename + (cons (propertize (helm-basename c) + 'face 'helm-ff-file) + c) + (propertize c 'face 'helm-ff-file))) + :mode-line helm-generic-file-mode-line-string + :keymap helm-generic-files-map + :action (helm-actions-from-type-file))) :buffer "*helm browse project*")) ;;;###autoload @@ -2806,7 +2856,7 @@ If the current directory is found in the cache, start `helm-browse-project-find-files' even with no prefix ARG. NOTE: The prefix ARG have no effect on the VCS controlled directories. -Need dependencies for VCS: +Needed dependencies for VCS: and ." @@ -2822,14 +2872,13 @@ and (t (let ((cur-dir (helm-current-directory))) (if (or arg (gethash cur-dir helm--browse-project-cache)) (helm-browse-project-find-files cur-dir (equal arg '(16))) - (helm-find-files nil)))))) + (helm :sources (helm-browse-project-build-buffers-source cur-dir) + :buffer "*helm browse project*")))))) (defun helm-ff-browse-project (_candidate) "Browse project in current directory. See `helm-browse-project'." (with-helm-default-directory helm-ff-default-directory - ;; `helm-browse-project' will call `helm-ls-git-ls' - ;; which will set locally `helm-default-directory' (helm-browse-project helm-current-prefix-arg))) (defun helm-ff-run-browse-project () @@ -2974,7 +3023,7 @@ utility mdfind.") (defvar helm-source-findutils (helm-build-async-source "Find" :header-name (lambda (name) - (concat name " in [" helm-default-directory "]")) + (concat name " in [" (helm-default-directory) "]")) :candidates-process 'helm-find-shell-command-fn :filtered-candidate-transformer 'helm-findutils-transformer :action-transformer 'helm-transform-file-load-el @@ -2987,7 +3036,7 @@ utility mdfind.") (defun helm-findutils-transformer (candidates _source) (cl-loop for i in candidates for type = (car (file-attributes i)) - for abs = (expand-file-name i helm-default-directory) + for abs = (expand-file-name i (helm-default-directory)) for disp = (if (and helm-ff-transformer-show-only-basename (not (string-match "[.]\\{1,2\\}$" i))) (helm-basename i) abs) diff --git a/elpa/helm-20150403.101/helm-font.el b/elpa/helm-20150426.2119/helm-font.el similarity index 100% rename from elpa/helm-20150403.101/helm-font.el rename to elpa/helm-20150426.2119/helm-font.el diff --git a/elpa/helm-20150403.101/helm-grep.el b/elpa/helm-20150426.2119/helm-grep.el similarity index 98% rename from elpa/helm-20150403.101/helm-grep.el rename to elpa/helm-20150426.2119/helm-grep.el index 004ea1fb..0bf22647 100644 --- a/elpa/helm-20150403.101/helm-grep.el +++ b/elpa/helm-20150426.2119/helm-grep.el @@ -238,6 +238,10 @@ If set to nil `doc-view-mode' will be used instead of an external command." (define-key map (kbd "") 'helm-grep-mode-jump-other-window-backward) (define-key map (kbd "") 'helm-gm-next-file) (define-key map (kbd "") 'helm-gm-precedent-file) + (define-key map (kbd "M-n") 'helm-grep-mode-jump-other-window-forward) + (define-key map (kbd "M-p") 'helm-grep-mode-jump-other-window-backward) + (define-key map (kbd "M-N") 'helm-gm-next-file) + (define-key map (kbd "M-P") 'helm-gm-precedent-file) map)) @@ -340,9 +344,10 @@ It is intended to use as a let-bound variable, DON'T set this globaly.") (and rec-com rec-com-ack-p))))))) (defun helm-grep--prepare-cmd-line (only-files &optional include zgrep) - (let* ((default-directory (or helm-default-directory + (let* ((default-directory (or (helm-default-directory) (expand-file-name helm-ff-default-directory))) - (fnargs (helm-grep-prepare-candidates only-files default-directory)) + (fnargs (helm-grep-prepare-candidates + only-files default-directory)) (ignored-files (unless (helm-grep-use-ack-p) (mapconcat #'(lambda (x) @@ -386,7 +391,7 @@ It is intended to use as a let-bound variable, DON'T set this globaly.") (defun helm-grep-init (cmd-line) "Start an asynchronous grep process with CMD-LINE using ZGREP if non--nil." (let* ((default-directory (or (expand-file-name helm-ff-default-directory) - helm-default-directory)) + (helm-default-directory))) (zgrep (string-match "\\`zgrep" cmd-line)) ;; Use pipe only with grep, zgrep or git-grep. (process-connection-type (and (not zgrep) (helm-grep-use-ack-p))) @@ -705,10 +710,8 @@ Special commands: ;;;###autoload (defun helm-grep-mode-jump () (interactive) - (let ((candidate (buffer-substring (point-at-bol) (point-at-eol)))) - (condition-case nil - (progn (helm-grep-action candidate) (delete-other-windows)) - (error nil)))) + (helm-grep-action + (buffer-substring (point-at-bol) (point-at-eol)))) (defun helm-grep-mode-jump-other-window-1 (arg) (let ((candidate (buffer-substring (point-at-bol) (point-at-eol)))) @@ -831,7 +834,7 @@ These extensions will be added to command line with --include arg of grep." ;; ;; (defvar helm-source-grep nil) -(defun helm-do-grep-1 (targets &optional recurse zgrep exts) +(defun helm-do-grep-1 (targets &optional recurse zgrep exts default-input) "Launch grep on a list of TARGETS files. When RECURSE is given use -r option of grep and prompt user to set the --include args of grep. @@ -920,7 +923,7 @@ in recurse, search being made on `helm-zgrep-file-extension-regexp'." (helm :sources 'helm-source-grep :buffer (format "*helm %s*" (if zgrep "zgrep" (helm-grep-command recurse))) - :default-directory helm-ff-default-directory + :default default-input :keymap helm-grep-map :history 'helm-grep-history :truncate-lines t))) @@ -990,7 +993,7 @@ in recurse, search being made on `helm-zgrep-file-extension-regexp'." (let ((helm-grep-default-directory-fn (or helm-grep-default-directory-fn (lambda () (or helm-ff-default-directory - helm-default-directory + (helm-default-directory) default-directory))))) (helm-grep--filter-candidate-1 candidate))) diff --git a/elpa/helm-20150403.101/helm-help.el b/elpa/helm-20150426.2119/helm-help.el similarity index 99% rename from elpa/helm-20150403.101/helm-help.el rename to elpa/helm-20150426.2119/helm-help.el index 682b0fd5..bfef7768 100644 --- a/elpa/helm-20150403.101/helm-help.el +++ b/elpa/helm-20150426.2119/helm-help.el @@ -428,6 +428,11 @@ also using not recursive wilcard (e.g \"*.el\") is perfectly fine for this. This feature (\"**\") is activated by default with the option `helm-file-globstar'. The directory selection with \"**foo/\" like bash shopt globstar option is not supported yet. +*** Bookmark your `helm-find-files' session + +You can bookmark your `helm-find-files' session with `C-x r m'. +You can retrieve later these bookmarks easily by using M-x helm-filtered-bookmarks. + \n** Specific commands for `helm-find-files':\n \\ \\[helm-ff-run-locate]\t\t->Run Locate (C-u to specify locate db, M-n insert basename of candidate) @@ -1059,7 +1064,8 @@ the amount of prefix args entered. Use persistent action to run your kmacro as many time as needed, you can change of kmacro with `helm-next-line' `helm-previous-line'. -NOTE: You can't record keys running helm commands. +NOTE: You can't record keys running helm commands except `helm-M-x' unless +you don't choose from there a command using helm completion. \n** Specific commands for Helm kmacro:\n \\ diff --git a/elpa/helm-20150403.101/helm-imenu.el b/elpa/helm-20150426.2119/helm-imenu.el similarity index 100% rename from elpa/helm-20150403.101/helm-imenu.el rename to elpa/helm-20150426.2119/helm-imenu.el diff --git a/elpa/helm-20150403.101/helm-info.el b/elpa/helm-20150426.2119/helm-info.el similarity index 100% rename from elpa/helm-20150403.101/helm-info.el rename to elpa/helm-20150426.2119/helm-info.el diff --git a/elpa/helm-20150403.101/helm-locate.el b/elpa/helm-20150426.2119/helm-locate.el similarity index 100% rename from elpa/helm-20150403.101/helm-locate.el rename to elpa/helm-20150426.2119/helm-locate.el diff --git a/elpa/helm-20150403.101/helm-man.el b/elpa/helm-20150426.2119/helm-man.el similarity index 100% rename from elpa/helm-20150403.101/helm-man.el rename to elpa/helm-20150426.2119/helm-man.el diff --git a/elpa/helm-20150403.101/helm-match-plugin.el b/elpa/helm-20150426.2119/helm-match-plugin.el similarity index 89% rename from elpa/helm-20150403.101/helm-match-plugin.el rename to elpa/helm-20150426.2119/helm-match-plugin.el index c9226036..c95bfb50 100644 --- a/elpa/helm-20150403.101/helm-match-plugin.el +++ b/elpa/helm-20150426.2119/helm-match-plugin.el @@ -53,9 +53,6 @@ Default is multi3." '(helm-mp-exact-match helm-mp-match)) (defconst helm-mp-default-search-functions '(helm-mp-exact-search helm-mp-search)) -(defconst helm-mp-default-search-backward-functions - '(helm-mp-exact-search-backward - helm-mp-search-backward)) ;;; Build regexps @@ -103,10 +100,6 @@ but \"foo\ bar\"=> (\"foobar\")." (and (search-forward (helm-mp-exact-get-pattern pattern) nil t) (forward-line -1))) -(defun helm-mp-exact-search-backward (pattern &rest _ignore) - (and (search-backward (helm-mp-exact-get-pattern pattern) nil t) - (forward-line 1))) - ;;; Prefix match ;; @@ -130,10 +123,6 @@ but \"foo\ bar\"=> (\"foobar\")." (defun helm-mp-prefix-search (pattern &rest _ignore) (search-forward (helm-mp-prefix-get-pattern pattern) nil t)) -(defun helm-mp-prefix-search-backward (pattern &rest _ignore) - (and (search-backward (helm-mp-prefix-get-pattern pattern) nil t) - (forward-line 1))) - ;;; Multiple regexp patterns 1 (order is preserved / prefix). ;; @@ -155,9 +144,6 @@ but \"foo\ bar\"=> (\"foobar\")." (defun helm-mp-1-search (pattern &rest _ignore) (re-search-forward (helm-mp-1-get-pattern pattern) nil t)) -(defun helm-mp-1-search-backward (pattern &rest _ignore) - (re-search-backward (helm-mp-1-get-pattern pattern) nil t)) - ;;; Multiple regexp patterns 2 (order is preserved / partial). ;; @@ -179,9 +165,6 @@ but \"foo\ bar\"=> (\"foobar\")." (defun helm-mp-2-search (pattern &rest _ignore) (re-search-forward (helm-mp-2-get-pattern pattern) nil t)) -(defun helm-mp-2-search-backward (pattern &rest _ignore) - (re-search-backward (helm-mp-2-get-pattern pattern) nil t)) - ;;; Multiple regexp patterns 3 (permutation). ;; @@ -263,12 +246,6 @@ i.e (identity (re-search-forward \"foo\" (point-at-eol) t)) => t." (helm-mp-3-search-base pattern 're-search-forward 're-search-forward)) -(defun helm-mp-3-search-backward (pattern &rest _ignore) - (when (stringp pattern) - (setq pattern (helm-mp-3-get-patterns pattern))) - (helm-mp-3-search-base - pattern 're-search-backward 're-search-backward)) - ;;; mp-3p- (multiple regexp pattern 3 with prefix search) ;; @@ -290,12 +267,6 @@ e.g \"bar foo\" will match \"barfoo\" but not \"foobar\" contrarily to (helm-mp-3-search-base pattern 'helm-mp-prefix-search 're-search-forward)) -(defun helm-mp-3p-search-backward (pattern &rest _ignore) - (when (stringp pattern) - (setq pattern (helm-mp-3-get-patterns pattern))) - (helm-mp-3-search-base - pattern 'helm-mp-prefix-search-backward 're-search-backward)) - ;;; Generic multi-match/search functions ;; @@ -316,14 +287,6 @@ e.g \"bar foo\" will match \"barfoo\" but not \"foobar\" contrarily to (multi3p #'helm-mp-3p-search)))) (funcall fun pattern))) -(defun helm-mp-search-backward (pattern &rest _ignore) - (let ((fun (cl-ecase helm-mp-matching-method - (multi1 #'helm-mp-1-search-backward) - (multi2 #'helm-mp-2-search-backward) - (multi3 #'helm-mp-3-search-backward) - (multi3p #'helm-mp-3p-search-backward)))) - (funcall fun pattern))) - ;;; source compiler ;; This is used only in old sources defined without helm-source. diff --git a/elpa/helm-20150403.101/helm-misc.el b/elpa/helm-20150426.2119/helm-misc.el similarity index 93% rename from elpa/helm-20150403.101/helm-misc.el rename to elpa/helm-20150426.2119/helm-misc.el index 5659c7ed..88fee5f3 100644 --- a/elpa/helm-20150403.101/helm-misc.el +++ b/elpa/helm-20150426.2119/helm-misc.el @@ -171,22 +171,22 @@ It is added to `extended-command-history'. ;; ;; (defvar helm-source-minibuffer-history - '((name . "Minibuffer History") - (header-name . (lambda (name) - (format "%s (%s)" name minibuffer-history-variable))) - (candidates - . (lambda () - (let ((history (cl-loop for i in - (symbol-value minibuffer-history-variable) - unless (string= "" i) collect i))) - (if (consp (car history)) - (mapcar 'prin1-to-string history) - history)))) - (migemo) - (multiline) - (action . (lambda (candidate) - (delete-minibuffer-contents) - (insert candidate))))) + (helm-build-sync-source "Minibuffer History" + :header-name (lambda (name) + (format "%s (%s)" name minibuffer-history-variable)) + :candidates + (lambda () + (let ((history (cl-loop for i in + (symbol-value minibuffer-history-variable) + unless (string= "" i) collect i))) + (if (consp (car history)) + (mapcar 'prin1-to-string history) + history))) + :migemo t + :multiline t + :action (lambda (candidate) + (delete-minibuffer-contents) + (insert candidate)))) ;;; Shell history ;; @@ -287,7 +287,6 @@ It is added to `extended-command-history'. (helm-other-buffer 'helm-source-stumpwm-commands "*helm stumpwm commands*")) - ;;;###autoload (defun helm-mini () "Preconfigured `helm' lightweight version \(buffer -> recentf\)." @@ -306,8 +305,8 @@ It is added to `extended-command-history'. "Preconfigured `helm' for `minibuffer-history'." (interactive) (let ((enable-recursive-minibuffers t)) - (helm-other-buffer 'helm-source-minibuffer-history - "*helm minibuffer-history*"))) + (helm :sources 'helm-source-minibuffer-history + :buffer "*helm minibuffer-history*"))) ;;;###autoload (defun helm-comint-input-ring () diff --git a/elpa/helm-20150403.101/helm-mode.el b/elpa/helm-20150426.2119/helm-mode.el similarity index 93% rename from elpa/helm-20150403.101/helm-mode.el rename to elpa/helm-20150426.2119/helm-mode.el index 992a360e..d49b30c5 100644 --- a/elpa/helm-20150403.101/helm-mode.el +++ b/elpa/helm-20150426.2119/helm-mode.el @@ -194,6 +194,16 @@ If COLLECTION is an `obarray', a TEST should be needed. See `obarray'." (all-completions "" (symbol-value collection) predicate))) ((and (symbolp collection) (boundp collection)) (all-completions "" (symbol-value collection))) + ;; Normally file completion should not be handled here, + ;; but special cases like `find-file-at-point' do it. + ;; Handle here specially such cases. + ((and (functionp collection) minibuffer-completing-file-name) + (cl-loop for f in (funcall collection helm-pattern test t) + unless (member f '("./" "../")) + collect (concat (file-name-as-directory + (helm-basedir helm-pattern)) f))) + ((functionp collection) + (funcall collection "" test t)) ((and alistp test) (cl-loop for i in collection when (funcall test i) collect i)) (alistp collection) @@ -517,7 +527,7 @@ that use `helm-comp-read' See `helm-M-x' for example." (helm-apropos-init (lambda (x) (and (funcall test x) (not (keywordp x)))) - default)) + (or (car-safe default) default))) :filtered-candidate-transformer 'helm-apropos-default-sort-fn :persistent-action 'helm-lisp-completion-persistent-action :persistent-help "Show brief doc in mode-line") @@ -541,14 +551,19 @@ that use `helm-comp-read' See `helm-M-x' for example." Extra optional arg CANDS-IN-BUFFER mean use `candidates-in-buffer' method which is faster. It should be used when candidate list don't need to rebuild dynamically." - (let ((history (or (car-safe hist) hist))) + (let ((history (or (car-safe hist) hist)) + (alistp cands-in-buffer)) (when (and default (listp default)) ;; When DEFAULT is a list move the list on head of COLLECTION ;; and set it to its car. #bugfix `grep-read-files'. (setq collection (if (listp collection) (append default collection) ;; Else COLLECTION is maybe a function or a table. - (append default (all-completions "" collection)))) + (prog1 + (append default (all-completions "" collection)) + ;; Ensure `all-completions' will not be used + ;; a second time to recompute COLLECTION [1]. + (setq alistp t)))) (setq default (car default))) (helm-comp-read prompt collection @@ -557,7 +572,7 @@ It should be used when candidate list don't need to rebuild dynamically." :reverse-history helm-mode-reverse-history :input-history history :must-match require-match - :alistp nil ; Be sure `all-completions' is used. + :alistp alistp ; Ensure `all-completions' is used when non-nil [1]. :name name :requires-pattern (if (and (string= default "") (or (eq require-match 'confirm) @@ -573,8 +588,13 @@ It should be used when candidate list don't need to rebuild dynamically." ;; Fail with special characters (e.g in gnus "nnimap+gmail:") ;; if regexp-quote is not used. ;; when init is added to history, it will be unquoted by - ; helm-comp-read. - :initial-input (and (stringp init) (regexp-quote init))))) + ;; helm-comp-read. + :initial-input (helm-aif (pcase init + ((pred (stringp)) init) + ;; INIT is a cons cell. + (`(,l . ,_ll) l)) + (if minibuffer-completing-file-name it + (regexp-quote it)))))) (defun helm-completing-read-with-cands-in-buffer (prompt collection test require-match @@ -1069,21 +1089,34 @@ Note: This mode is incompatible with Emacs23." (cl-assert (boundp 'completing-read-function) nil "`helm-mode' not available, upgrade to Emacs-24") (if helm-mode - (progn - (setq completing-read-function 'helm--completing-read-default - read-file-name-function 'helm--generic-read-file-name) - (when (and (boundp 'completion-in-region-function) - helm-mode-handle-completion-in-region) - (setq completion-in-region-function #'helm--completion-in-region)) - (message helm-completion-mode-start-message)) - (setq completing-read-function (and (fboundp 'completing-read-default) + (if (fboundp 'add-function) + (progn + (add-function :override completing-read-function + #'helm--completing-read-default) + (add-function :override read-file-name-function + #'helm--generic-read-file-name) + (when helm-mode-handle-completion-in-region + (add-function :override completion-in-region-function + #'helm--completion-in-region))) + (setq completing-read-function 'helm--completing-read-default + read-file-name-function 'helm--generic-read-file-name) + (when (and (boundp 'completion-in-region-function) + helm-mode-handle-completion-in-region) + (setq completion-in-region-function #'helm--completion-in-region)) + (message helm-completion-mode-start-message)) + (if (fboundp 'remove-function) + (progn + (remove-function completing-read-function #'helm--completing-read-default) + (remove-function read-file-name-function #'helm--generic-read-file-name) + (remove-function completion-in-region-function #'helm--completion-in-region)) + (setq completing-read-function (and (fboundp 'completing-read-default) 'completing-read-default) - read-file-name-function (and (fboundp 'read-file-name-default) - 'read-file-name-default)) - (when (and (boundp 'completion-in-region-function) - (boundp 'helm--old-completion-in-region-function)) - (setq completion-in-region-function helm--old-completion-in-region-function)) - (message helm-completion-mode-quit-message))) + read-file-name-function (and (fboundp 'read-file-name-default) + 'read-file-name-default)) + (when (and (boundp 'completion-in-region-function) + (boundp 'helm--old-completion-in-region-function)) + (setq completion-in-region-function helm--old-completion-in-region-function)) + (message helm-completion-mode-quit-message)))) (provide 'helm-mode) diff --git a/elpa/helm-20150403.101/helm-net.el b/elpa/helm-20150426.2119/helm-net.el similarity index 100% rename from elpa/helm-20150403.101/helm-net.el rename to elpa/helm-20150426.2119/helm-net.el diff --git a/elpa/helm-20150403.101/helm-org.el b/elpa/helm-20150426.2119/helm-org.el similarity index 93% rename from elpa/helm-20150403.101/helm-org.el rename to elpa/helm-20150426.2119/helm-org.el index 22696dec..6570016a 100644 --- a/elpa/helm-20150403.101/helm-org.el +++ b/elpa/helm-20150426.2119/helm-org.el @@ -93,7 +93,9 @@ NOTE: This will be slow on large org buffers." (defun helm-get-org-candidates-in-file (filename min-depth max-depth &optional fontify nofname) - (with-current-buffer (find-file-noselect filename) + (with-current-buffer (pcase filename + ((pred bufferp) filename) + ((pred stringp) (find-file-noselect filename))) (and fontify (jit-lock-fontify-now)) (let ((match-fn (if fontify 'match-string 'match-string-no-properties))) (save-excursion @@ -121,10 +123,11 @@ NOTE: This will be slow on large org buffers." ;;;###autoload (defun helm-org-in-buffer-headings () (interactive) - (helm :sources (helm-source-org-headings-for-files - (list (buffer-file-name (current-buffer)))) - :candidate-number-limit 99999 - :buffer "*helm org inbuffer*")) + (let ((helm-org-headings--nofilename t)) + (helm :sources (helm-source-org-headings-for-files + (list (current-buffer))) + :candidate-number-limit 99999 + :buffer "*helm org inbuffer*"))) ;;;###autoload (defun helm-org-capture-templates () diff --git a/elpa/helm-20150403.101/helm-pkg.el b/elpa/helm-20150426.2119/helm-pkg.el similarity index 61% rename from elpa/helm-20150403.101/helm-pkg.el rename to elpa/helm-20150426.2119/helm-pkg.el index 9e258761..071b8bf9 100644 --- a/elpa/helm-20150403.101/helm-pkg.el +++ b/elpa/helm-20150426.2119/helm-pkg.el @@ -1,4 +1,4 @@ -(define-package "helm" "20150403.101" "Helm is an Emacs incremental and narrowing framework" +(define-package "helm" "20150426.2119" "Helm is an Emacs incremental and narrowing framework" '((emacs "24") (cl-lib "0.5") (async "1.2")) diff --git a/elpa/helm-20150403.101/helm-plugin.el b/elpa/helm-20150426.2119/helm-plugin.el similarity index 100% rename from elpa/helm-20150403.101/helm-plugin.el rename to elpa/helm-20150426.2119/helm-plugin.el diff --git a/elpa/helm-20150403.101/helm-regexp.el b/elpa/helm-20150426.2119/helm-regexp.el similarity index 92% rename from elpa/helm-20150403.101/helm-regexp.el rename to elpa/helm-20150426.2119/helm-regexp.el index 62e10752..5b2b2fc7 100644 --- a/elpa/helm-20150403.101/helm-regexp.el +++ b/elpa/helm-20150426.2119/helm-regexp.el @@ -84,18 +84,18 @@ Any other non--nil value update after confirmation." "Query replace regexp from `helm-regexp'. With a prefix arg replace only matches surrounded by word boundaries, i.e Don't replace inside a word, regexp is surrounded with \\bregexp\\b." - (let ((regexp (funcall (helm-attr 'regexp)))) + (let ((regexp helm-input)) (apply 'query-replace-regexp (helm-query-replace-args regexp)))) (defun helm-kill-regexp-as-sexp (_candidate) "Kill regexp in a format usable in lisp code." (helm-regexp-kill-new - (prin1-to-string (funcall (helm-attr 'regexp))))) + (prin1-to-string helm-input))) (defun helm-kill-regexp (_candidate) "Kill regexp as it is in `helm-pattern'." - (helm-regexp-kill-new (funcall (helm-attr 'regexp)))) + (helm-regexp-kill-new helm-input)) (defun helm-query-replace-args (regexp) "create arguments of `query-replace-regexp' action in `helm-regexp'." @@ -112,25 +112,23 @@ i.e Don't replace inside a word, regexp is surrounded with \\bregexp\\b." (when region-only (region-end))))) (defvar helm-source-regexp - '((name . "Regexp Builder") - (init . (lambda () - (helm-init-candidates-in-buffer - 'global (with-temp-buffer - (insert-buffer-substring helm-current-buffer) - (buffer-string))))) - (candidates-in-buffer) - (get-line . helm-regexp-get-line) - (persistent-action . helm-regexp-persistent-action) - (persistent-help . "Show this line") - (multiline) - (no-matchplugin) - (requires-pattern . 2) - (mode-line . "Press TAB to select action.") - (regexp . (lambda () helm-input)) - (action . (("Kill Regexp as sexp" . helm-kill-regexp-as-sexp) - ("Query Replace Regexp (C-u Not inside word.)" - . helm-query-replace-regexp) - ("Kill Regexp" . helm-kill-regexp))))) + (helm-build-in-buffer-source "Regexp Builder" + :init (lambda () + (helm-init-candidates-in-buffer + 'global (with-temp-buffer + (insert-buffer-substring helm-current-buffer) + (buffer-string)))) + :get-line #'helm-regexp-get-line + :persistent-action #'helm-regexp-persistent-action + :persistent-help "Show this line" + :multiline t + :matchplugin nil + :requires-pattern 2 + :mode-line "Press TAB to select action." + :action '(("Kill Regexp as sexp" . helm-kill-regexp-as-sexp) + ("Query Replace Regexp (C-u Not inside word.)" + . helm-query-replace-regexp) + ("Kill Regexp" . helm-kill-regexp)))) (defun helm-regexp-get-line (s e) (let ((matches (match-data)) @@ -411,21 +409,42 @@ Same as `helm-moccur-goto-line' but go in new frame." (let ((map (make-sparse-keymap))) (define-key map (kbd "RET") 'helm-moccur-mode-goto-line) (define-key map (kbd "C-o") 'helm-moccur-mode-goto-line-ow) - (define-key map (kbd "") 'undefined) - (define-key map (kbd "") 'undefined) + (define-key map (kbd "") 'helm-moccur-mode-goto-line-ow-forward) + (define-key map (kbd "") 'helm-moccur-mode-goto-line-ow-backward) (define-key map (kbd "") 'helm-gm-next-file) (define-key map (kbd "") 'helm-gm-precedent-file) + (define-key map (kbd "M-n") 'helm-moccur-mode-goto-line-ow-forward) + (define-key map (kbd "M-p") 'helm-moccur-mode-goto-line-ow-backward) + (define-key map (kbd "M-N") 'helm-gm-next-file) + (define-key map (kbd "M-P") 'helm-gm-precedent-file) map)) (defun helm-moccur-mode-goto-line () (interactive) - (helm-moccur-goto-line - (buffer-substring (point-at-bol) (point-at-eol)))) + (helm-aif (get-text-property (point) 'helm-realvalue) + (helm-moccur-goto-line it))) (defun helm-moccur-mode-goto-line-ow () (interactive) - (helm-moccur-goto-line-ow - (buffer-substring (point-at-bol) (point-at-eol)))) + (helm-aif (get-text-property (point) 'helm-realvalue) + (helm-moccur-goto-line-ow it))) + +(defun helm-moccur-mode-goto-line-ow-forward-1 (arg) + (condition-case nil + (progn + (save-selected-window + (helm-moccur-mode-goto-line-ow) + (recenter)) + (forward-line arg)) + (error nil))) + +(defun helm-moccur-mode-goto-line-ow-forward () + (interactive) + (helm-moccur-mode-goto-line-ow-forward-1 1)) + +(defun helm-moccur-mode-goto-line-ow-backward () + (interactive) + (helm-moccur-mode-goto-line-ow-forward-1 -1)) (defun helm-moccur-save-results (_candidate) "Save helm moccur results in a `helm-moccur-mode' buffer." diff --git a/elpa/helm-20150403.101/helm-ring.el b/elpa/helm-20150426.2119/helm-ring.el similarity index 100% rename from elpa/helm-20150403.101/helm-ring.el rename to elpa/helm-20150426.2119/helm-ring.el diff --git a/elpa/helm-20150403.101/helm-semantic.el b/elpa/helm-20150426.2119/helm-semantic.el similarity index 99% rename from elpa/helm-20150403.101/helm-semantic.el rename to elpa/helm-20150426.2119/helm-semantic.el index db68f013..72ab49c5 100644 --- a/elpa/helm-20150403.101/helm-semantic.el +++ b/elpa/helm-20150426.2119/helm-semantic.el @@ -37,12 +37,19 @@ :group 'helm-semantic :type 'boolean) +(defcustom helm-semantic-display-style 'semantic-format-tag-summarize + "Function to present a semantic tag." + :group 'helm-semantic + :type '(radio + (const :tag "Default" semantic-format-tag-summarize) + (const :tag "Prototype" semantic-format-tag-prototype))) + ;;; keymap (defvar helm-semantic-map (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "C-c ?") 'helm-semantic-help) - (when helm-imenu-lynx-style-map + (when helm-semantic-lynx-style-map (define-key map (kbd "") 'helm-maybe-exit-minibuffer) (define-key map (kbd "") 'helm-execute-persistent-action)) (delq nil map))) @@ -50,13 +57,6 @@ ;; Internals vars (defvar helm-semantic--tags-cache nil) -(defcustom helm-semantic-display-style 'semantic-format-tag-summarize - "Function to present a semantic tag." - :group 'helm-semantic - :type '(radio - (const :tag "Default" semantic-format-tag-summarize) - (const :tag "Prototype" semantic-format-tag-prototype))) - (defun helm-semantic--fetch-candidates (tags depth &optional class) "Write the contents of TAGS to the current buffer." (let ((class class) cur-type) diff --git a/elpa/helm-20150403.101/helm-source.el b/elpa/helm-20150426.2119/helm-source.el similarity index 81% rename from elpa/helm-20150403.101/helm-source.el rename to elpa/helm-20150426.2119/helm-source.el index e229dcec..2a2e65c4 100644 --- a/elpa/helm-20150403.101/helm-source.el +++ b/elpa/helm-20150426.2119/helm-source.el @@ -143,7 +143,7 @@ :custom (alist :key-type string :value-type function) :documentation - " It is a list of (DISPLAY . FUNCTION) pairs or FUNCTION. + " It is a list of (DISPLAY . FUNCTION) pairs or FUNCTION. FUNCTION is called with one parameter: the selected candidate. An action other than the default can be chosen from this list @@ -159,7 +159,7 @@ :initform nil :custom function :documentation - " Can be a either a Function called with one parameter (the + " Can be a either a Function called with one parameter (the selected candidate) or a cons cell where first element is this same function and second element a symbol (e.g never-split) that inform `helm-execute-persistent-action'to not split his @@ -194,7 +194,7 @@ :initform nil :custom integer :documentation - " If present matches from the source are shown only if the + " If present matches from the source are shown only if the pattern is not empty. Optionally, it can have an integer parameter specifying the required length of input which is useful in case of sources with lots of candidates.") @@ -204,7 +204,7 @@ :initform nil :custom (choice function list) :documentation - " It's a function or a list of functions called with one argument + " It's a function or a list of functions called with one argument when the completion list from the source is built. The argument is the list of candidates retrieved from the source. The function should return a transformed list of candidates which @@ -217,13 +217,13 @@ Note that `candidates' is run already, so the given transformer function should also be able to handle candidates with (DISPLAY . REAL) format.") - + (filtered-candidate-transformer :initarg :filtered-candidate-transformer :initform nil :custom (choice function list) :documentation - " It has the same format as `candidate-transformer', except the + " It has the same format as `candidate-transformer', except the function is called with two parameters: the candidate list and the source. @@ -252,7 +252,7 @@ :initform nil :custom (choice function list) :documentation - " A transformer function that treat candidates one by one. + " A transformer function that treat candidates one by one. It is called with one arg the candidate. It is faster than `filtered-candidate-transformer' or `candidates-transformer', but should be used only in sources @@ -297,7 +297,7 @@ :initform nil :custom (choice function list) :documentation - " It's a function or a list of functions called with two + " It's a function or a list of functions called with two arguments when the action list from the source is assembled. The first argument is the list of actions, the second is the current selection. If it is a list of functions, @@ -313,7 +313,7 @@ :initform nil :custom (choice function list) :documentation - " It's a function or a list of functions called with one argument + " It's a function or a list of functions called with one argument before computing matches. Its argument is `helm-pattern'. Functions should return transformed `helm-pattern'. @@ -331,7 +331,7 @@ :initform nil :custom boolean :documentation - " Indicates the source assembles the candidate list dynamically, + " Indicates the source assembles the candidate list dynamically, so it shouldn't be cached within a single Helm invocation. It is only applicable to synchronous sources, because asynchronous sources are not cached.") @@ -341,7 +341,7 @@ :initform nil :custom (choice function list) :documentation - " List of functions called with one parameter: a candidate. The + " List of functions called with one parameter: a candidate. The function should return non-nil if the candidate matches the current pattern (see variable `helm-pattern'). @@ -431,7 +431,7 @@ :initform nil :custom function :documentation - " It's a function called with one argument: the selected candidate. + " It's a function called with one argument: the selected candidate. This function is intended for type convertion. In normal case, the selected candidate (string) is passed to action function. If coerce function is specified, it is called just @@ -461,7 +461,7 @@ :initform nil :custom function :documentation - " Function called with no parameters at end of initialization + " Function called with no parameters at end of initialization when `helm-resume' is started. If this function try to do something against `helm-buffer', \(e.g updating, searching etc...\) probably you should run it in a timer to ensure @@ -704,36 +704,37 @@ like `re-search-forward', see below documentation of :search slot.") (defmethod helm--setup-source :primary ((_source helm-type-file))) (defmethod helm--setup-source :before ((source helm-type-file)) - (set-slot-value source 'action - (helm-make-actions - "Find file" 'helm-find-many-files - "Find file as root" 'helm-find-file-as-root - "Find file other window" 'find-file-other-window - "Find file other frame" 'find-file-other-frame - "Open dired in file's directory" 'helm-open-dired - "Grep File(s) `C-u recurse'" 'helm-find-files-grep - "Zgrep File(s) `C-u Recurse'" 'helm-ff-zgrep - "Pdfgrep File(s)" 'helm-ff-pdfgrep - "Insert as org link" 'helm-files-insert-as-org-link - "Checksum File" 'helm-ff-checksum - "Ediff File" 'helm-find-files-ediff-files - "Ediff Merge File" 'helm-find-files-ediff-merge-files - "Etags `M-., C-u tap, C-u C-u reload tag file'" - 'helm-ff-etags-select - "View file" 'view-file - "Insert file" 'insert-file - "Add marked files to file-cache" 'helm-ff-cache-add-file - "Delete file(s)" 'helm-delete-marked-files - "Open file externally (C-u to choose)" 'helm-open-file-externally - "Open file with default tool" 'helm-open-file-with-default-tool - "Find file in hex dump" 'hexl-find-file)) - (set-slot-value source 'persistent-help "Show this file") - (set-slot-value source 'action-transformer '(helm-transform-file-load-el - helm-transform-file-browse-url - helm-transform-file-cache)) - (set-slot-value source 'candidate-transformer '(helm-skip-boring-files - helm-highlight-files - helm-w32-pathname-transformer))) + (set-slot-value + source 'action + (helm-make-actions + "Find file" 'helm-find-many-files + "Find file as root" 'helm-find-file-as-root + "Find file other window" 'find-file-other-window + "Find file other frame" 'find-file-other-frame + "Open dired in file's directory" 'helm-open-dired + "Grep File(s) `C-u recurse'" 'helm-find-files-grep + "Zgrep File(s) `C-u Recurse'" 'helm-ff-zgrep + "Pdfgrep File(s)" 'helm-ff-pdfgrep + "Insert as org link" 'helm-files-insert-as-org-link + "Checksum File" 'helm-ff-checksum + "Ediff File" 'helm-find-files-ediff-files + "Ediff Merge File" 'helm-find-files-ediff-merge-files + "Etags `M-., C-u tap, C-u C-u reload tag file'" + 'helm-ff-etags-select + "View file" 'view-file + "Insert file" 'insert-file + "Add marked files to file-cache" 'helm-ff-cache-add-file + "Delete file(s)" 'helm-delete-marked-files + "Open file externally (C-u to choose)" 'helm-open-file-externally + "Open file with default tool" 'helm-open-file-with-default-tool + "Find file in hex dump" 'hexl-find-file)) + (set-slot-value source 'persistent-help "Show this file") + (set-slot-value source 'action-transformer '(helm-transform-file-load-el + helm-transform-file-browse-url + helm-transform-file-cache)) + (set-slot-value source 'candidate-transformer '(helm-skip-boring-files + helm-highlight-files + helm-w32-pathname-transformer))) ;; Bookmarks (defclass helm-type-bookmark (helm-source) () @@ -742,15 +743,16 @@ like `re-search-forward', see below documentation of :search slot.") (defmethod helm--setup-source :primary ((_source helm-type-bookmark))) (defmethod helm--setup-source :before ((source helm-type-bookmark)) - (set-slot-value source 'action (helm-make-actions - "Jump to bookmark" 'helm-bookmark-jump - "Jump to BM other window" 'helm-bookmark-jump-other-window - "Bookmark edit annotation" 'bookmark-edit-annotation - "Bookmark show annotation" 'bookmark-show-annotation - "Delete bookmark(s)" 'helm-delete-marked-bookmarks - "Edit Bookmark" 'helm-bookmark-edit-bookmark - "Rename bookmark" 'helm-bookmark-rename - "Relocate bookmark" 'bookmark-relocate)) + (set-slot-value + source 'action (helm-make-actions + "Jump to bookmark" 'helm-bookmark-jump + "Jump to BM other window" 'helm-bookmark-jump-other-window + "Bookmark edit annotation" 'bookmark-edit-annotation + "Bookmark show annotation" 'bookmark-show-annotation + "Delete bookmark(s)" 'helm-delete-marked-bookmarks + "Edit Bookmark" 'helm-bookmark-edit-bookmark + "Rename bookmark" 'helm-bookmark-rename + "Relocate bookmark" 'bookmark-relocate)) (set-slot-value source 'keymap helm-bookmark-map) (set-slot-value source 'mode-line helm-bookmark-mode-line-string)) @@ -761,32 +763,41 @@ like `re-search-forward', see below documentation of :search slot.") (defmethod helm--setup-source :primary ((_source helm-type-buffer))) (defmethod helm--setup-source :before ((source helm-type-buffer)) - (set-slot-value source 'action (helm-make-actions - "Switch to buffer(s)" 'helm-switch-to-buffers - (lambda () (and (locate-library "popwin") "Switch to buffer in popup window")) - 'popwin:popup-buffer - "Switch to buffer(s) other window `C-c o'" - 'helm-switch-to-buffers-other-window - "Switch to buffer other frame `C-c C-o'" 'switch-to-buffer-other-frame - (lambda () (and (locate-library "elscreen") "Display buffer in Elscreen")) - 'helm-find-buffer-on-elscreen - "Query replace regexp `C-M-%'" 'helm-buffer-query-replace-regexp - "Query replace `M-%'" 'helm-buffer-query-replace - "View buffer" 'view-buffer - "Display buffer" 'display-buffer - "Grep buffers `M-g s' (C-u grep all buffers)" 'helm-zgrep-buffers - "Multi occur buffer(s) `C-s'" 'helm-multi-occur-as-action - "Revert buffer(s) `M-U'" 'helm-revert-marked-buffers - "Insert buffer" 'insert-buffer - "Kill buffer(s) `M-D'" 'helm-kill-marked-buffers - "Diff with file `C-='" 'diff-buffer-with-file - "Ediff Marked buffers `C-c ='" 'helm-ediff-marked-buffers - "Ediff Merge marked buffers `M-='" (lambda (candidate) - (helm-ediff-marked-buffers candidate t)))) - (set-slot-value source 'persistent-help "Show this buffer") - (set-slot-value source 'filtered-candidate-transformer '(helm-skip-boring-buffers - helm-buffers-sort-transformer - helm-highlight-buffers))) + (set-slot-value + source 'action (helm-make-actions + "Switch to buffer(s)" 'helm-switch-to-buffers + (lambda () (and (locate-library "popwin") + "Switch to buffer in popup window")) + 'popwin:popup-buffer + "Switch to buffer(s) other window `C-c o'" + 'helm-switch-to-buffers-other-window + "Switch to buffer other frame `C-c C-o'" + 'switch-to-buffer-other-frame + (lambda () (and (locate-library "elscreen") + "Display buffer in Elscreen")) + 'helm-find-buffer-on-elscreen + "Query replace regexp `C-M-%'" + 'helm-buffer-query-replace-regexp + "Query replace `M-%'" 'helm-buffer-query-replace + "View buffer" 'view-buffer + "Display buffer" 'display-buffer + "Grep buffers `M-g s' (C-u grep all buffers)" + 'helm-zgrep-buffers + "Multi occur buffer(s) `C-s'" 'helm-multi-occur-as-action + "Revert buffer(s) `M-U'" 'helm-revert-marked-buffers + "Insert buffer" 'insert-buffer + "Kill buffer(s) `M-D'" 'helm-kill-marked-buffers + "Diff with file `C-='" 'diff-buffer-with-file + "Ediff Marked buffers `C-c ='" 'helm-ediff-marked-buffers + "Ediff Merge marked buffers `M-='" + (lambda (candidate) + (helm-ediff-marked-buffers candidate t)))) + (set-slot-value source 'persistent-help "Show this buffer") + (set-slot-value + source 'filtered-candidate-transformer + '(helm-skip-boring-buffers + helm-buffers-sort-transformer + helm-highlight-buffers))) ;; Functions (defclass helm-type-function (helm-source) () @@ -795,17 +806,20 @@ like `re-search-forward', see below documentation of :search slot.") (defmethod helm--setup-source :primary ((_source helm-type-function))) (defmethod helm--setup-source :before ((source helm-type-function)) - (set-slot-value source 'action (helm-make-actions - "Describe command" 'describe-function - "Add command to kill ring" 'helm-kill-new - "Go to command's definition" 'find-function - "Debug on entry" 'debug-on-entry - "Cancel debug on entry" 'cancel-debug-on-entry - "Trace function" 'trace-function - "Trace function (background)" 'trace-function-background - "Untrace function" 'untrace-function)) - (set-slot-value source 'action-transformer 'helm-transform-function-call-interactively) - (set-slot-value source 'candidate-transformer 'helm-mark-interactive-functions) + (set-slot-value + source 'action (helm-make-actions + "Describe command" 'describe-function + "Add command to kill ring" 'helm-kill-new + "Go to command's definition" 'find-function + "Debug on entry" 'debug-on-entry + "Cancel debug on entry" 'cancel-debug-on-entry + "Trace function" 'trace-function + "Trace function (background)" 'trace-function-background + "Untrace function" 'untrace-function)) + (set-slot-value source 'action-transformer + 'helm-transform-function-call-interactively) + (set-slot-value source 'candidate-transformer + 'helm-mark-interactive-functions) (set-slot-value source 'coerce 'helm-symbolify)) ;; Commands @@ -815,12 +829,35 @@ like `re-search-forward', see below documentation of :search slot.") (defmethod helm--setup-source :primary ((_source helm-type-command))) (defmethod helm--setup-source :before ((source helm-type-command)) - (set-slot-value source 'action (append (helm-make-actions - "Call interactively" 'helm-call-interactively) - (helm-actions-from-type-function))) + (set-slot-value + source 'action (append (helm-make-actions + "Call interactively" 'helm-call-interactively) + (helm-actions-from-type-function))) (set-slot-value source 'coerce 'helm-symbolify) (set-slot-value source 'persistent-action 'describe-function)) +;; Timers +(defclass helm-type-timers (helm-source) () + "A class to define helm type timers.") + +(defmethod helm--setup-source :primary ((_source helm-type-timers))) + +(defmethod helm--setup-source :before ((source helm-type-timers)) + (set-slot-value + source 'action + '(("Cancel Timer" . (lambda (_timer) + (let ((mkd (helm-marked-candidates))) + (cl-loop for timer in mkd + do (cancel-timer timer))))) + ("Describe Function" . (lambda (tm) + (describe-function (timer--function tm)))) + ("Find Function" . (lambda (tm) + (find-function (timer--function tm)))))) + (set-slot-value source 'persistent-action + (lambda (tm) + (describe-function (timer--function tm)))) + (set-slot-value source 'persistent-help "Describe Function")) + ;;; Error functions ;; @@ -828,7 +865,7 @@ like `re-search-forward', see below documentation of :search slot.") (defun helm-default-init-source-in-buffer-function () (helm-init-candidates-in-buffer 'global '("ERROR: No buffer handling your data, use either the `init' slot or the `data' slot."))) - + ;;; Internal Builder functions. ;; @@ -941,7 +978,7 @@ an eieio class." (helm-aif (or (slot-value source 'persistent-action) (slot-value source 'action)) (cond ((or (symbolp it) (functionp it)) - (helm-symbol-name it)) + (helm-symbol-name it)) ((listp it) (let ((action (car it))) ;; It comes from :action ("foo" . function). @@ -957,25 +994,26 @@ an eieio class." " (keeping session)"))) (defmethod helm--setup-source :primary ((_source helm-source))) - + (defmethod helm--setup-source :before ((source helm-source)) (helm-aif (slot-value source 'keymap) (and (symbolp it) (set-slot-value source 'keymap (symbol-value it)))) (set-slot-value source 'header-line (helm-source--header-line source)) (helm-aif (slot-value source 'persistent-help) - (set-slot-value source 'header-line (helm-source--persistent-help-string it source))) + (set-slot-value source 'header-line + (helm-source--persistent-help-string it source))) (when (and (slot-value source 'fuzzy-match) helm-fuzzy-sort-fn) - (set-slot-value source 'filtered-candidate-transformer - (helm-aif (slot-value source 'filtered-candidate-transformer) - (append (helm-mklist it) - (list helm-fuzzy-sort-fn)) - (list helm-fuzzy-sort-fn)))) + (set-slot-value source 'filtered-candidate-transformer + (helm-aif (slot-value source 'filtered-candidate-transformer) + (append (helm-mklist it) + (list helm-fuzzy-sort-fn)) + (list helm-fuzzy-sort-fn)))) (unless (slot-value source 'nohighlight) (set-slot-value source 'filtered-candidate-transformer - (helm-aif (slot-value source 'filtered-candidate-transformer) - (append (helm-mklist it) - (list #'helm-fuzzy-highlight-matches)) - (list #'helm-fuzzy-highlight-matches))))) + (helm-aif (slot-value source 'filtered-candidate-transformer) + (append (helm-mklist it) + (list #'helm-fuzzy-highlight-matches)) + (list #'helm-fuzzy-highlight-matches))))) (defmethod helm-setup-user-source ((_source helm-source))) @@ -983,11 +1021,11 @@ an eieio class." (when (slot-value source 'fuzzy-match) (helm-aif (slot-value source 'match) (set-slot-value source 'match (append (helm-mklist it) - (list helm-fuzzy-match-fn))) + (list helm-fuzzy-match-fn))) (set-slot-value source 'match helm-fuzzy-match-fn))) (when (slot-value source 'matchplugin) (set-slot-value source 'match - (helm-source-mp-get-search-or-match-fns source 'match)))) + (helm-source-mp-get-search-or-match-fns source 'match)))) (defmethod helm--setup-source ((source helm-source-in-buffer)) (let ((cur-init (slot-value source 'init))) @@ -1007,10 +1045,11 @@ an eieio class." (when (slot-value source 'fuzzy-match) (helm-aif (slot-value source 'search) (set-slot-value source 'search (append (helm-mklist it) - (list helm-fuzzy-search-fn))) + (list helm-fuzzy-search-fn))) (set-slot-value source 'search (list helm-fuzzy-search-fn)))) (when (slot-value source 'matchplugin) - (set-slot-value source 'search (helm-source-mp-get-search-or-match-fns source 'search))) + (set-slot-value + source 'search (helm-source-mp-get-search-or-match-fns source 'search))) (let ((mtc (slot-value source 'match))) (cl-assert (or (equal '(identity) mtc) (eq 'identity mtc)) diff --git a/elpa/helm-20150403.101/helm-sys.el b/elpa/helm-20150426.2119/helm-sys.el similarity index 100% rename from elpa/helm-20150403.101/helm-sys.el rename to elpa/helm-20150426.2119/helm-sys.el diff --git a/elpa/helm-20150403.101/helm-tags.el b/elpa/helm-20150426.2119/helm-tags.el similarity index 87% rename from elpa/helm-20150403.101/helm-tags.el rename to elpa/helm-20150426.2119/helm-tags.el index e6ba1792..2df5c4ea 100644 --- a/elpa/helm-20150403.101/helm-tags.el +++ b/elpa/helm-20150426.2119/helm-tags.el @@ -1,4 +1,4 @@ -;;; helm-tags.el --- Helm for Etags and Ctags. -*- lexical-binding: t -*- +;;; helm-tags.el --- Helm for Etags. -*- lexical-binding: t -*- ;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto @@ -39,7 +39,7 @@ Don't search tag file deeply if outside this value." (defcustom helm-etags-match-part-only t "Whether to match only the tag part of CANDIDATE in -helm-source-ctags-select." +helm-source-etags-select." :type 'boolean :group 'helm-tags) @@ -61,8 +61,11 @@ one match." :underline t))) "Face used to highlight etags filenames." :group 'helm-tags-faces) - + +;;; Etags +;; +;; (defun helm-etags-run-switch-other-window () "Run switch to other window action from `helm-source-etags-select'." (interactive) @@ -91,55 +94,6 @@ one match." map) "Keymap used in Etags.") - -;;; Ctags -;; -;; -(defvar helm-ctags-modes - '( c-mode c++-mode awk-mode csharp-mode java-mode javascript-mode lua-mode - makefile-mode pascal-mode perl-mode cperl-mode php-mode python-mode - scheme-mode sh-mode slang-mode sql-mode tcl-mode )) - -(defun helm-ctags-init () - (when (and buffer-file-name - (memq major-mode helm-ctags-modes) - (helm-current-buffer-is-modified)) - (with-current-buffer (helm-candidate-buffer 'local) - (call-process-shell-command - (if (string-match "\\.el\\.gz$" helm-buffer-file-name) - (format "ctags -e -u -f- --language-force=lisp --fields=n =(zcat %s) " - helm-buffer-file-name) - (format "ctags -e -u -f- --fields=n %s " helm-buffer-file-name)) - nil (current-buffer)) - (goto-char (point-min)) - (forward-line 2) - (delete-region (point-min) (point)) - (cl-loop while (and (not (eobp)) (search-forward "\001" (point-at-eol) t)) - for lineno-start = (point) - for lineno = (buffer-substring - lineno-start - (1- (search-forward "," (point-at-eol) t))) - do - (forward-line 0) - (insert (format "%5s:" lineno)) - (search-forward "\177" (point-at-eol) t) - (delete-region (1- (point)) (point-at-eol)) - (forward-line 1))))) - -(defvar helm-source-ctags - '((name . "Exuberant ctags") - (init . helm-ctags-init) - (candidates-in-buffer) - (adjust) - (type . line)) - "Needs Exuberant Ctags. - -http://ctags.sourceforge.net/") - - -;;; Etags -;; -;; (defvar helm-etags-mtime-alist nil "Store the last modification time of etags files here.") (defvar helm-etags-cache (make-hash-table :test 'equal) diff --git a/elpa/helm-20150403.101/helm-utils.el b/elpa/helm-20150426.2119/helm-utils.el similarity index 99% rename from elpa/helm-20150403.101/helm-utils.el rename to elpa/helm-20150426.2119/helm-utils.el index e3f5b937..6e5853a6 100644 --- a/elpa/helm-20150403.101/helm-utils.el +++ b/elpa/helm-20150426.2119/helm-utils.el @@ -236,7 +236,7 @@ To use this add it to `helm-goto-line-before-hook'." With a numeric prefix arg show only the ARG number of candidates." (interactive "p") (with-helm-window - (with-helm-default-directory helm-default-directory + (with-helm-default-directory (helm-default-directory) (let ((helm-candidate-number-limit (and (> arg 1) arg))) (helm-set-source-filter (list (assoc-default 'name (helm-get-current-source)))))))) diff --git a/elpa/helm-20150403.101/helm.el b/elpa/helm-20150426.2119/helm.el similarity index 99% rename from elpa/helm-20150403.101/helm.el rename to elpa/helm-20150426.2119/helm.el index 580e7c36..10c78ed3 100644 --- a/elpa/helm-20150403.101/helm.el +++ b/elpa/helm-20150426.2119/helm.el @@ -813,8 +813,6 @@ If nil, use default `mode-line-format'.") "Current buffer when `helm' is invoked.") (defvar helm-buffer-file-name nil "Variable `buffer-file-name' when `helm' is invoked.") -(defvar helm-default-directory nil - "The value of `default-directory' when `helm' is initialized.") (defvar helm-candidate-cache (make-hash-table :test 'equal) "Holds the available candidate within a single helm invocation.") (defvar helm-pattern "" @@ -1098,8 +1096,8 @@ not `exit-minibuffer' or unwanted functions." ,@body)) (defun helm-default-directory () - "Return the value of `helm-default-directory'." - (buffer-local-value 'helm-default-directory (get-buffer helm-buffer))) + "Return the local value of `default-directory' in `helm-buffer'." + (buffer-local-value 'default-directory (get-buffer helm-buffer))) (defmacro with-helm-temp-hook (hook &rest body) "Execute temporarily BODY as a function for HOOK." @@ -1560,7 +1558,8 @@ Return the result of last function call." (helm-log "functions = %S" functions) (helm-log "args = %S" args) (cl-loop with result for fn in funs - do (setq result (apply fn args)) finally return result))) + do (setq result (apply fn args)) + finally return result))) (defun helm-funcall-foreach (sym &optional sources) "Call the associated function to SYM for each source if any." @@ -1661,9 +1660,9 @@ candidate-transformer: This is used in transformers to modify candidates list." (if (functionp funcs) (apply 'helm-funcall-with-source source funcs args) - (apply 'helm-funcall-with-source source - (lambda (&rest oargs) (helm-compose oargs funcs)) - args))) + (apply 'helm-funcall-with-source source + (lambda (&rest oargs) (helm-compose oargs funcs)) + args))) (defun helm-stringify (str-or-sym) "Get string of STR-OR-SYM." @@ -1953,7 +1952,7 @@ Called from lisp, you can specify a buffer-name as a string with ARG." 'helm-full-frame (get-buffer any-buffer))) (setq helm-compiled-sources nil) (setq cur-dir (buffer-local-value - 'helm-default-directory (get-buffer any-buffer))) + 'default-directory (get-buffer any-buffer))) (unless (buffer-live-p helm-current-buffer) ;; `helm-current-buffer' may have been killed. (setq helm-current-buffer (current-buffer))) @@ -2312,7 +2311,6 @@ It is intended to use this only in `helm-initial-setup'." (set (make-local-variable 'scroll-margin) (if helm-display-source-at-screen-top 0 helm-completion-window-scroll-margin)) - (set (make-local-variable 'helm-default-directory) root-dir) (set (make-local-variable 'default-directory) root-dir) (set (make-local-variable 'helm-marked-candidates) nil) (helm-initialize-persistent-action) diff --git a/elpa/org-20150427.signed b/elpa/org-20150427.signed new file mode 100644 index 00000000..fe07a322 --- /dev/null +++ b/elpa/org-20150427.signed @@ -0,0 +1 @@ +Good signature from 474F05837FBDEF9B GNU ELPA Signing Agent (trust undefined) created at 2015-04-27T11:05:03+0200 using DSA \ No newline at end of file diff --git a/elpa/org-20150427/COPYING b/elpa/org-20150427/COPYING new file mode 100644 index 00000000..94a9ed02 --- /dev/null +++ b/elpa/org-20150427/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/elpa/org-20150427/README_ELPA b/elpa/org-20150427/README_ELPA new file mode 100644 index 00000000..be893243 --- /dev/null +++ b/elpa/org-20150427/README_ELPA @@ -0,0 +1,41 @@ +This is the Emacs Org project, an Emacs library for organizing your life. + +The homepage of Org is at: + http://orgmode.org + +Installations instructions are at: + http://orgmode.org/org.html#Installation + +This distribution contains an ELPA packaged version of Org. +"ELPA" stands for the "Emacs Lisp Package Archive". + +The GNU ELPA is at: + http://elpa.gnu.org + +It contains the org-*.tar package, containing only the org files +that are also part of GNU Emacs. + +There are other ELPA online, offering more packages. + +Some contain the org-plus-contrib-*.tar ELPA package, which bundles +the core Org files plus many additional contributed libraries. + +All ELPA packages of Org contain: + +README_ELPA + This file. + +*.el + Elisp files. + +org + The Org info manual. + +orgcard.pdf + The Org reference card. + +etc/ + Libraries for the ODT exporter. + +org-*-pkg.el + The name of the package, requested GNU Emacs packaging system. diff --git a/elpa/org-20150427/dir b/elpa/org-20150427/dir new file mode 100644 index 00000000..9610c404 --- /dev/null +++ b/elpa/org-20150427/dir @@ -0,0 +1,18 @@ +This is the file .../info/dir, which contains the +topmost node of the Info hierarchy, called (dir)Top. +The first time you invoke Info you start off looking at this node. + +File: dir, Node: Top This is the top of the INFO tree + + This (the Directory node) gives a menu of major topics. + Typing "q" exits, "?" lists all Info commands, "d" returns here, + "h" gives a primer for first-timers, + "mEmacs" visits the Emacs manual, etc. + + In Emacs, you can click mouse button 2 on a menu item or cross reference + to select it. + +* Menu: + +Emacs +* Org Mode: (org). Outline-based notes management and organizer diff --git a/elpa/org-20150427/etc/styles/OrgOdtContentTemplate.xml b/elpa/org-20150427/etc/styles/OrgOdtContentTemplate.xml new file mode 100644 index 00000000..d0c98a3e --- /dev/null +++ b/elpa/org-20150427/etc/styles/OrgOdtContentTemplate.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/elpa/org-20150427/etc/styles/OrgOdtStyles.xml b/elpa/org-20150427/etc/styles/OrgOdtStyles.xml new file mode 100644 index 00000000..f41d9840 --- /dev/null +++ b/elpa/org-20150427/etc/styles/OrgOdtStyles.xml @@ -0,0 +1,841 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + / + + / + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/elpa/org-20150427/etc/styles/README b/elpa/org-20150427/etc/styles/README new file mode 100644 index 00000000..d04f4349 --- /dev/null +++ b/elpa/org-20150427/etc/styles/README @@ -0,0 +1,36 @@ +The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the +following copyright information: + +Copyright (C) 2010-2014 Free Software Foundation, Inc. + +These files are part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . + + +Author: Jambunathan K +Keywords: outlines, hypermedia, calendar, wp +Homepage: http://orgmode.org + +Commentary: + +These files are part of Org-mode's OpenDocument export module. + +OrgOdtContentTemplate.xml provides a template within which the content +of an exported document is enclosed. This file contributes to +"content.xml" file within an exported document and acts as a +repository of automatic styles. + +OrgOdtStyles.xml contributes to "styles.xml" file within an exported +document and acts as a repository of custom styles. diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-C.el b/elpa/org-20150427/ob-C.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/ob-C.el rename to elpa/org-20150427/ob-C.el index ddceb14f..c460be32 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-C.el +++ b/elpa/org-20150427/ob-C.el @@ -1,6 +1,6 @@ ;;; ob-C.el --- org-babel functions for C and similar languages -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-R.el b/elpa/org-20150427/ob-R.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ob-R.el rename to elpa/org-20150427/ob-R.el index 58f55366..b97fd912 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-R.el +++ b/elpa/org-20150427/ob-R.el @@ -1,6 +1,6 @@ ;;; ob-R.el --- org-babel functions for R code evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Dan Davison @@ -173,12 +173,11 @@ This function is called by `org-babel-execute-src-block'." (defun org-babel-R-assign-elisp (name value colnames-p rownames-p) "Construct R code assigning the elisp VALUE to a variable named NAME." (if (listp value) - (let ((max (apply #'max (mapcar #'length (org-remove-if-not - #'sequencep value)))) - (min (apply #'min (mapcar #'length (org-remove-if-not - #'sequencep value)))) - (transition-file (org-babel-temp-file "R-import-"))) - ;; ensure VALUE has an orgtbl structure (depth of at least 2) + (let* ((lengths (mapcar 'length (org-remove-if-not 'sequencep value))) + (max (if lengths (apply 'max lengths) 0)) + (min (if lengths (apply 'min lengths) 0)) + (transition-file (org-babel-temp-file "R-import-"))) + ;; Ensure VALUE has an orgtbl structure (depth of at least 2). (unless (listp (car value)) (setq value (list value))) (with-temp-file transition-file (insert diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-asymptote.el b/elpa/org-20150427/ob-asymptote.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-asymptote.el rename to elpa/org-20150427/ob-asymptote.el index 4ea68df9..21c0a170 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-asymptote.el +++ b/elpa/org-20150427/ob-asymptote.el @@ -1,6 +1,6 @@ ;;; ob-asymptote.el --- org-babel functions for asymptote evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-awk.el b/elpa/org-20150427/ob-awk.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-awk.el rename to elpa/org-20150427/ob-awk.el index a9215d0b..ed98afdf 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-awk.el +++ b/elpa/org-20150427/ob-awk.el @@ -1,6 +1,6 @@ ;;; ob-awk.el --- org-babel functions for awk evaluation -;; Copyright (C) 2011-2013 Free Software Foundation, Inc. +;; Copyright (C) 2011-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-calc.el b/elpa/org-20150427/ob-calc.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-calc.el rename to elpa/org-20150427/ob-calc.el index b4201a18..cdb528a5 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-calc.el +++ b/elpa/org-20150427/ob-calc.el @@ -1,6 +1,6 @@ ;;; ob-calc.el --- org-babel functions for calc code evaluation -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-clojure.el b/elpa/org-20150427/ob-clojure.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-clojure.el rename to elpa/org-20150427/ob-clojure.el index 25b39f7f..78f3c6d3 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-clojure.el +++ b/elpa/org-20150427/ob-clojure.el @@ -1,6 +1,6 @@ ;;; ob-clojure.el --- org-babel functions for clojure evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Joel Boehland ;; Eric Schulte diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-comint.el b/elpa/org-20150427/ob-comint.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/ob-comint.el rename to elpa/org-20150427/ob-comint.el index 8b03e2dc..40bfaf7c 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-comint.el +++ b/elpa/org-20150427/ob-comint.el @@ -1,6 +1,6 @@ ;;; ob-comint.el --- org-babel functions for interaction with comint buffers -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, comint diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-core.el b/elpa/org-20150427/ob-core.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/ob-core.el rename to elpa/org-20150427/ob-core.el index 0ec945d6..a6ffcc48 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-core.el +++ b/elpa/org-20150427/ob-core.el @@ -1,6 +1,6 @@ ;;; ob-core.el --- working with code blocks in org-mode -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison @@ -38,6 +38,7 @@ (defvar org-src-lang-modes) (defvar org-babel-library-of-babel) (declare-function show-all "outline" ()) +(declare-function org-every "org" (pred seq)) (declare-function org-reduce "org" (CL-FUNC CL-SEQ &rest CL-KEYS)) (declare-function org-mark-ring-push "org" (&optional pos buffer)) (declare-function tramp-compat-make-temp-file "tramp-compat" @@ -95,7 +96,8 @@ (declare-function org-unescape-code-in-string "org-src" (s)) (declare-function org-table-to-lisp "org-table" (&optional txt)) (declare-function org-reverse-string "org" (string)) -(declare-function org-element-context "org-element" (&optional ELEMENT)) +(declare-function org-element-context "org-element" (&optional element)) +(declare-function org-element-type "org-element" (element)) (defgroup org-babel nil "Code block evaluation and management in `org-mode' documents." @@ -217,7 +219,7 @@ Returns non-nil if match-data set" (let ((src-at-0-p (save-excursion (beginning-of-line 1) (string= "src" (thing-at-point 'word)))) - (first-line-p (= 1 (line-number-at-pos))) + (first-line-p (= (line-beginning-position) (point-min))) (orig (point))) (let ((search-for (cond ((and src-at-0-p first-line-p "src_")) (first-line-p "[[:punct:] \t]src_") @@ -318,7 +320,7 @@ Do not query the user." (message (format "Evaluation of this%scode-block%sis disabled." code-block block-name)))))) - ;; dynamically scoped for asynchroneous export + ;; dynamically scoped for asynchronous export (defvar org-babel-confirm-evaluate-answer-no) (defsubst org-babel-confirm-evaluate (info) @@ -940,7 +942,7 @@ evaluation mechanisms." (defvar org-bracket-link-regexp) (defun org-babel-active-location-p () - (memq (car (save-match-data (org-element-context))) + (memq (org-element-type (save-match-data (org-element-context))) '(babel-call inline-babel-call inline-src-block src-block))) ;;;###autoload @@ -994,7 +996,8 @@ beg-body --------- point at the beginning of the body end-body --------- point at the end of the body" (declare (indent 1)) (let ((tempvar (make-symbol "file"))) - `(let* ((,tempvar ,file) + `(let* ((case-fold-search t) + (,tempvar ,file) (visited-p (or (null ,tempvar) (get-file-buffer (expand-file-name ,tempvar)))) (point (point)) to-be-removed) @@ -1033,7 +1036,8 @@ If FILE is nil evaluate BODY forms on source blocks in current buffer." (declare (indent 1)) (let ((tempvar (make-symbol "file"))) - `(let* ((,tempvar ,file) + `(let* ((case-fold-search t) + (,tempvar ,file) (visited-p (or (null ,tempvar) (get-file-buffer (expand-file-name ,tempvar)))) (point (point)) to-be-removed) @@ -1348,7 +1352,7 @@ specified in the properties of the current outline entry." (org-entry-get org-babel-current-src-block-location (concat "header-args:" lang) 'inherit)))))) -(defvar org-src-preserve-indentation) +(defvar org-src-preserve-indentation) ;; declare defcustom from org-src (defun org-babel-parse-src-block-match () "Parse the results from a match of the `org-babel-src-block-regexp'." (let* ((block-indentation (length (match-string 1))) @@ -2100,9 +2104,9 @@ code ---- the results are extracted in the syntax of the source ((funcall proper-list-p result) (goto-char beg) (insert (concat (orgtbl-to-orgtbl - (if (or (eq 'hline (car result)) - (and (listp (car result)) - (listp (cdr (car result))))) + (if (org-every + (lambda (el) (or (listp el) (eq el 'hline))) + result) result (list result)) '(:fmt (lambda (cell) (format "%s" cell)))) "\n")) (goto-char beg) (when (org-at-table-p) (org-table-align))) diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-css.el b/elpa/org-20150427/ob-css.el similarity index 96% rename from xemacs-packages/lisp/org-8.2.3c/ob-css.el rename to elpa/org-20150427/ob-css.el index a1205f59..2fedb354 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-css.el +++ b/elpa/org-20150427/ob-css.el @@ -1,6 +1,6 @@ ;;; ob-css.el --- org-babel functions for css evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-ditaa.el b/elpa/org-20150427/ob-ditaa.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-ditaa.el rename to elpa/org-20150427/ob-ditaa.el index 36681d0a..26f0e4f4 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-ditaa.el +++ b/elpa/org-20150427/ob-ditaa.el @@ -1,6 +1,6 @@ ;;; ob-ditaa.el --- org-babel functions for ditaa evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-dot.el b/elpa/org-20150427/ob-dot.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-dot.el rename to elpa/org-20150427/ob-dot.el index 75042641..b35d7bbc 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-dot.el +++ b/elpa/org-20150427/ob-dot.el @@ -1,6 +1,6 @@ ;;; ob-dot.el --- org-babel functions for dot evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-emacs-lisp.el b/elpa/org-20150427/ob-emacs-lisp.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-emacs-lisp.el rename to elpa/org-20150427/ob-emacs-lisp.el index a30e369e..3219344d 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-emacs-lisp.el +++ b/elpa/org-20150427/ob-emacs-lisp.el @@ -1,6 +1,6 @@ ;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-eval.el b/elpa/org-20150427/ob-eval.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-eval.el rename to elpa/org-20150427/ob-eval.el index 85a8c4e3..057590f0 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-eval.el +++ b/elpa/org-20150427/ob-eval.el @@ -1,6 +1,6 @@ ;;; ob-eval.el --- org-babel functions for external code evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, comint diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-exp.el b/elpa/org-20150427/ob-exp.el similarity index 64% rename from xemacs-packages/lisp/org-8.2.3c/ob-exp.el rename to elpa/org-20150427/ob-exp.el index d6d4566c..761c9f17 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-exp.el +++ b/elpa/org-20150427/ob-exp.el @@ -1,6 +1,6 @@ ;;; ob-exp.el --- Exportation of org-babel source blocks -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison @@ -24,6 +24,7 @@ ;;; Code: (require 'ob-core) +(require 'org-src) (eval-when-compile (require 'cl)) @@ -150,19 +151,17 @@ this template." :type 'string) (defvar org-babel-default-lob-header-args) -(defun org-babel-exp-non-block-elements (start end) - "Process inline source and call lines between START and END for export." +(defun org-babel-exp-process-buffer () + "Execute all Babel blocks in current buffer." (interactive) - (save-excursion - (goto-char start) - (unless (markerp end) - (let ((m (make-marker))) - (set-marker m end (current-buffer)) - (setq end m))) - (let ((rx (concat "\\(?:" org-babel-inline-src-block-regexp - "\\|" org-babel-lob-one-liner-regexp "\\)"))) - (while (re-search-forward rx end t) - (save-excursion + (save-window-excursion + (save-excursion + (let ((case-fold-search t) + (regexp (concat org-babel-inline-src-block-regexp "\\|" + org-babel-lob-one-liner-regexp "\\|" + "^[ \t]*#\\+BEGIN_SRC"))) + (goto-char (point-min)) + (while (re-search-forward regexp nil t) (let* ((element (save-excursion ;; If match is inline, point is at its ;; end. Move backward so @@ -170,145 +169,120 @@ this template." ;; object, not the following one. (backward-char) (save-match-data (org-element-context)))) - (type (org-element-type element))) - (when (memq type '(babel-call inline-babel-call inline-src-block)) - (let ((beg-el (org-element-property :begin element)) - (end-el (org-element-property :end element))) - (case type - (inline-src-block - (let* ((info (org-babel-parse-inline-src-block-match)) - (params (nth 2 info))) - (setf (nth 1 info) - (if (and (cdr (assoc :noweb params)) - (string= "yes" (cdr (assoc :noweb params)))) - (org-babel-expand-noweb-references - info (org-babel-exp-get-export-buffer)) - (nth 1 info))) - (goto-char beg-el) - (let ((replacement (org-babel-exp-do-export info 'inline))) - (if (equal replacement "") - ;; Replacement code is empty: completely - ;; remove inline src block, including extra - ;; white space that might have been created - ;; when inserting results. - (delete-region beg-el - (progn (goto-char end-el) - (skip-chars-forward " \t") - (point))) - ;; Otherwise: remove inline src block but - ;; preserve following white spaces. Then - ;; insert value. - (delete-region beg-el - (progn (goto-char end-el) - (skip-chars-backward " \t") - (point))) - (insert replacement))))) - ((babel-call inline-babel-call) - (let* ((lob-info (org-babel-lob-get-info)) - (results - (org-babel-exp-do-export - (list "emacs-lisp" "results" - (apply #'org-babel-merge-params - org-babel-default-header-args - org-babel-default-lob-header-args - (append - (org-babel-params-from-properties) - (list - (org-babel-parse-header-arguments - (org-no-properties - (concat - ":var results=" - (mapconcat 'identity - (butlast lob-info 2) - " "))))))) - "" (nth 3 lob-info) (nth 2 lob-info)) - 'lob)) - (rep (org-fill-template - org-babel-exp-call-line-template - `(("line" . ,(nth 0 lob-info)))))) - ;; If replacement is empty, completely remove the - ;; object/element, including any extra white space - ;; that might have been created when including - ;; results. - (if (equal rep "") - (delete-region - beg-el - (progn (goto-char end-el) - (if (not (eq type 'babel-call)) - (progn (skip-chars-forward " \t") (point)) - (skip-chars-forward " \r\t\n") - (line-beginning-position)))) - ;; Otherwise, preserve following white - ;; spaces/newlines and then, insert replacement - ;; string. - (goto-char beg-el) - (delete-region beg-el - (progn (goto-char end-el) - (skip-chars-backward " \r\t\n") - (point))) - (insert rep))))))))))))) - -(defvar org-src-preserve-indentation) ; From org-src.el -(defun org-babel-exp-process-buffer () - "Execute all blocks in visible part of buffer." - (interactive) - (save-window-excursion - (let ((case-fold-search t) - (pos (point-min))) - (goto-char pos) - (while (re-search-forward "^[ \t]*#\\+BEGIN_SRC" nil t) - (let ((element (save-match-data (org-element-at-point)))) - (when (eq (org-element-type element) 'src-block) - (let* ((match-start (copy-marker (match-beginning 0))) - (begin (copy-marker (org-element-property :begin element))) - ;; Make sure we don't remove any blank lines after - ;; the block when replacing it. - (block-end (save-excursion - (goto-char (org-element-property :end element)) - (skip-chars-backward " \r\t\n") - (copy-marker (line-end-position)))) - (ind (org-get-indentation)) - (headers - (cons - (org-element-property :language element) - (let ((params (org-element-property :parameters element))) - (and params (org-split-string params "[ \t]+")))))) - ;; Execute all non-block elements between POS and - ;; current block. - (org-babel-exp-non-block-elements pos begin) - ;; Take care of matched block: compute replacement - ;; string. In particular, a nil REPLACEMENT means the - ;; block should be left as-is while an empty string - ;; should remove the block. - (let ((replacement (progn (goto-char match-start) - (org-babel-exp-src-block headers)))) - (cond ((not replacement) (goto-char block-end)) - ((equal replacement "") + (type (org-element-type element)) + (begin (copy-marker (org-element-property :begin element))) + (end (copy-marker + (save-excursion + (goto-char (org-element-property :end element)) + (skip-chars-backward " \r\t\n") + (point))))) + (case type + (inline-src-block + (let* ((info (org-babel-parse-inline-src-block-match)) + (params (nth 2 info))) + (setf (nth 1 info) + (if (and (cdr (assoc :noweb params)) + (string= "yes" (cdr (assoc :noweb params)))) + (org-babel-expand-noweb-references + info (org-babel-exp-get-export-buffer)) + (nth 1 info))) + (goto-char begin) + (let ((replacement (org-babel-exp-do-export info 'inline))) + (if (equal replacement "") + ;; Replacement code is empty: remove inline src + ;; block, including extra white space that + ;; might have been created when inserting + ;; results. (delete-region begin - (progn (goto-char block-end) - (skip-chars-forward " \r\t\n") - (if (eobp) (point) - (line-beginning-position))))) - (t - (goto-char match-start) - (delete-region (point) block-end) - (insert replacement) - (if (org-element-property :preserve-indent element) - ;; Indent only the code block markers. - (save-excursion (skip-chars-backward " \r\t\n") - (indent-line-to ind) - (goto-char match-start) - (indent-line-to ind)) - ;; Indent everything. - (indent-rigidly match-start (point) ind))))) - (setq pos (line-beginning-position)) - ;; Cleanup markers. - (set-marker match-start nil) - (set-marker begin nil) - (set-marker block-end nil))))) - ;; Eventually execute all non-block Babel elements between last - ;; src-block and end of buffer. - (org-babel-exp-non-block-elements pos (point-max))))) + (progn (goto-char end) + (skip-chars-forward " \t") + (point))) + ;; Otherwise: remove inline src block but + ;; preserve following white spaces. Then insert + ;; value. + (delete-region begin end) + (insert replacement))))) + ((babel-call inline-babel-call) + (let* ((lob-info (org-babel-lob-get-info)) + (results + (org-babel-exp-do-export + (list "emacs-lisp" "results" + (apply #'org-babel-merge-params + org-babel-default-header-args + org-babel-default-lob-header-args + (append + (org-babel-params-from-properties) + (list + (org-babel-parse-header-arguments + (org-no-properties + (concat + ":var results=" + (mapconcat 'identity + (butlast lob-info 2) + " "))))))) + "" (nth 3 lob-info) (nth 2 lob-info)) + 'lob)) + (rep (org-fill-template + org-babel-exp-call-line-template + `(("line" . ,(nth 0 lob-info)))))) + ;; If replacement is empty, completely remove the + ;; object/element, including any extra white space + ;; that might have been created when including + ;; results. + (if (equal rep "") + (delete-region + begin + (progn (goto-char end) + (if (not (eq type 'babel-call)) + (progn (skip-chars-forward " \t") (point)) + (skip-chars-forward " \r\t\n") + (line-beginning-position)))) + ;; Otherwise, preserve following white + ;; spaces/newlines and then, insert replacement + ;; string. + (goto-char begin) + (delete-region begin end) + (insert rep)))) + (src-block + (let* ((match-start (copy-marker (match-beginning 0))) + (ind (org-get-indentation)) + (headers + (cons + (org-element-property :language element) + (let ((params (org-element-property :parameters + element))) + (and params (org-split-string params "[ \t]+")))))) + ;; Take care of matched block: compute replacement + ;; string. In particular, a nil REPLACEMENT means + ;; the block should be left as-is while an empty + ;; string should remove the block. + (let ((replacement (progn (goto-char match-start) + (org-babel-exp-src-block headers)))) + (cond ((not replacement) (goto-char end)) + ((equal replacement "") + (goto-char end) + (skip-chars-forward " \r\t\n") + (beginning-of-line) + (delete-region begin (point))) + (t + (goto-char match-start) + (delete-region (point) + (save-excursion (goto-char end) + (line-end-position))) + (insert replacement) + (if (or org-src-preserve-indentation + (org-element-property :preserve-indent + element)) + ;; Indent only the code block markers. + (save-excursion (skip-chars-backward " \r\t\n") + (indent-line-to ind) + (goto-char match-start) + (indent-line-to ind)) + ;; Indent everything. + (indent-rigidly match-start (point) ind))))) + (set-marker match-start nil)))) + (set-marker begin nil) + (set-marker end nil))))))) (defun org-babel-in-example-or-verbatim () "Return true if point is in example or verbatim code. @@ -338,7 +312,7 @@ The function respects the value of the :exports header argument." (org-babel-exp-code info))))) (defcustom org-babel-exp-code-template - "#+BEGIN_SRC %lang%flags\n%body\n#+END_SRC" + "#+BEGIN_SRC %lang%switches%flags\n%body\n#+END_SRC" "Template used to export the body of code blocks. This template may be customized to include additional information such as the code block name, or the values of particular header @@ -348,6 +322,7 @@ and the following %keys may be used. lang ------ the language of the code block name ------ the name of the code block body ------ the body of the code block + switches -- the switches associated to the code block flags ----- the flags passed to the code block In addition to the keys mentioned above, every header argument @@ -370,11 +345,14 @@ replaced with its value." org-babel-exp-code-template `(("lang" . ,(nth 0 info)) ("body" . ,(org-escape-code-in-string (nth 1 info))) + ("switches" . ,(let ((f (nth 3 info))) + (and (org-string-nw-p f) (concat " " f)))) + ("flags" . ,(let ((f (assq :flags (nth 2 info)))) + (and f (concat " " (cdr f))))) ,@(mapcar (lambda (pair) (cons (substring (symbol-name (car pair)) 1) (format "%S" (cdr pair)))) (nth 2 info)) - ("flags" . ,(let ((f (nth 3 info))) (when f (concat " " f)))) ("name" . ,(or (nth 4 info) ""))))) (defun org-babel-exp-results (info type &optional silent hash) diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-fortran.el b/elpa/org-20150427/ob-fortran.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/ob-fortran.el rename to elpa/org-20150427/ob-fortran.el index 61cb19a5..0211fda5 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-fortran.el +++ b/elpa/org-20150427/ob-fortran.el @@ -1,6 +1,6 @@ ;;; ob-fortran.el --- org-babel functions for fortran -;; Copyright (C) 2011-2013 Free Software Foundation, Inc. +;; Copyright (C) 2011-2014 Free Software Foundation, Inc. ;; Authors: Sergey Litvinov ;; Eric Schulte diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-gnuplot.el b/elpa/org-20150427/ob-gnuplot.el similarity index 96% rename from xemacs-packages/lisp/org-8.2.3c/ob-gnuplot.el rename to elpa/org-20150427/ob-gnuplot.el index cc9186b1..ffe5dcf5 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-gnuplot.el +++ b/elpa/org-20150427/ob-gnuplot.el @@ -1,6 +1,6 @@ ;;; ob-gnuplot.el --- org-babel functions for gnuplot evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research @@ -85,10 +85,15 @@ code." (lambda (pair) (cons (car pair) ;; variable name - (if (listp (cdr pair)) ;; variable value - (org-babel-gnuplot-table-to-data - (cdr pair) (org-babel-temp-file "gnuplot-") params) - (cdr pair)))) + (let* ((val (cdr pair)) ;; variable value + (lp (listp val))) + (if lp + (org-babel-gnuplot-table-to-data + (let* ((first (car val)) + (tablep (or (listp first) (symbolp first)))) + (if tablep val (mapcar 'list val))) + (org-babel-temp-file "gnuplot-") params) + val)))) (mapcar #'cdr (org-babel-get-header params :var))))) (defun org-babel-expand-body:gnuplot (body params) @@ -253,7 +258,7 @@ then create one. Return the initialized session. The current (org-babel-gnuplot-quote-timestamp-field s) (if (zerop (length s)) (or *org-babel-gnuplot-missing* s) - (if (string-match "[ \"]" "?") + (if (string-match "[ \"]" s) (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\"") s))))) diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-haskell.el b/elpa/org-20150427/ob-haskell.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-haskell.el rename to elpa/org-20150427/ob-haskell.el index 6c9fed14..00066702 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-haskell.el +++ b/elpa/org-20150427/ob-haskell.el @@ -1,6 +1,6 @@ ;;; ob-haskell.el --- org-babel functions for haskell evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research @@ -147,7 +147,6 @@ specifying a variable of the same value." (concat "[" (mapconcat #'org-babel-haskell-var-to-haskell var ", ") "]") (format "%S" var))) -(defvar org-src-preserve-indentation) (defvar org-export-copy-to-kill-ring) (declare-function org-export-to-file "ox" (backend file diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-io.el b/elpa/org-20150427/ob-io.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-io.el rename to elpa/org-20150427/ob-io.el index 5368ff51..971b37fc 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-io.el +++ b/elpa/org-20150427/ob-io.el @@ -1,6 +1,6 @@ ;;; ob-io.el --- org-babel functions for Io evaluation -;; Copyright (C) 2012-2013 Free Software Foundation, Inc. +;; Copyright (C) 2012-2014 Free Software Foundation, Inc. ;; Author: Andrzej Lichnerowicz ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-java.el b/elpa/org-20150427/ob-java.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ob-java.el rename to elpa/org-20150427/ob-java.el index 37ac8dae..22f8785f 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-java.el +++ b/elpa/org-20150427/ob-java.el @@ -1,6 +1,6 @@ ;;; ob-java.el --- org-babel functions for java evaluation -;; Copyright (C) 2011-2013 Free Software Foundation, Inc. +;; Copyright (C) 2011-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-js.el b/elpa/org-20150427/ob-js.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ob-js.el rename to elpa/org-20150427/ob-js.el index 78914bc2..ea51ed98 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-js.el +++ b/elpa/org-20150427/ob-js.el @@ -1,6 +1,6 @@ ;;; ob-js.el --- org-babel functions for Javascript -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, js @@ -113,7 +113,7 @@ Convert an elisp value into a string of js source code specifying a variable of the same value." (if (listp var) (concat "[" (mapconcat #'org-babel-js-var-to-js var ", ") "]") - (format "%S" var))) + (replace-regexp-in-string "\n" "\\\\n" (format "%S" var)))) (defun org-babel-prep-session:js (session params) "Prepare SESSION according to the header arguments specified in PARAMS." diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-keys.el b/elpa/org-20150427/ob-keys.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-keys.el rename to elpa/org-20150427/ob-keys.el index 6cc7387e..90b5196c 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-keys.el +++ b/elpa/org-20150427/ob-keys.el @@ -1,6 +1,6 @@ ;;; ob-keys.el --- key bindings for org-babel -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-latex.el b/elpa/org-20150427/ob-latex.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-latex.el rename to elpa/org-20150427/ob-latex.el index 85918e60..35b66507 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-latex.el +++ b/elpa/org-20150427/ob-latex.el @@ -1,6 +1,6 @@ ;;; ob-latex.el --- org-babel functions for latex "evaluation" -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research @@ -59,7 +59,7 @@ '("[usenames]{color}" "{tikz}" "{color}" "{listings}" "{amsmath}") "Packages to use for htlatex export." :group 'org-babel - :type '(list (string))) + :type '(repeat (string))) (defun org-babel-expand-body:latex (body params) "Expand BODY according to PARAMS, return the expanded body." diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-ledger.el b/elpa/org-20150427/ob-ledger.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ob-ledger.el rename to elpa/org-20150427/ob-ledger.el index 17911cc7..806fec61 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-ledger.el +++ b/elpa/org-20150427/ob-ledger.el @@ -1,6 +1,6 @@ ;;; ob-ledger.el --- org-babel functions for ledger evaluation -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Keywords: literate programming, reproducible research, accounting diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-lilypond.el b/elpa/org-20150427/ob-lilypond.el similarity index 61% rename from xemacs-packages/lisp/org-8.2.3c/ob-lilypond.el rename to elpa/org-20150427/ob-lilypond.el index a58a443d..00a951d3 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-lilypond.el +++ b/elpa/org-20150427/ob-lilypond.el @@ -1,6 +1,6 @@ ;;; ob-lilypond.el --- org-babel functions for lilypond evaluation -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Martyn Jago ;; Keywords: babel language, literate programming @@ -39,62 +39,62 @@ (defvar org-babel-default-header-args:lilypond '() "Default header arguments for lilypond code blocks. NOTE: The arguments are determined at lilypond compile time. -See (ly-set-header-args)") +See (org-babel-lilypond-set-header-args)") -(defvar ly-compile-post-tangle t +(defvar org-babel-lilypond-compile-post-tangle t "Following the org-babel-tangle (C-c C-v t) command, -ly-compile-post-tangle determines whether ob-lilypond should +org-babel-lilypond-compile-post-tangle determines whether ob-lilypond should automatically attempt to compile the resultant tangled file. If the value is nil, no automated compilation takes place. Default value is t") -(defvar ly-display-pdf-post-tangle t +(defvar org-babel-lilypond-display-pdf-post-tangle t "Following a successful LilyPond compilation -ly-display-pdf-post-tangle determines whether to automate the +org-babel-lilypond-display-pdf-post-tangle determines whether to automate the drawing / redrawing of the resultant pdf. If the value is nil, the pdf is not automatically redrawn. Default value is t") -(defvar ly-play-midi-post-tangle t +(defvar org-babel-lilypond-play-midi-post-tangle t "Following a successful LilyPond compilation -ly-play-midi-post-tangle determines whether to automate the +org-babel-lilypond-play-midi-post-tangle determines whether to automate the playing of the resultant midi file. If the value is nil, the midi file is not automatically played. Default value is t") -(defvar ly-OSX-ly-path +(defvar org-babel-lilypond-OSX-ly-path "/Applications/lilypond.app/Contents/Resources/bin/lilypond") -(defvar ly-OSX-pdf-path "open") -(defvar ly-OSX-midi-path "open") +(defvar org-babel-lilypond-OSX-pdf-path "open") +(defvar org-babel-lilypond-OSX-midi-path "open") -(defvar ly-nix-ly-path "/usr/bin/lilypond") -(defvar ly-nix-pdf-path "evince") -(defvar ly-nix-midi-path "timidity") +(defvar org-babel-lilypond-nix-ly-path "/usr/bin/lilypond") +(defvar org-babel-lilypond-nix-pdf-path "evince") +(defvar org-babel-lilypond-nix-midi-path "timidity") -(defvar ly-w32-ly-path "lilypond") -(defvar ly-w32-pdf-path "") -(defvar ly-w32-midi-path "") +(defvar org-babel-lilypond-w32-ly-path "lilypond") +(defvar org-babel-lilypond-w32-pdf-path "") +(defvar org-babel-lilypond-w32-midi-path "") -(defvar ly-gen-png nil +(defvar org-babel-lilypond-gen-png nil "Image generation (png) can be turned on by default by setting -LY-GEN-PNG to t") +ORG-BABEL-LILYPOND-GEN-PNG to t") -(defvar ly-gen-svg nil +(defvar org-babel-lilypond-gen-svg nil "Image generation (SVG) can be turned on by default by setting -LY-GEN-SVG to t") +ORG-BABEL-LILYPOND-GEN-SVG to t") -(defvar ly-gen-html nil +(defvar org-babel-lilypond-gen-html nil "HTML generation can be turned on by default by setting -LY-GEN-HTML to t") +ORG-BABEL-LILYPOND-GEN-HTML to t") -(defvar ly-gen-pdf nil +(defvar org-babel-lilypond-gen-pdf nil "PDF generation can be turned on by default by setting -LY-GEN-PDF to t") +ORG-BABEL-LILYPOND-GEN-PDF to t") -(defvar ly-use-eps nil +(defvar org-babel-lilypond-use-eps nil "You can force the compiler to use the EPS backend by setting -LY-USE-EPS to t") +ORG-BABEL-LILYPOND-USE-EPS to t") -(defvar ly-arrange-mode nil - "Arrange mode is turned on by setting LY-ARRANGE-MODE +(defvar org-babel-lilypond-arrange-mode nil + "Arrange mode is turned on by setting ORG-BABEL-LILYPOND-ARRANGE-MODE to t. In Arrange mode the following settings are altered from default... :tangle yes, :noweb yes @@ -123,20 +123,20 @@ Depending on whether we are in arrange mode either: 1. Attempt to execute lilypond block according to header settings (This is the default basic mode) 2. Tangle all lilypond blocks and process the result (arrange mode)" - (ly-set-header-args ly-arrange-mode) - (if ly-arrange-mode - (ly-tangle) - (ly-process-basic body params))) + (org-babel-lilypond-set-header-args org-babel-lilypond-arrange-mode) + (if org-babel-lilypond-arrange-mode + (org-babel-lilypond-tangle) + (org-babel-lilypond-process-basic body params))) -(defun ly-tangle () +(defun org-babel-lilypond-tangle () "ob-lilypond specific tangle, attempts to invoke =ly-execute-tangled-ly= if tangle is successful. Also passes specific arguments to =org-babel-tangle=" (interactive) (if (org-babel-tangle nil "yes" "lilypond") - (ly-execute-tangled-ly) nil)) + (org-babel-lilypond-execute-tangled-ly) nil)) -(defun ly-process-basic (body params) +(defun org-babel-lilypond-process-basic (body params) "Execute a lilypond block in basic mode." (let* ((result-params (cdr (assoc :result-params params))) (out-file (cdr (assoc :file params))) @@ -148,7 +148,7 @@ specific arguments to =org-babel-tangle=" (insert (org-babel-expand-body:generic body params))) (org-babel-eval (concat - (ly-determine-ly-path) + (org-babel-lilypond-determine-ly-path) " -dbackend=eps " "-dno-gs-load-fonts " "-dinclude-eps-fonts " @@ -167,45 +167,45 @@ specific arguments to =org-babel-tangle=" "Return an error because LilyPond exporter does not support sessions." (error "Sorry, LilyPond does not currently support sessions!")) -(defun ly-execute-tangled-ly () +(defun org-babel-lilypond-execute-tangled-ly () "Compile result of block tangle with lilypond. If error in compilation, attempt to mark the error in lilypond org file" - (when ly-compile-post-tangle - (let ((ly-tangled-file (ly-switch-extension + (when org-babel-lilypond-compile-post-tangle + (let ((org-babel-lilypond-tangled-file (org-babel-lilypond-switch-extension (buffer-file-name) ".lilypond")) - (ly-temp-file (ly-switch-extension + (org-babel-lilypond-temp-file (org-babel-lilypond-switch-extension (buffer-file-name) ".ly"))) - (if (file-exists-p ly-tangled-file) + (if (file-exists-p org-babel-lilypond-tangled-file) (progn - (when (file-exists-p ly-temp-file) - (delete-file ly-temp-file)) - (rename-file ly-tangled-file - ly-temp-file)) + (when (file-exists-p org-babel-lilypond-temp-file) + (delete-file org-babel-lilypond-temp-file)) + (rename-file org-babel-lilypond-tangled-file + org-babel-lilypond-temp-file)) (error "Error: Tangle Failed!") t) (switch-to-buffer-other-window "*lilypond*") (erase-buffer) - (ly-compile-lilyfile ly-temp-file) + (org-babel-lilypond-compile-lilyfile org-babel-lilypond-temp-file) (goto-char (point-min)) - (if (not (ly-check-for-compile-error ly-temp-file)) + (if (not (org-babel-lilypond-check-for-compile-error org-babel-lilypond-temp-file)) (progn (other-window -1) - (ly-attempt-to-open-pdf ly-temp-file) - (ly-attempt-to-play-midi ly-temp-file)) + (org-babel-lilypond-attempt-to-open-pdf org-babel-lilypond-temp-file) + (org-babel-lilypond-attempt-to-play-midi org-babel-lilypond-temp-file)) (error "Error in Compilation!")))) nil) -(defun ly-compile-lilyfile (file-name &optional test) +(defun org-babel-lilypond-compile-lilyfile (file-name &optional test) "Compile lilypond file and check for compile errors FILE-NAME is full path to lilypond (.ly) file" (message "Compiling LilyPond...") - (let ((arg-1 (ly-determine-ly-path)) ;program + (let ((arg-1 (org-babel-lilypond-determine-ly-path)) ;program (arg-2 nil) ;infile (arg-3 "*lilypond*") ;buffer (arg-4 t) ;display - (arg-5 (if ly-gen-png "--png" "")) ;&rest... - (arg-6 (if ly-gen-html "--html" "")) - (arg-7 (if ly-gen-pdf "--pdf" "")) - (arg-8 (if ly-use-eps "-dbackend=eps" "")) - (arg-9 (if ly-gen-svg "-dbackend=svg" "")) + (arg-5 (if org-babel-lilypond-gen-png "--png" "")) ;&rest... + (arg-6 (if org-babel-lilypond-gen-html "--html" "")) + (arg-7 (if org-babel-lilypond-gen-pdf "--pdf" "")) + (arg-8 (if org-babel-lilypond-use-eps "-dbackend=eps" "")) + (arg-9 (if org-babel-lilypond-gen-svg "-dbackend=svg" "")) (arg-10 (concat "--output=" (file-name-sans-extension file-name))) (arg-11 file-name)) (if test @@ -215,7 +215,7 @@ FILE-NAME is full path to lilypond (.ly) file" arg-1 arg-2 arg-3 arg-4 arg-5 arg-6 arg-7 arg-8 arg-9 arg-10 arg-11)))) -(defun ly-check-for-compile-error (file-name &optional test) +(defun org-babel-lilypond-check-for-compile-error (file-name &optional test) "Check for compile error. This is performed by parsing the *lilypond* buffer containing the output message from the compilation. @@ -226,24 +226,24 @@ nil as file-name since it is unused in this context" (if (not test) (if (not is-error) nil - (ly-process-compile-error file-name)) + (org-babel-lilypond-process-compile-error file-name)) is-error))) -(defun ly-process-compile-error (file-name) +(defun org-babel-lilypond-process-compile-error (file-name) "Process the compilation error that has occurred. FILE-NAME is full path to lilypond file" - (let ((line-num (ly-parse-line-num))) - (let ((error-lines (ly-parse-error-line file-name line-num))) - (ly-mark-error-line file-name error-lines) + (let ((line-num (org-babel-lilypond-parse-line-num))) + (let ((error-lines (org-babel-lilypond-parse-error-line file-name line-num))) + (org-babel-lilypond-mark-error-line file-name error-lines) (error "Error: Compilation Failed!")))) -(defun ly-mark-error-line (file-name line) +(defun org-babel-lilypond-mark-error-line (file-name line) "Mark the erroneous lines in the lilypond org buffer. FILE-NAME is full path to lilypond file. LINE is the erroneous line" (switch-to-buffer-other-window (concat (file-name-nondirectory - (ly-switch-extension file-name ".org")))) + (org-babel-lilypond-switch-extension file-name ".org")))) (let ((temp (point))) (goto-char (point-min)) (setq case-fold-search nil) @@ -254,7 +254,7 @@ LINE is the erroneous line" (goto-char (- (point) (length line)))) (goto-char temp)))) -(defun ly-parse-line-num (&optional buffer) +(defun org-babel-lilypond-parse-line-num (&optional buffer) "Extract error line number." (when buffer (set-buffer buffer)) @@ -276,12 +276,12 @@ LINE is the erroneous line" nil))) nil))) -(defun ly-parse-error-line (file-name lineNo) +(defun org-babel-lilypond-parse-error-line (file-name lineNo) "Extract the erroneous line from the tangled .ly file FILE-NAME is full path to lilypond file. LINENO is the number of the erroneous line" (with-temp-buffer - (insert-file-contents (ly-switch-extension file-name ".ly") + (insert-file-contents (org-babel-lilypond-switch-extension file-name ".ly") nil nil nil t) (if (> lineNo 0) (progn @@ -290,128 +290,128 @@ LINENO is the number of the erroneous line" (buffer-substring (point) (point-at-eol))) nil))) -(defun ly-attempt-to-open-pdf (file-name &optional test) +(defun org-babel-lilypond-attempt-to-open-pdf (file-name &optional test) "Attempt to display the generated pdf file FILE-NAME is full path to lilypond file If TEST is non-nil, the shell command is returned and is not run" - (when ly-display-pdf-post-tangle - (let ((pdf-file (ly-switch-extension file-name ".pdf"))) + (when org-babel-lilypond-display-pdf-post-tangle + (let ((pdf-file (org-babel-lilypond-switch-extension file-name ".pdf"))) (if (file-exists-p pdf-file) (let ((cmd-string - (concat (ly-determine-pdf-path) " " pdf-file))) + (concat (org-babel-lilypond-determine-pdf-path) " " pdf-file))) (if test cmd-string (start-process "\"Audition pdf\"" "*lilypond*" - (ly-determine-pdf-path) + (org-babel-lilypond-determine-pdf-path) pdf-file))) (message "No pdf file generated so can't display!"))))) -(defun ly-attempt-to-play-midi (file-name &optional test) +(defun org-babel-lilypond-attempt-to-play-midi (file-name &optional test) "Attempt to play the generated MIDI file FILE-NAME is full path to lilypond file If TEST is non-nil, the shell command is returned and is not run" - (when ly-play-midi-post-tangle - (let ((midi-file (ly-switch-extension file-name ".midi"))) + (when org-babel-lilypond-play-midi-post-tangle + (let ((midi-file (org-babel-lilypond-switch-extension file-name ".midi"))) (if (file-exists-p midi-file) (let ((cmd-string - (concat (ly-determine-midi-path) " " midi-file))) + (concat (org-babel-lilypond-determine-midi-path) " " midi-file))) (if test cmd-string (start-process "\"Audition midi\"" "*lilypond*" - (ly-determine-midi-path) + (org-babel-lilypond-determine-midi-path) midi-file))) (message "No midi file generated so can't play!"))))) -(defun ly-determine-ly-path (&optional test) +(defun org-babel-lilypond-determine-ly-path (&optional test) "Return correct path to ly binary depending on OS If TEST is non-nil, it contains a simulation of the OS for test purposes" (let ((sys-type (or test system-type))) (cond ((string= sys-type "darwin") - ly-OSX-ly-path) + org-babel-lilypond-OSX-ly-path) ((string= sys-type "windows-nt") - ly-w32-ly-path) - (t ly-nix-ly-path)))) + org-babel-lilypond-w32-ly-path) + (t org-babel-lilypond-nix-ly-path)))) -(defun ly-determine-pdf-path (&optional test) +(defun org-babel-lilypond-determine-pdf-path (&optional test) "Return correct path to pdf viewer depending on OS If TEST is non-nil, it contains a simulation of the OS for test purposes" (let ((sys-type (or test system-type))) (cond ((string= sys-type "darwin") - ly-OSX-pdf-path) + org-babel-lilypond-OSX-pdf-path) ((string= sys-type "windows-nt") - ly-w32-pdf-path) - (t ly-nix-pdf-path)))) + org-babel-lilypond-w32-pdf-path) + (t org-babel-lilypond-nix-pdf-path)))) -(defun ly-determine-midi-path (&optional test) +(defun org-babel-lilypond-determine-midi-path (&optional test) "Return correct path to midi player depending on OS If TEST is non-nil, it contains a simulation of the OS for test purposes" (let ((sys-type (or test test system-type))) (cond ((string= sys-type "darwin") - ly-OSX-midi-path) + org-babel-lilypond-OSX-midi-path) ((string= sys-type "windows-nt") - ly-w32-midi-path) - (t ly-nix-midi-path)))) + org-babel-lilypond-w32-midi-path) + (t org-babel-lilypond-nix-midi-path)))) -(defun ly-toggle-midi-play () +(defun org-babel-lilypond-toggle-midi-play () "Toggle whether midi will be played following a successful compilation." (interactive) - (setq ly-play-midi-post-tangle - (not ly-play-midi-post-tangle)) + (setq org-babel-lilypond-play-midi-post-tangle + (not org-babel-lilypond-play-midi-post-tangle)) (message (concat "Post-Tangle MIDI play has been " - (if ly-play-midi-post-tangle + (if org-babel-lilypond-play-midi-post-tangle "ENABLED." "DISABLED.")))) -(defun ly-toggle-pdf-display () +(defun org-babel-lilypond-toggle-pdf-display () "Toggle whether pdf will be displayed following a successful compilation." (interactive) - (setq ly-display-pdf-post-tangle - (not ly-display-pdf-post-tangle)) + (setq org-babel-lilypond-display-pdf-post-tangle + (not org-babel-lilypond-display-pdf-post-tangle)) (message (concat "Post-Tangle PDF display has been " - (if ly-display-pdf-post-tangle + (if org-babel-lilypond-display-pdf-post-tangle "ENABLED." "DISABLED.")))) -(defun ly-toggle-png-generation () +(defun org-babel-lilypond-toggle-png-generation () "Toggle whether png image will be generated by compilation." (interactive) - (setq ly-gen-png (not ly-gen-png)) + (setq org-babel-lilypond-gen-png (not org-babel-lilypond-gen-png)) (message (concat "PNG image generation has been " - (if ly-gen-png "ENABLED." "DISABLED.")))) + (if org-babel-lilypond-gen-png "ENABLED." "DISABLED.")))) -(defun ly-toggle-html-generation () +(defun org-babel-lilypond-toggle-html-generation () "Toggle whether html will be generated by compilation." (interactive) - (setq ly-gen-html (not ly-gen-html)) + (setq org-babel-lilypond-gen-html (not org-babel-lilypond-gen-html)) (message (concat "HTML generation has been " - (if ly-gen-html "ENABLED." "DISABLED.")))) + (if org-babel-lilypond-gen-html "ENABLED." "DISABLED.")))) -(defun ly-toggle-pdf-generation () +(defun org-babel-lilypond-toggle-pdf-generation () "Toggle whether pdf will be generated by compilation." (interactive) - (setq ly-gen-pdf (not ly-gen-pdf)) + (setq org-babel-lilypond-gen-pdf (not org-babel-lilypond-gen-pdf)) (message (concat "PDF generation has been " - (if ly-gen-pdf "ENABLED." "DISABLED.")))) + (if org-babel-lilypond-gen-pdf "ENABLED." "DISABLED.")))) -(defun ly-toggle-arrange-mode () +(defun org-babel-lilypond-toggle-arrange-mode () "Toggle whether in Arrange mode or Basic mode." (interactive) - (setq ly-arrange-mode - (not ly-arrange-mode)) + (setq org-babel-lilypond-arrange-mode + (not org-babel-lilypond-arrange-mode)) (message (concat "Arrange mode has been " - (if ly-arrange-mode "ENABLED." "DISABLED.")))) + (if org-babel-lilypond-arrange-mode "ENABLED." "DISABLED.")))) -(defun ly-switch-extension (file-name ext) +(defun org-babel-lilypond-switch-extension (file-name ext) "Utility command to swap current FILE-NAME extension with EXT" (concat (file-name-sans-extension file-name) ext)) -(defun ly-get-header-args (mode) +(defun org-babel-lilypond-get-header-args (mode) "Default arguments to use when evaluating a lilypond source block. These depend upon whether we are in arrange mode i.e. ARRANGE-MODE is t" @@ -425,11 +425,11 @@ mode i.e. ARRANGE-MODE is t" '((:results . "file") (:exports . "results"))))) -(defun ly-set-header-args (mode) +(defun org-babel-lilypond-set-header-args (mode) "Set org-babel-default-header-args:lilypond -dependent on LY-ARRANGE-MODE" +dependent on ORG-BABEL-LILYPOND-ARRANGE-MODE" (setq org-babel-default-header-args:lilypond - (ly-get-header-args mode))) + (org-babel-lilypond-get-header-args mode))) (provide 'ob-lilypond) diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-lisp.el b/elpa/org-20150427/ob-lisp.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-lisp.el rename to elpa/org-20150427/ob-lisp.el index c912fd9f..6bddd614 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-lisp.el +++ b/elpa/org-20150427/ob-lisp.el @@ -1,6 +1,6 @@ ;;; ob-lisp.el --- org-babel functions for common lisp evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Authors: Joel Boehland ;; Eric Schulte diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-lob.el b/elpa/org-20150427/ob-lob.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ob-lob.el rename to elpa/org-20150427/ob-lob.el index d37940a1..4e635da1 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-lob.el +++ b/elpa/org-20150427/ob-lob.el @@ -1,6 +1,6 @@ ;;; ob-lob.el --- functions supporting the Library of Babel -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison @@ -40,14 +40,13 @@ files to `org-babel-lob-files'.") To add files to this list use the `org-babel-lob-ingest' command." :group 'org-babel :version "24.1" - :type 'list) + :type '(repeat file)) (defvar org-babel-default-lob-header-args '((:exports . "results")) "Default header arguments to use when exporting #+lob/call lines.") (defun org-babel-lob-ingest (&optional file) - "Add all named source-blocks defined in FILE to -`org-babel-library-of-babel'." + "Add all named source blocks defined in FILE to `org-babel-library-of-babel'." (interactive "fFile: ") (let ((lob-ingest-count 0)) (org-babel-map-src-blocks file diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-makefile.el b/elpa/org-20150427/ob-makefile.el similarity index 93% rename from xemacs-packages/lisp/org-8.2.3c/ob-makefile.el rename to elpa/org-20150427/ob-makefile.el index 517b5a68..af7e66e5 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-makefile.el +++ b/elpa/org-20150427/ob-makefile.el @@ -1,8 +1,9 @@ ;;; ob-makefile.el --- org-babel functions for makefile evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. -;; Author: Eric Schulte and Thomas S. Dye +;; Author: Eric Schulte +;; Thomas S. Dye ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-matlab.el b/elpa/org-20150427/ob-matlab.el similarity index 95% rename from xemacs-packages/lisp/org-8.2.3c/ob-matlab.el rename to elpa/org-20150427/ob-matlab.el index 481ed24f..ef77de30 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-matlab.el +++ b/elpa/org-20150427/ob-matlab.el @@ -1,6 +1,6 @@ ;;; ob-matlab.el --- org-babel support for matlab evaluation -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-maxima.el b/elpa/org-20150427/ob-maxima.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ob-maxima.el rename to elpa/org-20150427/ob-maxima.el index 5be378ed..7435f1d3 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-maxima.el +++ b/elpa/org-20150427/ob-maxima.el @@ -1,6 +1,6 @@ ;;; ob-maxima.el --- org-babel functions for maxima evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Eric Schulte @@ -43,7 +43,8 @@ (defcustom org-babel-maxima-command (if (boundp 'maxima-command) maxima-command "maxima") "Command used to call maxima on the shell." - :group 'org-babel) + :group 'org-babel + :type 'string) (defun org-babel-maxima-expand (body params) "Expand a block of Maxima code according to its header arguments." diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-mscgen.el b/elpa/org-20150427/ob-mscgen.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ob-mscgen.el rename to elpa/org-20150427/ob-mscgen.el index 209ad7dc..4a4dc052 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-mscgen.el +++ b/elpa/org-20150427/ob-mscgen.el @@ -1,6 +1,6 @@ ;;; ob-msc.el --- org-babel functions for mscgen evaluation -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Juan Pechiar ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-ocaml.el b/elpa/org-20150427/ob-ocaml.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/ob-ocaml.el rename to elpa/org-20150427/ob-ocaml.el index 25f79c5b..1f29a25c 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-ocaml.el +++ b/elpa/org-20150427/ob-ocaml.el @@ -1,6 +1,6 @@ ;;; ob-ocaml.el --- org-babel functions for ocaml evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-octave.el b/elpa/org-20150427/ob-octave.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/ob-octave.el rename to elpa/org-20150427/ob-octave.el index 40bedfdb..8cc66b6f 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-octave.el +++ b/elpa/org-20150427/ob-octave.el @@ -1,6 +1,6 @@ ;;; ob-octave.el --- org-babel functions for octave and matlab evaluation -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-org.el b/elpa/org-20150427/ob-org.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ob-org.el rename to elpa/org-20150427/ob-org.el index 892c56c2..bc02f23f 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-org.el +++ b/elpa/org-20150427/ob-org.el @@ -1,6 +1,6 @@ ;;; ob-org.el --- org-babel functions for org code block evaluation -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-perl.el b/elpa/org-20150427/ob-perl.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-perl.el rename to elpa/org-20150427/ob-perl.el index d374e47e..ff4cbea9 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-perl.el +++ b/elpa/org-20150427/ob-perl.el @@ -1,6 +1,6 @@ ;;; ob-perl.el --- org-babel functions for perl evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Authors: Dan Davison ;; Eric Schulte diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-picolisp.el b/elpa/org-20150427/ob-picolisp.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/ob-picolisp.el rename to elpa/org-20150427/ob-picolisp.el index 279cd7b3..b240138f 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-picolisp.el +++ b/elpa/org-20150427/ob-picolisp.el @@ -1,6 +1,6 @@ ;;; ob-picolisp.el --- org-babel functions for picolisp evaluation -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Authors: Thorsten Jolitz ;; Eric Schulte diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-plantuml.el b/elpa/org-20150427/ob-plantuml.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-plantuml.el rename to elpa/org-20150427/ob-plantuml.el index f992d04d..ebc5a10e 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-plantuml.el +++ b/elpa/org-20150427/ob-plantuml.el @@ -1,6 +1,6 @@ ;;; ob-plantuml.el --- org-babel functions for plantuml evaluation -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Zhang Weize ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-python.el b/elpa/org-20150427/ob-python.el similarity index 96% rename from xemacs-packages/lisp/org-8.2.3c/ob-python.el rename to elpa/org-20150427/ob-python.el index 2f91b535..7cee1046 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-python.el +++ b/elpa/org-20150427/ob-python.el @@ -1,6 +1,6 @@ ;;; ob-python.el --- org-babel functions for python evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison @@ -56,8 +56,6 @@ This will typically be either 'python or 'python-mode." :package-version '(Org . "8.0") :type 'symbol) -(defvar org-src-preserve-indentation) - (defcustom org-babel-python-hline-to "None" "Replace hlines in incoming tables with this when translating to python." :group 'org-babel @@ -137,7 +135,7 @@ specifying a variable of the same value." org-babel-python-hline-to (format (if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%S\"\"" "%S") - var)))) + (if (stringp var) (substring-no-properties var) var))))) (defun org-babel-python-table-or-string (results) "Convert RESULTS into an appropriate elisp value. @@ -156,14 +154,14 @@ Emacs-lisp table, otherwise return the results as a string." "Return the buffer associated with SESSION." (cdr (assoc session org-babel-python-buffers))) -(defun org-babel-python-with-earmufs (session) +(defun org-babel-python-with-earmuffs (session) (let ((name (if (stringp session) session (format "%s" session)))) (if (and (string= "*" (substring name 0 1)) (string= "*" (substring name (- (length name) 1)))) name (format "*%s*" name)))) -(defun org-babel-python-without-earmufs (session) +(defun org-babel-python-without-earmuffs (session) (let ((name (if (stringp session) session (format "%s" session)))) (if (and (string= "*" (substring name 0 1)) (string= "*" (substring name (- (length name) 1)))) @@ -190,9 +188,9 @@ then create. Return the initialized session." (if (not (version< "24.1" emacs-version)) (run-python cmd) (unless python-buffer - (setq python-buffer (org-babel-python-with-earmufs session))) + (setq python-buffer (org-babel-python-with-earmuffs session))) (let ((python-shell-buffer-name - (org-babel-python-without-earmufs python-buffer))) + (org-babel-python-without-earmuffs python-buffer))) (run-python cmd)))) ((and (eq 'python-mode org-babel-python-mode) (fboundp 'py-shell)) ; python-mode.el @@ -208,7 +206,7 @@ then create. Return the initialized session." (concat "Python-" (symbol-name session)))) (py-which-bufname bufname)) (py-shell) - (setq python-buffer (org-babel-python-with-earmufs bufname)))) + (setq python-buffer (org-babel-python-with-earmuffs bufname)))) (t (error "No function available for running an inferior Python"))) (setq org-babel-python-buffers diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-ref.el b/elpa/org-20150427/ob-ref.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ob-ref.el rename to elpa/org-20150427/ob-ref.el index 5a3c8ba2..152af86a 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-ref.el +++ b/elpa/org-20150427/ob-ref.el @@ -1,6 +1,6 @@ ;;; ob-ref.el --- org-babel functions for referencing external data -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison @@ -85,7 +85,9 @@ the variable." (cons (intern var) (let ((out (save-excursion (when org-babel-current-src-block-location - (goto-char org-babel-current-src-block-location)) + (goto-char (if (markerp org-babel-current-src-block-location) + (marker-position org-babel-current-src-block-location) + org-babel-current-src-block-location))) (org-babel-read ref)))) (if (equal out ref) (if (string-match "^\".*\"$" ref) diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-ruby.el b/elpa/org-20150427/ob-ruby.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/ob-ruby.el rename to elpa/org-20150427/ob-ruby.el index 34b9eaf4..5b31247b 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-ruby.el +++ b/elpa/org-20150427/ob-ruby.el @@ -1,6 +1,6 @@ ;;; ob-ruby.el --- org-babel functions for ruby evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-sass.el b/elpa/org-20150427/ob-sass.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ob-sass.el rename to elpa/org-20150427/ob-sass.el index cdb75bea..78c0c958 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-sass.el +++ b/elpa/org-20150427/ob-sass.el @@ -1,6 +1,6 @@ ;;; ob-sass.el --- org-babel functions for the sass css generation language -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-scala.el b/elpa/org-20150427/ob-scala.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-scala.el rename to elpa/org-20150427/ob-scala.el index f7783619..0584342f 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-scala.el +++ b/elpa/org-20150427/ob-scala.el @@ -1,6 +1,6 @@ ;;; ob-scala.el --- org-babel functions for Scala evaluation -;; Copyright (C) 2012-2013 Free Software Foundation, Inc. +;; Copyright (C) 2012-2014 Free Software Foundation, Inc. ;; Author: Andrzej Lichnerowicz ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-scheme.el b/elpa/org-20150427/ob-scheme.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-scheme.el rename to elpa/org-20150427/ob-scheme.el index f979640a..b7117e9a 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-scheme.el +++ b/elpa/org-20150427/ob-scheme.el @@ -1,8 +1,9 @@ ;;; ob-scheme.el --- org-babel functions for Scheme -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. -;; Authors: Eric Schulte, Michael Gauland +;; Authors: Eric Schulte +;; Michael Gauland ;; Keywords: literate programming, reproducible research, scheme ;; Homepage: http://orgmode.org diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-screen.el b/elpa/org-20150427/ob-screen.el similarity index 96% rename from xemacs-packages/lisp/org-8.2.3c/ob-screen.el rename to elpa/org-20150427/ob-screen.el index f2633769..1d4ccddd 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-screen.el +++ b/elpa/org-20150427/ob-screen.el @@ -1,6 +1,6 @@ ;;; ob-screen.el --- org-babel support for interactive terminal -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Benjamin Andresen ;; Keywords: literate programming, interactive shell @@ -106,7 +106,7 @@ In case you want to use a different screen than one selected by your $PATH") (defun org-babel-screen-session-write-temp-file (session body) "Save BODY in a temp file that is named after SESSION." - (let ((tmpfile (concat "/tmp/screen.org-babel-session-" session))) + (let ((tmpfile (org-babel-temp-file "screen-"))) (with-temp-file tmpfile (insert body) @@ -121,7 +121,7 @@ The terminal should shortly flicker." (interactive) (let* ((session "org-babel-testing") (random-string (format "%s" (random 99999))) - (tmpfile "/tmp/org-babel-screen.test") + (tmpfile (org-babel-temp-file "ob-screen-test-")) (body (concat "echo '" random-string "' > " tmpfile "\nexit\n")) process tmp-string) (org-babel-execute:screen body org-babel-default-header-args:screen) diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-sh.el b/elpa/org-20150427/ob-sh.el similarity index 96% rename from xemacs-packages/lisp/org-8.2.3c/ob-sh.el rename to elpa/org-20150427/ob-sh.el index 4984ff9b..856c7a01 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-sh.el +++ b/elpa/org-20150427/ob-sh.el @@ -1,6 +1,6 @@ ;;; ob-sh.el --- org-babel functions for shell evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research @@ -123,7 +123,13 @@ Emacs-lisp table, otherwise return the results as a string." (when (and session (not (string= session "none"))) (save-window-excursion (or (org-babel-comint-buffer-livep session) - (progn (shell session) (get-buffer (current-buffer))))))) + (progn + (shell session) + ;; Needed for Emacs 23 since the marker is initially + ;; undefined and the filter functions try to use it without + ;; checking. + (set-marker comint-last-output-start (point)) + (get-buffer (current-buffer))))))) (defvar org-babel-sh-eoe-indicator "echo 'org_babel_sh_eoe'" "String to indicate that evaluation has completed.") diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-shen.el b/elpa/org-20150427/ob-shen.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ob-shen.el rename to elpa/org-20150427/ob-shen.el index 68169da9..e40e45cc 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-shen.el +++ b/elpa/org-20150427/ob-shen.el @@ -1,6 +1,6 @@ ;;; ob-shen.el --- org-babel functions for Shen -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, shen diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-sql.el b/elpa/org-20150427/ob-sql.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/ob-sql.el rename to elpa/org-20150427/ob-sql.el index d17dd8a7..08d44191 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-sql.el +++ b/elpa/org-20150427/ob-sql.el @@ -1,6 +1,6 @@ ;;; ob-sql.el --- org-babel functions for sql evaluation -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-sqlite.el b/elpa/org-20150427/ob-sqlite.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-sqlite.el rename to elpa/org-20150427/ob-sqlite.el index fcfdb8eb..098626fe 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-sqlite.el +++ b/elpa/org-20150427/ob-sqlite.el @@ -1,6 +1,6 @@ ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-table.el b/elpa/org-20150427/ob-table.el similarity index 93% rename from xemacs-packages/lisp/org-8.2.3c/ob-table.el rename to elpa/org-20150427/ob-table.el index c71bb875..831e3521 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-table.el +++ b/elpa/org-20150427/ob-table.el @@ -1,6 +1,6 @@ ;;; ob-table.el --- support for calling org-babel functions from tables -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research @@ -24,7 +24,7 @@ ;;; Commentary: ;; Should allow calling functions from org-mode tables using the -;; function `sbe' as so... +;; function `org-sbe' as so... ;; #+begin_src emacs-lisp :results silent ;; (defun fibbd (n) (if (< n 2) 1 (+ (fibbd (- n 1)) (fibbd (- n 2))))) @@ -47,7 +47,7 @@ ;; | 7 | | ;; | 8 | | ;; | 9 | | -;; #+TBLFM: $2='(sbe 'fibbd (n $1)) +;; #+TBLFM: $2='(org-sbe 'fibbd (n $1)) ;;; Code: (require 'ob-core) @@ -60,14 +60,14 @@ character and replace it with ellipses." (concat (substring string 0 (match-beginning 0)) (if (match-string 1 string) "...")) string)) -(defmacro sbe (source-block &rest variables) ;FIXME: Namespace prefix! +(defmacro org-sbe (source-block &rest variables) "Return the results of calling SOURCE-BLOCK with VARIABLES. Each element of VARIABLES should be a two element list, whose first element is the name of the variable and second element is a string of its value. The following call to -`sbe' would be equivalent to the following source code block. +`org-sbe' would be equivalent to the following source code block. - (sbe 'source-block (n $2) (m 3)) + (org-sbe 'source-block (n $2) (m 3)) #+begin_src emacs-lisp :var results=source-block(n=val_at_col_2, m=3) :results silent results @@ -84,7 +84,7 @@ the header argument which can then be passed before all variables as shown in the example below. | 1 | 2 | :file nothing.png | nothing.png | -#+TBLFM: @1$4='(sbe test-sbe $3 (x $1) (y $2))" +#+TBLFM: @1$4='(org-sbe test-sbe $3 (x $1) (y $2))" (declare (debug (form form))) (let* ((header-args (if (stringp (car variables)) (car variables) "")) (variables (if (stringp (car variables)) (cdr variables) variables))) diff --git a/xemacs-packages/lisp/org-8.2.3c/ob-tangle.el b/elpa/org-20150427/ob-tangle.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ob-tangle.el rename to elpa/org-20150427/ob-tangle.el index ffc74cb2..3a43b42e 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob-tangle.el +++ b/elpa/org-20150427/ob-tangle.el @@ -1,6 +1,6 @@ ;;; ob-tangle.el --- extract source code from org-mode files -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research @@ -225,13 +225,14 @@ used to limit the exported source code blocks by language." (concat base-name "." ext) base-name)))) (when file-name ;; Possibly create the parent directories for file. - (when (let ((m (funcall get-spec :mkdirp))) - (and m (not (string= m "no")))) - (make-directory (file-name-directory file-name) 'parents)) + (let ((m (funcall get-spec :mkdirp)) + (fnd (file-name-directory file-name))) + (and m fnd (not (string= m "no")) + (make-directory fnd 'parents))) ;; delete any old versions of file - (when (and (file-exists-p file-name) - (not (member file-name (mapcar #'car path-collector)))) - (delete-file file-name)) + (and (file-exists-p file-name) + (not (member file-name (mapcar #'car path-collector))) + (delete-file file-name)) ;; drop source-block to file (with-temp-buffer (when (fboundp lang-f) (ignore-errors (funcall lang-f))) diff --git a/xemacs-packages/lisp/org-8.2.3c/ob.el b/elpa/org-20150427/ob.el similarity index 95% rename from xemacs-packages/lisp/org-8.2.3c/ob.el rename to elpa/org-20150427/ob.el index 827dd04a..87657fef 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ob.el +++ b/elpa/org-20150427/ob.el @@ -1,6 +1,6 @@ ;;; ob.el --- working with code blocks in org-mode -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-20150427/org b/elpa/org-20150427/org new file mode 100644 index 00000000..038c98f9 --- /dev/null +++ b/elpa/org-20150427/org @@ -0,0 +1,21283 @@ +This is org, produced by makeinfo version 4.13 from org.texi. + +This manual is for Org version 8.2.10 (release_8.2.10-37-gc000e8). + + Copyright (C) 2004-2014 Free Software Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with no Invariant Sections, with the Front-Cover Texts + being "A GNU Manual," and with the Back-Cover Texts as in (a) + below. A copy of the license is included in the section entitled + "GNU Free Documentation License." + + (a) The FSF's Back-Cover Text is: "You have the freedom to copy and + modify this GNU manual." + +INFO-DIR-SECTION Emacs editing modes +START-INFO-DIR-ENTRY +* Org Mode: (org). Outline-based notes management and organizer +END-INFO-DIR-ENTRY + + +File: org, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) + +Org Mode Manual +*************** + +This manual is for Org version 8.2.10 (release_8.2.10-37-gc000e8). + + Copyright (C) 2004-2014 Free Software Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with no Invariant Sections, with the Front-Cover Texts + being "A GNU Manual," and with the Back-Cover Texts as in (a) + below. A copy of the license is included in the section entitled + "GNU Free Documentation License." + + (a) The FSF's Back-Cover Text is: "You have the freedom to copy and + modify this GNU manual." + +* Menu: + +* Introduction:: Getting started +* Document Structure:: A tree works like your brain +* Tables:: Pure magic for quick formatting +* Hyperlinks:: Notes in context +* TODO Items:: Every tree branch can be a TODO item +* Tags:: Tagging headlines and matching sets of tags +* Properties and Columns:: Storing information about an entry +* Dates and Times:: Making items useful for planning +* Capture - Refile - Archive:: The ins and outs for projects +* Agenda Views:: Collecting information into views +* Markup:: Prepare text for rich export +* Exporting:: Sharing and publishing notes +* Publishing:: Create a web site of linked Org files +* Working With Source Code:: Export, evaluate, and tangle code blocks +* Miscellaneous:: All the rest which did not fit elsewhere +* Hacking:: How to hack your way around +* MobileOrg:: Viewing and capture on a mobile device +* History and Acknowledgments:: How Org came into being +* GNU Free Documentation License:: The license for this documentation. +* Main Index:: An index of Org's concepts and features +* Key Index:: Key bindings and where they are described +* Command and Function Index:: Command names and some internal functions +* Variable Index:: Variables mentioned in the manual + + --- The Detailed Node Listing --- + +Introduction + +* Summary:: Brief summary of what Org does +* Installation:: Installing Org +* Activation:: How to activate Org for certain buffers +* Feedback:: Bug reports, ideas, patches etc. +* Conventions:: Typesetting conventions in the manual + +Document structure + +* Outlines:: Org is based on Outline mode +* Headlines:: How to typeset Org tree headlines +* Visibility cycling:: Show and hide, much simplified +* Motion:: Jumping to other headlines +* Structure editing:: Changing sequence and level of headlines +* Sparse trees:: Matches embedded in context +* Plain lists:: Additional structure within an entry +* Drawers:: Tucking stuff away +* Blocks:: Folding blocks +* Footnotes:: How footnotes are defined in Org's syntax +* Orgstruct mode:: Structure editing outside Org +* Org syntax:: Formal description of Org's syntax + +Visibility cycling + +* Global and local cycling:: Cycling through various visibility states +* Initial visibility:: Setting the initial visibility state +* Catching invisible edits:: Preventing mistakes when editing invisible parts + +Global and local cycling + +* Initial visibility:: Setting the initial visibility state +* Catching invisible edits:: Preventing mistakes when editing invisible parts + +Tables + +* Built-in table editor:: Simple tables +* Column width and alignment:: Overrule the automatic settings +* Column groups:: Grouping to trigger vertical lines +* Orgtbl mode:: The table editor as minor mode +* The spreadsheet:: The table editor has spreadsheet capabilities +* Org-Plot:: Plotting from org tables + +The spreadsheet + +* References:: How to refer to another field or range +* Formula syntax for Calc:: Using Calc to compute stuff +* Formula syntax for Lisp:: Writing formulas in Emacs Lisp +* Durations and time values:: How to compute durations and time values +* Field and range formulas:: Formula for specific (ranges of) fields +* Column formulas:: Formulas valid for an entire column +* Lookup functions:: Lookup functions for searching tables +* Editing and debugging formulas:: Fixing formulas +* Updating the table:: Recomputing all dependent fields +* Advanced features:: Field and column names, parameters and automatic recalc + +Hyperlinks + +* Link format:: How links in Org are formatted +* Internal links:: Links to other places in the current file +* External links:: URL-like links to the world +* Handling links:: Creating, inserting and following +* Using links outside Org:: Linking from my C source code? +* Link abbreviations:: Shortcuts for writing complex links +* Search options:: Linking to a specific location +* Custom searches:: When the default search is not enough + +Internal links + +* Radio targets:: Make targets trigger links in plain text + +TODO items + +* TODO basics:: Marking and displaying TODO entries +* TODO extensions:: Workflow and assignments +* Progress logging:: Dates and notes for progress +* Priorities:: Some things are more important than others +* Breaking down tasks:: Splitting a task into manageable pieces +* Checkboxes:: Tick-off lists + +Extended use of TODO keywords + +* Workflow states:: From TODO to DONE in steps +* TODO types:: I do this, Fred does the rest +* Multiple sets in one file:: Mixing it all, and still finding your way +* Fast access to TODO states:: Single letter selection of a state +* Per-file keywords:: Different files, different requirements +* Faces for TODO keywords:: Highlighting states +* TODO dependencies:: When one task needs to wait for others + +Progress logging + +* Closing items:: When was this entry marked DONE? +* Tracking TODO state changes:: When did the status change? +* Tracking your habits:: How consistent have you been? + +Tags + +* Tag inheritance:: Tags use the tree structure of the outline +* Setting tags:: How to assign tags to a headline +* Tag groups:: Use one tag to search for several tags +* Tag searches:: Searching for combinations of tags + +Properties and columns + +* Property syntax:: How properties are spelled out +* Special properties:: Access to other Org mode features +* Property searches:: Matching property values +* Property inheritance:: Passing values down the tree +* Column view:: Tabular viewing and editing +* Property API:: Properties for Lisp programmers + +Column view + +* Defining columns:: The COLUMNS format property +* Using column view:: How to create and use column view +* Capturing column view:: A dynamic block for column view + +Defining columns + +* Scope of column definitions:: Where defined, where valid? +* Column attributes:: Appearance and content of a column + +Dates and times + +* Timestamps:: Assigning a time to a tree entry +* Creating timestamps:: Commands which insert timestamps +* Deadlines and scheduling:: Planning your work +* Clocking work time:: Tracking how long you spend on a task +* Effort estimates:: Planning work effort in advance +* Relative timer:: Notes with a running timer +* Countdown timer:: Starting a countdown timer for a task + +Creating timestamps + +* The date/time prompt:: How Org mode helps you entering date and time +* Custom time format:: Making dates look different + +Deadlines and scheduling + +* Inserting deadline/schedule:: Planning items +* Repeated tasks:: Items that show up again and again + +Clocking work time + +* Clocking commands:: Starting and stopping a clock +* The clock table:: Detailed reports +* Resolving idle time:: Resolving time when you've been idle + +Capture - Refile - Archive + +* Capture:: Capturing new stuff +* Attachments:: Add files to tasks +* RSS Feeds:: Getting input from RSS feeds +* Protocols:: External (e.g., Browser) access to Emacs and Org +* Refile and copy:: Moving/copying a tree from one place to another +* Archiving:: What to do with finished projects + +Capture + +* Setting up capture:: Where notes will be stored +* Using capture:: Commands to invoke and terminate capture +* Capture templates:: Define the outline of different note types + +Capture templates + +* Template elements:: What is needed for a complete template entry +* Template expansion:: Filling in information about time and context +* Templates in contexts:: Only show a template in a specific context + +Archiving + +* Moving subtrees:: Moving a tree to an archive file +* Internal archiving:: Switch off a tree but keep it in the file + +Agenda views + +* Agenda files:: Files being searched for agenda information +* Agenda dispatcher:: Keyboard access to agenda views +* Built-in agenda views:: What is available out of the box? +* Presentation and sorting:: How agenda items are prepared for display +* Agenda commands:: Remote editing of Org trees +* Custom agenda views:: Defining special searches and views +* Exporting Agenda Views:: Writing a view to a file +* Agenda column view:: Using column view for collected entries + +The built-in agenda views + +* Weekly/daily agenda:: The calendar page with current tasks +* Global TODO list:: All unfinished action items +* Matching tags and properties:: Structured information with fine-tuned search +* Timeline:: Time-sorted view for single file +* Search view:: Find entries by searching for text +* Stuck projects:: Find projects you need to review + +Presentation and sorting + +* Categories:: Not all tasks are equal +* Time-of-day specifications:: How the agenda knows the time +* Sorting agenda items:: The order of things +* Filtering/limiting agenda items:: Dynamically narrow the agenda + +Custom agenda views + +* Storing searches:: Type once, use often +* Block agenda:: All the stuff you need in a single buffer +* Setting Options:: Changing the rules + +Markup for rich export + +* Structural markup elements:: The basic structure as seen by the exporter +* Images and tables:: Images, tables and caption mechanism +* Literal examples:: Source code examples with special formatting +* Include files:: Include additional files into a document +* Index entries:: Making an index +* Macro replacement:: Use macros to create templates +* Embedded LaTeX:: LaTeX can be freely used inside Org documents +* Special blocks:: Containers targeted at export back-ends + +Structural markup elements + +* Document title:: Where the title is taken from +* Headings and sections:: The document structure as seen by the exporter +* Table of contents:: The if and where of the table of contents +* Lists:: Lists +* Paragraphs:: Paragraphs +* Footnote markup:: Footnotes +* Emphasis and monospace:: Bold, italic, etc. +* Horizontal rules:: Make a line +* Comment lines:: What will *not* be exported + +Embedded LaTeX + +* Special symbols:: Greek letters and other symbols +* Subscripts and superscripts:: Simple syntax for raising/lowering text +* LaTeX fragments:: Complex formulas made easy +* Previewing LaTeX fragments:: What will this snippet look like? +* CDLaTeX mode:: Speed up entering of formulas + +Exporting + +* The Export Dispatcher:: The main exporter interface +* Export back-ends:: Built-in export formats +* Export settings:: Generic export settings +* ASCII/Latin-1/UTF-8 export:: Exporting to flat files with encoding +* Beamer export:: Exporting as a Beamer presentation +* HTML export:: Exporting to HTML +* LaTeX and PDF export:: Exporting to LaTeX, and processing to PDF +* Markdown export:: Exporting to Markdown +* OpenDocument Text export:: Exporting to OpenDocument Text +* Org export:: Exporting to Org +* Texinfo export:: Exporting to Texinfo +* iCalendar export:: Exporting to iCalendar +* Other built-in back-ends:: Exporting to a man page +* Export in foreign buffers:: Author tables and lists in Org syntax +* Advanced configuration:: Fine-tuning the export output + +HTML export + +* HTML Export commands:: How to invoke HTML export +* HTML doctypes:: Org can export to various (X)HTML flavors +* HTML preamble and postamble:: How to insert a preamble and a postamble +* Quoting HTML tags:: Using direct HTML in Org mode +* Links in HTML export:: How links will be interpreted and formatted +* Tables in HTML export:: How to modify the formatting of tables +* Images in HTML export:: How to insert figures into HTML output +* Math formatting in HTML export:: Beautiful math also on the web +* Text areas in HTML export:: An alternative way to show an example +* CSS support:: Changing the appearance of the output +* JavaScript support:: Info and Folding in a web browser + +LaTeX and PDF export + +* LaTeX export commands:: How to export to LaTeX and PDF +* Header and sectioning:: Setting up the export file structure +* Quoting LaTeX code:: Incorporating literal LaTeX code +* LaTeX specific attributes:: Controlling LaTeX output + +OpenDocument Text export + +* Pre-requisites for ODT export:: What packages ODT exporter relies on +* ODT export commands:: How to invoke ODT export +* Extending ODT export:: How to produce `doc', `pdf' files +* Applying custom styles:: How to apply custom styles to the output +* Links in ODT export:: How links will be interpreted and formatted +* Tables in ODT export:: How Tables are exported +* Images in ODT export:: How to insert images +* Math formatting in ODT export:: How LaTeX fragments are formatted +* Labels and captions in ODT export:: How captions are rendered +* Literal examples in ODT export:: How source and example blocks are formatted +* Advanced topics in ODT export:: Read this if you are a power user + +Math formatting in ODT export + +* Working with LaTeX math snippets:: How to embed LaTeX math fragments +* Working with MathML or OpenDocument formula files:: How to embed equations in native format + +Advanced topics in ODT export + +* Configuring a document converter:: How to register a document converter +* Working with OpenDocument style files:: Explore the internals +* Creating one-off styles:: How to produce custom highlighting etc +* Customizing tables in ODT export:: How to define and use Table templates +* Validating OpenDocument XML:: How to debug corrupt OpenDocument files + +Texinfo export + +* Texinfo export commands:: How to invoke Texinfo export +* Document preamble:: File header, title and copyright page +* Headings and sectioning structure:: Building document structure +* Indices:: Creating indices +* Quoting Texinfo code:: Incorporating literal Texinfo code +* Texinfo specific attributes:: Controlling Texinfo output +* An example:: + +Publishing + +* Configuration:: Defining projects +* Uploading files:: How to get files up on the server +* Sample configuration:: Example projects +* Triggering publication:: Publication commands + +Configuration + +* Project alist:: The central configuration variable +* Sources and destinations:: From here to there +* Selecting files:: What files are part of the project? +* Publishing action:: Setting the function doing the publishing +* Publishing options:: Tweaking HTML/LaTeX export +* Publishing links:: Which links keep working after publishing? +* Sitemap:: Generating a list of all pages +* Generating an index:: An index that reaches across pages + +Sample configuration + +* Simple example:: One-component publishing +* Complex example:: A multi-component publishing example + +Working with source code + +* Structure of code blocks:: Code block syntax described +* Editing source code:: Language major-mode editing +* Exporting code blocks:: Export contents and/or results +* Extracting source code:: Create pure source code files +* Evaluating code blocks:: Place results of evaluation in the Org mode buffer +* Library of Babel:: Use and contribute to a library of useful code blocks +* Languages:: List of supported code block languages +* Header arguments:: Configure code block functionality +* Results of evaluation:: How evaluation results are handled +* Noweb reference syntax:: Literate programming in Org mode +* Key bindings and useful functions:: Work quickly with code blocks +* Batch execution:: Call functions from the command line + +Header arguments + +* Using header arguments:: Different ways to set header arguments +* Specific header arguments:: List of header arguments + +Using header arguments + +* System-wide header arguments:: Set global default values +* Language-specific header arguments:: Set default values by language +* Header arguments in Org mode properties:: Set default values for a buffer or heading +* Language-specific header arguments in Org mode properties:: Set language-specific default values for a buffer or heading +* Code block specific header arguments:: The most common way to set values +* Header arguments in function calls:: The most specific level + +Specific header arguments + +* var:: Pass arguments to code blocks +* results:: Specify the type of results and how they will + be collected and handled +* file:: Specify a path for file output +* file-desc:: Specify a description for file results +* dir:: Specify the default (possibly remote) + directory for code block execution +* exports:: Export code and/or results +* tangle:: Toggle tangling and specify file name +* mkdirp:: Toggle creation of parent directories of target + files during tangling +* comments:: Toggle insertion of comments in tangled + code files +* padline:: Control insertion of padding lines in tangled + code files +* no-expand:: Turn off variable assignment and noweb + expansion during tangling +* session:: Preserve the state of code evaluation +* noweb:: Toggle expansion of noweb references +* noweb-ref:: Specify block's noweb reference resolution target +* noweb-sep:: String used to separate noweb references +* cache:: Avoid re-evaluating unchanged code blocks +* sep:: Delimiter for writing tabular results outside Org +* hlines:: Handle horizontal lines in tables +* colnames:: Handle column names in tables +* rownames:: Handle row names in tables +* shebang:: Make tangled files executable +* tangle-mode:: Set permission of tangled files +* eval:: Limit evaluation of specific code blocks +* wrap:: Mark source block evaluation results +* post:: Post processing of code block results +* prologue:: Text to prepend to code block body +* epilogue:: Text to append to code block body + +Miscellaneous + +* Completion:: M-TAB knows what you need +* Easy Templates:: Quick insertion of structural elements +* Speed keys:: Electric commands at the beginning of a headline +* Code evaluation security:: Org mode files evaluate inline code +* Customization:: Adapting Org to your taste +* In-buffer settings:: Overview of the #+KEYWORDS +* The very busy C-c C-c key:: When in doubt, press C-c C-c +* Clean view:: Getting rid of leading stars in the outline +* TTY keys:: Using Org on a tty +* Interaction:: Other Emacs packages +* org-crypt:: Encrypting Org files + +Interaction with other packages + +* Cooperation:: Packages Org cooperates with +* Conflicts:: Packages that lead to conflicts + +Hacking + +* Hooks:: How to reach into Org's internals +* Add-on packages:: Available extensions +* Adding hyperlink types:: New custom link types +* Adding export back-ends:: How to write new export back-ends +* Context-sensitive commands:: How to add functionality to such commands +* Tables in arbitrary syntax:: Orgtbl for LaTeX and other programs +* Dynamic blocks:: Automatically filled blocks +* Special agenda views:: Customized views +* Speeding up your agendas:: Tips on how to speed up your agendas +* Extracting agenda information:: Post-processing of agenda information +* Using the property API:: Writing programs that use entry properties +* Using the mapping API:: Mapping over all or selected entries + +Tables and lists in arbitrary syntax + +* Radio tables:: Sending and receiving radio tables +* A LaTeX example:: Step by step, almost a tutorial +* Translator functions:: Copy and modify +* Radio lists:: Sending and receiving lists + +MobileOrg + +* Setting up the staging area:: Where to interact with the mobile device +* Pushing to MobileOrg:: Uploading Org files and agendas +* Pulling from MobileOrg:: Integrating captured and flagged items + + +File: org, Node: Introduction, Next: Document Structure, Prev: Top, Up: Top + +1 Introduction +************** + +* Menu: + +* Summary:: Brief summary of what Org does +* Installation:: Installing Org +* Activation:: How to activate Org for certain buffers +* Feedback:: Bug reports, ideas, patches etc. +* Conventions:: Typesetting conventions in the manual + + +File: org, Node: Summary, Next: Installation, Prev: Introduction, Up: Introduction + +1.1 Summary +=========== + +Org is a mode for keeping notes, maintaining TODO lists, and doing +project planning with a fast and effective plain-text system. + + Org develops organizational tasks around NOTES files that contain +lists or information about projects as plain text. Org is implemented +on top of Outline mode, which makes it possible to keep the content of +large files well structured. Visibility cycling and structure editing +help to work with the tree. Tables are easily created with a built-in +table editor. Org supports TODO items, deadlines, timestamps, and +scheduling. It dynamically compiles entries into an agenda that +utilizes and smoothly integrates much of the Emacs calendar and diary. +Plain text URL-like links connect to websites, emails, Usenet messages, +BBDB entries, and any files related to the projects. For printing and +sharing notes, an Org file can be exported as a structured ASCII file, +as HTML, or (TODO and agenda items only) as an iCalendar file. It can +also serve as a publishing tool for a set of linked web pages. + + As a project planning environment, Org works by adding metadata to +outline nodes. Based on this data, specific entries can be extracted +in queries and create dynamic agenda views. + + Org mode contains the Org Babel environment which allows you to work +with embedded source code blocks in a file, to facilitate code +evaluation, documentation, and literate programming techniques. + + Org's automatic, context-sensitive table editor with spreadsheet +capabilities can be integrated into any major mode by activating the +minor Orgtbl mode. Using a translation step, it can be used to maintain +tables in arbitrary file types, for example in LaTeX. The structure +editing and list creation capabilities can be used outside Org with the +minor Orgstruct mode. + + Org keeps simple things simple. When first fired up, it should feel +like a straightforward, easy to use outliner. Complexity is not +imposed, but a large amount of functionality is available when you need +it. Org is a toolbox and can be used in different ways and for +different ends, for example: + + * an outline extension with visibility cycling and structure editing + * an ASCII system and table editor for taking structured notes + * a TODO list editor + * a full agenda and planner with deadlines and work scheduling + * an environment in which to implement David Allen's GTD system + * a simple hypertext system, with HTML and LaTeX export + * a publishing tool to create a set of interlinked web pages + * an environment for literate programming + + There is a website for Org which provides links to the newest +version of Org, as well as additional information, frequently asked +questions (FAQ), links to tutorials, etc. This page is located at +`http://orgmode.org'. + + The version 7.3 of this manual is available as a paperback book from +Network Theory Ltd. (http://www.network-theory.co.uk/org/manual/) + + +File: org, Node: Installation, Next: Activation, Prev: Summary, Up: Introduction + +1.2 Installation +================ + +Org is part of recent distributions of GNU Emacs, so you normally don't +need to install it. If, for one reason or another, you want to install +Org on top of this pre-packaged version, there are three ways to do it: + + * By using Emacs package system. + + * By downloading Org as an archive. + + * By using Org's git repository. + + We strongly recommend to stick to a single installation method. + +Using Emacs packaging system +............................ + +Recent Emacs distributions include a packaging system which lets you +install Elisp libraries. You can install Org with `M-x package-install +RET org'. + +Important: you need to do this in a session where no `.org' file has +been visited, i.e. where no Org built-in function have been loaded. +Otherwise autoload Org functions will mess up the installation. + + Then, to make sure your Org configuration is taken into account, +initialize the package system with `(package-initialize)' in your +`.emacs' before setting any Org option. If you want to use Org's +package repository, check out the Org ELPA page +(http://orgmode.org/elpa.html). + +Downloading Org as an archive +............................. + +You can download Org latest release from Org's website +(http://orgmode.org/). In this case, make sure you set the load-path +correctly in your `.emacs': + + (add-to-list 'load-path "~/path/to/orgdir/lisp") + + The downloaded archive contains contributed libraries that are not +included in Emacs. If you want to use them, add the `contrib' +directory to your load-path: + + (add-to-list 'load-path "~/path/to/orgdir/contrib/lisp" t) + + Optionally, you can compile the files and/or install them in your +system. Run `make help' to list compilation and installation options. + +Using Org's git repository +.......................... + +You can clone Org's repository and install Org like this: + + $ cd ~/src/ + $ git clone git://orgmode.org/org-mode.git + $ make autoloads + + Note that in this case, `make autoloads' is mandatory: it defines +Org's version in `org-version.el' and Org's autoloads in +`org-loaddefs.el'. + + Remember to add the correct load-path as described in the method +above. + + You can also compile with `make', generate the documentation with +`make doc', create a local configuration with `make config' and install +Org with `make install'. Please run `make help' to get the list of +compilation/installation options. + + For more detailed explanations on Org's build system, please check +the Org Build System page on Worg +(http://orgmode.org/worg/dev/org-build-system.html). + + +File: org, Node: Activation, Next: Feedback, Prev: Installation, Up: Introduction + +1.3 Activation +============== + +Since Emacs 22.2, files with the `.org' extension use Org mode by +default. If you are using an earlier version of Emacs, add this line +to your `.emacs' file: + + (add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode)) + + Org mode buffers need font-lock to be turned on: this is the default +in Emacs(1). + + There are compatibility issues between Org mode and some other Elisp +packages, please take the time to check the list (*note Conflicts::). + + The four Org commands `org-store-link', `org-capture', `org-agenda', +and `org-iswitchb' should be accessible through global keys (i.e., +anywhere in Emacs, not just in Org buffers). Here are suggested +bindings for these keys, please modify the keys to your own liking. + (global-set-key "\C-cl" 'org-store-link) + (global-set-key "\C-cc" 'org-capture) + (global-set-key "\C-ca" 'org-agenda) + (global-set-key "\C-cb" 'org-iswitchb) + + With this setup, all files with extension `.org' will be put into +Org mode. As an alternative, make the first line of a file look like +this: + + MY PROJECTS -*- mode: org; -*- + +which will select Org mode for this buffer no matter what the file's +name is. See also the variable `org-insert-mode-line-in-empty-file'. + + Many commands in Org work on the region if the region is active. To +make use of this, you need to have `transient-mark-mode' +(`zmacs-regions' in XEmacs) turned on. In Emacs 23 this is the default, +in Emacs 22 you need to do this yourself with + (transient-mark-mode 1) + If you do not like `transient-mark-mode', you can create an active +region by using the mouse to select a region, or pressing `C-' +twice before moving the cursor. + + ---------- Footnotes ---------- + + (1) If you don't use font-lock globally, turn it on in Org buffer +with `(add-hook 'org-mode-hook 'turn-on-font-lock)' + + +File: org, Node: Feedback, Next: Conventions, Prev: Activation, Up: Introduction + +1.4 Feedback +============ + +If you find problems with Org, or if you have questions, remarks, or +ideas about it, please mail to the Org mailing list +. If you are not a member of the mailing list, +your mail will be passed to the list after a moderator has approved +it(1). + + For bug reports, please first try to reproduce the bug with the +latest version of Org available--if you are running an outdated +version, it is quite possible that the bug has been fixed already. If +the bug persists, prepare a report and provide as much information as +possible, including the version information of Emacs (`M-x +emacs-version ') and Org (`M-x org-version RET'), as well as the +Org related setup in `.emacs'. The easiest way to do this is to use +the command + M-x org-submit-bug-report RET + which will put all this information into an Emacs mail buffer so +that you only need to add your description. If you re not sending the +Email from within Emacs, please copy and paste the content into your +Email program. + + Sometimes you might face a problem due to an error in your Emacs or +Org mode setup. Before reporting a bug, it is very helpful to start +Emacs with minimal customizations and reproduce the problem. Doing so +often helps you determine if the problem is with your customization or +with Org mode itself. You can start a typical minimal session with a +command like the example below. + + $ emacs -Q -l /path/to/minimal-org.el + + However if you are using Org mode as distributed with Emacs, a +minimal setup is not necessary. In that case it is sufficient to start +Emacs as `emacs -Q'. The `minimal-org.el' setup file can have contents +as shown below. + + ;;; Minimal setup to load latest `org-mode' + + ;; activate debugging + (setq debug-on-error t + debug-on-signal nil + debug-on-quit nil) + + ;; add latest org-mode to load path + (add-to-list 'load-path (expand-file-name "/path/to/org-mode/lisp")) + (add-to-list 'load-path (expand-file-name "/path/to/org-mode/contrib/lisp" t)) + + If an error occurs, a backtrace can be very useful (see below on how +to create one). Often a small example file helps, along with clear +information about: + + 1. What exactly did you do? + + 2. What did you expect to happen? + + 3. What happened instead? + Thank you for helping to improve this program. + +How to create a useful backtrace +................................ + +If working with Org produces an error with a message you don't +understand, you may have hit a bug. The best way to report this is by +providing, in addition to what was mentioned above, a _backtrace_. +This is information from the built-in debugger about where and how the +error occurred. Here is how to produce a useful backtrace: + + 1. Reload uncompiled versions of all Org mode Lisp files. The + backtrace contains much more information if it is produced with + uncompiled code. To do this, use + C-u M-x org-reload RET + or select `Org -> Refresh/Reload -> Reload Org uncompiled' from the + menu. + + 2. Go to the `Options' menu and select `Enter Debugger on Error' + (XEmacs has this option in the `Troubleshooting' sub-menu). + + 3. Do whatever you have to do to hit the error. Don't forget to + document the steps you take. + + 4. When you hit the error, a `*Backtrace*' buffer will appear on the + screen. Save this buffer to a file (for example using `C-x C-w') + and attach it to your bug report. + + ---------- Footnotes ---------- + + (1) Please consider subscribing to the mailing list, in order to +minimize the work the mailing list moderators have to do. + + +File: org, Node: Conventions, Prev: Feedback, Up: Introduction + +1.5 Typesetting conventions used in this manual +=============================================== + +TODO keywords, tags, properties, etc. +..................................... + +Org mainly uses three types of keywords: TODO keywords, tags and +property names. In this manual we use the following conventions: + +`TODO' +`WAITING' + TODO keywords are written with all capitals, even if they are + user-defined. + +`boss' +`ARCHIVE' + User-defined tags are written in lowercase; built-in tags with + special meaning are written with all capitals. + +`Release' +`PRIORITY' + User-defined properties are capitalized; built-in properties with + special meaning are written with all capitals. + + Moreover, Org uses option keywords (like `#+TITLE' to set the title) +and environment keywords (like `#+BEGIN_HTML' to start a `HTML' +environment). They are written in uppercase in the manual to enhance +its readability, but you can use lowercase in your Org files(1). + +Keybindings and commands +........................ + +The manual suggests two global keybindings: `C-c a' for `org-agenda' +and `C-c c' for `org-capture'. These are only suggestions, but the +rest of the manual assumes that you are using these keybindings. + + Also, the manual lists both the keys and the corresponding commands +for accessing a functionality. Org mode often uses the same key for +different functions, depending on context. The command that is bound +to such keys has a generic name, like `org-metaright'. In the manual +we will, wherever possible, give the function that is internally called +by the generic command. For example, in the chapter on document +structure, `M-' will be listed to call `org-do-demote', while in +the chapter on tables, it will be listed to call +`org-table-move-column-right'. If you prefer, you can compile the +manual without the command names by unsetting the flag `cmdnames' in +`org.texi'. + + ---------- Footnotes ---------- + + (1) Easy templates insert lowercase keywords and Babel dynamically +inserts `#+results'. + + +File: org, Node: Document Structure, Next: Tables, Prev: Introduction, Up: Top + +2 Document structure +******************** + +Org is based on Outline mode and provides flexible commands to edit the +structure of the document. + +* Menu: + +* Outlines:: Org is based on Outline mode +* Headlines:: How to typeset Org tree headlines +* Visibility cycling:: Show and hide, much simplified +* Motion:: Jumping to other headlines +* Structure editing:: Changing sequence and level of headlines +* Sparse trees:: Matches embedded in context +* Plain lists:: Additional structure within an entry +* Drawers:: Tucking stuff away +* Blocks:: Folding blocks +* Footnotes:: How footnotes are defined in Org's syntax +* Orgstruct mode:: Structure editing outside Org +* Org syntax:: Formal description of Org's syntax + + +File: org, Node: Outlines, Next: Headlines, Prev: Document Structure, Up: Document Structure + +2.1 Outlines +============ + +Org is implemented on top of Outline mode. Outlines allow a document +to be organized in a hierarchical structure, which (at least for me) is +the best representation of notes and thoughts. An overview of this +structure is achieved by folding (hiding) large parts of the document +to show only the general document structure and the parts currently +being worked on. Org greatly simplifies the use of outlines by +compressing the entire show/hide functionality into a single command, +`org-cycle', which is bound to the key. + + +File: org, Node: Headlines, Next: Visibility cycling, Prev: Outlines, Up: Document Structure + +2.2 Headlines +============= + +Headlines define the structure of an outline tree. The headlines in Org +start with one or more stars, on the left margin(1) (2). For example: + + * Top level headline + ** Second level + *** 3rd level + some text + *** 3rd level + more text + + * Another top level headline + +Some people find the many stars too noisy and would prefer an outline +that has whitespace followed by a single star as headline starters. +*note Clean view::, describes a setup to realize this. + + An empty line after the end of a subtree is considered part of it and +will be hidden when the subtree is folded. However, if you leave at +least two empty lines, one empty line will remain visible after folding +the subtree, in order to structure the collapsed view. See the +variable `org-cycle-separator-lines' to modify this behavior. + + ---------- Footnotes ---------- + + (1) See the variables `org-special-ctrl-a/e', `org-special-ctrl-k', +and `org-ctrl-k-protect-subtree' to configure special behavior of `C-a', +`C-e', and `C-k' in headlines. + + (2) Clocking only works with headings indented less then 30 stars. + + +File: org, Node: Visibility cycling, Next: Motion, Prev: Headlines, Up: Document Structure + +2.3 Visibility cycling +====================== + +* Menu: + +* Global and local cycling:: Cycling through various visibility states +* Initial visibility:: Setting the initial visibility state +* Catching invisible edits:: Preventing mistakes when editing invisible parts + + +File: org, Node: Global and local cycling, Next: Initial visibility, Prev: Visibility cycling, Up: Visibility cycling + +2.3.1 Global and local cycling +------------------------------ + +Outlines make it possible to hide parts of the text in the buffer. Org +uses just two commands, bound to and `S-' to change the +visibility in the buffer. + +`' (`org-cycle') + _Subtree cycling_: Rotate current subtree among the states + + ,-> FOLDED -> CHILDREN -> SUBTREE --. + '-----------------------------------' + + The cursor must be on a headline for this to work(1). When the + cursor is at the beginning of the buffer and the first line is not + a headline, then actually runs global cycling (see + below)(2). Also when called with a prefix argument (`C-u '), + global cycling is invoked. + +`S-' (`org-global-cycle') +C-u + _Global cycling_: Rotate the entire buffer among the states + + ,-> OVERVIEW -> CONTENTS -> SHOW ALL --. + '--------------------------------------' + + When `S-' is called with a numeric prefix argument N, the + CONTENTS view up to headlines of level N will be shown. Note that + inside tables, `S-' jumps to the previous field. + +`C-u C-u ' (`org-set-startup-visibility') + Switch back to the startup visibility of the buffer (*note Initial + visibility::). + +`C-u C-u C-u ' (`show-all') + Show all, including drawers. + +`C-c C-r' (`org-reveal') + Reveal context around point, showing the current entry, the + following heading and the hierarchy above. Useful for working + near a location that has been exposed by a sparse tree command + (*note Sparse trees::) or an agenda command (*note Agenda + commands::). With a prefix argument show, on each level, all + sibling headings. With a double prefix argument, also show the + entire subtree of the parent. + +`C-c C-k' (`show-branches') + Expose all the headings of the subtree, CONTENT view for just one + subtree. + +`C-c ' (`show-children') + Expose all direct children of the subtree. With a numeric prefix + argument N, expose all children down to level N. + +`C-c C-x b' (`org-tree-to-indirect-buffer') + Show the current subtree in an indirect buffer(3). With a numeric + prefix argument N, go up to level N and then take that tree. If N + is negative then go up that many levels. With a `C-u' prefix, do + not remove the previously used indirect buffer. + +`C-c C-x v' (`org-copy-visible') + Copy the visible text in the region into the kill ring. + +* Menu: + +* Initial visibility:: Setting the initial visibility state +* Catching invisible edits:: Preventing mistakes when editing invisible parts + + ---------- Footnotes ---------- + + (1) see, however, the option `org-cycle-emulate-tab'. + + (2) see the option `org-cycle-global-at-bob'. + + (3) The indirect buffer (*note Indirect Buffers: (emacs)Indirect +Buffers.) will contain the entire buffer, but will be narrowed to the +current tree. Editing the indirect buffer will also change the +original buffer, but without affecting visibility in that buffer. + + +File: org, Node: Initial visibility, Next: Catching invisible edits, Prev: Global and local cycling, Up: Visibility cycling + +2.3.2 Initial visibility +------------------------ + +When Emacs first visits an Org file, the global state is set to +OVERVIEW, i.e., only the top level headlines are visible(1). This can +be configured through the variable `org-startup-folded', or on a +per-file basis by adding one of the following lines anywhere in the +buffer: + + #+STARTUP: overview + #+STARTUP: content + #+STARTUP: showall + #+STARTUP: showeverything + + The startup visibility options are ignored when the file is open for +the first time during the agenda generation: if you want the agenda to +honor the startup visibility, set `org-agenda-inhibit-startup' to `nil'. + +Furthermore, any entries with a `VISIBILITY' property (*note Properties +and Columns::) will get their visibility adapted accordingly. Allowed +values for this property are `folded', `children', `content', and `all'. + +`C-u C-u ' (`org-set-startup-visibility') + Switch back to the startup visibility of the buffer, i.e., + whatever is requested by startup options and `VISIBILITY' + properties in individual entries. + + ---------- Footnotes ---------- + + (1) When `org-agenda-inhibit-startup' is non-`nil', Org will not +honor the default visibility state when first opening a file for the +agenda (*note Speeding up your agendas::). + + +File: org, Node: Catching invisible edits, Prev: Initial visibility, Up: Visibility cycling + +2.3.3 Catching invisible edits +------------------------------ + +Sometimes you may inadvertently edit an invisible part of the buffer +and be confused on what has been edited and how to undo the mistake. +Setting `org-catch-invisible-edits' to non-`nil' will help prevent +this. See the docstring of this option on how Org should catch +invisible edits and process them. + + +File: org, Node: Motion, Next: Structure editing, Prev: Visibility cycling, Up: Document Structure + +2.4 Motion +========== + +The following commands jump to other headlines in the buffer. + +`C-c C-n' (`outline-next-visible-heading') + Next heading. + +`C-c C-p' (`outline-previous-visible-heading') + Previous heading. + +`C-c C-f' (`org-forward-same-level') + Next heading same level. + +`C-c C-b' (`org-backward-same-level') + Previous heading same level. + +`C-c C-u' (`outline-up-heading') + Backward to higher level heading. + +`C-c C-j' (`org-goto') + Jump to a different place without changing the current outline + visibility. Shows the document structure in a temporary buffer, + where you can use the following keys to find your destination: + Cycle visibility. + / Next/previous visible headline. + Select this location. + / Do a Sparse-tree search + The following keys work if you turn off `org-goto-auto-isearch' + n / p Next/previous visible headline. + f / b Next/previous headline same level. + u One level up. + 0-9 Digit argument. + q Quit + See also the option `org-goto-interface'. + + +File: org, Node: Structure editing, Next: Sparse trees, Prev: Motion, Up: Document Structure + +2.5 Structure editing +===================== + +`M-' (`org-insert-heading') + Insert a new heading/item with the same level than the one at + point. If the cursor is in a plain list item, a new item is + created (*note Plain lists::). To prevent this behavior in lists, + call the command with a prefix argument. When this command is + used in the middle of a line, the line is split and the rest of + the line becomes the new item or headline(1). If the command is + used at the _beginning_ of a headline, the new headline is created + before the current line. If the command is used at the _end_ of a + folded subtree (i.e., behind the ellipses at the end of a + headline), then a headline will be inserted after the end of the + subtree. Calling this command with `C-u C-u' will unconditionally + respect the headline's content and create a new item at the end of + the parent subtree. + +`C-' (`org-insert-heading-respect-content') + Just like `M-', except when adding a new heading below the + current heading, the new heading is placed after the body instead + of before it. This command works from anywhere in the entry. + +`M-S-' (`org-insert-todo-heading') + Insert new TODO entry with same level as current heading. See + also the variable `org-treat-insert-todo-heading-as-state-change'. + +`C-S-' (`org-insert-todo-heading-respect-content') + Insert new TODO entry with same level as current heading. Like + `C-', the new headline will be inserted after the current + subtree. + +`' (`org-cycle') + In a new entry with no text yet, the first demotes the entry + to become a child of the previous one. The next makes it a + parent, and so on, all the way to top level. Yet another , + and you are back to the initial level. + +`M-' (`org-do-promote') + Promote current heading by one level. + +`M-' (`org-do-demote') + Demote current heading by one level. + +`M-S-' (`org-promote-subtree') + Promote the current subtree by one level. + +`M-S-' (`org-demote-subtree') + Demote the current subtree by one level. + +`M-S-' (`org-move-subtree-up') + Move subtree up (swap with previous subtree of same level). + +`M-S-' (`org-move-subtree-down') + Move subtree down (swap with next subtree of same level). + +`M-h' (`org-mark-element') + Mark the element at point. Hitting repeatedly will mark + subsequent elements of the one just marked. E.g., hitting + on a paragraph will mark it, hitting immediately again will + mark the next one. + +`C-c @' (`org-mark-subtree') + Mark the subtree at point. Hitting repeatedly will mark + subsequent subtrees of the same level than the marked subtree. + +`C-c C-x C-w' (`org-cut-subtree') + Kill subtree, i.e., remove it from buffer but save in kill ring. + With a numeric prefix argument N, kill N sequential subtrees. + +`C-c C-x M-w' (`org-copy-subtree') + Copy subtree to kill ring. With a numeric prefix argument N, copy + the N sequential subtrees. + +`C-c C-x C-y' (`org-paste-subtree') + Yank subtree from kill ring. This does modify the level of the + subtree to make sure the tree fits in nicely at the yank position. + The yank level can also be specified with a numeric prefix + argument, or by yanking after a headline marker like `****'. + +`C-y' (`org-yank') + Depending on the options `org-yank-adjusted-subtrees' and + `org-yank-folded-subtrees', Org's internal `yank' command will + paste subtrees folded and in a clever way, using the same command + as `C-c C-x C-y'. With the default settings, no level adjustment + will take place, but the yanked tree will be folded unless doing + so would swallow text previously visible. Any prefix argument to + this command will force a normal `yank' to be executed, with the + prefix passed along. A good way to force a normal yank is `C-u + C-y'. If you use `yank-pop' after a yank, it will yank previous + kill items plainly, without adjustment and folding. + +`C-c C-x c' (`org-clone-subtree-with-time-shift') + Clone a subtree by making a number of sibling copies of it. You + will be prompted for the number of copies to make, and you can + also specify if any timestamps in the entry should be shifted. + This can be useful, for example, to create a number of tasks + related to a series of lectures to prepare. For more details, see + the docstring of the command `org-clone-subtree-with-time-shift'. + +`C-c C-w' (`org-refile') + Refile entry or region to a different location. *Note Refile and + copy::. + +`C-c ^' (`org-sort') + Sort same-level entries. When there is an active region, all + entries in the region will be sorted. Otherwise the children of + the current headline are sorted. The command prompts for the + sorting method, which can be alphabetically, numerically, by time + (first timestamp with active preferred, creation time, scheduled + time, deadline time), by priority, by TODO keyword (in the + sequence the keywords have been defined in the setup) or by the + value of a property. Reverse sorting is possible as well. You + can also supply your own function to extract the sorting key. + With a `C-u' prefix, sorting will be case-sensitive. + +`C-x n s' (`org-narrow-to-subtree') + Narrow buffer to current subtree. + +`C-x n b' (`org-narrow-to-block') + Narrow buffer to current block. + +`C-x n w' (`widen') + Widen buffer to remove narrowing. + +`C-c *' (`org-toggle-heading') + Turn a normal line or plain list item into a headline (so that it + becomes a subheading at its location). Also turn a headline into + a normal line by removing the stars. If there is an active + region, turn all lines in the region into headlines. If the first + line in the region was an item, turn only the item lines into + headlines. Finally, if the first line is a headline, remove the + stars from all headlines in the region. + + When there is an active region (Transient Mark mode), promotion and +demotion work on all headlines in the region. To select a region of +headlines, it is best to place both point and mark at the beginning of a +line, mark at the beginning of the first headline, and point at the line +just after the last headline to change. Note that when the cursor is +inside a table (*note Tables::), the Meta-Cursor keys have different +functionality. + + ---------- Footnotes ---------- + + (1) If you do not want the line to be split, customize the variable +`org-M-RET-may-split-line'. + + +File: org, Node: Sparse trees, Next: Plain lists, Prev: Structure editing, Up: Document Structure + +2.6 Sparse trees +================ + +An important feature of Org mode is the ability to construct _sparse +trees_ for selected information in an outline tree, so that the entire +document is folded as much as possible, but the selected information is +made visible along with the headline structure above it(1). Just try +it out and you will see immediately how it works. + + Org mode contains several commands creating such trees, all these +commands can be accessed through a dispatcher: + +`C-c /' (`org-sparse-tree') + This prompts for an extra key to select a sparse-tree creating + command. + +`C-c / r' (`org-occur') + Prompts for a regexp and shows a sparse tree with all matches. If + the match is in a headline, the headline is made visible. If the + match is in the body of an entry, headline and body are made + visible. In order to provide minimal context, also the full + hierarchy of headlines above the match is shown, as well as the + headline following the match. Each match is also highlighted; the + highlights disappear when the buffer is changed by an editing + command(2), or by pressing `C-c C-c'. When called with a `C-u' + prefix argument, previous highlights are kept, so several calls to + this command can be stacked. + +`M-g n' or `M-g M-n' (`next-error') + Jump to the next sparse tree match in this buffer. + +`M-g p' or `M-g M-p' (`previous-error') + Jump to the previous sparse tree match in this buffer. + +For frequently used sparse trees of specific search strings, you can +use the option `org-agenda-custom-commands' to define fast keyboard +access to specific sparse trees. These commands will then be +accessible through the agenda dispatcher (*note Agenda dispatcher::). +For example: + + (setq org-agenda-custom-commands + '(("f" occur-tree "FIXME"))) + +will define the key `C-c a f' as a shortcut for creating a sparse tree +matching the string `FIXME'. + + The other sparse tree commands select headings based on TODO +keywords, tags, or properties and will be discussed later in this +manual. + + To print a sparse tree, you can use the Emacs command +`ps-print-buffer-with-faces' which does not print invisible parts of +the document (3). Or you can use `C-c C-e C-v' to export only the +visible part of the document and print the resulting file. + + ---------- Footnotes ---------- + + (1) See also the variables `org-show-hierarchy-above', +`org-show-following-heading', `org-show-siblings', and +`org-show-entry-below' for detailed control on how much context is +shown around each match. + + (2) This depends on the option `org-remove-highlights-with-change' + + (3) This does not work under XEmacs, because XEmacs uses selective +display for outlining, not text properties. + + +File: org, Node: Plain lists, Next: Drawers, Prev: Sparse trees, Up: Document Structure + +2.7 Plain lists +=============== + +Within an entry of the outline tree, hand-formatted lists can provide +additional structure. They also provide a way to create lists of +checkboxes (*note Checkboxes::). Org supports editing such lists, and +every exporter (*note Exporting::) can parse and format them. + + Org knows ordered lists, unordered lists, and description lists. + * _Unordered_ list items start with `-', `+', or `*'(1) as bullets. + + * _Ordered_ list items start with a numeral followed by either a + period or a right parenthesis(2), such as `1.' or `1)'(3). If you + want a list to start with a different value (e.g., 20), start the + text of the item with `[@20]'(4). Those constructs can be used in + any item of the list in order to enforce a particular numbering. + + * _Description_ list items are unordered list items, and contain the + separator ` :: ' to distinguish the description _term_ from the + description. + + Items belonging to the same list must have the same indentation on +the first line. In particular, if an ordered list reaches number +`10.', then the 2-digit numbers must be written left-aligned with the +other numbers in the list. An item ends before the next line that is +less or equally indented than its bullet/number. + + A list ends whenever every item has ended, which means before any +line less or equally indented than items at top level. It also ends +before two blank lines(5). In that case, all items are closed. Here +is an example: + + ** Lord of the Rings + My favorite scenes are (in this order) + 1. The attack of the Rohirrim + 2. Eowyn's fight with the witch king + + this was already my favorite scene in the book + + I really like Miranda Otto. + 3. Peter Jackson being shot by Legolas + - on DVD only + He makes a really funny face when it happens. + But in the end, no individual scenes matter but the film as a whole. + Important actors in this film are: + - Elijah Wood :: He plays Frodo + - Sean Austin :: He plays Sam, Frodo's friend. I still remember + him very well from his role as Mikey Walsh in The Goonies. + + Org supports these lists by tuning filling and wrapping commands to +deal with them correctly(6), and by exporting them properly (*note +Exporting::). Since indentation is what governs the structure of these +lists, many structural constructs like `#+BEGIN_...' blocks can be +indented to signal that they belong to a particular item. + + If you find that using a different bullet for a sub-list (than that +used for the current list-level) improves readability, customize the +variable `org-list-demote-modify-bullet'. To get a greater difference +of indentation between items and theirs sub-items, customize +`org-list-indent-offset'. + + The following commands act on items when the cursor is in the first +line of an item (the line with the bullet or number). Some of them +imply the application of automatic rules to keep list structure intact. +If some of these actions get in your way, configure +`org-list-automatic-rules' to disable them individually. + +`' (`org-cycle') + Items can be folded just like headline levels. Normally this + works only if the cursor is on a plain list item. For more + details, see the variable `org-cycle-include-plain-lists'. If + this variable is set to `integrate', plain list items will be + treated like low-level headlines. The level of an item is then + given by the indentation of the bullet/number. Items are always + subordinate to real headlines, however; the hierarchies remain + completely separated. In a new item with no text yet, the first + demotes the item to become a child of the previous one. + Subsequent s move the item to meaningful levels in the list + and eventually get it back to its initial position. + +`M-' (`org-insert-heading') + Insert new item at current level. With a prefix argument, force a + new heading (*note Structure editing::). If this command is used + in the middle of an item, that item is _split_ in two, and the + second part becomes the new item(7). If this command is executed + _before item's body_, the new item is created _before_ the current + one. + +`M-S-' + Insert a new item with a checkbox (*note Checkboxes::). + +`S-up' +`S-down' + Jump to the previous/next item in the current list(8), but only if + `org-support-shift-select' is off. If not, you can still use + paragraph jumping commands like `C-' and `C-' to quite + similar effect. + +`M-up' +`M-down' + Move the item including subitems up/down(9) (swap with + previous/next item of same indentation). If the list is ordered, + renumbering is automatic. + +`M-left' +`M-right' + Decrease/increase the indentation of an item, leaving children + alone. + +`M-S-' +`M-S-' + Decrease/increase the indentation of the item, including subitems. + Initially, the item tree is selected based on current indentation. + When these commands are executed several times in direct + succession, the initially selected region is used, even if the new + indentation would imply a different hierarchy. To use the new + hierarchy, break the command chain with a cursor motion or so. + + As a special case, using this command on the very first item of a + list will move the whole list. This behavior can be disabled by + configuring `org-list-automatic-rules'. The global indentation of + a list has no influence on the text _after_ the list. + +`C-c C-c' + If there is a checkbox (*note Checkboxes::) in the item line, + toggle the state of the checkbox. In any case, verify bullets and + indentation consistency in the whole list. + +`C-c -' + Cycle the entire list level through the different + itemize/enumerate bullets (`-', `+', `*', `1.', `1)') or a subset + of them, depending on `org-plain-list-ordered-item-terminator', + the type of list, and its indentation. With a numeric prefix + argument N, select the Nth bullet from this list. If there is an + active region when calling this, selected text will be changed + into an item. With a prefix argument, all lines will be converted + to list items. If the first line already was a list item, any item + marker will be removed from the list. Finally, even without an + active region, a normal line will be converted into a list item. + +`C-c *' + Turn a plain list item into a headline (so that it becomes a + subheading at its location). *Note Structure editing::, for a + detailed explanation. + +`C-c C-*' + Turn the whole plain list into a subtree of the current heading. + Checkboxes (*note Checkboxes::) will become TODO (resp. DONE) + keywords when unchecked (resp. checked). + +`S-left/right' + This command also cycles bullet styles when the cursor in on the + bullet or anywhere in an item line, details depending on + `org-support-shift-select'. + +`C-c ^' + Sort the plain list. You will be prompted for the sorting method: + numerically, alphabetically, by time, by checked status for check + lists, or by a custom function. + + ---------- Footnotes ---------- + + (1) When using `*' as a bullet, lines must be indented or they will +be seen as top-level headlines. Also, when you are hiding leading +stars to get a clean outline view, plain list items starting with a +star may be hard to distinguish from true headlines. In short: even +though `*' is supported, it may be better to not use it for plain list +items. + + (2) You can filter out any of them by configuring +`org-plain-list-ordered-item-terminator'. + + (3) You can also get `a.', `A.', `a)' and `A)' by configuring +`org-list-allow-alphabetical'. To minimize confusion with normal text, +those are limited to one character only. Beyond that limit, bullets +will automatically fallback to numbers. + + (4) If there's a checkbox in the item, the cookie must be put +_before_ the checkbox. If you have activated alphabetical lists, you +can also use counters like `[@b]'. + + (5) See also `org-list-empty-line-terminates-plain-lists'. + + (6) Org only changes the filling settings for Emacs. For XEmacs, +you should use Kyle E. Jones' `filladapt.el'. To turn this on, put +into `.emacs': `(require 'filladapt)' + + (7) If you do not want the item to be split, customize the variable +`org-M-RET-may-split-line'. + + (8) If you want to cycle around items that way, you may customize +`org-list-use-circular-motion'. + + (9) See `org-list-use-circular-motion' for a cyclic behavior. + + +File: org, Node: Drawers, Next: Blocks, Prev: Plain lists, Up: Document Structure + +2.8 Drawers +=========== + +Sometimes you want to keep information associated with an entry, but you +normally don't want to see it. For this, Org mode has _drawers_. +Drawers need to be configured with the option `org-drawers'(1). +Drawers look like this: + + ** This is a headline + Still outside the drawer + :DRAWERNAME: + This is inside the drawer. + :END: + After the drawer. + + You can interactively insert drawers at point by calling +`org-insert-drawer', which is bound to . With an active +region, this command will put the region inside the drawer. With a +prefix argument, this command calls `org-insert-property-drawer' and +add a property drawer right below the current headline. Completion +over drawer keywords is also possible using . + + Visibility cycling (*note Visibility cycling::) on the headline will +hide and show the entry, but keep the drawer collapsed to a single +line. In order to look inside the drawer, you need to move the cursor +to the drawer line and press there. Org mode uses the +`PROPERTIES' drawer for storing properties (*note Properties and +Columns::), and you can also arrange for state change notes (*note +Tracking TODO state changes::) and clock times (*note Clocking work +time::) to be stored in a drawer `LOGBOOK'. If you want to store a +quick note in the LOGBOOK drawer, in a similar way to state changes, use + +`C-c C-z' + Add a time-stamped note to the LOGBOOK drawer. + + You can select the name of the drawers which should be exported with +`org-export-with-drawers'. In that case, drawer contents will appear in +export output. Property drawers are not affected by this variable and +are never exported. + + ---------- Footnotes ---------- + + (1) You can define additional drawers on a per-file basis with a +line like `#+DRAWERS: HIDDEN STATE' + + +File: org, Node: Blocks, Next: Footnotes, Prev: Drawers, Up: Document Structure + +2.9 Blocks +========== + +Org mode uses begin...end blocks for various purposes from including +source code examples (*note Literal examples::) to capturing time +logging information (*note Clocking work time::). These blocks can be +folded and unfolded by pressing TAB in the begin line. You can also +get all blocks folded at startup by configuring the option +`org-hide-block-startup' or on a per-file basis by using + + #+STARTUP: hideblocks + #+STARTUP: nohideblocks + + +File: org, Node: Footnotes, Next: Orgstruct mode, Prev: Blocks, Up: Document Structure + +2.10 Footnotes +============== + +Org mode supports the creation of footnotes. In contrast to the +`footnote.el' package, Org mode's footnotes are designed for work on a +larger document, not only for one-off documents like emails. + + A footnote is started by a footnote marker in square brackets in +column 0, no indentation allowed. It ends at the next footnote +definition, headline, or after two consecutive empty lines. The +footnote reference is simply the marker in square brackets, inside +text. For example: + + The Org homepage[fn:1] now looks a lot better than it used to. + ... + [fn:1] The link is: http://orgmode.org + + Org mode extends the number-based syntax to _named_ footnotes and +optional inline definition. Using plain numbers as markers (as +`footnote.el' does) is supported for backward compatibility, but not +encouraged because of possible conflicts with LaTeX snippets (*note +Embedded LaTeX::). Here are the valid references: + +`[1]' + A plain numeric footnote marker. Compatible with `footnote.el', + but not recommended because something like `[1]' could easily be + part of a code snippet. + +`[fn:name]' + A named footnote reference, where `name' is a unique label word, + or, for simplicity of automatic creation, a number. + +`[fn:: This is the inline definition of this footnote]' + A LaTeX-like anonymous footnote where the definition is given + directly at the reference point. + +`[fn:name: a definition]' + An inline definition of a footnote, which also specifies a name + for the note. Since Org allows multiple references to the same + note, you can then use `[fn:name]' to create additional references. + + Footnote labels can be created automatically, or you can create +names yourself. This is handled by the variable +`org-footnote-auto-label' and its corresponding `#+STARTUP' keywords. +See the docstring of that variable for details. + +The following command handles footnotes: + +`C-c C-x f' + The footnote action command. + + When the cursor is on a footnote reference, jump to the + definition. When it is at a definition, jump to the (first) + reference. + + Otherwise, create a new footnote. Depending on the option + `org-footnote-define-inline'(1), the definition will be placed + right into the text as part of the reference, or separately into + the location determined by the option `org-footnote-section'. + + When this command is called with a prefix argument, a menu of + additional options is offered: + s Sort the footnote definitions by reference sequence. During editing, + Org makes no effort to sort footnote definitions into a particular + sequence. If you want them sorted, use this command, which will + also move entries according to `org-footnote-section'. Automatic + sorting after each insertion/deletion can be configured using the + option `org-footnote-auto-adjust'. + r Renumber the simple `fn:N' footnotes. Automatic renumbering + after each insertion/deletion can be configured using the option + `org-footnote-auto-adjust'. + S Short for first `r', then `s' action. + n Normalize the footnotes by collecting all definitions (including + inline definitions) into a special section, and then numbering them + in sequence. The references will then also be numbers. This is + meant to be the final step before finishing a document (e.g., sending + off an email). + d Delete the footnote at point, and all definitions of and references + to it. + Depending on the variable `org-footnote-auto-adjust'(2), + renumbering and sorting footnotes can be automatic after each + insertion or deletion. + +`C-c C-c' + If the cursor is on a footnote reference, jump to the definition. + If it is a the definition, jump back to the reference. When + called at a footnote location with a prefix argument, offer the + same menu as `C-c C-x f'. + +`C-c C-o or mouse-1/2' + Footnote labels are also links to the corresponding + definition/reference, and you can use the usual commands to follow + these links. + + ---------- Footnotes ---------- + + (1) The corresponding in-buffer setting is: `#+STARTUP: fninline' or +`#+STARTUP: nofninline' + + (2) the corresponding in-buffer options are `fnadjust' and +`nofnadjust'. + + +File: org, Node: Orgstruct mode, Next: Org syntax, Prev: Footnotes, Up: Document Structure + +2.11 The Orgstruct minor mode +============================= + +If you like the intuitive way the Org mode structure editing and list +formatting works, you might want to use these commands in other modes +like Text mode or Mail mode as well. The minor mode `orgstruct-mode' +makes this possible. Toggle the mode with `M-x orgstruct-mode RET', or +turn it on by default, for example in Message mode, with one of: + + (add-hook 'message-mode-hook 'turn-on-orgstruct) + (add-hook 'message-mode-hook 'turn-on-orgstruct++) + + When this mode is active and the cursor is on a line that looks to +Org like a headline or the first line of a list item, most structure +editing commands will work, even if the same keys normally have +different functionality in the major mode you are using. If the cursor +is not in one of those special lines, Orgstruct mode lurks silently in +the shadows. + + When you use `orgstruct++-mode', Org will also export indentation and +autofill settings into that mode, and detect item context after the +first line of an item. + + You can also use Org structure editing to fold and unfold headlines +in _any_ file, provided you defined `orgstruct-heading-prefix-regexp': +the regular expression must match the local prefix to use before Org's +headlines. For example, if you set this variable to `";; "' in Emacs +Lisp files, you will be able to fold and unfold headlines in Emacs Lisp +commented lines. Some commands like `org-demote' are disabled when the +prefix is set, but folding/unfolding will work correctly. + + +File: org, Node: Org syntax, Prev: Orgstruct mode, Up: Document Structure + +2.12 Org syntax +=============== + +A reference document providing a formal description of Org's syntax is +available as a draft on Worg +(http://orgmode.org/worg/dev/org-syntax.html), written and maintained +by Nicolas Goaziou. It defines Org's core internal concepts such as +`headlines', `sections', `affiliated keywords', `(greater) elements' +and `objects'. Each part of an Org file falls into one of the +categories above. + + To explore the abstract structure of an Org buffer, run this in a +buffer: + + M-: (org-element-parse-buffer) RET + + It will output a list containing the buffer's content represented as +an abstract structure. The export engine relies on the information +stored in this list. Most interactive commands (e.g., for structure +editing) also rely on the syntactic meaning of the surrounding context. + + +File: org, Node: Tables, Next: Hyperlinks, Prev: Document Structure, Up: Top + +3 Tables +******** + +Org comes with a fast and intuitive table editor. Spreadsheet-like +calculations are supported using the Emacs `calc' package (*note Calc: +(calc)Top.). + +* Menu: + +* Built-in table editor:: Simple tables +* Column width and alignment:: Overrule the automatic settings +* Column groups:: Grouping to trigger vertical lines +* Orgtbl mode:: The table editor as minor mode +* The spreadsheet:: The table editor has spreadsheet capabilities +* Org-Plot:: Plotting from org tables + + +File: org, Node: Built-in table editor, Next: Column width and alignment, Prev: Tables, Up: Tables + +3.1 The built-in table editor +============================= + +Org makes it easy to format tables in plain ASCII. Any line with `|' as +the first non-whitespace character is considered part of a table. `|' +is also the column separator(1). A table might look like this: + + | Name | Phone | Age | + |-------+-------+-----| + | Peter | 1234 | 17 | + | Anna | 4321 | 25 | + + A table is re-aligned automatically each time you press or + or `C-c C-c' inside the table. also moves to the next +field ( to the next row) and creates new table rows at the end of +the table or before horizontal lines. The indentation of the table is +set by the first line. Any line starting with `|-' is considered as a +horizontal separator line and will be expanded on the next re-align to +span the whole table width. So, to create the above table, you would +only type + + |Name|Phone|Age| + |- + +and then press to align the table and start filling in fields. +Even faster would be to type `|Name|Phone|Age' followed by `C-c '. + + When typing text into a field, Org treats , , and +all character keys in a special way, so that inserting and deleting +avoids shifting other fields. Also, when typing _immediately after the +cursor was moved into a new field with `', `S-' or `'_, +the field is automatically made blank. If this behavior is too +unpredictable for you, configure the options `org-enable-table-editor' +and `org-table-auto-blank-field'. + +Creation and conversion +....................... + +`C-c | (`org-table-create-or-convert-from-region')' + Convert the active region to table. If every line contains at + least one TAB character, the function assumes that the material is + tab separated. If every line contains a comma, comma-separated + values (CSV) are assumed. If not, lines are split at whitespace + into fields. You can use a prefix argument to force a specific + separator: `C-u' forces CSV, `C-u C-u' forces TAB, and a numeric + argument N indicates that at least N consecutive spaces, or + alternatively a TAB will be the separator. + If there is no active region, this command creates an empty Org + table. But it is easier just to start typing, like + `|Name|Phone|Age |- '. + +Re-aligning and field motion +............................ + +`C-c C-c (`org-table-align')' + Re-align the table and don't move to another field. + +` (`org-table-next-field')' + Re-align the table, move to the next field. Creates a new row if + necessary. + +`S- (`org-table-previous-field')' + Re-align, move to previous field. + +` (`org-table-next-row')' + Re-align the table and move down to next row. Creates a new row if + necessary. At the beginning or end of a line, still does + NEWLINE, so it can be used to split a table. + +`M-a (`org-table-beginning-of-field')' + Move to beginning of the current table field, or on to the + previous field. + +`M-e (`org-table-end-of-field')' + Move to end of the current table field, or on to the next field. + +Column and row editing +...................... + +`M- (`org-table-move-column-left')' +`M- (`org-table-move-column-right')' + Move the current column left/right. + +`M-S- (`org-table-delete-column')' + Kill the current column. + +`M-S- (`org-table-insert-column')' + Insert a new column to the left of the cursor position. + +`M- (`org-table-move-row-up')' +`M- (`org-table-move-row-down')' + Move the current row up/down. + +`M-S- (`org-table-kill-row')' + Kill the current row or horizontal line. + +`M-S- (`org-table-insert-row')' + Insert a new row above the current row. With a prefix argument, + the line is created below the current one. + +`C-c - (`org-table-insert-hline')' + Insert a horizontal line below current row. With a prefix + argument, the line is created above the current line. + +`C-c (`org-table-hline-and-move')' + Insert a horizontal line below current row, and move the cursor + into the row below that line. + +`C-c ^ (`org-table-sort-lines')' + Sort the table lines in the region. The position of point + indicates the column to be used for sorting, and the range of + lines is the range between the nearest horizontal separator lines, + or the entire table. If point is before the first column, you + will be prompted for the sorting column. If there is an active + region, the mark specifies the first line and the sorting column, + while point should be in the last line to be included into the + sorting. The command prompts for the sorting type + (alphabetically, numerically, or by time). When called with a + prefix argument, alphabetic sorting will be case-sensitive. + +Regions +....... + +`C-c C-x M-w (`org-table-copy-region')' + Copy a rectangular region from a table to a special clipboard. + Point and mark determine edge fields of the rectangle. If there + is no active region, copy just the current field. The process + ignores horizontal separator lines. + +`C-c C-x C-w (`org-table-cut-region')' + Copy a rectangular region from a table to a special clipboard, and + blank all fields in the rectangle. So this is the "cut" operation. + +`C-c C-x C-y (`org-table-paste-rectangle')' + Paste a rectangular region into a table. The upper left corner + ends up in the current field. All involved fields will be + overwritten. If the rectangle does not fit into the present table, + the table is enlarged as needed. The process ignores horizontal + separator lines. + +`M- (`org-table-wrap-region')' + Split the current field at the cursor position and move the rest + to the line below. If there is an active region, and both point + and mark are in the same column, the text in the column is wrapped + to minimum width for the given number of lines. A numeric prefix + argument may be used to change the number of desired lines. If + there is no region, but you specify a prefix argument, the current + field is made blank, and the content is appended to the field + above. + +Calculations +............ + +`C-c + (`org-table-sum')' + Sum the numbers in the current column, or in the rectangle defined + by the active region. The result is shown in the echo area and can + be inserted with `C-y'. + +`S- (`org-table-copy-down')' + When current field is empty, copy from first non-empty field + above. When not empty, copy current field down to next row and + move cursor along with it. Depending on the option + `org-table-copy-increment', integer field values will be + incremented during copy. Integers that are too large will not be + incremented. Also, a `0' prefix argument temporarily disables the + increment. This key is also used by shift-selection and related + modes (*note Conflicts::). + +Miscellaneous +............. + +`C-c ` (`org-table-edit-field')' + Edit the current field in a separate window. This is useful for + fields that are not fully visible (*note Column width and + alignment::). When called with a `C-u' prefix, just make the full + field visible, so that it can be edited in place. When called + with two `C-u' prefixes, make the editor window follow the cursor + through the table and always show the current field. The follow + mode exits automatically when the cursor leaves the table, or when + you repeat this command with `C-u C-u C-c `'. + +`M-x org-table-import RET' + Import a file as a table. The table should be TAB or whitespace + separated. Use, for example, to import a spreadsheet table or data + from a database, because these programs generally can write + TAB-separated text files. This command works by inserting the + file into the buffer and then converting the region to a table. + Any prefix argument is passed on to the converter, which uses it + to determine the separator. + +`C-c | (`org-table-create-or-convert-from-region')' + Tables can also be imported by pasting tabular text into the Org + buffer, selecting the pasted text with `C-x C-x' and then using the + `C-c |' command (see above under Creation and conversion). + +`M-x org-table-export RET' + Export the table, by default as a TAB-separated file. Use for data + exchange with, for example, spreadsheet or database programs. The + format used to export the file can be configured in the option + `org-table-export-default-format'. You may also use properties + `TABLE_EXPORT_FILE' and `TABLE_EXPORT_FORMAT' to specify the file + name and the format for table export in a subtree. Org supports + quite general formats for exported tables. The exporter format is + the same as the format used by Orgtbl radio tables, see *note + Translator functions::, for a detailed description. + + If you don't like the automatic table editor because it gets in your +way on lines which you would like to start with `|', you can turn it +off with + + (setq org-enable-table-editor nil) + +Then the only table command that still works is `C-c C-c' to do a +manual re-align. + + ---------- Footnotes ---------- + + (1) To insert a vertical bar into a table field, use `\vert' or, +inside a word `abc\vert{}def'. + + +File: org, Node: Column width and alignment, Next: Column groups, Prev: Built-in table editor, Up: Tables + +3.2 Column width and alignment +============================== + +The width of columns is automatically determined by the table editor. +And also the alignment of a column is determined automatically from the +fraction of number-like versus non-number fields in the column. + + Sometimes a single field or a few fields need to carry more text, +leading to inconveniently wide columns. Or maybe you want to make a +table with several columns having a fixed width, regardless of content. +To set(1) the width of a column, one field anywhere in the column may +contain just the string `' where `N' is an integer specifying the +width of the column in characters. The next re-align will then set the +width of this column to this value. + + |---+------------------------------| |---+--------| + | | | | | <6> | + | 1 | one | | 1 | one | + | 2 | two | ----\ | 2 | two | + | 3 | This is a long chunk of text | ----/ | 3 | This=> | + | 4 | four | | 4 | four | + |---+------------------------------| |---+--------| + +Fields that are wider become clipped and end in the string `=>'. Note +that the full text is still in the buffer but is hidden. To see the +full text, hold the mouse over the field--a tool-tip window will show +the full content. To edit such a field, use the command `C-c `' (that +is `C-c' followed by the backquote). This will open a new window with +the full field. Edit it and finish with `C-c C-c'. + + When visiting a file containing a table with narrowed columns, the +necessary character hiding has not yet happened, and the table needs to +be aligned before it looks nice. Setting the option +`org-startup-align-all-tables' will realign all tables in a file upon +visiting, but also slow down startup. You can also set this option on +a per-file basis with: + + #+STARTUP: align + #+STARTUP: noalign + + If you would like to overrule the automatic alignment of number-rich +columns to the right and of string-rich column to the left, you can use +`', `'(2) or `' in a similar fashion. You may also combine +alignment and field width like this: `'. + + Lines which only contain these formatting cookies will be removed +automatically when exporting the document. + + ---------- Footnotes ---------- + + (1) This feature does not work on XEmacs. + + (2) Centering does not work inside Emacs, but it does have an effect +when exporting to HTML. + + +File: org, Node: Column groups, Next: Orgtbl mode, Prev: Column width and alignment, Up: Tables + +3.3 Column groups +================= + +When Org exports tables, it does so by default without vertical lines +because that is visually more satisfying in general. Occasionally +however, vertical lines can be useful to structure a table into groups +of columns, much like horizontal lines can do for groups of rows. In +order to specify column groups, you can use a special row where the +first field contains only `/'. The further fields can either contain +`<' to indicate that this column should start a group, `>' to indicate +the end of a column, or `<>' (no space between `<' and `>') to make a +column a group of its own. Boundaries between column groups will upon +export be marked with vertical lines. Here is an example: + + | N | N^2 | N^3 | N^4 | sqrt(n) | sqrt[4](N) | + |---+-----+-----+-----+---------+------------| + | / | < | | > | < | > | + | 1 | 1 | 1 | 1 | 1 | 1 | + | 2 | 4 | 8 | 16 | 1.4142 | 1.1892 | + | 3 | 9 | 27 | 81 | 1.7321 | 1.3161 | + |---+-----+-----+-----+---------+------------| + #+TBLFM: $2=$1^2::$3=$1^3::$4=$1^4::$5=sqrt($1)::$6=sqrt(sqrt(($1))) + + It is also sufficient to just insert the column group starters after +every vertical line you would like to have: + + | N | N^2 | N^3 | N^4 | sqrt(n) | sqrt[4](N) | + |----+-----+-----+-----+---------+------------| + | / | < | | | < | | + + +File: org, Node: Orgtbl mode, Next: The spreadsheet, Prev: Column groups, Up: Tables + +3.4 The Orgtbl minor mode +========================= + +If you like the intuitive way the Org table editor works, you might +also want to use it in other modes like Text mode or Mail mode. The +minor mode Orgtbl mode makes this possible. You can always toggle the +mode with `M-x orgtbl-mode RET'. To turn it on by default, for example +in Message mode, use + + (add-hook 'message-mode-hook 'turn-on-orgtbl) + + Furthermore, with some special setup, it is possible to maintain +tables in arbitrary syntax with Orgtbl mode. For example, it is +possible to construct LaTeX tables with the underlying ease and power of +Orgtbl mode, including spreadsheet capabilities. For details, see +*note Tables in arbitrary syntax::. + + +File: org, Node: The spreadsheet, Next: Org-Plot, Prev: Orgtbl mode, Up: Tables + +3.5 The spreadsheet +=================== + +The table editor makes use of the Emacs `calc' package to implement +spreadsheet-like capabilities. It can also evaluate Emacs Lisp forms to +derive fields from other fields. While fully featured, Org's +implementation is not identical to other spreadsheets. For example, +Org knows the concept of a _column formula_ that will be applied to all +non-header fields in a column without having to copy the formula to +each relevant field. There is also a formula debugger, and a formula +editor with features for highlighting fields in the table corresponding +to the references at the point in the formula, moving these references +by arrow keys + +* Menu: + +* References:: How to refer to another field or range +* Formula syntax for Calc:: Using Calc to compute stuff +* Formula syntax for Lisp:: Writing formulas in Emacs Lisp +* Durations and time values:: How to compute durations and time values +* Field and range formulas:: Formula for specific (ranges of) fields +* Column formulas:: Formulas valid for an entire column +* Lookup functions:: Lookup functions for searching tables +* Editing and debugging formulas:: Fixing formulas +* Updating the table:: Recomputing all dependent fields +* Advanced features:: Field and column names, parameters and automatic recalc + + +File: org, Node: References, Next: Formula syntax for Calc, Prev: The spreadsheet, Up: The spreadsheet + +3.5.1 References +---------------- + +To compute fields in the table from other fields, formulas must +reference other fields or ranges. In Org, fields can be referenced by +name, by absolute coordinates, and by relative coordinates. To find +out what the coordinates of a field are, press `C-c ?' in that field, +or press `C-c }' to toggle the display of a grid. + +Field references +................ + +Formulas can reference the value of another field in two ways. Like in +any other spreadsheet, you may reference fields with a letter/number +combination like `B3', meaning the 2nd field in the 3rd row. However, +Org prefers(1) to use another, more general representation that looks +like this: + @ROW$COLUMN + + Column specifications can be absolute like `$1', `$2',...`$N', or +relative to the current column (i.e., the column of the field which is +being computed) like `$+1' or `$-2'. `$<' and `$>' are immutable +references to the first and last column, respectively, and you can use +`$>>>' to indicate the third column from the right. + + The row specification only counts data lines and ignores horizontal +separator lines (hlines). Like with columns, you can use absolute row +numbers `@1', `@2',...`@N', and row numbers relative to the current row +like `@+3' or `@-1'. `@<' and `@>' are immutable references the first +and last(2) row in the table, respectively. You may also specify the +row relative to one of the hlines: `@I' refers to the first hline, +`@II' to the second, etc. `@-I' refers to the first such line above +the current line, `@+I' to the first such line below the current line. +You can also write `@III+2' which is the second data line after the +third hline in the table. + + `@0' and `$0' refer to the current row and column, respectively, +i.e., to the row/column for the field being computed. Also, if you omit +either the column or the row part of the reference, the current +row/column is implied. + + Org's references with _unsigned_ numbers are fixed references in the +sense that if you use the same reference in the formula for two +different fields, the same field will be referenced each time. Org's +references with _signed_ numbers are floating references because the +same reference operator can reference different fields depending on the +field being calculated by the formula. + + Here are a few examples: + + @2$3 2nd row, 3rd column (same as `C2') + $5 column 5 in the current row (same as `E&') + @2 current column, row 2 + @-1$-3 the field one row up, three columns to the left + @-I$2 field just under hline above current row, column 2 + @>$5 field in the last row, in column 5 + +Range references +................ + +You may reference a rectangular range of fields by specifying two field +references connected by two dots `..'. If both fields are in the +current row, you may simply use `$2..$7', but if at least one field is +in a different row, you need to use the general `@row$column' format at +least for the first field (i.e the reference must start with `@' in +order to be interpreted correctly). Examples: + + $1..$3 first three fields in the current row + $P..$Q range, using column names (see under Advanced) + $<<<..$>> start in third column, continue to the one but last + @2$1..@4$3 6 fields between these two fields (same as `A2..C4') + @-1$-2..@-1 3 fields in the row above, starting from 2 columns on the left + @I..II between first and second hline, short for `@I..@II' + +Range references return a vector of values that can be fed into Calc +vector functions. Empty fields in ranges are normally suppressed, so +that the vector contains only the non-empty fields. For other options +with the mode switches `E', `N' and examples *note Formula syntax for +Calc::. + +Field coordinates in formulas +............................. + +For Calc formulas and Lisp formulas `@#' and `$#' can be used to get +the row or column number of the field where the formula result goes. +The traditional Lisp formula equivalents are `org-table-current-dline' +and `org-table-current-column'. Examples: + + if(@# % 2, $#, string("")) column number on odd lines only + $3 = remote(FOO, @@#$2) copy column 2 from table FOO into + column 3 of the current table + +For the second example, table FOO must have at least as many rows as +the current table. Note that this is inefficient(3) for large number +of rows. + +Named references +................ + +`$name' is interpreted as the name of a column, parameter or constant. +Constants are defined globally through the option +`org-table-formula-constants', and locally (for the file) through a +line like + + #+CONSTANTS: c=299792458. pi=3.14 eps=2.4e-6 + +Also properties (*note Properties and Columns::) can be used as +constants in table formulas: for a property `:Xyz:' use the name +`$PROP_Xyz', and the property will be searched in the current outline +entry and in the hierarchy above it. If you have the `constants.el' +package, it will also be used to resolve constants, including natural +constants like `$h' for Planck's constant, and units like `$km' for +kilometers(4). Column names and parameters can be specified in special +table lines. These are described below, see *note Advanced features::. +All names must start with a letter, and further consist of letters and +numbers. + +Remote references +................. + +You may also reference constants, fields and ranges from a different +table, either in the current file or even in a different file. The +syntax is + + remote(NAME-OR-ID,REF) + +where NAME can be the name of a table in the current file as set by a +`#+NAME: Name' line before the table. It can also be the ID of an +entry, even in a different file, and the reference then refers to the +first table in that entry. REF is an absolute field or range reference +as described above for example `@3$3' or `$somename', valid in the +referenced table. + + ---------- Footnotes ---------- + + (1) Org will understand references typed by the user as `B4', but it +will not use this syntax when offering a formula for editing. You can +customize this behavior using the option +`org-table-use-standard-references'. + + (2) For backward compatibility you can also use special names like +`$LR5' and `$LR12' to refer in a stable way to the 5th and 12th field +in the last row of the table. However, this syntax is deprecated, it +should not be used for new documents. Use `@>$' instead. + + (3) The computation time scales as O(N^2) because table FOO is +parsed for each field to be copied. + + (4) `constants.el' can supply the values of constants in two +different unit systems, `SI' and `cgs'. Which one is used depends on +the value of the variable `constants-unit-system'. You can use the +`#+STARTUP' options `constSI' and `constcgs' to set this value for the +current buffer. + + +File: org, Node: Formula syntax for Calc, Next: Formula syntax for Lisp, Prev: References, Up: The spreadsheet + +3.5.2 Formula syntax for Calc +----------------------------- + +A formula can be any algebraic expression understood by the Emacs `Calc' +package. Note that `calc' has the non-standard convention that `/' has +lower precedence than `*', so that `a/b*c' is interpreted as `a/(b*c)'. +Before evaluation by `calc-eval' (*note calc-eval: (calc)Calling Calc +from Your Programs.), variable substitution takes place according to the +rules described above. The range vectors can be directly fed into the +Calc vector functions like `vmean' and `vsum'. + + A formula can contain an optional mode string after a semicolon. +This string consists of flags to influence Calc and other modes during +execution. By default, Org uses the standard Calc modes (precision 12, +angular units degrees, fraction and symbolic modes off). The display +format, however, has been changed to `(float 8)' to keep tables +compact. The default settings can be configured using the option +`org-calc-default-modes'. + +List of modes: + +`p20' + Set the internal Calc calculation precision to 20 digits. + +`n3', `s3', `e2', `f4' + Normal, scientific, engineering or fixed format of the result of + Calc passed back to Org. Calc formatting is unlimited in + precision as long as the Calc calculation precision is greater. + +`D', `R' + Degree and radian angle modes of Calc. + +`F', `S' + Fraction and symbolic modes of Calc. + +`T', `t' + Duration computations in Calc or Lisp, *note Durations and time + values::. + +`E' + If and how to consider empty fields. Without `E' empty fields in + range references are suppressed so that the Calc vector or Lisp + list contains only the non-empty fields. With `E' the empty + fields are kept. For empty fields in ranges or empty field + references the value `nan' (not a number) is used in Calc formulas + and the empty string is used for Lisp formulas. Add `N' to use 0 + instead for both formula types. For the value of a field the mode + `N' has higher precedence than `E'. + +`N' + Interpret all fields as numbers, use 0 for non-numbers. See the + next section to see how this is essential for computations with + Lisp formulas. In Calc formulas it is used only occasionally + because there number strings are already interpreted as numbers + without `N'. + +`L' + Literal, for Lisp formulas only. See the next section. + +Unless you use large integer numbers or high-precision-calculation and +-display for floating point numbers you may alternatively provide a +`printf' format specifier to reformat the Calc result after it has been +passed back to Org instead of letting Calc already do the +formatting(1). A few examples: + + $1+$2 Sum of first and second field + $1+$2;%.2f Same, format result to two decimals + exp($2)+exp($1) Math functions can be used + $0;%.1f Reformat current cell to 1 decimal + ($3-32)*5/9 Degrees F -> C conversion + $c/$1/$cm Hz -> cm conversion, using `constants.el' + tan($1);Dp3s1 Compute in degrees, precision 3, display SCI 1 + sin($1);Dp3%.1e Same, but use printf specifier for display + taylor($3,x=7,2) Taylor series of $3, at x=7, second degree + + Calc also contains a complete set of logical operations, (*note +Logical Operations: (calc)Logical Operations.). For example + +`if($1 < 20, teen, string(""))' + "teen" if age $1 is less than 20, else the Org table result field + is set to empty with the empty string. + +`if("$1" == "nan" || "$2" == "nan", string(""), $1 + $2); E f-1' + Sum of the first two columns. When at least one of the input + fields is empty the Org table result field is set to empty. `E' + is required to not convert empty fields to 0. `f-1' is an + optional Calc format string similar to `%.1f' but leaves empty + results empty. + +`if(typeof(vmean($1..$7)) == 12, string(""), vmean($1..$7); E' + Mean value of a range unless there is any empty field. Every + field in the range that is empty is replaced by `nan' which lets + `vmean' result in `nan'. Then `typeof == 12' detects the `nan' + from `vmean' and the Org table result field is set to empty. Use + this when the sample set is expected to never have missing values. + +`if("$1..$7" == "[]", string(""), vmean($1..$7))' + Mean value of a range with empty fields skipped. Every field in + the range that is empty is skipped. When all fields in the range + are empty the mean value is not defined and the Org table result + field is set to empty. Use this when the sample set can have a + variable size. + +`vmean($1..$7); EN' + To complete the example before: Mean value of a range with empty + fields counting as samples with value 0. Use this only when + incomplete sample sets should be padded with 0 to the full size. + + You can add your own Calc functions defined in Emacs Lisp with +`defmath' and use them in formula syntax for Calc. + + ---------- Footnotes ---------- + + (1) The `printf' reformatting is limited in precision because the +value passed to it is converted into an `integer' or `double'. The +`integer' is limited in size by truncating the signed value to 32 bits. +The `double' is limited in precision to 64 bits overall which leaves +approximately 16 significant decimal digits. + + +File: org, Node: Formula syntax for Lisp, Next: Durations and time values, Prev: Formula syntax for Calc, Up: The spreadsheet + +3.5.3 Emacs Lisp forms as formulas +---------------------------------- + +It is also possible to write a formula in Emacs Lisp. This can be +useful for string manipulation and control structures, if Calc's +functionality is not enough. + + If a formula starts with a single-quote followed by an opening +parenthesis, then it is evaluated as a Lisp form. The evaluation +should return either a string or a number. Just as with `calc' +formulas, you can specify modes and a printf format after a semicolon. + + With Emacs Lisp forms, you need to be conscious about the way field +references are interpolated into the form. By default, a reference +will be interpolated as a Lisp string (in double-quotes) containing the +field. If you provide the `N' mode switch, all referenced elements +will be numbers (non-number fields will be zero) and interpolated as +Lisp numbers, without quotes. If you provide the `L' flag, all fields +will be interpolated literally, without quotes. I.e., if you want a +reference to be interpreted as a string by the Lisp form, enclose the +reference operator itself in double-quotes, like `"$3"'. Ranges are +inserted as space-separated fields, so you can embed them in list or +vector syntax. + + Here are a few examples--note how the `N' mode is used when we do +computations in Lisp: + +`'(concat (substring $1 1 2) (substring $1 0 1) (substring $1 2))' + Swap the first two characters of the content of column 1. + +`'(+ $1 $2);N' + Add columns 1 and 2, equivalent to Calc's `$1+$2'. + +`'(apply '+ '($1..$4));N' + Compute the sum of columns 1 to 4, like Calc's `vsum($1..$4)'. + + +File: org, Node: Durations and time values, Next: Field and range formulas, Prev: Formula syntax for Lisp, Up: The spreadsheet + +3.5.4 Durations and time values +------------------------------- + +If you want to compute time values use the `T' flag, either in Calc +formulas or Elisp formulas: + + | Task 1 | Task 2 | Total | + |---------+----------+----------| + | 2:12 | 1:47 | 03:59:00 | + | 3:02:20 | -2:07:00 | 0.92 | + #+TBLFM: @2$3=$1+$2;T::@3$3=$1+$2;t + + Input duration values must be of the form `[HH:MM[:SS]', where +seconds are optional. With the `T' flag, computed durations will be +displayed as `HH:MM:SS' (see the first formula above). With the `t' +flag, computed durations will be displayed according to the value of +the option `org-table-duration-custom-format', which defaults to +`'hours' and will display the result as a fraction of hours (see the +second formula in the example above). + + Negative duration values can be manipulated as well, and integers +will be considered as seconds in addition and subtraction. + + +File: org, Node: Field and range formulas, Next: Column formulas, Prev: Durations and time values, Up: The spreadsheet + +3.5.5 Field and range formulas +------------------------------ + +To assign a formula to a particular field, type it directly into the +field, preceded by `:=', for example `:=vsum(@II..III)'. When you press + or or `C-c C-c' with the cursor still in the field, the +formula will be stored as the formula for this field, evaluated, and the +current field will be replaced with the result. + + Formulas are stored in a special line starting with `#+TBLFM:' +directly below the table. If you type the equation in the 4th field of +the 3rd data line in the table, the formula will look like +`@3$4=$1+$2'. When inserting/deleting/swapping column and rows with +the appropriate commands, absolute references (but not relative ones) +in stored formulas are modified in order to still reference the same +field. To avoid this from happening, in particular in range +references, anchor ranges at the table borders (using `@<', `@>', `$<', +`$>'), or at hlines using the `@I' notation. Automatic adaptation of +field references does of course not happen if you edit the table +structure with normal editing commands--then you must fix the equations +yourself. + + Instead of typing an equation into the field, you may also use the +following command + +`C-u C-c = (`org-table-eval-formula')' + Install a new formula for the current field. The command prompts + for a formula with default taken from the `#+TBLFM:' line, applies + it to the current field, and stores it. + + The left-hand side of a formula can also be a special expression in +order to assign the formula to a number of different fields. There is +no keyboard shortcut to enter such range formulas. To add them, use +the formula editor (*note Editing and debugging formulas::) or edit the +`#+TBLFM:' line directly. + +`$2=' + Column formula, valid for the entire column. This is so common + that Org treats these formulas in a special way, see *note Column + formulas::. + +`@3=' + Row formula, applies to all fields in the specified row. `@>=' + means the last row. + +`@1$2..@4$3=' + Range formula, applies to all fields in the given rectangular + range. This can also be used to assign a formula to some but not + all fields in a row. + +`$name=' + Named field, see *note Advanced features::. + + +File: org, Node: Column formulas, Next: Lookup functions, Prev: Field and range formulas, Up: The spreadsheet + +3.5.6 Column formulas +--------------------- + +When you assign a formula to a simple column reference like `$3=', the +same formula will be used in all fields of that column, with the +following very convenient exceptions: (i) If the table contains +horizontal separator hlines with rows above and below, everything +before the first such hline is considered part of the table _header_ +and will not be modified by column formulas. Therefore a header is +mandatory when you use column formulas and want to add hlines to group +rows, like for example to separate a total row at the bottom from the +summand rows above. (ii) Fields that already get a value from a +field/range formula will be left alone by column formulas. These +conditions make column formulas very easy to use. + + To assign a formula to a column, type it directly into any field in +the column, preceded by an equal sign, like `=$1+$2'. When you press + or or `C-c C-c' with the cursor still in the field, the +formula will be stored as the formula for the current column, evaluated +and the current field replaced with the result. If the field contains +only `=', the previously stored formula for this column is used. For +each column, Org will only remember the most recently used formula. In +the `#+TBLFM:' line, column formulas will look like `$4=$1+$2'. The +left-hand side of a column formula can not be the name of column, it +must be the numeric column reference or `$>'. + + Instead of typing an equation into the field, you may also use the +following command: + +`C-c = (`org-table-eval-formula')' + Install a new formula for the current column and replace current + field with the result of the formula. The command prompts for a + formula, with default taken from the `#+TBLFM' line, applies it to + the current field and stores it. With a numeric prefix + argument(e.g., `C-5 C-c =') the command will apply it to that many + consecutive fields in the current column. + + +File: org, Node: Lookup functions, Next: Editing and debugging formulas, Prev: Column formulas, Up: The spreadsheet + +3.5.7 Lookup functions +---------------------- + +Org has three predefined Emacs Lisp functions for lookups in tables. +`(org-lookup-first VAL S-LIST R-LIST &optional PREDICATE)' + Searches for the first element `S' in list `S-LIST' for which + (PREDICATE VAL S) + is `t'; returns the value from the corresponding position in list + `R-LIST'. The default `PREDICATE' is `equal'. Note that the + parameters `VAL' and `S' are passed to `PREDICATE' in the same + order as the corresponding parameters are in the call to + `org-lookup-first', where `VAL' precedes `S-LIST'. If `R-LIST' is + `nil', the matching element `S' of `S-LIST' is returned. + +`(org-lookup-last VAL S-LIST R-LIST &optional PREDICATE)' + Similar to `org-lookup-first' above, but searches for the last + element for which `PREDICATE' is `t'. + +`(org-lookup-all VAL S-LIST R-LIST &optional PREDICATE)' + Similar to `org-lookup-first', but searches for all elements for + which `PREDICATE' is `t', and returns all corresponding values. + This function can not be used by itself in a formula, because it + returns a list of values. However, powerful lookups can be built + when this function is combined with other Emacs Lisp functions. + + If the ranges used in these functions contain empty fields, the `E' +mode for the formula should usually be specified: otherwise empty +fields will not be included in `S-LIST' and/or `R-LIST' which can, for +example, result in an incorrect mapping from an element of `S-LIST' to +the corresponding element of `R-LIST'. + + These three functions can be used to implement associative arrays, +count matching cells, rank results, group data etc. For practical +examples see this tutorial on Worg +(http://orgmode.org/worg/org-tutorials/org-lookups.html). + + +File: org, Node: Editing and debugging formulas, Next: Updating the table, Prev: Lookup functions, Up: The spreadsheet + +3.5.8 Editing and debugging formulas +------------------------------------ + +You can edit individual formulas in the minibuffer or directly in the +field. Org can also prepare a special buffer with all active formulas +of a table. When offering a formula for editing, Org converts +references to the standard format (like `B3' or `D&') if possible. If +you prefer to only work with the internal format (like `@3$2' or `$4'), +configure the option `org-table-use-standard-references'. + +`C-c = or C-u C-c = (`org-table-eval-formula')' + Edit the formula associated with the current column/field in the + minibuffer. See *note Column formulas::, and *note Field and + range formulas::. + +`C-u C-u C-c = (`org-table-eval-formula')' + Re-insert the active formula (either a field formula, or a column + formula) into the current field, so that you can edit it directly + in the field. The advantage over editing in the minibuffer is + that you can use the command `C-c ?'. + +`C-c ? (`org-table-field-info')' + While editing a formula in a table field, highlight the field(s) + referenced by the reference at the cursor position in the formula. + +`C-c }' + Toggle the display of row and column numbers for a table, using + overlays (`org-table-toggle-coordinate-overlays'). These are + updated each time the table is aligned; you can force it with `C-c + C-c'. + +`C-c {' + Toggle the formula debugger on and off + (`org-table-toggle-formula-debugger'). See below. + +`C-c ' (`org-table-edit-formulas')' + Edit all formulas for the current table in a special buffer, where + the formulas will be displayed one per line. If the current field + has an active formula, the cursor in the formula editor will mark + it. While inside the special buffer, Org will automatically + highlight any field or range reference at the cursor position. + You may edit, remove and add formulas, and use the following + commands: + + `C-c C-c or C-x C-s (`org-table-fedit-finish')' + Exit the formula editor and store the modified formulas. + With `C-u' prefix, also apply the new formulas to the entire + table. + + `C-c C-q (`org-table-fedit-abort')' + Exit the formula editor without installing changes. + + `C-c C-r (`org-table-fedit-toggle-ref-type')' + Toggle all references in the formula editor between standard + (like `B3') and internal (like `@3$2'). + + ` (`org-table-fedit-lisp-indent')' + Pretty-print or indent Lisp formula at point. When in a line + containing a Lisp formula, format the formula according to + Emacs Lisp rules. Another collapses the formula back + again. In the open formula, re-indents just like in + Emacs Lisp mode. + + `M- (`lisp-complete-symbol')' + Complete Lisp symbols, just like in Emacs Lisp mode. + + `S-///' + Shift the reference at point. For example, if the reference + is `B3' and you press `S-', it will become `C3'. This + also works for relative references and for hline references. + + `M-S- (`org-table-fedit-line-up')' + `M-S- (`org-table-fedit-line-down')' + Move the test line for column formulas in the Org buffer up + and down. + + `M- (`org-table-fedit-scroll-down')' + `M- (`org-table-fedit-scroll-up')' + Scroll the window displaying the table. + + `C-c }' + Turn the coordinate grid in the table on and off. + + Making a table field blank does not remove the formula associated +with the field, because that is stored in a different line (the +`#+TBLFM' line)--during the next recalculation the field will be filled +again. To remove a formula from a field, you have to give an empty +reply when prompted for the formula, or to edit the `#+TBLFM' line. + + You may edit the `#+TBLFM' directly and re-apply the changed +equations with `C-c C-c' in that line or with the normal recalculation +commands in the table. + +Using multiple #+TBLFM lines +............................ + +You may apply the formula temporarily. This is useful when you switch +the formula. Place multiple `#+TBLFM' lines right after the table, and +then press `C-c C-c' on the formula to apply. Here is an example: + + | x | y | + |---+---| + | 1 | | + | 2 | | + #+TBLFM: $2=$1*1 + #+TBLFM: $2=$1*2 + +Pressing `C-c C-c' in the line of `#+TBLFM: $2=$1*2' yields: + + | x | y | + |---+---| + | 1 | 2 | + | 2 | 4 | + #+TBLFM: $2=$1*1 + #+TBLFM: $2=$1*2 + +Note: If you recalculate this table (with `C-u C-c *', for example), you +will get the following result of applying only the first `#+TBLFM' line. + + | x | y | + |---+---| + | 1 | 1 | + | 2 | 2 | + #+TBLFM: $2=$1*1 + #+TBLFM: $2=$1*2 + +Debugging formulas +.................. + +When the evaluation of a formula leads to an error, the field content +becomes the string `#ERROR'. If you would like see what is going on +during variable substitution and calculation in order to find a bug, +turn on formula debugging in the `Tbl' menu and repeat the calculation, +for example by pressing `C-u C-u C-c = ' in a field. Detailed +information will be displayed. + + +File: org, Node: Updating the table, Next: Advanced features, Prev: Editing and debugging formulas, Up: The spreadsheet + +3.5.9 Updating the table +------------------------ + +Recalculation of a table is normally not automatic, but needs to be +triggered by a command. See *note Advanced features::, for a way to +make recalculation at least semi-automatic. + + In order to recalculate a line of a table or the entire table, use +the following commands: + +`C-c * (`org-table-recalculate')' + Recalculate the current row by first applying the stored column + formulas from left to right, and all field/range formulas in the + current row. + +`C-u C-c *' +`C-u C-c C-c' + Recompute the entire table, line by line. Any lines before the + first hline are left alone, assuming that these are part of the + table header. + +`C-u C-u C-c * or C-u C-u C-c C-c (`org-table-iterate')' + Iterate the table by recomputing it until no further changes occur. + This may be necessary if some computed fields use the value of + other fields that are computed later in the calculation sequence. + +`M-x org-table-recalculate-buffer-tables RET' + Recompute all tables in the current buffer. + +`M-x org-table-iterate-buffer-tables RET' + Iterate all tables in the current buffer, in order to converge + table-to-table dependencies. + + +File: org, Node: Advanced features, Prev: Updating the table, Up: The spreadsheet + +3.5.10 Advanced features +------------------------ + +If you want the recalculation of fields to happen automatically, or if +you want to be able to assign names(1) to fields and columns, you need +to reserve the first column of the table for special marking characters. + +`C-# (`org-table-rotate-recalc-marks')' + Rotate the calculation mark in first column through the states ` ', + `#', `*', `!', `$'. When there is an active region, change all + marks in the region. + + Here is an example of a table that collects exam results of students +and makes use of these features: + + |---+---------+--------+--------+--------+-------+------| + | | Student | Prob 1 | Prob 2 | Prob 3 | Total | Note | + |---+---------+--------+--------+--------+-------+------| + | ! | | P1 | P2 | P3 | Tot | | + | # | Maximum | 10 | 15 | 25 | 50 | 10.0 | + | ^ | | m1 | m2 | m3 | mt | | + |---+---------+--------+--------+--------+-------+------| + | # | Peter | 10 | 8 | 23 | 41 | 8.2 | + | # | Sam | 2 | 4 | 3 | 9 | 1.8 | + |---+---------+--------+--------+--------+-------+------| + | | Average | | | | 25.0 | | + | ^ | | | | | at | | + | $ | max=50 | | | | | | + |---+---------+--------+--------+--------+-------+------| + #+TBLFM: $6=vsum($P1..$P3)::$7=10*$Tot/$max;%.1f::$at=vmean(@-II..@-I);%.1f + +Important: please note that for these special tables, recalculating the +table with `C-u C-c *' will only affect rows that are marked `#' or +`*', and fields that have a formula assigned to the field itself. The +column formulas are not applied in rows with empty first field. + + The marking characters have the following meaning: + +`!' + The fields in this line define names for the columns, so that you + may refer to a column as `$Tot' instead of `$6'. + +`^' + This row defines names for the fields _above_ the row. With such + a definition, any formula in the table may use `$m1' to refer to + the value `10'. Also, if you assign a formula to a names field, it + will be stored as `$name=...'. + +`_' + Similar to `^', but defines names for the fields in the row + _below_. + +`$' + Fields in this row can define _parameters_ for formulas. For + example, if a field in a `$' row contains `max=50', then formulas + in this table can refer to the value 50 using `$max'. Parameters + work exactly like constants, only that they can be defined on a + per-table basis. + +`#' + Fields in this row are automatically recalculated when pressing + or or `S-' in this row. Also, this row is + selected for a global recalculation with `C-u C-c *'. Unmarked + lines will be left alone by this command. + +`*' + Selects this line for global recalculation with `C-u C-c *', but + not for automatic recalculation. Use this when automatic + recalculation slows down editing too much. + +` ' + Unmarked lines are exempt from recalculation with `C-u C-c *'. + All lines that should be recalculated should be marked with `#' or + `*'. + +`/' + Do not export this line. Useful for lines that contain the + narrowing `' markers or column group markers. + + Finally, just to whet your appetite for what can be done with the +fantastic `calc.el' package, here is a table that computes the Taylor +series of degree `n' at location `x' for a couple of functions. + + |---+-------------+---+-----+--------------------------------------| + | | Func | n | x | Result | + |---+-------------+---+-----+--------------------------------------| + | # | exp(x) | 1 | x | 1 + x | + | # | exp(x) | 2 | x | 1 + x + x^2 / 2 | + | # | exp(x) | 3 | x | 1 + x + x^2 / 2 + x^3 / 6 | + | # | x^2+sqrt(x) | 2 | x=0 | x*(0.5 / 0) + x^2 (2 - 0.25 / 0) / 2 | + | # | x^2+sqrt(x) | 2 | x=1 | 2 + 2.5 x - 2.5 + 0.875 (x - 1)^2 | + | * | tan(x) | 3 | x | 0.0175 x + 1.77e-6 x^3 | + |---+-------------+---+-----+--------------------------------------| + #+TBLFM: $5=taylor($2,$4,$3);n3 + + ---------- Footnotes ---------- + + (1) Such names must start by an alphabetic character and use only +alphanumeric/underscore characters. + + +File: org, Node: Org-Plot, Prev: The spreadsheet, Up: Tables + +3.6 Org-Plot +============ + +Org-Plot can produce 2D and 3D graphs of information stored in org +tables using `Gnuplot' `http://www.gnuplot.info/' and `gnuplot-mode' +`http://xafs.org/BruceRavel/GnuplotMode'. To see this in action, ensure +that you have both Gnuplot and Gnuplot mode installed on your system, +then call `org-plot/gnuplot' on the following table. + + #+PLOT: title:"Citas" ind:1 deps:(3) type:2d with:histograms set:"yrange [0:]" + | Sede | Max cites | H-index | + |-----------+-----------+---------| + | Chile | 257.72 | 21.39 | + | Leeds | 165.77 | 19.68 | + | Sao Paolo | 71.00 | 11.50 | + | Stockholm | 134.19 | 14.33 | + | Morelia | 257.56 | 17.67 | + + Notice that Org Plot is smart enough to apply the table's headers as +labels. Further control over the labels, type, content, and appearance +of plots can be exercised through the `#+PLOT:' lines preceding a +table. See below for a complete list of Org-plot options. For more +information and examples see the Org-plot tutorial at +`http://orgmode.org/worg/org-tutorials/org-plot.html'. + +Plot Options +............ + +`set' + Specify any `gnuplot' option to be set when graphing. + +`title' + Specify the title of the plot. + +`ind' + Specify which column of the table to use as the `x' axis. + +`deps' + Specify the columns to graph as a Lisp style list, surrounded by + parentheses and separated by spaces for example `dep:(3 4)' to + graph the third and fourth columns (defaults to graphing all other + columns aside from the `ind' column). + +`type' + Specify whether the plot will be `2d', `3d', or `grid'. + +`with' + Specify a `with' option to be inserted for every col being plotted + (e.g., `lines', `points', `boxes', `impulses', etc...). Defaults + to `lines'. + +`file' + If you want to plot to a file, specify + `"PATH/TO/DESIRED/OUTPUT-FILE"'. + +`labels' + List of labels to be used for the `deps' (defaults to the column + headers if they exist). + +`line' + Specify an entire line to be inserted in the Gnuplot script. + +`map' + When plotting `3d' or `grid' types, set this to `t' to graph a + flat mapping rather than a `3d' slope. + +`timefmt' + Specify format of Org mode timestamps as they will be parsed by + Gnuplot. Defaults to `%Y-%m-%d-%H:%M:%S'. + +`script' + If you want total control, you can specify a script file (place + the file name between double-quotes) which will be used to plot. + Before plotting, every instance of `$datafile' in the specified + script will be replaced with the path to the generated data file. + Note: even if you set this option, you may still want to specify + the plot type, as that can impact the content of the data file. + + +File: org, Node: Hyperlinks, Next: TODO Items, Prev: Tables, Up: Top + +4 Hyperlinks +************ + +Like HTML, Org provides links inside a file, external links to other +files, Usenet articles, emails, and much more. + +* Menu: + +* Link format:: How links in Org are formatted +* Internal links:: Links to other places in the current file +* External links:: URL-like links to the world +* Handling links:: Creating, inserting and following +* Using links outside Org:: Linking from my C source code? +* Link abbreviations:: Shortcuts for writing complex links +* Search options:: Linking to a specific location +* Custom searches:: When the default search is not enough + + +File: org, Node: Link format, Next: Internal links, Prev: Hyperlinks, Up: Hyperlinks + +4.1 Link format +=============== + +Org will recognize plain URL-like links and activate them as clickable +links. The general link format, however, looks like this: + + [[link][description]] or alternatively [[link]] + +Once a link in the buffer is complete (all brackets present), Org will +change the display so that `description' is displayed instead of +`[[link][description]]' and `link' is displayed instead of `[[link]]'. +Links will be highlighted in the face `org-link', which by default is +an underlined face. You can directly edit the visible part of a link. +Note that this can be either the `link' part (if there is no +description) or the `description' part. To edit also the invisible +`link' part, use `C-c C-l' with the cursor on the link. + + If you place the cursor at the beginning or just behind the end of +the displayed text and press , you will remove the +(invisible) bracket at that location. This makes the link incomplete +and the internals are again displayed as plain text. Inserting the +missing bracket hides the link internals again. To show the internal +structure of all links, use the menu entry `Org->Hyperlinks->Literal +links'. + + +File: org, Node: Internal links, Next: External links, Prev: Link format, Up: Hyperlinks + +4.2 Internal links +================== + +If the link does not look like a URL, it is considered to be internal +in the current file. The most important case is a link like +`[[#my-custom-id]]' which will link to the entry with the `CUSTOM_ID' +property `my-custom-id'. You are responsible yourself to make sure +these custom IDs are unique in a file. + + Links such as `[[My Target]]' or `[[My Target][Find my target]]' +lead to a text search in the current file. + + The link can be followed with `C-c C-o' when the cursor is on the +link, or with a mouse click (*note Handling links::). Links to custom +IDs will point to the corresponding headline. The preferred match for +a text link is a dedicated target: the same string in double angular +brackets, like `<>'. + + If no dedicated target exists, the link will then try to match the +exact name of an element within the buffer. Naming is done with the +`#+NAME' keyword, which has to be put the line before the element it +refers to, as in the following example + + #+NAME: My Target + | a | table | + |----+------------| + | of | four cells | + + If none of the above succeeds, Org will search for a headline that +is exactly the link text but may also include a TODO keyword and +tags(1). + + During export, internal links will be used to mark objects and +assign them a number. Marked objects will then be referenced by links +pointing to them. In particular, links without a description will +appear as the number assigned to the marked object(2). In the +following excerpt from an Org buffer + + - one item + - <>another item + Here we refer to item [[target]]. + +The last sentence will appear as `Here we refer to item 2' when +exported. + + In non-Org files, the search will look for the words in the link +text. In the above example the search would be for `my target'. + + Following a link pushes a mark onto Org's own mark ring. You can +return to the previous position with `C-c &'. Using this command +several times in direct succession goes back to positions recorded +earlier. + +* Menu: + +* Radio targets:: Make targets trigger links in plain text + + ---------- Footnotes ---------- + + (1) To insert a link targeting a headline, in-buffer completion can +be used. Just type a star followed by a few optional letters into the +buffer and press `M-'. All headlines in the current buffer will +be offered as completions. + + (2) When targeting a `#+NAME' keyword, `#+CAPTION' keyword is +mandatory in order to get proper numbering (*note Images and tables::). + + +File: org, Node: Radio targets, Prev: Internal links, Up: Internal links + +4.2.1 Radio targets +------------------- + +Org can automatically turn any occurrences of certain target names in +normal text into a link. So without explicitly creating a link, the +text connects to the target radioing its position. Radio targets are +enclosed by triple angular brackets. For example, a target `<<>>' causes each occurrence of `my target' in normal text to +become activated as a link. The Org file is scanned automatically for +radio targets only when the file is first loaded into Emacs. To update +the target list during editing, press `C-c C-c' with the cursor on or +at a target. + + +File: org, Node: External links, Next: Handling links, Prev: Internal links, Up: Hyperlinks + +4.3 External links +================== + +Org supports links to files, websites, Usenet and email messages, BBDB +database entries and links to both IRC conversations and their logs. +External links are URL-like locators. They start with a short +identifying string followed by a colon. There can be no space after +the colon. The following list shows examples for each link type. + + http://www.astro.uva.nl/~dominik on the web + doi:10.1000/182 DOI for an electronic resource + file:/home/dominik/images/jupiter.jpg file, absolute path + /home/dominik/images/jupiter.jpg same as above + file:papers/last.pdf file, relative path + ./papers/last.pdf same as above + file:/myself@some.where:papers/last.pdf file, path on remote machine + /myself@some.where:papers/last.pdf same as above + file:sometextfile::NNN file, jump to line number + file:projects.org another Org file + file:projects.org::some words text search in Org file(1) + file:projects.org::*task title heading search in Org file + file+sys:/path/to/file open via OS, like double-click + file+emacs:/path/to/file force opening by Emacs + docview:papers/last.pdf::NNN open in doc-view mode at page + id:B7423F4D-2E8A-471B-8810-C40F074717E9 Link to heading by ID + news:comp.emacs Usenet link + mailto:adent@galaxy.net Mail link + mhe:folder MH-E folder link + mhe:folder#id MH-E message link + rmail:folder RMAIL folder link + rmail:folder#id RMAIL message link + gnus:group Gnus group link + gnus:group#id Gnus article link + bbdb:R.*Stallman BBDB link (with regexp) + irc:/irc.com/#emacs/bob IRC link + info:org#External links Info node link + shell:ls *.org A shell command + elisp:org-agenda Interactive Elisp command + elisp:(find-file-other-frame "Elisp.org") Elisp form to evaluate + + On top of these built-in link types, some are available through the +`contrib/' directory (*note Installation::). For example, these links +to VM or Wanderlust messages are available when you load the +corresponding libraries from the `contrib/' directory: + + vm:folder VM folder link + vm:folder#id VM message link + vm://myself@some.where.org/folder#id VM on remote machine + vm-imap:account:folder VM IMAP folder link + vm-imap:account:folder#id VM IMAP message link + wl:folder WANDERLUST folder link + wl:folder#id WANDERLUST message link + + For customizing Org to add new link types *note Adding hyperlink +types::. + + A link should be enclosed in double brackets and may contain a +descriptive text to be displayed instead of the URL (*note Link +format::), for example: + + [[http://www.gnu.org/software/emacs/][GNU Emacs]] + +If the description is a file name or URL that points to an image, HTML +export (*note HTML export::) will inline the image as a clickable +button. If there is no description at all and the link points to an +image, that image will be inlined into the exported HTML file. + + Org also finds external links in the normal text and activates them +as links. If spaces must be part of the link (for example in +`bbdb:Richard Stallman'), or if you need to remove ambiguities about +the end of the link, enclose them in square brackets. + + ---------- Footnotes ---------- + + (1) The actual behavior of the search will depend on the value of +the option `org-link-search-must-match-exact-headline'. If its value +is `nil', then a fuzzy text search will be done. If it is t, then only +the exact headline will be matched. If the value is `'query-to-create', +then an exact headline will be searched; if it is not found, then the +user will be queried to create it. + + +File: org, Node: Handling links, Next: Using links outside Org, Prev: External links, Up: Hyperlinks + +4.4 Handling links +================== + +Org provides methods to create a link in the correct syntax, to insert +it into an Org file, and to follow the link. + +`C-c l (`org-store-link')' + Store a link to the current location. This is a _global_ command + (you must create the key binding yourself) which can be used in + any buffer to create a link. The link will be stored for later + insertion into an Org buffer (see below). What kind of link will + be created depends on the current buffer: + + Org mode buffers + For Org files, if there is a `<>' at the cursor, the link + points to the target. Otherwise it points to the current + headline, which will also be the description(1). + + If the headline has a `CUSTOM_ID' property, a link to this custom + ID will be stored. In addition or alternatively (depending on the + value of `org-id-link-to-org-use-id'), a globally unique `ID' + property will be created and/or used to construct a link(2). So + using this command in Org buffers will potentially create two + links: a human-readable from the custom ID, and one that is + globally unique and works even if the entry is moved from file to + file. Later, when inserting the link, you need to decide which + one to use. + + Email/News clients: VM, Rmail, Wanderlust, MH-E, Gnus + Pretty much all Emacs mail clients are supported. The link will + point to the current article, or, in some GNUS buffers, to the + group. The description is constructed from the author and the + subject. + + Web browsers: W3 and W3M + Here the link will be the current URL, with the page title as + description. + + Contacts: BBDB + Links created in a BBDB buffer will point to the current entry. + + Chat: IRC + For IRC links, if you set the option `org-irc-link-to-logs' to `t', + a `file:/' style link to the relevant point in the logs for the + current conversation is created. Otherwise an `irc:/' style link + to the user/channel/server under the point will be stored. + + Other files + For any other files, the link will point to the file, with a + search string (*note Search options::) pointing to the contents of + the current line. If there is an active region, the selected + words will form the basis of the search string. If the + automatically created link is not working correctly or accurately + enough, you can write custom functions to select the search string + and to do the search for particular file types--see *note Custom + searches::. The key binding `C-c l' is only a suggestion--see + *note Installation::. + + Agenda view + When the cursor is in an agenda view, the created link points to + the entry referenced by the current line. + +`C-c C-l (`org-insert-link')' + Insert a link(3). This prompts for a link to be inserted into the + buffer. You can just type a link, using text for an internal + link, or one of the link type prefixes mentioned in the examples + above. The link will be inserted into the buffer(4), along with a + descriptive text. If some text was selected when this command is + called, the selected text becomes the default description. + + Inserting stored links + All links stored during the current session are part of the + history for this prompt, so you can access them with and + (or `M-p/n'). + + Completion support + Completion with will help you to insert valid link prefixes + like `http:' or `ftp:', including the prefixes defined through + link abbreviations (*note Link abbreviations::). If you press + after inserting only the PREFIX, Org will offer specific + completion support for some link types(5) For example, if you + type `file ', file name completion (alternative access: `C-u + C-c C-l', see below) will be offered, and after `bbdb ' you + can complete contact names. + +`C-u C-c C-l' + When `C-c C-l' is called with a `C-u' prefix argument, a link to a + file will be inserted and you may use file name completion to + select the name of the file. The path to the file is inserted + relative to the directory of the current Org file, if the linked + file is in the current directory or in a sub-directory of it, or + if the path is written relative to the current directory using + `../'. Otherwise an absolute path is used, if possible with `~/' + for your home directory. You can force an absolute path with two + `C-u' prefixes. + +`C-c C-l (with cursor on existing link)' + When the cursor is on an existing link, `C-c C-l' allows you to + edit the link and description parts of the link. + +`C-c C-o (`org-open-at-point')' + Open link at point. This will launch a web browser for URLs (using + `browse-url-at-point'), run VM/MH-E/Wanderlust/Rmail/Gnus/BBDB for + the corresponding links, and execute the command in a shell link. + When the cursor is on an internal link, this command runs the + corresponding search. When the cursor is on a TAG list in a + headline, it creates the corresponding TAGS view. If the cursor + is on a timestamp, it compiles the agenda for that date. + Furthermore, it will visit text and remote files in `file:' links + with Emacs and select a suitable application for local non-text + files. Classification of files is based on file extension only. + See option `org-file-apps'. If you want to override the default + application and visit the file with Emacs, use a `C-u' prefix. If + you want to avoid opening in Emacs, use a `C-u C-u' prefix. + If the cursor is on a headline, but not on a link, offer all links + in the headline and entry text. If you want to setup the frame + configuration for following links, customize + `org-link-frame-setup'. + +`' + When `org-return-follows-link' is set, `' will also follow + the link at point. + +`mouse-2' +`mouse-1' + On links, `mouse-2' will open the link just as `C-c C-o' would. + Under Emacs 22 and later, `mouse-1' will also follow a link. + +`mouse-3' + Like `mouse-2', but force file links to be opened with Emacs, and + internal links to be displayed in another window(6). + +`C-c C-x C-v (`org-toggle-inline-images')' + Toggle the inline display of linked images. Normally this will + only inline images that have no description part in the link, + i.e., images that will also be inlined during export. When called + with a prefix argument, also display images that do have a link + description. You can ask for inline images to be displayed at + startup by configuring the variable + `org-startup-with-inline-images'(7). + +`C-c % (`org-mark-ring-push')' + Push the current position onto the mark ring, to be able to return + easily. Commands following an internal link do this automatically. + +`C-c & (`org-mark-ring-goto')' + Jump back to a recorded position. A position is recorded by the + commands following internal links, and by `C-c %'. Using this + command several times in direct succession moves through a ring of + previously recorded positions. + +`C-c C-x C-n (`org-next-link')' +`C-c C-x C-p (`org-previous-link')' + Move forward/backward to the next link in the buffer. At the + limit of the buffer, the search fails once, and then wraps around. + The key bindings for this are really too long; you might want to + bind this also to `C-n' and `C-p' + (add-hook 'org-load-hook + (lambda () + (define-key org-mode-map "\C-n" 'org-next-link) + (define-key org-mode-map "\C-p" 'org-previous-link))) + + ---------- Footnotes ---------- + + (1) If the headline contains a timestamp, it will be removed from +the link and result in a wrong link--you should avoid putting timestamp +in the headline. + + (2) The library `org-id.el' must first be loaded, either through +`org-customize' by enabling `org-id' in `org-modules', or by adding +`(require 'org-id)' in your `.emacs'. + + (3) Note that you don't have to use this command to insert a link. +Links in Org are plain text, and you can type or paste them straight +into the buffer. By using this command, the links are automatically +enclosed in double brackets, and you will be asked for the optional +descriptive text. + + (4) After insertion of a stored link, the link will be removed from +the list of stored links. To keep it in the list later use, use a +triple `C-u' prefix argument to `C-c C-l', or configure the option +`org-keep-stored-link-after-insertion'. + + (5) This works by calling a special function +`org-PREFIX-complete-link'. + + (6) See the option `org-display-internal-link-with-indirect-buffer' + + (7) with corresponding `#+STARTUP' keywords `inlineimages' and +`noinlineimages' + + +File: org, Node: Using links outside Org, Next: Link abbreviations, Prev: Handling links, Up: Hyperlinks + +4.5 Using links outside Org +=========================== + +You can insert and follow links that have Org syntax not only in Org, +but in any Emacs buffer. For this, you should create two global +commands, like this (please select suitable global keys yourself): + + (global-set-key "\C-c L" 'org-insert-link-global) + (global-set-key "\C-c o" 'org-open-at-point-global) + + +File: org, Node: Link abbreviations, Next: Search options, Prev: Using links outside Org, Up: Hyperlinks + +4.6 Link abbreviations +====================== + +Long URLs can be cumbersome to type, and often many similar links are +needed in a document. For this you can use link abbreviations. An +abbreviated link looks like this + + [[linkword:tag][description]] + +where the tag is optional. The linkword must be a word, starting with +a letter, followed by letters, numbers, `-', and `_'. Abbreviations +are resolved according to the information in the variable +`org-link-abbrev-alist' that relates the linkwords to replacement text. +Here is an example: + + (setq org-link-abbrev-alist + '(("bugzilla" . "http://10.1.2.9/bugzilla/show_bug.cgi?id=") + ("url-to-ja" . "http://translate.google.fr/translate?sl=en&tl=ja&u=%h") + ("google" . "http://www.google.com/search?q=") + ("gmap" . "http://maps.google.com/maps?q=%s") + ("omap" . "http://nominatim.openstreetmap.org/search?q=%s&polygon=1") + ("ads" . "http://adsabs.harvard.edu/cgi-bin/nph-abs_connect?author=%s&db_key=AST"))) + + If the replacement text contains the string `%s', it will be +replaced with the tag. Using `%h' instead of `%s' will url-encode the +tag (see the example above, where we need to encode the URL parameter.) +Using `%(my-function)' will pass the tag to a custom function, and +replace it by the resulting string. + + If the replacement text don't contain any specifier, it will simply +be appended to the string in order to create the link. + + Instead of a string, you may also specify a function that will be +called with the tag as the only argument to create the link. + + With the above setting, you could link to a specific bug with +`[[bugzilla:129]]', search the web for `OrgMode' with +`[[google:OrgMode]]', show the map location of the Free Software +Foundation `[[gmap:51 Franklin Street, Boston]]' or of Carsten office +`[[omap:Science Park 904, Amsterdam, The Netherlands]]' and find out +what the Org author is doing besides Emacs hacking with +`[[ads:Dominik,C]]'. + + If you need special abbreviations just for a single Org buffer, you +can define them in the file with + + #+LINK: bugzilla http://10.1.2.9/bugzilla/show_bug.cgi?id= + #+LINK: google http://www.google.com/search?q=%s + +In-buffer completion (*note Completion::) can be used after `[' to +complete link abbreviations. You may also define a function +`org-PREFIX-complete-link' that implements special (e.g., completion) +support for inserting such a link with `C-c C-l'. Such a function +should not accept any arguments, and return the full link with prefix. + + +File: org, Node: Search options, Next: Custom searches, Prev: Link abbreviations, Up: Hyperlinks + +4.7 Search options in file links +================================ + +File links can contain additional information to make Emacs jump to a +particular location in the file when following a link. This can be a +line number or a search option after a double(1) colon. For example, +when the command `C-c l' creates a link (*note Handling links::) to a +file, it encodes the words in the current line as a search string that +can be used to find this line back later when following the link with +`C-c C-o'. + + Here is the syntax of the different ways to attach a search to a file +link, together with an explanation: + + [[file:~/code/main.c::255]] + [[file:~/xx.org::My Target]] + [[file:~/xx.org::*My Target]] + [[file:~/xx.org::#my-custom-id]] + [[file:~/xx.org::/regexp/]] + +`255' + Jump to line 255. + +`My Target' + Search for a link target `<>', or do a text search for + `my target', similar to the search in internal links, see *note + Internal links::. In HTML export (*note HTML export::), such a + file link will become an HTML reference to the corresponding named + anchor in the linked file. + +`*My Target' + In an Org file, restrict search to headlines. + +`#my-custom-id' + Link to a heading with a `CUSTOM_ID' property + +`/regexp/' + Do a regular expression search for `regexp'. This uses the Emacs + command `occur' to list all matches in a separate window. If the + target file is in Org mode, `org-occur' is used to create a sparse + tree with the matches. + + As a degenerate case, a file link with an empty file name can be used +to search the current file. For example, `[[file:::find me]]' does a +search for `find me' in the current file, just as `[[find me]]' would. + + ---------- Footnotes ---------- + + (1) For backward compatibility, line numbers can also follow a +single colon. + + +File: org, Node: Custom searches, Prev: Search options, Up: Hyperlinks + +4.8 Custom Searches +=================== + +The default mechanism for creating search strings and for doing the +actual search related to a file link may not work correctly in all +cases. For example, BibTeX database files have many entries like +`year="1993"' which would not result in good search strings, because +the only unique identification for a BibTeX entry is the citation key. + + If you come across such a problem, you can write custom functions to +set the right search string for a particular file type, and to do the +search for the string in the file. Using `add-hook', these functions +need to be added to the hook variables +`org-create-file-search-functions' and +`org-execute-file-search-functions'. See the docstring for these +variables for more information. Org actually uses this mechanism for +BibTeX database files, and you can use the corresponding code as an +implementation example. See the file `org-bibtex.el'. + + +File: org, Node: TODO Items, Next: Tags, Prev: Hyperlinks, Up: Top + +5 TODO items +************ + +Org mode does not maintain TODO lists as separate documents(1). +Instead, TODO items are an integral part of the notes file, because +TODO items usually come up while taking notes! With Org mode, simply +mark any entry in a tree as being a TODO item. In this way, +information is not duplicated, and the entire context from which the +TODO item emerged is always present. + + Of course, this technique for managing TODO items scatters them +throughout your notes file. Org mode compensates for this by providing +methods to give you an overview of all the things that you have to do. + +* Menu: + +* TODO basics:: Marking and displaying TODO entries +* TODO extensions:: Workflow and assignments +* Progress logging:: Dates and notes for progress +* Priorities:: Some things are more important than others +* Breaking down tasks:: Splitting a task into manageable pieces +* Checkboxes:: Tick-off lists + + ---------- Footnotes ---------- + + (1) Of course, you can make a document that contains only long lists +of TODO items, but this is not required. + + +File: org, Node: TODO basics, Next: TODO extensions, Prev: TODO Items, Up: TODO Items + +5.1 Basic TODO functionality +============================ + +Any headline becomes a TODO item when it starts with the word `TODO', +for example: + + *** TODO Write letter to Sam Fortune + +The most important commands to work with TODO entries are: + +`C-c C-t (`org-todo')' + Rotate the TODO state of the current item among + + ,-> (unmarked) -> TODO -> DONE --. + '--------------------------------' + + If TODO keywords have fast access keys (see *note Fast access to + TODO states::), you will be prompted for a TODO keyword through + the fast selection interface; this is the default behavior when + `org-use-fast-todo-selection' is non-`nil'. + + The same rotation can also be done "remotely" from the timeline + and agenda buffers with the `t' command key (*note Agenda + commands::). + +`C-u C-c C-t' + When TODO keywords have no selection keys, select a specific + keyword using completion; otherwise force cycling through TODO + states with no prompt. When `org-use-fast-todo-selection' is set + to `prefix', use the fast selection interface. + +`S- / S-' + Select the following/preceding TODO state, similar to cycling. + Useful mostly if more than two TODO states are possible (*note + TODO extensions::). See also *note Conflicts::, for a discussion + of the interaction with `shift-selection-mode'. See also the + variable `org-treat-S-cursor-todo-selection-as-state-change'. + +`C-c / t (`org-show-todo-tree')' + View TODO items in a _sparse tree_ (*note Sparse trees::). Folds + the entire buffer, but shows all TODO items (with not-DONE state) + and the headings hierarchy above them. With a prefix argument (or + by using `C-c / T'), search for a specific TODO. You will be + prompted for the keyword, and you can also give a list of keywords + like `KWD1|KWD2|...' to list entries that match any one of these + keywords. With a numeric prefix argument N, show the tree for the + Nth keyword in the option `org-todo-keywords'. With two prefix + arguments, find all TODO states, both un-done and done. + +`C-c a t (`org-todo-list')' + Show the global TODO list. Collects the TODO items (with not-DONE + states) from all agenda files (*note Agenda Views::) into a single + buffer. The new buffer will be in `agenda-mode', which provides + commands to examine and manipulate the TODO entries from the new + buffer (*note Agenda commands::). *Note Global TODO list::, for + more information. + +`S-M- (`org-insert-todo-heading')' + Insert a new TODO entry below the current one. + +Changing a TODO state can also trigger tag changes. See the docstring +of the option `org-todo-state-tags-triggers' for details. + + +File: org, Node: TODO extensions, Next: Progress logging, Prev: TODO basics, Up: TODO Items + +5.2 Extended use of TODO keywords +================================= + +By default, marked TODO entries have one of only two states: TODO and +DONE. Org mode allows you to classify TODO items in more complex ways +with _TODO keywords_ (stored in `org-todo-keywords'). With special +setup, the TODO keyword system can work differently in different files. + + Note that tags are another way to classify headlines in general and +TODO items in particular (*note Tags::). + +* Menu: + +* Workflow states:: From TODO to DONE in steps +* TODO types:: I do this, Fred does the rest +* Multiple sets in one file:: Mixing it all, and still finding your way +* Fast access to TODO states:: Single letter selection of a state +* Per-file keywords:: Different files, different requirements +* Faces for TODO keywords:: Highlighting states +* TODO dependencies:: When one task needs to wait for others + + +File: org, Node: Workflow states, Next: TODO types, Prev: TODO extensions, Up: TODO extensions + +5.2.1 TODO keywords as workflow states +-------------------------------------- + +You can use TODO keywords to indicate different _sequential_ states in +the process of working on an item, for example(1): + + (setq org-todo-keywords + '((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED"))) + + The vertical bar separates the TODO keywords (states that _need +action_) from the DONE states (which need _no further action_). If you +don't provide the separator bar, the last state is used as the DONE +state. With this setup, the command `C-c C-t' will cycle an entry from +TODO to FEEDBACK, then to VERIFY, and finally to DONE and DELEGATED. +You may also use a numeric prefix argument to quickly select a specific +state. For example `C-3 C-c C-t' will change the state immediately to +VERIFY. Or you can use `S-' to go backward through the sequence. +If you define many keywords, you can use in-buffer completion (*note +Completion::) or even a special one-key selection scheme (*note Fast +access to TODO states::) to insert these words into the buffer. +Changing a TODO state can be logged with a timestamp, see *note +Tracking TODO state changes::, for more information. + + ---------- Footnotes ---------- + + (1) Changing this variable only becomes effective after restarting +Org mode in a buffer. + + +File: org, Node: TODO types, Next: Multiple sets in one file, Prev: Workflow states, Up: TODO extensions + +5.2.2 TODO keywords as types +---------------------------- + +The second possibility is to use TODO keywords to indicate different +_types_ of action items. For example, you might want to indicate that +items are for "work" or "home". Or, when you work with several people +on a single project, you might want to assign action items directly to +persons, by using their names as TODO keywords. This would be set up +like this: + + (setq org-todo-keywords '((type "Fred" "Sara" "Lucy" "|" "DONE"))) + + In this case, different keywords do not indicate a sequence, but +rather different types. So the normal work flow would be to assign a +task to a person, and later to mark it DONE. Org mode supports this +style by adapting the workings of the command `C-c C-t'(1). When used +several times in succession, it will still cycle through all names, in +order to first select the right type for a task. But when you return +to the item after some time and execute `C-c C-t' again, it will switch +from any name directly to DONE. Use prefix arguments or completion to +quickly select a specific name. You can also review the items of a +specific TODO type in a sparse tree by using a numeric prefix to `C-c / +t'. For example, to see all things Lucy has to do, you would use `C-3 +C-c / t'. To collect Lucy's items from all agenda files into a single +buffer, you would use the numeric prefix argument as well when creating +the global TODO list: `C-3 C-c a t'. + + ---------- Footnotes ---------- + + (1) This is also true for the `t' command in the timeline and agenda +buffers. + + +File: org, Node: Multiple sets in one file, Next: Fast access to TODO states, Prev: TODO types, Up: TODO extensions + +5.2.3 Multiple keyword sets in one file +--------------------------------------- + +Sometimes you may want to use different sets of TODO keywords in +parallel. For example, you may want to have the basic `TODO'/`DONE', +but also a workflow for bug fixing, and a separate state indicating +that an item has been canceled (so it is not DONE, but also does not +require action). Your setup would then look like this: + + (setq org-todo-keywords + '((sequence "TODO" "|" "DONE") + (sequence "REPORT" "BUG" "KNOWNCAUSE" "|" "FIXED") + (sequence "|" "CANCELED"))) + + The keywords should all be different, this helps Org mode to keep +track of which subsequence should be used for a given entry. In this +setup, `C-c C-t' only operates within a subsequence, so it switches from +`DONE' to (nothing) to `TODO', and from `FIXED' to (nothing) to +`REPORT'. Therefore you need a mechanism to initially select the +correct sequence. Besides the obvious ways like typing a keyword or +using completion, you may also apply the following commands: + +`C-u C-u C-c C-t' +`C-S-' +`C-S-' + These keys jump from one TODO subset to the next. In the above + example, `C-u C-u C-c C-t' or `C-S-' would jump from `TODO' + or `DONE' to `REPORT', and any of the words in the second row to + `CANCELED'. Note that the `C-S-' key binding conflict with + `shift-selection-mode' (*note Conflicts::). + +`S-' +`S-' + `S-<>' and `S-<>' and walk through _all_ keywords + from all sets, so for example `S-<>' would switch from + `DONE' to `REPORT' in the example above. See also *note + Conflicts::, for a discussion of the interaction with + `shift-selection-mode'. + + +File: org, Node: Fast access to TODO states, Next: Per-file keywords, Prev: Multiple sets in one file, Up: TODO extensions + +5.2.4 Fast access to TODO states +-------------------------------- + +If you would like to quickly change an entry to an arbitrary TODO state +instead of cycling through the states, you can set up keys for +single-letter access to the states. This is done by adding the +selection character after each keyword, in parentheses(1). For example: + + (setq org-todo-keywords + '((sequence "TODO(t)" "|" "DONE(d)") + (sequence "REPORT(r)" "BUG(b)" "KNOWNCAUSE(k)" "|" "FIXED(f)") + (sequence "|" "CANCELED(c)"))) + + If you then press `C-c C-t' followed by the selection key, the entry +will be switched to this state. `SPC' can be used to remove any TODO +keyword from an entry.(2) + + ---------- Footnotes ---------- + + (1) All characters are allowed except `@^!', which have a special +meaning here. + + (2) Check also the option `org-fast-tag-selection-include-todo', it +allows you to change the TODO state through the tags interface (*note +Setting tags::), in case you like to mingle the two concepts. Note +that this means you need to come up with unique keys across both sets +of keywords. + + +File: org, Node: Per-file keywords, Next: Faces for TODO keywords, Prev: Fast access to TODO states, Up: TODO extensions + +5.2.5 Setting up keywords for individual files +---------------------------------------------- + +It can be very useful to use different aspects of the TODO mechanism in +different files. For file-local settings, you need to add special lines +to the file which set the keywords and interpretation for that file +only. For example, to set one of the two examples discussed above, you +need one of the following lines, starting in column zero anywhere in the +file: + + #+TODO: TODO FEEDBACK VERIFY | DONE CANCELED + (you may also write `#+SEQ_TODO' to be explicit about the +interpretation, but it means the same as `#+TODO'), or + #+TYP_TODO: Fred Sara Lucy Mike | DONE + + A setup for using several sets in parallel would be: + + #+TODO: TODO | DONE + #+TODO: REPORT BUG KNOWNCAUSE | FIXED + #+TODO: | CANCELED + +To make sure you are using the correct keyword, type `#+' into the +buffer and then use `M-' completion. + + Remember that the keywords after the vertical bar (or the last +keyword if no bar is there) must always mean that the item is DONE +(although you may use a different word). After changing one of these +lines, use `C-c C-c' with the cursor still in the line to make the +changes known to Org mode(1). + + ---------- Footnotes ---------- + + (1) Org mode parses these lines only when Org mode is activated +after visiting a file. `C-c C-c' with the cursor in a line starting +with `#+' is simply restarting Org mode for the current buffer. + + +File: org, Node: Faces for TODO keywords, Next: TODO dependencies, Prev: Per-file keywords, Up: TODO extensions + +5.2.6 Faces for TODO keywords +----------------------------- + +Org mode highlights TODO keywords with special faces: `org-todo' for +keywords indicating that an item still has to be acted upon, and +`org-done' for keywords indicating that an item is finished. If you +are using more than 2 different states, you might want to use special +faces for some of them. This can be done using the option +`org-todo-keyword-faces'. For example: + + (setq org-todo-keyword-faces + '(("TODO" . org-warning) ("STARTED" . "yellow") + ("CANCELED" . (:foreground "blue" :weight bold)))) + + While using a list with face properties as shown for CANCELED +_should_ work, this does not always seem to be the case. If necessary, +define a special face and use that. A string is interpreted as a +color. The option `org-faces-easy-properties' determines if that color +is interpreted as a foreground or a background color. + + +File: org, Node: TODO dependencies, Prev: Faces for TODO keywords, Up: TODO extensions + +5.2.7 TODO dependencies +----------------------- + +The structure of Org files (hierarchy and lists) makes it easy to +define TODO dependencies. Usually, a parent TODO task should not be +marked DONE until all subtasks (defined as children tasks) are marked +as DONE. And sometimes there is a logical sequence to a number of +(sub)tasks, so that one task cannot be acted upon before all siblings +above it are done. If you customize the option +`org-enforce-todo-dependencies', Org will block entries from changing +state to DONE while they have children that are not DONE. Furthermore, +if an entry has a property `ORDERED', each of its children will be +blocked until all earlier siblings are marked DONE. Here is an example: + + * TODO Blocked until (two) is done + ** DONE one + ** TODO two + + * Parent + :PROPERTIES: + :ORDERED: t + :END: + ** TODO a + ** TODO b, needs to wait for (a) + ** TODO c, needs to wait for (a) and (b) + +`C-c C-x o (`org-toggle-ordered-property')' + Toggle the `ORDERED' property of the current entry. A property is + used for this behavior because this should be local to the current + entry, not inherited like a tag. However, if you would like to + track the value of this property with a tag for better visibility, + customize the option `org-track-ordered-property-with-tag'. + +`C-u C-u C-u C-c C-t' + Change TODO state, circumventing any state blocking. + + If you set the option `org-agenda-dim-blocked-tasks', TODO entries +that cannot be closed because of such dependencies will be shown in a +dimmed font or even made invisible in agenda views (*note Agenda +Views::). + + You can also block changes of TODO states by looking at checkboxes +(*note Checkboxes::). If you set the option +`org-enforce-todo-checkbox-dependencies', an entry that has unchecked +checkboxes will be blocked from switching to DONE. + + If you need more complex dependency structures, for example +dependencies between entries in different trees or files, check out the +contributed module `org-depend.el'. + + +File: org, Node: Progress logging, Next: Priorities, Prev: TODO extensions, Up: TODO Items + +5.3 Progress logging +==================== + +Org mode can automatically record a timestamp and possibly a note when +you mark a TODO item as DONE, or even each time you change the state of +a TODO item. This system is highly configurable; settings can be on a +per-keyword basis and can be localized to a file or even a subtree. For +information on how to clock working time for a task, see *note Clocking +work time::. + +* Menu: + +* Closing items:: When was this entry marked DONE? +* Tracking TODO state changes:: When did the status change? +* Tracking your habits:: How consistent have you been? + + +File: org, Node: Closing items, Next: Tracking TODO state changes, Prev: Progress logging, Up: Progress logging + +5.3.1 Closing items +------------------- + +The most basic logging is to keep track of _when_ a certain TODO item +was finished. This is achieved with(1) + + (setq org-log-done 'time) + +Then each time you turn an entry from a TODO (not-done) state into any +of the DONE states, a line `CLOSED: [timestamp]' will be inserted just +after the headline. If you turn the entry back into a TODO item +through further state cycling, that line will be removed again. If you +turn the entry back to a non-TODO state (by pressing for +example), that line will also be removed, unless you set +`org-closed-keep-when-no-todo' to non-`nil'. If you want to record a +note along with the timestamp, use(2) + + (setq org-log-done 'note) + +You will then be prompted for a note, and that note will be stored below +the entry with a `Closing Note' heading. + + In the timeline (*note Timeline::) and in the agenda (*note +Weekly/daily agenda::), you can then use the `l' key to display the +TODO items with a `CLOSED' timestamp on each day, giving you an +overview of what has been done. + + ---------- Footnotes ---------- + + (1) The corresponding in-buffer setting is: `#+STARTUP: logdone' + + (2) The corresponding in-buffer setting is: `#+STARTUP: lognotedone'. + + +File: org, Node: Tracking TODO state changes, Next: Tracking your habits, Prev: Closing items, Up: Progress logging + +5.3.2 Tracking TODO state changes +--------------------------------- + +When TODO keywords are used as workflow states (*note Workflow +states::), you might want to keep track of when a state change occurred +and maybe take a note about this change. You can either record just a +timestamp, or a time-stamped note for a change. These records will be +inserted after the headline as an itemized list, newest first(1). When +taking a lot of notes, you might want to get the notes out of the way +into a drawer (*note Drawers::). Customize `org-log-into-drawer' to +get this behavior--the recommended drawer for this is called +`LOGBOOK'(2). You can also overrule the setting of this variable for a +subtree by setting a `LOG_INTO_DRAWER' property. + + Since it is normally too much to record a note for every state, Org +mode expects configuration on a per-keyword basis for this. This is +achieved by adding special markers `!' (for a timestamp) or `@' (for a +note with timestamp) in parentheses after each keyword. For example, +with the setting + + (setq org-todo-keywords + '((sequence "TODO(t)" "WAIT(w@/!)" "|" "DONE(d!)" "CANCELED(c@)"))) + + To record a timestamp without a note for TODO keywords configured +with `@', just type `C-c C-c' to enter a blank note when prompted. + +You not only define global TODO keywords and fast access keys, but also +request that a time is recorded when the entry is set to DONE(3), and +that a note is recorded when switching to WAIT or CANCELED. The +setting for WAIT is even more special: the `!' after the slash means +that in addition to the note taken when entering the state, a timestamp +should be recorded when leaving the WAIT state, if and only if the +target state does not configure logging for entering it. So it has no +effect when switching from WAIT to DONE, because DONE is configured to +record a timestamp only. But when switching from WAIT back to TODO, +the `/!' in the WAIT setting now triggers a timestamp even though TODO +has no logging configured. + + You can use the exact same syntax for setting logging preferences +local to a buffer: + #+TODO: TODO(t) WAIT(w@/!) | DONE(d!) CANCELED(c@) + + In order to define logging settings that are local to a subtree or a +single item, define a LOGGING property in this entry. Any non-empty +LOGGING property resets all logging settings to `nil'. You may then +turn on logging for this specific tree using STARTUP keywords like +`lognotedone' or `logrepeat', as well as adding state specific settings +like `TODO(!)'. For example + + * TODO Log each state with only a time + :PROPERTIES: + :LOGGING: TODO(!) WAIT(!) DONE(!) CANCELED(!) + :END: + * TODO Only log when switching to WAIT, and when repeating + :PROPERTIES: + :LOGGING: WAIT(@) logrepeat + :END: + * TODO No logging at all + :PROPERTIES: + :LOGGING: nil + :END: + + ---------- Footnotes ---------- + + (1) See the option `org-log-states-order-reversed' + + (2) Note that the `LOGBOOK' drawer is unfolded when pressing +in the agenda to show an entry--use to keep it folded here + + (3) It is possible that Org mode will record two timestamps when you +are using both `org-log-done' and state change logging. However, it +will never prompt for two notes--if you have configured both, the state +change recording note will take precedence and cancel the `Closing +Note'. + + +File: org, Node: Tracking your habits, Prev: Tracking TODO state changes, Up: Progress logging + +5.3.3 Tracking your habits +-------------------------- + +Org has the ability to track the consistency of a special category of +TODOs, called "habits". A habit has the following properties: + + 1. You have enabled the `habits' module by customizing `org-modules'. + + 2. The habit is a TODO item, with a TODO keyword representing an open + state. + + 3. The property `STYLE' is set to the value `habit'. + + 4. The TODO has a scheduled date, usually with a `.+' style repeat + interval. A `++' style may be appropriate for habits with time + constraints, e.g., must be done on weekends, or a `+' style for an + unusual habit that can have a backlog, e.g., weekly reports. + + 5. The TODO may also have minimum and maximum ranges specified by + using the syntax `.+2d/3d', which says that you want to do the + task at least every three days, but at most every two days. + + 6. You must also have state logging for the `DONE' state enabled + (*note Tracking TODO state changes::), in order for historical + data to be represented in the consistency graph. If it is not + enabled it is not an error, but the consistency graphs will be + largely meaningless. + + To give you an idea of what the above rules look like in action, +here's an actual habit with some history: + + ** TODO Shave + SCHEDULED: <2009-10-17 Sat .+2d/4d> + - State "DONE" from "TODO" [2009-10-15 Thu] + - State "DONE" from "TODO" [2009-10-12 Mon] + - State "DONE" from "TODO" [2009-10-10 Sat] + - State "DONE" from "TODO" [2009-10-04 Sun] + - State "DONE" from "TODO" [2009-10-02 Fri] + - State "DONE" from "TODO" [2009-09-29 Tue] + - State "DONE" from "TODO" [2009-09-25 Fri] + - State "DONE" from "TODO" [2009-09-19 Sat] + - State "DONE" from "TODO" [2009-09-16 Wed] + - State "DONE" from "TODO" [2009-09-12 Sat] + :PROPERTIES: + :STYLE: habit + :LAST_REPEAT: [2009-10-19 Mon 00:36] + :END: + + What this habit says is: I want to shave at most every 2 days (given +by the `SCHEDULED' date and repeat interval) and at least every 4 days. +If today is the 15th, then the habit first appears in the agenda on Oct +17, after the minimum of 2 days has elapsed, and will appear overdue on +Oct 19, after four days have elapsed. + + What's really useful about habits is that they are displayed along +with a consistency graph, to show how consistent you've been at getting +that task done in the past. This graph shows every day that the task +was done over the past three weeks, with colors for each day. The +colors used are: + +`Blue' + If the task wasn't to be done yet on that day. + +`Green' + If the task could have been done on that day. + +`Yellow' + If the task was going to be overdue the next day. + +`Red' + If the task was overdue on that day. + + In addition to coloring each day, the day is also marked with an +asterisk if the task was actually done that day, and an exclamation +mark to show where the current day falls in the graph. + + There are several configuration variables that can be used to change +the way habits are displayed in the agenda. + +`org-habit-graph-column' + The buffer column at which the consistency graph should be drawn. + This will overwrite any text in that column, so it is a good idea + to keep your habits' titles brief and to the point. + +`org-habit-preceding-days' + The amount of history, in days before today, to appear in + consistency graphs. + +`org-habit-following-days' + The number of days after today that will appear in consistency + graphs. + +`org-habit-show-habits-only-for-today' + If non-`nil', only show habits in today's agenda view. This is + set to true by default. + + Lastly, pressing `K' in the agenda buffer will cause habits to +temporarily be disabled and they won't appear at all. Press `K' again +to bring them back. They are also subject to tag filtering, if you +have habits which should only be done in certain contexts, for example. + + +File: org, Node: Priorities, Next: Breaking down tasks, Prev: Progress logging, Up: TODO Items + +5.4 Priorities +============== + +If you use Org mode extensively, you may end up with enough TODO items +that it starts to make sense to prioritize them. Prioritizing can be +done by placing a _priority cookie_ into the headline of a TODO item, +like this + + *** TODO [#A] Write letter to Sam Fortune + +By default, Org mode supports three priorities: `A', `B', and `C'. `A' +is the highest priority. An entry without a cookie is treated just +like priority `B'. Priorities make a difference only for sorting in +the agenda (*note Weekly/daily agenda::); outside the agenda, they have +no inherent meaning to Org mode. The cookies can be highlighted with +special faces by customizing `org-priority-faces'. + + Priorities can be attached to any outline node; they do not need to +be TODO items. + +`C-c ,' + Set the priority of the current headline (`org-priority'). The + command prompts for a priority character `A', `B' or `C'. When + you press instead, the priority cookie is removed from the + headline. The priorities can also be changed "remotely" from the + timeline and agenda buffer with the `,' command (*note Agenda + commands::). + +`S- (`org-priority-up')' +`S- (`org-priority-down')' + Increase/decrease priority of current headline(1). Note that + these keys are also used to modify timestamps (*note Creating + timestamps::). See also *note Conflicts::, for a discussion of + the interaction with `shift-selection-mode'. + + You can change the range of allowed priorities by setting the options +`org-highest-priority', `org-lowest-priority', and +`org-default-priority'. For an individual buffer, you may set these +values (highest, lowest, default) like this (please make sure that the +highest priority is earlier in the alphabet than the lowest priority): + + #+PRIORITIES: A C B + + ---------- Footnotes ---------- + + (1) See also the option `org-priority-start-cycle-with-default'. + + +File: org, Node: Breaking down tasks, Next: Checkboxes, Prev: Priorities, Up: TODO Items + +5.5 Breaking tasks down into subtasks +===================================== + +It is often advisable to break down large tasks into smaller, manageable +subtasks. You can do this by creating an outline tree below a TODO +item, with detailed subtasks on the tree(1). To keep the overview over +the fraction of subtasks that are already completed, insert either +`[/]' or `[%]' anywhere in the headline. These cookies will be updated +each time the TODO status of a child changes, or when pressing `C-c +C-c' on the cookie. For example: + + * Organize Party [33%] + ** TODO Call people [1/2] + *** TODO Peter + *** DONE Sarah + ** TODO Buy food + ** DONE Talk to neighbor + + If a heading has both checkboxes and TODO children below it, the +meaning of the statistics cookie become ambiguous. Set the property +`COOKIE_DATA' to either `checkbox' or `todo' to resolve this issue. + + If you would like to have the statistics cookie count any TODO +entries in the subtree (not just direct children), configure +`org-hierarchical-todo-statistics'. To do this for a single subtree, +include the word `recursive' into the value of the `COOKIE_DATA' +property. + + * Parent capturing statistics [2/20] + :PROPERTIES: + :COOKIE_DATA: todo recursive + :END: + + If you would like a TODO entry to automatically change to DONE when +all children are done, you can use the following setup: + + (defun org-summary-todo (n-done n-not-done) + "Switch entry to DONE when all subentries are done, to TODO otherwise." + (let (org-log-done org-log-states) ; turn off logging + (org-todo (if (= n-not-done 0) "DONE" "TODO")))) + + (add-hook 'org-after-todo-statistics-hook 'org-summary-todo) + + Another possibility is the use of checkboxes to identify (a +hierarchy of) a large number of subtasks (*note Checkboxes::). + + ---------- Footnotes ---------- + + (1) To keep subtasks out of the global TODO list, see the +`org-agenda-todo-list-sublevels'. + + +File: org, Node: Checkboxes, Prev: Breaking down tasks, Up: TODO Items + +5.6 Checkboxes +============== + +Every item in a plain list(1) (*note Plain lists::) can be made into a +checkbox by starting it with the string `[ ]'. This feature is similar +to TODO items (*note TODO Items::), but is more lightweight. +Checkboxes are not included in the global TODO list, so they are often +great to split a task into a number of simple steps. Or you can use +them in a shopping list. To toggle a checkbox, use `C-c C-c', or use +the mouse (thanks to Piotr Zielinski's `org-mouse.el'). + + Here is an example of a checkbox list. + + * TODO Organize party [2/4] + - [-] call people [1/3] + - [ ] Peter + - [X] Sarah + - [ ] Sam + - [X] order food + - [ ] think about what music to play + - [X] talk to the neighbors + + Checkboxes work hierarchically, so if a checkbox item has children +that are checkboxes, toggling one of the children checkboxes will make +the parent checkbox reflect if none, some, or all of the children are +checked. + + The `[2/4]' and `[1/3]' in the first and second line are cookies +indicating how many checkboxes present in this entry have been checked +off, and the total number of checkboxes present. This can give you an +idea on how many checkboxes remain, even without opening a folded +entry. The cookies can be placed into a headline or into (the first +line of) a plain list item. Each cookie covers checkboxes of direct +children structurally below the headline/item on which the cookie +appears(2). You have to insert the cookie yourself by typing either +`[/]' or `[%]'. With `[/]' you get an `n out of m' result, as in the +examples above. With `[%]' you get information about the percentage of +checkboxes checked (in the above example, this would be `[50%]' and +`[33%]', respectively). In a headline, a cookie can count either +checkboxes below the heading or TODO states of children, and it will +display whatever was changed last. Set the property `COOKIE_DATA' to +either `checkbox' or `todo' to resolve this issue. + + If the current outline node has an `ORDERED' property, checkboxes +must be checked off in sequence, and an error will be thrown if you try +to check off a box while there are unchecked boxes above it. + +The following commands work with checkboxes: + +`C-c C-c (`org-toggle-checkbox')' + Toggle checkbox status or (with prefix arg) checkbox presence at + point. With a single prefix argument, add an empty checkbox or + remove the current one(3). With a double prefix argument, set it + to `[-]', which is considered to be an intermediate state. + +`C-c C-x C-b (`org-toggle-checkbox')' + Toggle checkbox status or (with prefix arg) checkbox presence at + point. With double prefix argument, set it to `[-]', which is + considered to be an intermediate state. + - If there is an active region, toggle the first checkbox in + the region and set all remaining boxes to the same status as + the first. With a prefix arg, add or remove the checkbox for + all items in the region. + + - If the cursor is in a headline, toggle checkboxes in the + region between this headline and the next (so _not_ the + entire subtree). + + - If there is no active region, just toggle the checkbox at + point. + +`M-S- (`org-insert-todo-heading')' + Insert a new item with a checkbox. This works only if the cursor + is already in a plain list item (*note Plain lists::). + +`C-c C-x o (`org-toggle-ordered-property')' + Toggle the `ORDERED' property of the entry, to toggle if + checkboxes must be checked off in sequence. A property is used + for this behavior because this should be local to the current + entry, not inherited like a tag. However, if you would like to + track the value of this property with a tag for better visibility, + customize `org-track-ordered-property-with-tag'. + +`C-c # (`org-update-statistics-cookies')' + Update the statistics cookie in the current outline entry. When + called with a `C-u' prefix, update the entire file. Checkbox + statistic cookies are updated automatically if you toggle + checkboxes with `C-c C-c' and make new ones with `M-S-'. + TODO statistics cookies update when changing TODO states. If you + delete boxes/entries or add/change them by hand, use this command + to get things back into sync. + + ---------- Footnotes ---------- + + (1) With the exception of description lists. But you can allow it +by modifying `org-list-automatic-rules' accordingly. + + (2) Set the option `org-checkbox-hierarchical-statistics' if you +want such cookies to count all checkboxes below the cookie, not just +those belonging to direct children. + + (3) `C-u C-c C-c' on the _first_ item of a list with no checkbox +will add checkboxes to the rest of the list. + + +File: org, Node: Tags, Next: Properties and Columns, Prev: TODO Items, Up: Top + +6 Tags +****** + +An excellent way to implement labels and contexts for cross-correlating +information is to assign tags to headlines. Org mode has extensive +support for tags. + + Every headline can contain a list of tags; they occur at the end of +the headline. Tags are normal words containing letters, numbers, `_', +and `@'. Tags must be preceded and followed by a single colon, e.g., +`:work:'. Several tags can be specified, as in `:work:urgent:'. Tags +will by default be in bold face with the same color as the headline. +You may specify special faces for specific tags using the option +`org-tag-faces', in much the same way as you can for TODO keywords +(*note Faces for TODO keywords::). + +* Menu: + +* Tag inheritance:: Tags use the tree structure of the outline +* Setting tags:: How to assign tags to a headline +* Tag groups:: Use one tag to search for several tags +* Tag searches:: Searching for combinations of tags + + +File: org, Node: Tag inheritance, Next: Setting tags, Prev: Tags, Up: Tags + +6.1 Tag inheritance +=================== + +Tags make use of the hierarchical structure of outline trees. If a +heading has a certain tag, all subheadings will inherit the tag as +well. For example, in the list + + * Meeting with the French group :work: + ** Summary by Frank :boss:notes: + *** TODO Prepare slides for him :action: + +the final heading will have the tags `:work:', `:boss:', `:notes:', and +`:action:' even though the final heading is not explicitly marked with +those tags. You can also set tags that all entries in a file should +inherit just as if these tags were defined in a hypothetical level zero +that surrounds the entire file. Use a line like this(1): + + #+FILETAGS: :Peter:Boss:Secret: + +To limit tag inheritance to specific tags, use +`org-tags-exclude-from-inheritance'. To turn it off entirely, use +`org-use-tag-inheritance'. + + When a headline matches during a tags search while tag inheritance +is turned on, all the sublevels in the same tree will (for a simple +match form) match as well(2). The list of matches may then become very +long. If you only want to see the first tags match in a subtree, +configure `org-tags-match-list-sublevels' (not recommended). + + Tag inheritance is relevant when the agenda search tries to match a +tag, either in the `tags' or `tags-todo' agenda types. In other agenda +types, `org-use-tag-inheritance' has no effect. Still, you may want to +have your tags correctly set in the agenda, so that tag filtering works +fine, with inherited tags. Set `org-agenda-use-tag-inheritance' to +control this: the default value includes all agenda types, but setting +this to `nil' can really speed up agenda generation. + + ---------- Footnotes ---------- + + (1) As with all these in-buffer settings, pressing `C-c C-c' +activates any changes in the line. + + (2) This is only true if the search does not involve more complex +tests including properties (*note Property searches::). + + +File: org, Node: Setting tags, Next: Tag groups, Prev: Tag inheritance, Up: Tags + +6.2 Setting tags +================ + +Tags can simply be typed into the buffer at the end of a headline. +After a colon, `M-' offers completion on tags. There is also a +special command for inserting tags: + +`C-c C-q (`org-set-tags-command')' + Enter new tags for the current headline. Org mode will either + offer completion or a special single-key interface for setting + tags, see below. After pressing , the tags will be inserted + and aligned to `org-tags-column'. When called with a `C-u' + prefix, all tags in the current buffer will be aligned to that + column, just to make things look nice. TAGS are automatically + realigned after promotion, demotion, and TODO state changes (*note + TODO basics::). + +`C-c C-c (`org-set-tags-command')' + When the cursor is in a headline, this does the same as `C-c C-q'. + + Org supports tag insertion based on a _list of tags_. By default +this list is constructed dynamically, containing all tags currently +used in the buffer. You may also globally specify a hard list of tags +with the variable `org-tag-alist'. Finally you can set the default +tags for a given file with lines like + + #+TAGS: @work @home @tennisclub + #+TAGS: laptop car pc sailboat + + If you have globally defined your preferred set of tags using the +variable `org-tag-alist', but would like to use a dynamic tag list in a +specific file, add an empty TAGS option line to that file: + + #+TAGS: + + If you have a preferred set of tags that you would like to use in +every file, in addition to those defined on a per-file basis by TAGS +option lines, then you may specify a list of tags with the variable +`org-tag-persistent-alist'. You may turn this off on a per-file basis +by adding a STARTUP option line to that file: + + #+STARTUP: noptag + + By default Org mode uses the standard minibuffer completion +facilities for entering tags. However, it also implements another, +quicker, tag selection method called _fast tag selection_. This allows +you to select and deselect tags with just a single key press. For this +to work well you should assign unique letters to most of your commonly +used tags. You can do this globally by configuring the variable +`org-tag-alist' in your `.emacs' file. For example, you may find the +need to tag many items in different files with `:@home:'. In this case +you can set something like: + + (setq org-tag-alist '(("@work" . ?w) ("@home" . ?h) ("laptop" . ?l))) + +If the tag is only relevant to the file you are working on, then you +can instead set the TAGS option line as: + + #+TAGS: @work(w) @home(h) @tennisclub(t) laptop(l) pc(p) + +The tags interface will show the available tags in a splash window. If +you want to start a new line after a specific tag, insert `\n' into the +tag list + + #+TAGS: @work(w) @home(h) @tennisclub(t) \n laptop(l) pc(p) + +or write them in two lines: + + #+TAGS: @work(w) @home(h) @tennisclub(t) + #+TAGS: laptop(l) pc(p) + +You can also group together tags that are mutually exclusive by using +braces, as in: + + #+TAGS: { @work(w) @home(h) @tennisclub(t) } laptop(l) pc(p) + +you indicate that at most one of `@work', `@home', and `@tennisclub' +should be selected. Multiple such groups are allowed. + +Don't forget to press `C-c C-c' with the cursor in one of these lines +to activate any changes. + +To set these mutually exclusive groups in the variable `org-tag-alist', +you must use the dummy tags `:startgroup' and `:endgroup' instead of +the braces. Similarly, you can use `:newline' to indicate a line +break. The previous example would be set globally by the following +configuration: + + (setq org-tag-alist '((:startgroup . nil) + ("@work" . ?w) ("@home" . ?h) + ("@tennisclub" . ?t) + (:endgroup . nil) + ("laptop" . ?l) ("pc" . ?p))) + + If at least one tag has a selection key then pressing `C-c C-c' will +automatically present you with a special interface, listing inherited +tags, the tags of the current headline, and a list of all valid tags +with corresponding keys(1). In this interface, you can use the +following keys: + +`a-z...' + Pressing keys assigned to tags will add or remove them from the + list of tags in the current line. Selecting a tag in a group of + mutually exclusive tags will turn off any other tags from that + group. + +`' + Enter a tag in the minibuffer, even if the tag is not in the + predefined list. You will be able to complete on all tags present + in the buffer. You can also add several tags: just separate them + with a comma. + +`' + Clear all tags for this line. + +`' + Accept the modified set. + +`C-g' + Abort without installing changes. + +`q' + If `q' is not assigned to a tag, it aborts like `C-g'. + +`!' + Turn off groups of mutually exclusive tags. Use this to (as an + exception) assign several tags from such a group. + +`C-c' + Toggle auto-exit after the next change (see below). If you are + using expert mode, the first `C-c' will display the selection + window. + +This method lets you assign tags to a headline with very few keys. With +the above setup, you could clear the current tags and set `@home', +`laptop' and `pc' tags with just the following keys: `C-c C-c h l +p '. Switching from `@home' to `@work' would be done with `C-c +C-c w ' or alternatively with `C-c C-c C-c w'. Adding the +non-predefined tag `Sarah' could be done with `C-c C-c S a r a h + '. + + If you find that most of the time you need only a single key press to +modify your list of tags, set `org-fast-tag-selection-single-key'. +Then you no longer have to press to exit fast tag selection--it +will immediately exit after the first change. If you then occasionally +need more keys, press `C-c' to turn off auto-exit for the current tag +selection process (in effect: start selection with `C-c C-c C-c' +instead of `C-c C-c'). If you set the variable to the value `expert', +the special window is not even shown for single-key tag selection, it +comes up only when you press an extra `C-c'. + + ---------- Footnotes ---------- + + (1) Keys will automatically be assigned to tags which have no +configured keys. + + +File: org, Node: Tag groups, Next: Tag searches, Prev: Setting tags, Up: Tags + +6.3 Tag groups +============== + +In a set of mutually exclusive tags, the first tag can be defined as a +_group tag_. When you search for a group tag, it will return matches +for all members in the group. In an agenda view, filtering by a group +tag will display headlines tagged with at least one of the members of +the group. This makes tag searches and filters even more flexible. + + You can set group tags by inserting a colon between the group tag +and other tags--beware that all whitespaces are mandatory so that Org +can parse this line correctly: + + #+TAGS: { @read : @read_book @read_ebook } + + In this example, `@read' is a _group tag_ for a set of three tags: +`@read', `@read_book' and `@read_ebook'. + + You can also use the `:grouptags' keyword directly when setting +`org-tag-alist': + + (setq org-tag-alist '((:startgroup . nil) + ("@read" . nil) + (:grouptags . nil) + ("@read_book" . nil) + ("@read_ebook" . nil) + (:endgroup . nil))) + + You cannot nest group tags or use a group tag as a tag in another +group. + + If you want to ignore group tags temporarily, toggle group tags +support with `org-toggle-tags-groups', bound to `C-c C-x q'. If you +want to disable tag groups completely, set `org-group-tags' to `nil'. + + +File: org, Node: Tag searches, Prev: Tag groups, Up: Tags + +6.4 Tag searches +================ + +Once a system of tags has been set up, it can be used to collect related +information into special lists. + +`C-c / m or C-c \ (`org-match-sparse-tree')' + Create a sparse tree with all headlines matching a + tags/property/TODO search. With a `C-u' prefix argument, ignore + headlines that are not a TODO line. *Note Matching tags and + properties::. + +`C-c a m (`org-tags-view')' + Create a global list of tag matches from all agenda files. *Note + Matching tags and properties::. + +`C-c a M (`org-tags-view')' + Create a global list of tag matches from all agenda files, but + check only TODO items and force checking subitems (see the option + `org-tags-match-list-sublevels'). + + These commands all prompt for a match string which allows basic +Boolean logic like `+boss+urgent-project1', to find entries with tags +`boss' and `urgent', but not `project1', or `Kathy|Sally' to find +entries which are tagged, like `Kathy' or `Sally'. The full syntax of +the search string is rich and allows also matching against TODO +keywords, entry levels and properties. For a complete description with +many examples, see *note Matching tags and properties::. + + +File: org, Node: Properties and Columns, Next: Dates and Times, Prev: Tags, Up: Top + +7 Properties and columns +************************ + +A property is a key-value pair associated with an entry. Properties +can be set so they are associated with a single entry, with every entry +in a tree, or with every entry in an Org mode file. + + There are two main applications for properties in Org mode. First, +properties are like tags, but with a value. Imagine maintaining a file +where you document bugs and plan releases for a piece of software. +Instead of using tags like `:release_1:', `:release_2:', you can use a +property, say `:Release:', that in different subtrees has different +values, such as `1.0' or `2.0'. Second, you can use properties to +implement (very basic) database capabilities in an Org buffer. Imagine +keeping track of your music CDs, where properties could be things such +as the album, artist, date of release, number of tracks, and so on. + + Properties can be conveniently edited and viewed in column view +(*note Column view::). + +* Menu: + +* Property syntax:: How properties are spelled out +* Special properties:: Access to other Org mode features +* Property searches:: Matching property values +* Property inheritance:: Passing values down the tree +* Column view:: Tabular viewing and editing +* Property API:: Properties for Lisp programmers + + +File: org, Node: Property syntax, Next: Special properties, Prev: Properties and Columns, Up: Properties and Columns + +7.1 Property syntax +=================== + +Properties are key-value pairs. When they are associated with a single +entry or with a tree they need to be inserted into a special drawer +(*note Drawers::) with the name `PROPERTIES'. Each property is +specified on a single line, with the key (surrounded by colons) first, +and the value after it. Here is an example: + + * CD collection + ** Classic + *** Goldberg Variations + :PROPERTIES: + :Title: Goldberg Variations + :Composer: J.S. Bach + :Artist: Glen Gould + :Publisher: Deutsche Grammophon + :NDisks: 1 + :END: + + Depending on the value of `org-use-property-inheritance', a property +set this way will either be associated with a single entry, or the +sub-tree defined by the entry, see *note Property inheritance::. + + You may define the allowed values for a particular property `:Xyz:' +by setting a property `:Xyz_ALL:'. This special property is +_inherited_, so if you set it in a level 1 entry, it will apply to the +entire tree. When allowed values are defined, setting the +corresponding property becomes easier and is less prone to typing +errors. For the example with the CD collection, we can predefine +publishers and the number of disks in a box like this: + + * CD collection + :PROPERTIES: + :NDisks_ALL: 1 2 3 4 + :Publisher_ALL: "Deutsche Grammophon" Philips EMI + :END: + + If you want to set properties that can be inherited by any entry in a +file, use a line like + #+PROPERTY: NDisks_ALL 1 2 3 4 + + Contrary to properties set from a special drawer, you have to +refresh the buffer with `C-c C-c' to activate this changes. + + If you want to add to the value of an existing property, append a +`+' to the property name. The following results in the property `var' +having the value "foo=1 bar=2". + #+PROPERTY: var foo=1 + #+PROPERTY: var+ bar=2 + + It is also possible to add to the values of inherited properties. +The following results in the `genres' property having the value "Classic +Baroque" under the `Goldberg Variations' subtree. + * CD collection + ** Classic + :PROPERTIES: + :GENRES: Classic + :END: + *** Goldberg Variations + :PROPERTIES: + :Title: Goldberg Variations + :Composer: J.S. Bach + :Artist: Glen Gould + :Publisher: Deutsche Grammophon + :NDisks: 1 + :GENRES+: Baroque + :END: + Note that a property can only have one entry per Drawer. + + Property values set with the global variable `org-global-properties' +can be inherited by all entries in all Org files. + +The following commands help to work with properties: + +`M- (`pcomplete')' + After an initial colon in a line, complete property keys. All + keys used in the current file will be offered as possible + completions. + +`C-c C-x p (`org-set-property')' + Set a property. This prompts for a property name and a value. If + necessary, the property drawer is created as well. + +`C-u M-x org-insert-drawer RET' + Insert a property drawer into the current entry. The drawer will + be inserted early in the entry, but after the lines with planning + information like deadlines. + +`C-c C-c (`org-property-action')' + With the cursor in a property drawer, this executes property + commands. + +`C-c C-c s (`org-set-property')' + Set a property in the current entry. Both the property and the + value can be inserted using completion. + +`S- (`org-property-next-allowed-value')' +`S- (`org-property-previous-allowed-value')' + Switch property at point to the next/previous allowed value. + +`C-c C-c d (`org-delete-property')' + Remove a property from the current entry. + +`C-c C-c D (`org-delete-property-globally')' + Globally remove a property, from all entries in the current file. + +`C-c C-c c (`org-compute-property-at-point')' + Compute the property at point, using the operator and scope from + the nearest column format definition. + + +File: org, Node: Special properties, Next: Property searches, Prev: Property syntax, Up: Properties and Columns + +7.2 Special properties +====================== + +Special properties provide an alternative access method to Org mode +features, like the TODO state or the priority of an entry, discussed in +the previous chapters. This interface exists so that you can include +these states in a column view (*note Column view::), or to use them in +queries. The following property names are special and (except for +`:CATEGORY:') should not be used as keys in the properties drawer: + + ID A globally unique ID used for synchronization during + iCalendar or MobileOrg export. + TODO The TODO keyword of the entry. + TAGS The tags defined directly in the headline. + ALLTAGS All tags, including inherited ones. + CATEGORY The category of an entry. + PRIORITY The priority of the entry, a string with a single letter. + DEADLINE The deadline time string, without the angular brackets. + SCHEDULED The scheduling timestamp, without the angular brackets. + CLOSED When was this entry closed? + TIMESTAMP The first keyword-less timestamp in the entry. + TIMESTAMP_IA The first inactive timestamp in the entry. + CLOCKSUM The sum of CLOCK intervals in the subtree. `org-clock-sum' + must be run first to compute the values in the current buffer. + CLOCKSUM_T The sum of CLOCK intervals in the subtree for today. + `org-clock-sum-today' must be run first to compute the + values in the current buffer. + BLOCKED "t" if task is currently blocked by children or siblings + ITEM The headline of the entry. + FILE The filename the entry is located in. + + +File: org, Node: Property searches, Next: Property inheritance, Prev: Special properties, Up: Properties and Columns + +7.3 Property searches +===================== + +To create sparse trees and special lists with selection based on +properties, the same commands are used as for tag searches (*note Tag +searches::). + +`C-c / m or C-c \ (`org-match-sparse-tree')' + Create a sparse tree with all matching entries. With a `C-u' + prefix argument, ignore headlines that are not a TODO line. + +`C-c a m (`org-tags-view')' + Create a global list of tag/property matches from all agenda + files. *Note Matching tags and properties::. + +`C-c a M (`org-tags-view')' + Create a global list of tag matches from all agenda files, but + check only TODO items and force checking of subitems (see the + option `org-tags-match-list-sublevels'). + + The syntax for the search string is described in *note Matching tags +and properties::. + + There is also a special command for creating sparse trees based on a +single property: + +`C-c / p' + Create a sparse tree based on the value of a property. This first + prompts for the name of a property, and then for a value. A + sparse tree is created with all entries that define this property + with the given value. If you enclose the value in curly braces, + it is interpreted as a regular expression and matched against the + property values. + + +File: org, Node: Property inheritance, Next: Column view, Prev: Property searches, Up: Properties and Columns + +7.4 Property Inheritance +======================== + +The outline structure of Org mode documents lends itself to an +inheritance model of properties: if the parent in a tree has a certain +property, the children can inherit this property. Org mode does not +turn this on by default, because it can slow down property searches +significantly and is often not needed. However, if you find inheritance +useful, you can turn it on by setting the variable +`org-use-property-inheritance'. It may be set to `t' to make all +properties inherited from the parent, to a list of properties that +should be inherited, or to a regular expression that matches inherited +properties. If a property has the value `nil', this is interpreted as +an explicit undefine of the property, so that inheritance search will +stop at this value and return `nil'. + + Org mode has a few properties for which inheritance is hard-coded, at +least for the special applications for which they are used: + +`COLUMNS' + The `:COLUMNS:' property defines the format of column view (*note + Column view::). It is inherited in the sense that the level where + a `:COLUMNS:' property is defined is used as the starting point + for a column view table, independently of the location in the + subtree from where columns view is turned on. + +`CATEGORY' + For agenda view, a category set through a `:CATEGORY:' property + applies to the entire subtree. + +`ARCHIVE' + For archiving, the `:ARCHIVE:' property may define the archive + location for the entire subtree (*note Moving subtrees::). + +`LOGGING' + The LOGGING property may define logging settings for an entry or a + subtree (*note Tracking TODO state changes::). + + +File: org, Node: Column view, Next: Property API, Prev: Property inheritance, Up: Properties and Columns + +7.5 Column view +=============== + +A great way to view and edit properties in an outline tree is _column +view_. In column view, each outline node is turned into a table row. +Columns in this table provide access to properties of the entries. Org +mode implements columns by overlaying a tabular structure over the +headline of each item. While the headlines have been turned into a +table row, you can still change the visibility of the outline tree. +For example, you get a compact table by switching to CONTENTS view +(`S- S-', or simply `c' while column view is active), but you +can still open, read, and edit the entry below each headline. Or, you +can switch to column view after executing a sparse tree command and in +this way get a table only for the selected items. Column view also +works in agenda buffers (*note Agenda Views::) where queries have +collected selected items, possibly from a number of files. + +* Menu: + +* Defining columns:: The COLUMNS format property +* Using column view:: How to create and use column view +* Capturing column view:: A dynamic block for column view + + +File: org, Node: Defining columns, Next: Using column view, Prev: Column view, Up: Column view + +7.5.1 Defining columns +---------------------- + +Setting up a column view first requires defining the columns. This is +done by defining a column format line. + +* Menu: + +* Scope of column definitions:: Where defined, where valid? +* Column attributes:: Appearance and content of a column + + +File: org, Node: Scope of column definitions, Next: Column attributes, Prev: Defining columns, Up: Defining columns + +7.5.1.1 Scope of column definitions +................................... + +To define a column format for an entire file, use a line like + + #+COLUMNS: %25ITEM %TAGS %PRIORITY %TODO + + To specify a format that only applies to a specific tree, add a +`:COLUMNS:' property to the top node of that tree, for example: + + ** Top node for columns view + :PROPERTIES: + :COLUMNS: %25ITEM %TAGS %PRIORITY %TODO + :END: + + If a `:COLUMNS:' property is present in an entry, it defines columns +for the entry itself, and for the entire subtree below it. Since the +column definition is part of the hierarchical structure of the document, +you can define columns on level 1 that are general enough for all +sublevels, and more specific columns further down, when you edit a +deeper part of the tree. + + +File: org, Node: Column attributes, Prev: Scope of column definitions, Up: Defining columns + +7.5.1.2 Column attributes +......................... + +A column definition sets the attributes of a column. The general +definition looks like this: + + %[WIDTH]PROPERTY[(TITLE)][{SUMMARY-TYPE}] + +Except for the percent sign and the property name, all items are +optional. The individual parts have the following meaning: + + WIDTH An integer specifying the width of the column in characters. + If omitted, the width will be determined automatically. + PROPERTY The property that should be edited in this column. + Special properties representing meta data are allowed here + as well (*note Special properties::) + TITLE The header text for the column. If omitted, the property + name is used. + {SUMMARY-TYPE} The summary type. If specified, the column values for + parent nodes are computed from the children. + Supported summary types are: + {+} Sum numbers in this column. + {+;%.1f} Like `+', but format result with `%.1f'. + {$} Currency, short for `+;%.2f'. + {:} Sum times, HH:MM, plain numbers are hours. + {X} Checkbox status, `[X]' if all children are `[X]'. + {X/} Checkbox status, `[n/m]'. + {X%} Checkbox status, `[n%]'. + {min} Smallest number in column. + {max} Largest number. + {mean} Arithmetic mean of numbers. + {:min} Smallest time value in column. + {:max} Largest time value. + {:mean} Arithmetic mean of time values. + {@min} Minimum age (in days/hours/mins/seconds). + {@max} Maximum age (in days/hours/mins/seconds). + {@mean} Arithmetic mean of ages (in days/hours/mins/seconds). + {est+} Add low-high estimates. + +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 `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 work 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, `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, `est+' estimates the full job more realistically, at 10-15 +days. + + Numbers are right-aligned when a format specifier with an explicit +width like `%5d' or `%5.1f' is used. + + Here is an example for a complete columns definition, along with +allowed values. + + :COLUMNS: %25ITEM %9Approved(Approved?){X} %Owner %11Status \(1) + %10Time_Estimate{:} %CLOCKSUM %CLOCKSUM_T + :Owner_ALL: Tammy Mark Karl Lisa Don + :Status_ALL: "In progress" "Not started yet" "Finished" "" + :Approved_ALL: "[ ]" "[X]" + +The first column, `%25ITEM', means the first 25 characters of the item +itself, i.e., of the headline. You probably always should start the +column definition with the `ITEM' specifier. The other specifiers +create columns `Owner' with a list of names as allowed values, for +`Status' with four different possible values, and for a checkbox field +`Approved'. When no width is given after the `%' character, the column +will be exactly as wide as it needs to be in order to fully display all +values. The `Approved' column does have a modified title (`Approved?', +with a question mark). Summaries will be created for the +`Time_Estimate' column by adding time duration expressions like HH:MM, +and for the `Approved' column, by providing an `[X]' status if all +children have been checked. The `CLOCKSUM' and `CLOCKSUM_T' columns +are special, they lists the sums of CLOCK intervals in the subtree, +either for all clocks or just for today. + + ---------- Footnotes ---------- + + (1) Please note that the COLUMNS definition must be on a single +line--it is wrapped here only because of formatting constraints. + + +File: org, Node: Using column view, Next: Capturing column view, Prev: Defining columns, Up: Column view + +7.5.2 Using column view +----------------------- + +Turning column view on and off +.............................. + +`C-c C-x C-c (`org-columns')' + Turn on column view. If the cursor is before the first headline + in the file, column view is turned on for the entire file, using + the `#+COLUMNS' definition. If the cursor is somewhere inside the + outline, this command searches the hierarchy, up from point, for a + `:COLUMNS:' property that defines a format. When one is found, + the column view table is established for the tree starting at the + entry that contains the `:COLUMNS:' property. If no such property + is found, the format is taken from the `#+COLUMNS' line or from + the variable `org-columns-default-format', and column view is + established for the current entry and its subtree. + +`r (`org-columns-redo')' + Recreate the column view, to include recent changes made in the + buffer. + +`g (`org-columns-redo')' + Same as `r'. + +`q (`org-columns-quit')' + Exit column view. + +Editing values +.............. + +` ' + Move through the column view from field to field. + +`S-/' + Switch to the next/previous allowed value of the field. For this, + you have to have specified allowed values for a property. + +`1..9,0' + Directly select the Nth allowed value, `0' selects the 10th value. + +`n (`org-columns-next-allowed-value')' +`p (`org-columns-previous-allowed-value')' + Same as `S-/' + +`e (`org-columns-edit-value')' + Edit the property at point. For the special properties, this will + invoke the same interface that you normally use to change that + property. For example, when editing a TAGS property, the tag + completion or fast selection interface will pop up. + +`C-c C-c (`org-columns-set-tags-or-toggle')' + When there is a checkbox at point, toggle it. + +`v (`org-columns-show-value')' + View the full value of this property. This is useful if the width + of the column is smaller than that of the value. + +`a (`org-columns-edit-allowed')' + Edit the list of allowed values for this property. If the list is + found in the hierarchy, the modified values is stored there. If + no list is found, the new value is stored in the first entry that + is part of the current column view. + +Modifying the table structure +............................. + +`< (`org-columns-narrow')' +`> (`org-columns-widen')' + Make the column narrower/wider by one character. + +`S-M- (`org-columns-new')' + Insert a new column, to the left of the current column. + +`S-M- (`org-columns-delete')' + Delete the current column. + + +File: org, Node: Capturing column view, Prev: Using column view, Up: Column view + +7.5.3 Capturing column view +--------------------------- + +Since column view is just an overlay over a buffer, it cannot be +exported or printed directly. If you want to capture a column view, use +a `columnview' dynamic block (*note Dynamic blocks::). The frame of +this block looks like this: + + * The column view + #+BEGIN: columnview :hlines 1 :id "label" + + #+END: + +This dynamic block has the following parameters: + +`:id' + This is the most important parameter. Column view is a feature + that is often localized to a certain (sub)tree, and the capture + block might be at a different location in the file. To identify + the tree whose view to capture, you can use 4 values: + local use the tree in which the capture block is located + global make a global view, including all headings in the file + "file:PATH-TO-FILE" + run column view at the top of this file + "ID" call column view in the tree that has an `:ID:' + property with the value label. You can use + `M-x org-id-copy RET' to create a globally unique ID for + the current entry and copy it to the kill-ring. + +`:hlines' + When `t', insert an hline after every line. When a number N, + insert an hline before each headline with level `<= N'. + +`:vlines' + When set to `t', force column groups to get vertical lines. + +`:maxlevel' + When set to a number, don't capture entries below this level. + +`:skip-empty-rows' + When set to `t', skip rows where the only non-empty specifier of + the column view is `ITEM'. + + +The following commands insert or update the dynamic block: + +`C-c C-x i (`org-insert-columns-dblock')' + Insert a dynamic block capturing a column view. You will be + prompted for the scope or ID of the view. + +`C-c C-c or C-c C-x C-u (`org-dblock-update')' + Update dynamic block at point. The cursor needs to be in the + `#+BEGIN' line of the dynamic block. + +`C-u C-c C-x C-u (`org-update-all-dblocks')' + Update all dynamic blocks (*note Dynamic blocks::). This is + useful if you have several clock table blocks, column-capturing + blocks or other dynamic blocks in a buffer. + + You can add formulas to the column view table and you may add +plotting instructions in front of the table--these will survive an +update of the block. If there is a `#+TBLFM:' after the table, the +table will actually be recalculated automatically after an update. + + An alternative way to capture and process property values into a +table is provided by Eric Schulte's `org-collector.el' which is a +contributed package(1). It provides a general API to collect +properties from entries in a certain scope, and arbitrary Lisp +expressions to process these values before inserting them into a table +or a dynamic block. + + ---------- Footnotes ---------- + + (1) Contributed packages are not part of Emacs, but are distributed +with the main distribution of Org (visit `http://orgmode.org'). + + +File: org, Node: Property API, Prev: Column view, Up: Properties and Columns + +7.6 The Property API +==================== + +There is a full API for accessing and changing properties. This API can +be used by Emacs Lisp programs to work with properties and to implement +features based on them. For more information see *note Using the +property API::. + + +File: org, Node: Dates and Times, Next: Capture - Refile - Archive, Prev: Properties and Columns, Up: Top + +8 Dates and times +***************** + +To assist project planning, TODO items can be labeled with a date and/or +a time. The specially formatted string carrying the date and time +information is called a _timestamp_ in Org mode. This may be a little +confusing because timestamp is often used as indicating when something +was created or last changed. However, in Org mode this term is used in +a much wider sense. + +* Menu: + +* Timestamps:: Assigning a time to a tree entry +* Creating timestamps:: Commands which insert timestamps +* Deadlines and scheduling:: Planning your work +* Clocking work time:: Tracking how long you spend on a task +* Effort estimates:: Planning work effort in advance +* Relative timer:: Notes with a running timer +* Countdown timer:: Starting a countdown timer for a task + + +File: org, Node: Timestamps, Next: Creating timestamps, Prev: Dates and Times, Up: Dates and Times + +8.1 Timestamps, deadlines, and scheduling +========================================= + +A timestamp is a specification of a date (possibly with a time or a +range of times) in a special format, either `<2003-09-16 Tue>'(1) or +`<2003-09-16 Tue 09:39>' or `<2003-09-16 Tue 12:00-12:30>'(2). A +timestamp can appear anywhere in the headline or body of an Org tree +entry. Its presence causes entries to be shown on specific dates in the +agenda (*note Weekly/daily agenda::). We distinguish: + +PLAIN TIMESTAMP; EVENT; APPOINTMENT + A simple timestamp just assigns a date/time to an item. This is + just like writing down an appointment or event in a paper agenda. + In the timeline and agenda displays, the headline of an entry + associated with a plain timestamp will be shown exactly on that + date. + + * Meet Peter at the movies + <2006-11-01 Wed 19:15> + * Discussion on climate change + <2006-11-02 Thu 20:00-22:00> + +TIMESTAMP WITH REPEATER INTERVAL + A timestamp may contain a _repeater interval_, indicating that it + applies not only on the given date, but again and again after a + certain interval of N days (d), weeks (w), months (m), or years + (y). The following will show up in the agenda every Wednesday: + + * Pick up Sam at school + <2007-05-16 Wed 12:30 +1w> + +DIARY-STYLE SEXP ENTRIES + For more complex date specifications, Org mode supports using the + special sexp diary entries implemented in the Emacs calendar/diary + package(3). For example with optional time + + * 22:00-23:00 The nerd meeting on every 2nd Thursday of the month + <%%(diary-float t 4 2)> + +TIME/DATE RANGE + Two timestamps connected by `--' denote a range. The headline + will be shown on the first and last day of the range, and on any + dates that are displayed and fall in the range. Here is an + example: + + ** Meeting in Amsterdam + <2004-08-23 Mon>--<2004-08-26 Thu> + +INACTIVE TIMESTAMP + Just like a plain timestamp, but with square brackets instead of + angular ones. These timestamps are inactive in the sense that + they do _not_ trigger an entry to show up in the agenda. + + * Gillian comes late for the fifth time + [2006-11-01 Wed] + + + ---------- Footnotes ---------- + + (1) In this simplest form, the day name is optional when you type +the date yourself. However, any dates inserted or modified by Org will +add that day name, for reading convenience. + + (2) This is inspired by the standard ISO 8601 date/time format. To +use an alternative format, see *note Custom time format::. + + (3) When working with the standard diary sexp functions, you need to +be very careful with the order of the arguments. That order depend +evilly on the variable `calendar-date-style' (or, for older Emacs +versions, `european-calendar-style'). For example, to specify a date +December 12, 2005, the call might look like `(diary-date 12 1 2005)' or +`(diary-date 1 12 2005)' or `(diary-date 2005 12 1)', depending on the +settings. This has been the source of much confusion. Org mode users +can resort to special versions of these functions like `org-date' or +`org-anniversary'. These work just like the corresponding `diary-' +functions, but with stable ISO order of arguments (year, month, day) +wherever applicable, independent of the value of `calendar-date-style'. + + +File: org, Node: Creating timestamps, Next: Deadlines and scheduling, Prev: Timestamps, Up: Dates and Times + +8.2 Creating timestamps +======================= + +For Org mode to recognize timestamps, they need to be in the specific +format. All commands listed below produce timestamps in the correct +format. + +`C-c . (`org-time-stamp')' + Prompt for a date and insert a corresponding timestamp. When the + cursor is at an existing timestamp in the buffer, the command is + used to modify this timestamp instead of inserting a new one. + When this command is used twice in succession, a time range is + inserted. + +`C-c ! (`org-time-stamp-inactive')' + Like `C-c .', but insert an inactive timestamp that will not cause + an agenda entry. + +`C-u C-c .' +`C-u C-c !' + Like `C-c .' and `C-c !', but use the alternative format which + contains date and time. The default time can be rounded to + multiples of 5 minutes, see the option + `org-time-stamp-rounding-minutes'. + +`C-c C-c' + Normalize timestamp, insert/fix day name if missing or wrong. + +`C-c < (`org-date-from-calendar')' + Insert a timestamp corresponding to the cursor date in the + Calendar. + +`C-c > (`org-goto-calendar')' + Access the Emacs calendar for the current date. If there is a + timestamp in the current line, go to the corresponding date + instead. + +`C-c C-o (`org-open-at-point')' + Access the agenda for the date given by the timestamp or -range at + point (*note Weekly/daily agenda::). + +`S- (`org-timestamp-down-day')' +`S- (`org-timestamp-up-day')' + Change date at cursor by one day. These key bindings conflict with + shift-selection and related modes (*note Conflicts::). + +`S- (`org-timestamp-up')' +`S- (`org-timestamp-down-down')' + Change the item under the cursor in a timestamp. The cursor can + be on a year, month, day, hour or minute. When the timestamp + contains a time range like `15:30-16:30', modifying the first time + will also shift the second, shifting the time block with constant + length. To change the length, modify the second time. Note that + if the cursor is in a headline and not at a timestamp, these same + keys modify the priority of an item. (*note Priorities::). The + key bindings also conflict with shift-selection and related modes + (*note Conflicts::). + +`C-c C-y (`org-evaluate-time-range')' + Evaluate a time range by computing the difference between start + and end. With a prefix argument, insert result after the time + range (in a table: into the following column). + +* Menu: + +* The date/time prompt:: How Org mode helps you entering date and time +* Custom time format:: Making dates look different + + +File: org, Node: The date/time prompt, Next: Custom time format, Prev: Creating timestamps, Up: Creating timestamps + +8.2.1 The date/time prompt +-------------------------- + +When Org mode prompts for a date/time, the default is shown in default +date/time format, and the prompt therefore seems to ask for a specific +format. But it will in fact accept date/time information in a variety +of formats. Generally, the information should start at the beginning +of the string. Org mode will find whatever information is in there and +derive anything you have not specified from the _default date and +time_. The default is usually the current date and time, but when +modifying an existing timestamp, or when entering the second stamp of a +range, it is taken from the stamp in the buffer. When filling in +information, Org mode assumes that most of the time you will want to +enter a date in the future: if you omit the month/year and the given +day/month is before today, it will assume that you mean a future +date(1). If the date has been automatically shifted into the future, +the time prompt will show this with `(=>F).' + + For example, let's assume that today is June 13, 2006. Here is how +various inputs will be interpreted, the items filled in by Org mode are +in bold. + + 3-2-5 => 2003-02-05 + 2/5/3 => 2003-02-05 + 14 => 2006-06-14 + 12 => 2006-07-12 + 2/5 => 2007-02-05 + Fri => nearest Friday after the default date + sep 15 => 2006-09-15 + feb 15 => 2007-02-15 + sep 12 9 => 2009-09-12 + 12:45 => 2006-06-13 12:45 + 22 sept 0:34 => 2006-09-22 0:34 + w4 => ISO week for of the current year 2006 + 2012 w4 fri => Friday of ISO week 4 in 2012 + 2012-w04-5 => Same as above + + Furthermore you can specify a relative date by giving, as the _first_ +thing in the input: a plus/minus sign, a number and a letter ([hdwmy]) +to indicate change in hours, days, weeks, months, or years. With a +single plus or minus, the date is always relative to today. With a +double plus or minus, it is relative to the default date. If instead +of a single letter, you use the abbreviation of day name, the date will +be the Nth such day, e.g.: + + +0 => today + . => today + +4d => four days from today + +4 => same as above + +2w => two weeks from today + ++5 => five days from default date + +2tue => second Tuesday from now + -wed => last Wednesday + + The function understands English month and weekday abbreviations. If +you want to use unabbreviated names and/or other languages, configure +the variables `parse-time-months' and `parse-time-weekdays'. + + Not all dates can be represented in a given Emacs implementation. +By default Org mode forces dates into the compatibility range 1970-2037 +which works on all Emacs implementations. If you want to use dates +outside of this range, read the docstring of the variable +`org-read-date-force-compatible-dates'. + + You can specify a time range by giving start and end times or by +giving a start time and a duration (in HH:MM format). Use one or two +dash(es) as the separator in the former case and use '+' as the +separator in the latter case, e.g.: + + 11am-1:15pm => 11:00-13:15 + 11am--1:15pm => same as above + 11am+2:15 => same as above + + Parallel to the minibuffer prompt, a calendar is popped up(2). When +you exit the date prompt, either by clicking on a date in the calendar, +or by pressing , the date selected in the calendar will be +combined with the information entered at the prompt. You can control +the calendar fully from the minibuffer: + + Choose date at cursor in calendar. + mouse-1 Select date by clicking on it. + S-/ One day forward/backward. + S-/ One week forward/backward. + M-S-/ One month forward/backward. + > / < Scroll calendar forward/backward by one month. + M-v / C-v Scroll calendar forward/backward by 3 months. + + The actions of the date/time prompt may seem complex, but I assure +you they will grow on you, and you will start getting annoyed by pretty +much any other way of entering a date/time out there. To help you +understand what is going on, the current interpretation of your input +will be displayed live in the minibuffer(3). + + ---------- Footnotes ---------- + + (1) See the variable `org-read-date-prefer-future'. You may set +that variable to the symbol `time' to even make a time before now shift +the date to tomorrow. + + (2) If you don't need/want the calendar, configure the variable +`org-popup-calendar-for-date-prompt'. + + (3) If you find this distracting, turn the display off with +`org-read-date-display-live'. + + +File: org, Node: Custom time format, Prev: The date/time prompt, Up: Creating timestamps + +8.2.2 Custom time format +------------------------ + +Org mode uses the standard ISO notation for dates and times as it is +defined in ISO 8601. If you cannot get used to this and require another +representation of date and time to keep you happy, you can get it by +customizing the options `org-display-custom-times' and +`org-time-stamp-custom-formats'. + +`C-c C-x C-t (`org-toggle-time-stamp-overlays')' + Toggle the display of custom formats for dates and times. + +Org mode needs the default format for scanning, so the custom date/time +format does not _replace_ the default format--instead it is put _over_ +the default format using text properties. This has the following +consequences: + * You cannot place the cursor onto a timestamp anymore, only before + or after. + + * The `S-/' keys can no longer be used to adjust each + component of a timestamp. If the cursor is at the beginning of + the stamp, `S-/' will change the stamp by one day, just + like `S-/'. At the end of the stamp, the time will + be changed by one minute. + + * If the timestamp contains a range of clock times or a repeater, + these will not be overlaid, but remain in the buffer as they were. + + * When you delete a timestamp character-by-character, it will only + disappear from the buffer after _all_ (invisible) characters + belonging to the ISO timestamp have been removed. + + * If the custom timestamp format is longer than the default and you + are using dates in tables, table alignment will be messed up. If + the custom format is shorter, things do work as expected. + + +File: org, Node: Deadlines and scheduling, Next: Clocking work time, Prev: Creating timestamps, Up: Dates and Times + +8.3 Deadlines and scheduling +============================ + +A timestamp may be preceded by special keywords to facilitate planning: + +DEADLINE + Meaning: the task (most likely a TODO item, though not + necessarily) is supposed to be finished on that date. + + On the deadline date, the task will be listed in the agenda. In + addition, the agenda for _today_ will carry a warning about the + approaching or missed deadline, starting + `org-deadline-warning-days' before the due date, and continuing + until the entry is marked DONE. An example: + + *** TODO write article about the Earth for the Guide + DEADLINE: <2004-02-29 Sun> + The editor in charge is [[bbdb:Ford Prefect]] + + You can specify a different lead time for warnings for a specific + deadlines using the following syntax. Here is an example with a + warning period of 5 days `DEADLINE: <2004-02-29 Sun -5d>'. This + warning is deactivated if the task get scheduled and you set + `org-agenda-skip-deadline-prewarning-if-scheduled' to `t'. + +SCHEDULED + Meaning: you are planning to start working on that task on the + given date. + + The headline will be listed under the given date(1). In addition, + a reminder that the scheduled date has passed will be present in + the compilation for _today_, until the entry is marked DONE, i.e., + the task will automatically be forwarded until completed. + + *** TODO Call Trillian for a date on New Years Eve. + SCHEDULED: <2004-12-25 Sat> + + If you want to _delay_ the display of this task in the agenda, use + `SCHEDULED: <2004-12-25 Sat -2d>': the task is still scheduled on + the 25th but will appear two days later. In case the task + contains a repeater, the delay is considered to affect all + occurrences; if you want the delay to only affect the first + scheduled occurrence of the task, use `--2d' instead. See + `org-scheduled-delay-days' and + `org-agenda-skip-scheduled-delay-if-deadline' for details on how to + control this globally or per agenda. + + Important: Scheduling an item in Org mode should not be understood + in the same way that we understand scheduling a meeting. Setting + a date for a meeting is just a simple appointment, you should mark + this entry with a simple plain timestamp, to get this item shown + on the date where it applies. This is a frequent misunderstanding + by Org users. In Org mode, scheduling means setting a date when + you want to start working on an action item. + + You may use timestamps with repeaters in scheduling and deadline +entries. Org mode will issue early and late warnings based on the +assumption that the timestamp represents the nearest instance of the +repeater. However, the use of diary sexp entries like `<%%(diary-float +t 42)>' in scheduling and deadline timestamps is limited. Org mode +does not know enough about the internals of each sexp function to issue +early and late warnings. However, it will show the item on each day +where the sexp entry matches. + +* Menu: + +* Inserting deadline/schedule:: Planning items +* Repeated tasks:: Items that show up again and again + + ---------- Footnotes ---------- + + (1) It will still be listed on that date after it has been marked +DONE. If you don't like this, set the variable +`org-agenda-skip-scheduled-if-done'. + + +File: org, Node: Inserting deadline/schedule, Next: Repeated tasks, Prev: Deadlines and scheduling, Up: Deadlines and scheduling + +8.3.1 Inserting deadlines or schedules +-------------------------------------- + +The following commands allow you to quickly insert(1) a deadline or to +schedule an item: + +`C-c C-d (`org-deadline')' + Insert `DEADLINE' keyword along with a stamp. The insertion will + happen in the line directly following the headline. Any CLOSED + timestamp will be removed. When called with a prefix arg, an + existing deadline will be removed from the entry. Depending on + the variable `org-log-redeadline'(2), a note will be taken when + changing an existing deadline. + +`C-c C-s (`org-schedule')' + Insert `SCHEDULED' keyword along with a stamp. The insertion will + happen in the line directly following the headline. Any CLOSED + timestamp will be removed. When called with a prefix argument, + remove the scheduling date from the entry. Depending on the + variable `org-log-reschedule'(3), a note will be taken when + changing an existing scheduling time. + +`C-c C-x C-k (`org-mark-entry-for-agenda-action')' + Mark the current entry for agenda action. After you have marked + the entry like this, you can open the agenda or the calendar to + find an appropriate date. With the cursor on the selected date, + press `k s' or `k d' to schedule the marked item. + +`C-c / d (`org-check-deadlines')' + Create a sparse tree with all deadlines that are either past-due, + or which will become due within `org-deadline-warning-days'. With + `C-u' prefix, show all deadlines in the file. With a numeric + prefix, check that many days. For example, `C-1 C-c / d' shows + all deadlines due tomorrow. + +`C-c / b (`org-check-before-date')' + Sparse tree for deadlines and scheduled items before a given date. + +`C-c / a (`org-check-after-date')' + Sparse tree for deadlines and scheduled items after a given date. + + Note that `org-schedule' and `org-deadline' supports setting the +date by indicating a relative time: e.g., +1d will set the date to the +next day after today, and -1w will set the date to the previous week +before any current timestamp. + + ---------- Footnotes ---------- + + (1) The `SCHEDULED' and `DEADLINE' dates are inserted on the line +right below the headline. Don't put any text between this line and the +headline. + + (2) with corresponding `#+STARTUP' keywords `logredeadline', +`lognoteredeadline', and `nologredeadline' + + (3) with corresponding `#+STARTUP' keywords `logreschedule', +`lognotereschedule', and `nologreschedule' + + +File: org, Node: Repeated tasks, Prev: Inserting deadline/schedule, Up: Deadlines and scheduling + +8.3.2 Repeated tasks +-------------------- + +Some tasks need to be repeated again and again. Org mode helps to +organize such tasks using a so-called repeater in a DEADLINE, SCHEDULED, +or plain timestamp. In the following example + ** TODO Pay the rent + DEADLINE: <2005-10-01 Sat +1m> + the `+1m' is a repeater; the intended interpretation is that the task +has a deadline on <2005-10-01> and repeats itself every (one) month +starting from that time. You can use yearly, monthly, weekly, daily +and hourly repeat cookies by using the `y/w/m/d/h' letters. If you +need both a repeater and a special warning period in a deadline entry, +the repeater should come first and the warning period last: `DEADLINE: +<2005-10-01 Sat +1m -3d>'. + + Deadlines and scheduled items produce entries in the agenda when +they are over-due, so it is important to be able to mark such an entry +as completed once you have done so. When you mark a DEADLINE or a +SCHEDULE with the TODO keyword DONE, it will no longer produce entries +in the agenda. The problem with this is, however, that then also the +_next_ instance of the repeated entry will not be active. Org mode +deals with this in the following way: When you try to mark such an +entry DONE (using `C-c C-t'), it will shift the base date of the +repeating timestamp by the repeater interval, and immediately set the +entry state back to TODO(1). In the example above, setting the state +to DONE would actually switch the date like this: + + ** TODO Pay the rent + DEADLINE: <2005-11-01 Tue +1m> + + A timestamp(2) will be added under the deadline, to keep a record +that you actually acted on the previous instance of this deadline. + + As a consequence of shifting the base date, this entry will no +longer be visible in the agenda when checking past dates, but all +future instances will be visible. + + With the `+1m' cookie, the date shift will always be exactly one +month. So if you have not paid the rent for three months, marking this +entry DONE will still keep it as an overdue deadline. Depending on the +task, this may not be the best way to handle it. For example, if you +forgot to call your father for 3 weeks, it does not make sense to call +him 3 times in a single day to make up for it. Finally, there are tasks +like changing batteries which should always repeat a certain time after +the last time you did it. For these tasks, Org mode has special +repeaters `++' and `.+'. For example: + + ** TODO Call Father + DEADLINE: <2008-02-10 Sun ++1w> + Marking this DONE will shift the date by at least one week, + but also by as many weeks as it takes to get this date into + the future. However, it stays on a Sunday, even if you called + and marked it done on Saturday. + ** TODO Check the batteries in the smoke detectors + DEADLINE: <2005-11-01 Tue .+1m> + Marking this DONE will shift the date to one month after + today. + + You may have both scheduling and deadline information for a specific +task. If the repeater is set for the scheduling information only, you +probably want the repeater to be ignored after the deadline. If so, +set the variable `org-agenda-skip-scheduled-if-deadline-is-shown' to +`repeated-after-deadline'. If you want both scheduling and deadline +information to repeat after the same interval, set the same repeater +for both timestamps. + + An alternative to using a repeater is to create a number of copies +of a task subtree, with dates shifted in each copy. The command `C-c +C-x c' was created for this purpose, it is described in *note Structure +editing::. + + ---------- Footnotes ---------- + + (1) In fact, the target state is taken from, in this sequence, the +`REPEAT_TO_STATE' property or the variable `org-todo-repeat-to-state'. +If neither of these is specified, the target state defaults to the +first state of the TODO state sequence. + + (2) You can change this using the option `org-log-repeat', or the +`#+STARTUP' options `logrepeat', `lognoterepeat', and `nologrepeat'. +With `lognoterepeat', you will also be prompted for a note. + + +File: org, Node: Clocking work time, Next: Effort estimates, Prev: Deadlines and scheduling, Up: Dates and Times + +8.4 Clocking work time +====================== + +Org mode allows you to clock the time you spend on specific tasks in a +project. When you start working on an item, you can start the clock. +When you stop working on that task, or when you mark the task done, the +clock is stopped and the corresponding time interval is recorded. It +also computes the total time spent on each subtree(1) of a project. +And it remembers a history or tasks recently clocked, to that you can +jump quickly between a number of tasks absorbing your time. + + To save the clock history across Emacs sessions, use + (setq org-clock-persist 'history) + (org-clock-persistence-insinuate) + When you clock into a new task after resuming Emacs, the incomplete +clock(2) will be found (*note Resolving idle time::) and you will be +prompted about what to do with it. + +* Menu: + +* Clocking commands:: Starting and stopping a clock +* The clock table:: Detailed reports +* Resolving idle time:: Resolving time when you've been idle + + ---------- Footnotes ---------- + + (1) Clocking only works if all headings are indented with less than +30 stars. This is a hardcoded limitation of `lmax' in `org-clock-sum'. + + (2) To resume the clock under the assumption that you have worked on +this task while outside Emacs, use `(setq org-clock-persist t)'. + + +File: org, Node: Clocking commands, Next: The clock table, Prev: Clocking work time, Up: Clocking work time + +8.4.1 Clocking commands +----------------------- + +`C-c C-x C-i (`org-clock-in')' + Start the clock on the current item (clock-in). This inserts the + CLOCK keyword together with a timestamp. If this is not the first + clocking of this item, the multiple CLOCK lines will be wrapped + into a `:LOGBOOK:' drawer (see also the variable + `org-clock-into-drawer'). You can also overrule the setting of + this variable for a subtree by setting a `CLOCK_INTO_DRAWER' or + `LOG_INTO_DRAWER' property. When called with a `C-u' prefix + argument, select the task from a list of recently clocked tasks. + With two `C-u C-u' prefixes, clock into the task at point and mark + it as the default task; the default task will then always be + available with letter `d' when selecting a clocking task. With + three `C-u C-u C-u' prefixes, force continuous clocking by + starting the clock when the last clock stopped. + While the clock is running, the current clocking time is shown in + the mode line, along with the title of the task. The clock time + shown will be all time ever clocked for this task and its + children. If the task has an effort estimate (*note Effort + estimates::), the mode line displays the current clocking time + against it(1) If the task is a repeating one (*note Repeated + tasks::), only the time since the last reset of the task (2) will + be shown. More control over what time is shown can be exercised + with the `CLOCK_MODELINE_TOTAL' property. It may have the values + `current' to show only the current clocking instance, `today' to + show all time clocked on this tasks today (see also the variable + `org-extend-today-until'), `all' to include all time, or `auto' + which is the default(3). + Clicking with `mouse-1' onto the mode line entry will pop up a + menu with clocking options. + +`C-c C-x C-o (`org-clock-out')' + Stop the clock (clock-out). This inserts another timestamp at the + same location where the clock was last started. It also directly + computes the resulting time in inserts it after the time range as + `=> HH:MM'. See the variable `org-log-note-clock-out' for the + possibility to record an additional note together with the + clock-out timestamp(4). + +`C-c C-x C-x (`org-clock-in-last')' + Reclock the last clocked task. With one `C-u' prefix argument, + select the task from the clock history. With two `C-u' prefixes, + force continuous clocking by starting the clock when the last clock + stopped. + +`C-c C-x C-e (`org-clock-modify-effort-estimate')' + Update the effort estimate for the current clock task. + +`C-c C-c or C-c C-y (`org-evaluate-time-range')' + Recompute the time interval after changing one of the timestamps. + This is only necessary if you edit the timestamps directly. If + you change them with `S-' keys, the update is automatic. + +`C-S- (`org-clock-timestamps-up/down')' + On `CLOCK' log lines, increase/decrease both timestamps so that the + clock duration keeps the same. + +`S-M- (`org-timestamp-up/down')' + On `CLOCK' log lines, increase/decrease the timestamp at point and + the one of the previous (or the next clock) timestamp by the same + duration. For example, if you hit `S-M-' to increase a + clocked-out timestamp by five minutes, then the clocked-in + timestamp of the next clock will be increased by five minutes. + +`C-c C-t (`org-todo')' + Changing the TODO state of an item to DONE automatically stops the + clock if it is running in this same item. + +`C-c C-x C-q (`org-clock-cancel')' + Cancel the current clock. This is useful if a clock was started by + mistake, or if you ended up working on something else. + +`C-c C-x C-j (`org-clock-goto')' + Jump to the headline of the currently clocked in task. With a + `C-u' prefix arg, select the target task from a list of recently + clocked tasks. + +`C-c C-x C-d (`org-clock-display')' + Display time summaries for each subtree in the current buffer. + This puts overlays at the end of each headline, showing the total + time recorded under that heading, including the time of any + subheadings. You can use visibility cycling to study the tree, + but the overlays disappear when you change the buffer (see + variable `org-remove-highlights-with-change') or press `C-c C-c'. + + The `l' key may be used in the timeline (*note Timeline::) and in +the agenda (*note Weekly/daily agenda::) to show which tasks have been +worked on or closed during a day. + + *Important:* note that both `org-clock-out' and `org-clock-in-last' +can have a global keybinding and will not modify the window disposition. + + ---------- Footnotes ---------- + + (1) To add an effort estimate "on the fly", hook a function doing +this to `org-clock-in-prepare-hook'. + + (2) as recorded by the `LAST_REPEAT' property + + (3) See also the variable `org-clock-modeline-total'. + + (4) The corresponding in-buffer setting is: `#+STARTUP: +lognoteclock-out' + + +File: org, Node: The clock table, Next: Resolving idle time, Prev: Clocking commands, Up: Clocking work time + +8.4.2 The clock table +--------------------- + +Org mode can produce quite complex reports based on the time clocking +information. Such a report is called a _clock table_, because it is +formatted as one or several Org tables. + +`C-c C-x C-r (`org-clock-report')' + Insert a dynamic block (*note Dynamic blocks::) containing a clock + report as an Org mode table into the current file. When the + cursor is at an existing clock table, just update it. When called + with a prefix argument, jump to the first clock report in the + current document and update it. The clock table always includes + also trees with `:ARCHIVE:' tag. + +`C-c C-c or C-c C-x C-u (`org-dblock-update')' + Update dynamic block at point. The cursor needs to be in the + `#+BEGIN' line of the dynamic block. + +`C-u C-c C-x C-u' + Update all dynamic blocks (*note Dynamic blocks::). This is + useful if you have several clock table blocks in a buffer. + +`S-' +`S- (`org-clocktable-try-shift')' + Shift the current `:block' interval and update the table. The + cursor needs to be in the `#+BEGIN: clocktable' line for this + command. If `:block' is `today', it will be shifted to `today-1' + etc. + + Here is an example of the frame for a clock table as it is inserted +into the buffer with the `C-c C-x C-r' command: + + #+BEGIN: clocktable :maxlevel 2 :emphasize nil :scope file + #+END: clocktable + The `BEGIN' line and specify a number of options to define the scope, +structure, and formatting of the report. Defaults for all these +options can be configured in the variable `org-clocktable-defaults'. + +First there are options that determine which clock entries are to be +selected: + :maxlevel Maximum level depth to which times are listed in the table. + Clocks at deeper levels will be summed into the upper level. + :scope The scope to consider. This can be any of the following: + nil the current buffer or narrowed region + file the full current buffer + subtree the subtree where the clocktable is located + treeN the surrounding level N tree, for example `tree3' + tree the surrounding level 1 tree + agenda all agenda files + ("file"..) scan these files + file-with-archives current file and its archives + agenda-with-archives all agenda files, including archives + :block The time block to consider. This block is specified either + absolute, or relative to the current time and may be any of + these formats: + 2007-12-31 New year eve 2007 + 2007-12 December 2007 + 2007-W50 ISO-week 50 in 2007 + 2007-Q2 2nd quarter in 2007 + 2007 the year 2007 + today, yesterday, today-N a relative day + thisweek, lastweek, thisweek-N a relative week + thismonth, lastmonth, thismonth-N a relative month + thisyear, lastyear, thisyear-N a relative year + Use `S-/' keys to shift the time interval. + :tstart A time string specifying when to start considering times. + Relative times like `"<-2w>"' can also be used. See + *note Matching tags and properties:: for relative time syntax. + :tend A time string specifying when to stop considering times. + Relative times like `""' can also be used. See + *note Matching tags and properties:: for relative time syntax. + :wstart The starting day of the week. The default is 1 for monday. + :mstart The starting day of the month. The default 1 is for the first + day of the month. + :step `week' or `day', to split the table into chunks. + To use this, `:block' or `:tstart', `:tend' are needed. + :stepskip0 Do not show steps that have zero time. + :fileskip0 Do not show table sections from files which did not contribute. + :tags A tags match to select entries that should contribute. See + *note Matching tags and properties:: for the match syntax. + + Then there are options which determine the formatting of the table. +There options are interpreted by the function +`org-clocktable-write-default', but you can specify your own function +using the `:formatter' parameter. + :emphasize When `t', emphasize level one and level two items. + :lang Language(1) to use for descriptive cells like "Task". + :link Link the item headlines in the table to their origins. + :narrow An integer to limit the width of the headline column in + the org table. If you write it like `50!', then the + headline will also be shortened in export. + :indent Indent each headline field according to its level. + :tcolumns Number of columns to be used for times. If this is smaller + than `:maxlevel', lower levels will be lumped into one column. + :level Should a level number column be included? + :compact Abbreviation for `:level nil :indent t :narrow 40! :tcolumns 1' + All are overwritten except if there is an explicit `:narrow' + :timestamp A timestamp for the entry, when available. Look for SCHEDULED, + DEADLINE, TIMESTAMP and TIMESTAMP_IA, in this order. + :properties List of properties that should be shown in the table. Each + property will get its own column. + :inherit-props When this flag is `t', the values for `:properties' will be inherited. + :formula Content of a `#+TBLFM' line to be added and evaluated. + As a special case, `:formula %' adds a column with % time. + If you do not specify a formula here, any existing formula + below the clock table will survive updates and be evaluated. + :formatter A function to format clock data and insert it into the buffer. + To get a clock summary of the current level 1 tree, for the current +day, you could write + #+BEGIN: clocktable :maxlevel 2 :block today :scope tree1 :link t + #+END: clocktable + and to use a specific time range you could write(2) + #+BEGIN: clocktable :tstart "<2006-08-10 Thu 10:00>" + :tend "<2006-08-10 Thu 12:00>" + #+END: clocktable + A range starting a week ago and ending right now could be written as + #+BEGIN: clocktable :tstart "<-1w>" :tend "" + #+END: clocktable + A summary of the current subtree with % times would be + #+BEGIN: clocktable :scope subtree :link t :formula % + #+END: clocktable + A horizontally compact representation of everything clocked during +last week would be + #+BEGIN: clocktable :scope agenda :block lastweek :compact t + #+END: clocktable + + ---------- Footnotes ---------- + + (1) Language terms can be set through the variable +`org-clock-clocktable-language-setup'. + + (2) Note that all parameters must be specified in a single line--the +line is broken here only to fit it into the manual. + + +File: org, Node: Resolving idle time, Prev: The clock table, Up: Clocking work time + +8.4.3 Resolving idle time and continuous clocking +------------------------------------------------- + +Resolving idle time +................... + +If you clock in on a work item, and then walk away from your +computer--perhaps to take a phone call--you often need to "resolve" the +time you were away by either subtracting it from the current clock, or +applying it to another one. + + By customizing the variable `org-clock-idle-time' to some integer, +such as 10 or 15, Emacs can alert you when you get back to your +computer after being idle for that many minutes(1), and ask what you +want to do with the idle time. There will be a question waiting for +you when you get back, indicating how much idle time has passed +(constantly updated with the current amount), as well as a set of +choices to correct the discrepancy: + +`k' + To keep some or all of the minutes and stay clocked in, press `k'. + Org will ask how many of the minutes to keep. Press to keep + them all, effectively changing nothing, or enter a number to keep + that many minutes. + +`K' + If you use the shift key and press `K', it will keep however many + minutes you request and then immediately clock out of that task. + If you keep all of the minutes, this is the same as just clocking + out of the current task. + +`s' + To keep none of the minutes, use `s' to subtract all the away time + from the clock, and then check back in from the moment you + returned. + +`S' + To keep none of the minutes and just clock out at the start of the + away time, use the shift key and press `S'. Remember that using + shift will always leave you clocked out, no matter which option + you choose. + +`C' + To cancel the clock altogether, use `C'. Note that if instead of + canceling you subtract the away time, and the resulting clock + amount is less than a minute, the clock will still be canceled + rather than clutter up the log with an empty entry. + + What if you subtracted those away minutes from the current clock, +and now want to apply them to a new clock? Simply clock in to any task +immediately after the subtraction. Org will notice that you have +subtracted time "on the books", so to speak, and will ask if you want +to apply those minutes to the next task you clock in on. + + There is one other instance when this clock resolution magic occurs. +Say you were clocked in and hacking away, and suddenly your cat chased +a mouse who scared a hamster that crashed into your UPS's power button! +You suddenly lose all your buffers, but thanks to auto-save you still +have your recent Org mode changes, including your last clock in. + + If you restart Emacs and clock into any task, Org will notice that +you have a dangling clock which was never clocked out from your last +session. Using that clock's starting time as the beginning of the +unaccounted-for period, Org will ask how you want to resolve that time. +The logic and behavior is identical to dealing with away time due to +idleness; it is just happening due to a recovery event rather than a +set amount of idle time. + + You can also check all the files visited by your Org agenda for +dangling clocks at any time using `M-x org-resolve-clocks RET' (or `C-c +C-x C-z'). + +Continuous clocking +................... + +You may want to start clocking from the time when you clocked out the +previous task. To enable this systematically, set +`org-clock-continuously' to `t'. Each time you clock in, Org retrieves +the clock-out time of the last clocked entry for this session, and +start the new clock from there. + + If you only want this from time to time, use three universal prefix +arguments with `org-clock-in' and two `C-u C-u' with +`org-clock-in-last'. + + ---------- Footnotes ---------- + + (1) On computers using Mac OS X, idleness is based on actual user +idleness, not just Emacs' idle time. For X11, you can install a +utility program `x11idle.c', available in the `contrib/scripts' +directory of the Org git distribution, or install the `xprintidle' +package and set it to the variable `org-clock-x11idle-program-name' if +you are running Debian, to get the same general treatment of idleness. +On other systems, idle time refers to Emacs idle time only. + + +File: org, Node: Effort estimates, Next: Relative timer, Prev: Clocking work time, Up: Dates and Times + +8.5 Effort estimates +==================== + +If you want to plan your work in a very detailed way, or if you need to +produce offers with quotations of the estimated work effort, you may +want to assign effort estimates to entries. If you are also clocking +your work, you may later want to compare the planned effort with the +actual working time, a great way to improve planning estimates. Effort +estimates are stored in a special property `EFFORT'. You can set the +effort for an entry with the following commands: + +`C-c C-x e (`org-set-effort')' + Set the effort estimate for the current entry. With a numeric + prefix argument, set it to the Nth allowed value (see below). + This command is also accessible from the agenda with the `e' key. + +`C-c C-x C-e (`org-clock-modify-effort-estimate')' + Modify the effort estimate of the item currently being clocked. + + Clearly the best way to work with effort estimates is through column +view (*note Column view::). You should start by setting up discrete +values for effort estimates, and a `COLUMNS' format that displays these +values together with clock sums (if you want to clock your time). For +a specific buffer you can use + + #+PROPERTY: Effort_ALL 0 0:10 0:30 1:00 2:00 3:00 4:00 5:00 6:00 7:00 + #+COLUMNS: %40ITEM(Task) %17Effort(Estimated Effort){:} %CLOCKSUM + +or, even better, you can set up these values globally by customizing the +variables `org-global-properties' and `org-columns-default-format'. In +particular if you want to use this setup also in the agenda, a global +setup may be advised. + + The way to assign estimates to individual items is then to switch to +column mode, and to use `S-' and `S-' to change the value. +The values you enter will immediately be summed up in the hierarchy. +In the column next to it, any clocked time will be displayed. + + If you switch to column view in the daily/weekly agenda, the effort +column will summarize the estimated work effort for each day(1), and +you can use this to find space in your schedule. To get an overview of +the entire part of the day that is committed, you can set the option +`org-agenda-columns-add-appointments-to-effort-sum'. The appointments +on a day that take place over a specified time interval will then also +be added to the load estimate of the day. + + Effort estimates can be used in secondary agenda filtering that is +triggered with the `/' key in the agenda (*note Agenda commands::). If +you have these estimates defined consistently, two or three key presses +will narrow down the list to stuff that fits into an available time +slot. + + ---------- Footnotes ---------- + + (1) Please note the pitfalls of summing hierarchical data in a flat +list (*note Agenda column view::). + + +File: org, Node: Relative timer, Next: Countdown timer, Prev: Effort estimates, Up: Dates and Times + +8.6 Taking notes with a relative timer +====================================== + +When taking notes during, for example, a meeting or a video viewing, it +can be useful to have access to times relative to a starting time. Org +provides such a relative timer and make it easy to create timed notes. + +`C-c C-x . (`org-timer')' + Insert a relative time into the buffer. The first time you use + this, the timer will be started. When called with a prefix + argument, the timer is restarted. + +`C-c C-x - (`org-timer-item')' + Insert a description list item with the current relative time. + With a prefix argument, first reset the timer to 0. + +`M- (`org-insert-heading')' + Once the timer list is started, you can also use `M-' to + insert new timer items. + +`C-c C-x ,' + Pause the timer, or continue it if it is already paused + (`org-timer-pause-or-continue'). + +`C-u C-c C-x ,' + Stop the timer. After this, you can only start a new timer, not + continue the old one. This command also removes the timer from + the mode line. + +`C-c C-x 0 (`org-timer-start')' + Reset the timer without inserting anything into the buffer. By + default, the timer is reset to 0. When called with a `C-u' + prefix, reset the timer to specific starting offset. The user is + prompted for the offset, with a default taken from a timer string + at point, if any, So this can be used to restart taking notes + after a break in the process. When called with a double prefix + argument `C-u C-u', change all timer strings in the active region + by a certain amount. This can be used to fix timer strings if the + timer was not started at exactly the right moment. + + +File: org, Node: Countdown timer, Prev: Relative timer, Up: Dates and Times + +8.7 Countdown timer +=================== + +Calling `org-timer-set-timer' from an Org mode buffer runs a countdown +timer. Use `;' from agenda buffers, everywhere else. + + `org-timer-set-timer' prompts the user for a duration and displays a +countdown timer in the modeline. `org-timer-default-timer' sets the +default countdown value. Giving a prefix numeric argument overrides +this default value. + + +File: org, Node: Capture - Refile - Archive, Next: Agenda Views, Prev: Dates and Times, Up: Top + +9 Capture - Refile - Archive +**************************** + +An important part of any organization system is the ability to quickly +capture new ideas and tasks, and to associate reference material with +them. Org does this using a process called capture. It also can store +files related to a task (attachments) in a special directory. Once in +the system, tasks and projects need to be moved around. Moving +completed project trees to an archive file keeps the system compact and +fast. + +* Menu: + +* Capture:: Capturing new stuff +* Attachments:: Add files to tasks +* RSS Feeds:: Getting input from RSS feeds +* Protocols:: External (e.g., Browser) access to Emacs and Org +* Refile and copy:: Moving/copying a tree from one place to another +* Archiving:: What to do with finished projects + + +File: org, Node: Capture, Next: Attachments, Prev: Capture - Refile - Archive, Up: Capture - Refile - Archive + +9.1 Capture +=========== + +Capture lets you quickly store notes with little interruption of your +work flow. Org's method for capturing new items is heavily inspired by +John Wiegley excellent `remember.el' package. Up to version 6.36, Org +used a special setup for `remember.el', then replaced it with +`org-remember.el'. As of version 8.0, `org-remember.el' has been +completely replaced by `org-capture.el'. + + If your configuration depends on `org-remember.el', you need to +update it and use the setup described below. To convert your +`org-remember-templates', run the command + M-x org-capture-import-remember-templates RET + and then customize the new variable with `M-x customize-variable +org-capture-templates', check the result, and save the customization. + +* Menu: + +* Setting up capture:: Where notes will be stored +* Using capture:: Commands to invoke and terminate capture +* Capture templates:: Define the outline of different note types + + +File: org, Node: Setting up capture, Next: Using capture, Prev: Capture, Up: Capture + +9.1.1 Setting up capture +------------------------ + +The following customization sets a default target file for notes, and +defines a global key(1) for capturing new material. + + (setq org-default-notes-file (concat org-directory "/notes.org")) + (define-key global-map "\C-cc" 'org-capture) + + ---------- Footnotes ---------- + + (1) Please select your own key, `C-c c' is only a suggestion. + + +File: org, Node: Using capture, Next: Capture templates, Prev: Setting up capture, Up: Capture + +9.1.2 Using capture +------------------- + +`C-c c (`org-capture')' + Call the command `org-capture'. Note that this keybinding is + global and not active by default: you need to install it. If you + have templates defined *note Capture templates::, it will offer + these templates for selection or use a new Org outline node as the + default template. It will insert the template into the target + file and switch to an indirect buffer narrowed to this new node. + You may then insert the information you want. + +`C-c C-c (`org-capture-finalize')' + Once you have finished entering information into the capture + buffer, `C-c C-c' will return you to the window configuration + before the capture process, so that you can resume your work + without further distraction. When called with a prefix arg, + finalize and then jump to the captured item. + +`C-c C-w (`org-capture-refile')' + Finalize the capture process by refiling (*note Refile and copy::) + the note to a different place. Please realize that this is a + normal refiling command that will be executed--so the cursor + position at the moment you run this command is important. If you + have inserted a tree with a parent and children, first move the + cursor back to the parent. Any prefix argument given to this + command will be passed on to the `org-refile' command. + +`C-c C-k (`org-capture-kill')' + Abort the capture process and return to the previous state. + + + You can also call `org-capture' in a special way from the agenda, +using the `k c' key combination. With this access, any timestamps +inserted by the selected capture template will default to the cursor +date in the agenda, rather than to the current date. + + To find the locations of the last stored capture, use `org-capture' +with prefix commands: + +`C-u C-c c' + Visit the target location of a capture template. You get to + select the template in the usual way. + +`C-u C-u C-c c' + Visit the last stored capture item in its buffer. + + You can also jump to the bookmark `org-capture-last-stored', which +will automatically be created unless you set `org-capture-bookmark' to +`nil'. + + To insert the capture at point in an Org buffer, call `org-capture' +with a `C-0' prefix argument. + + +File: org, Node: Capture templates, Prev: Using capture, Up: Capture + +9.1.3 Capture templates +----------------------- + +You can use templates for different types of capture items, and for +different target locations. The easiest way to create such templates is +through the customize interface. + +`C-c c C' + Customize the variable `org-capture-templates'. + + Before we give the formal description of template definitions, let's +look at an example. Say you would like to use one template to create +general TODO entries, and you want to put these entries under the +heading `Tasks' in your file `~/org/gtd.org'. Also, a date tree in the +file `journal.org' should capture journal entries. A possible +configuration would look like: + + (setq org-capture-templates + '(("t" "Todo" entry (file+headline "~/org/gtd.org" "Tasks") + "* TODO %?\n %i\n %a") + ("j" "Journal" entry (file+datetree "~/org/journal.org") + "* %?\nEntered on %U\n %i\n %a"))) + +If you then press `C-c c t', Org will prepare the template for you like +this: + * TODO + [[file:LINK TO WHERE YOU INITIATED CAPTURE]] + +During expansion of the template, `%a' has been replaced by a link to +the location from where you called the capture command. This can be +extremely useful for deriving tasks from emails, for example. You fill +in the task definition, press `C-c C-c' and Org returns you to the same +place where you started the capture process. + + To define special keys to capture to a particular template without +going through the interactive template selection, you can create your +key binding like this: + + (define-key global-map "\C-cx" + (lambda () (interactive) (org-capture nil "x"))) + +* Menu: + +* Template elements:: What is needed for a complete template entry +* Template expansion:: Filling in information about time and context +* Templates in contexts:: Only show a template in a specific context + + +File: org, Node: Template elements, Next: Template expansion, Prev: Capture templates, Up: Capture templates + +9.1.3.1 Template elements +......................... + +Now lets look at the elements of a template definition. Each entry in +`org-capture-templates' is a list with the following items: + +KEYS + The keys that will select the template, as a string, characters + only, for example `"a"' for a template to be selected with a + single key, or `"bt"' for selection with two keys. When using + several keys, keys using the same prefix key must be sequential in + the list and preceded by a 2-element entry explaining the prefix + key, for example + ("b" "Templates for marking stuff to buy") + If you do not define a template for the `C' key, this key will be + used to open the customize buffer for this complex variable. + +DESCRIPTION + A short string describing the template, which will be shown during + selection. + +TYPE + The type of entry, a symbol. Valid values are: + + `entry' + An Org mode node, with a headline. Will be filed as the + child of the target entry or as a top-level entry. The + target file should be an Org mode file. + + `item' + A plain list item, placed in the first plain list at the + target location. Again the target file should be an Org file. + + `checkitem' + A checkbox item. This only differs from the plain list item + by the default template. + + `table-line' + a new line in the first table at the target location. Where + exactly the line will be inserted depends on the properties + `:prepend' and `:table-line-pos' (see below). + + `plain' + Text to be inserted as it is. + +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. Most target specifications contain + a file name. If that file name is the empty string, it defaults + to `org-default-notes-file'. A file can also be given as a + variable, function, or Emacs Lisp form. + + Valid values are: + + `(file "path/to/file")' + Text will be placed at the beginning or end of that file. + + `(id "id of existing org entry")' + Filing as child of this entry, or in the body of the entry. + + `(file+headline "path/to/file" "node headline")' + Fast configuration if the target heading is unique in the + file. + + `(file+olp "path/to/file" "Level 1 heading" "Level 2" ...)' + For non-unique headings, the full path is safer. + + `(file+regexp "path/to/file" "regexp to find location")' + Use a regular expression to position the cursor. + + `(file+datetree "path/to/file")' + Will create a heading in a date tree for today's date(1). + + `(file+datetree+prompt "path/to/file")' + Will create a heading in a date tree, but will prompt for the + date. + + `(file+function "path/to/file" function-finding-location)' + A function to find the right location in the file. + + `(clock)' + File to the entry that is currently being clocked. + + `(function function-finding-location)' + Most general way, write your own function to find both file + and location. + +TEMPLATE + The template for creating the capture item. If you leave this + empty, an appropriate default template will be used. Otherwise + this is a string with escape codes, which will be replaced + depending on time and context of the capture call. The string + with escapes may be loaded from a template file, using the special + syntax `(file "path/to/template")'. See below for more details. + +PROPERTIES + The rest of the entry is a property list of additional options. + Recognized properties are: + + `:prepend' + Normally new captured information will be appended at the + target location (last child, last table line, last list + item...). Setting this property will change that. + + `:immediate-finish' + When set, do not offer to edit the information, just file it + away immediately. This makes sense if the template only needs + information that can be added automatically. + + `:empty-lines' + Set this to the number of lines to insert before and after + the new item. Default 0, only common other value is 1. + + `:clock-in' + Start the clock in this item. + + `:clock-keep' + Keep the clock running when filing the captured entry. + + `:clock-resume' + If starting the capture interrupted a clock, restart that + clock when finished with the capture. Note that + `:clock-keep' has precedence over `:clock-resume'. When + setting both to `t', the current clock will run and the + previous one will not be resumed. + + `:unnarrowed' + Do not narrow the target buffer, simply show the full buffer. + Default is to narrow it so that you only see the new material. + + `:table-line-pos' + Specification of the location in the table where the new line + should be inserted. It should be a string like `"II-3"' + meaning that the new line should become the third line before + the second horizontal separator line. + + `:kill-buffer' + If the target file was not yet visited when capture was + invoked, kill the buffer again after capture is completed. + + ---------- Footnotes ---------- + + (1) Datetree headlines for years accept tags, so if you use both `* +2013 :noexport:' and `* 2013' in your file, the capture will refile the +note to the first one matched. + + +File: org, Node: Template expansion, Next: Templates in contexts, Prev: Template elements, Up: Capture templates + +9.1.3.2 Template expansion +.......................... + +In the template itself, special `%'-escapes(1) allow dynamic insertion +of content. The templates are expanded in the order given here: + + %[FILE] Insert the contents of the file given by FILE. + %(SEXP) Evaluate Elisp SEXP and replace with the result. + For convenience, %:keyword (see below) placeholders + within the expression will be expanded prior to this. + The sexp must return a string. + %<...> The result of format-time-string on the ... format specification. + %t Timestamp, date only. + %T Timestamp, with date and time. + %u, %U Like the above, but inactive timestamps. + %i Initial content, the region when capture is called while the + region is active. + The entire text will be indented like `%i' itself. + %a Annotation, normally the link created with `org-store-link'. + %A Like `%a', but prompt for the description part. + %l Like %a, but only insert the literal link. + %c Current kill ring head. + %x Content of the X clipboard. + %k Title of the currently clocked task. + %K Link to the currently clocked task. + %n User name (taken from `user-full-name'). + %f File visited by current buffer when org-capture was called. + %F Full path of the file or directory visited by current buffer. + %:keyword Specific information for certain link types, see below. + %^g Prompt for tags, with completion on tags in target file. + %^G Prompt for tags, with completion all tags in all agenda files. + %^t Like `%t', but prompt for date. Similarly `%^T', `%^u', `%^U'. + You may define a prompt like `%^{Birthday}t'. + %^C Interactive selection of which kill or clip to use. + %^L Like `%^C', but insert as link. + %^{PROP}p Prompt the user for a value for property PROP. + %^{PROMPT} prompt the user for a string and replace this sequence with it. + You may specify a default value and a completion table with + %^{prompt|default|completion2|completion3...}. + The arrow keys access a prompt-specific history. + %\\n Insert the text entered at the nth %^{PROMPT}, where `n' is + a number, starting from 1. + %? After completing the template, position cursor here. + +For specific link types, the following keywords will be defined(2): + + Link type | Available keywords + ---------------------------------+---------------------------------------------- + bbdb | %:name %:company + irc | %:server %:port %:nick + vm, vm-imap, wl, mh, mew, rmail | %:type %:subject %:message-id + | %:from %:fromname %:fromaddress + | %:to %:toname %:toaddress + | %:date (message date header field) + | %:date-timestamp (date as active timestamp) + | %:date-timestamp-inactive (date as inactive timestamp) + | %:fromto (either "to NAME" or "from NAME")(3) + gnus | %:group, for messages also all email fields + w3, w3m | %:url + info | %:file %:node + calendar | %:date + +To place the cursor after template expansion use: + + %? After completing the template, position cursor here. + + ---------- Footnotes ---------- + + (1) If you need one of these sequences literally, escape the `%' +with a backslash. + + (2) If you define your own link types (*note Adding hyperlink +types::), any property you store with `org-store-link-props' can be +accessed in capture templates in a similar way. + + (3) This will always be the other, not the user. See the variable +`org-from-is-user-regexp'. + + +File: org, Node: Templates in contexts, Prev: Template expansion, Up: Capture templates + +9.1.3.3 Templates in contexts +............................. + +To control whether a capture template should be accessible from a +specific context, you can customize `org-capture-templates-contexts'. +Let's say for example that you have a capture template `"p"' for +storing Gnus emails containing patches. Then you would configure this +option like this: + + (setq org-capture-templates-contexts + '(("p" (in-mode . "message-mode")))) + + You can also tell that the command key `"p"' should refer to another +template. In that case, add this command key like this: + + (setq org-capture-templates-contexts + '(("p" "q" (in-mode . "message-mode")))) + + See the docstring of the variable for more information. + + +File: org, Node: Attachments, Next: RSS Feeds, Prev: Capture, Up: Capture - Refile - Archive + +9.2 Attachments +=============== + +It is often useful to associate reference material with an outline +node/task. Small chunks of plain text can simply be stored in the +subtree of a project. Hyperlinks (*note Hyperlinks::) can establish +associations with files that live elsewhere on your computer or in the +cloud, like emails or source code files belonging to a project. +Another method is attachments, which are files located in a directory +belonging to an outline node. Org uses directories named by the unique +ID of each entry. These directories are located in the `data' +directory which lives in the same directory where your Org file +lives(1). If you initialize this directory with `git init', Org will +automatically commit changes when it sees them. The attachment system +has been contributed to Org by John Wiegley. + + In cases where it seems better to do so, you can also attach a +directory of your choice to an entry. You can also make children +inherit the attachment directory from a parent, so that an entire +subtree uses the same attached directory. + +The following commands deal with attachments: + +`C-c C-a (`org-attach')' + The dispatcher for commands related to the attachment system. + After these keys, a list of commands is displayed and you must + press an additional key to select a command: + + `a (`org-attach-attach')' + Select a file and move it into the task's attachment + directory. The file will be copied, moved, or linked, + depending on `org-attach-method'. Note that hard links are + not supported on all systems. + + `c/m/l' + Attach a file using the copy/move/link method. Note that + hard links are not supported on all systems. + + `n (`org-attach-new')' + Create a new attachment as an Emacs buffer. + + `z (`org-attach-sync')' + Synchronize the current task with its attachment directory, + in case you added attachments yourself. + + `o (`org-attach-open')' + Open current task's attachment. If there is more than one, + prompt for a file name first. Opening will follow the rules + set by `org-file-apps'. For more details, see the + information on following hyperlinks (*note Handling links::). + + `O (`org-attach-open-in-emacs')' + Also open the attachment, but force opening the file in Emacs. + + `f (`org-attach-reveal')' + Open the current task's attachment directory. + + `F (`org-attach-reveal-in-emacs')' + Also open the directory, but force using `dired' in Emacs. + + `d (`org-attach-delete-one')' + Select and delete a single attachment. + + `D (`org-attach-delete-all')' + Delete all of a task's attachments. A safer way is to open + the directory in `dired' and delete from there. + + `s (`org-attach-set-directory')' + Set a specific directory as the entry's attachment directory. + This works by putting the directory path into the + `ATTACH_DIR' property. + + `i (`org-attach-set-inherit')' + Set the `ATTACH_DIR_INHERIT' property, so that children will + use the same directory for attachments as the parent does. + + ---------- Footnotes ---------- + + (1) If you move entries or Org files from one directory to another, +you may want to configure `org-attach-directory' to contain an absolute +path. + + +File: org, Node: RSS Feeds, Next: Protocols, Prev: Attachments, Up: Capture - Refile - Archive + +9.3 RSS feeds +============= + +Org can add and change entries based on information found in RSS feeds +and Atom feeds. You could use this to make a task out of each new +podcast in a podcast feed. Or you could use a phone-based +note-creating service on the web to import tasks into Org. To access +feeds, configure the variable `org-feed-alist'. The docstring of this +variable has detailed information. Here is just an example: + + (setq org-feed-alist + '(("Slashdot" + "http://rss.slashdot.org/Slashdot/slashdot" + "~/txt/org/feeds.org" "Slashdot Entries"))) + +will configure that new items from the feed provided by +`rss.slashdot.org' will result in new entries in the file +`~/org/feeds.org' under the heading `Slashdot Entries', whenever the +following command is used: + +`C-c C-x g (`org-feed-update-all')' + +`C-c C-x g' + Collect items from the feeds configured in `org-feed-alist' and + act upon them. + +`C-c C-x G (`org-feed-goto-inbox')' + Prompt for a feed name and go to the inbox configured for this + feed. + + Under the same headline, Org will create a drawer `FEEDSTATUS' in +which it will store information about the status of items in the feed, +to avoid adding the same item several times. You should add +`FEEDSTATUS' to the list of drawers in that file: + + #+DRAWERS: LOGBOOK PROPERTIES FEEDSTATUS + + For more information, including how to read atom feeds, see +`org-feed.el' and the docstring of `org-feed-alist'. + + +File: org, Node: Protocols, Next: Refile and copy, Prev: RSS Feeds, Up: Capture - Refile - Archive + +9.4 Protocols for external access +================================= + +You can set up Org for handling protocol calls from outside +applications that are passed to Emacs through the `emacsserver'. For +example, you can configure bookmarks in your web browser to send a link +to the current page to Org and create a note from it using capture +(*note Capture::). Or you could create a bookmark that will tell Emacs +to open the local source file of a remote website you are looking at +with the browser. See +`http://orgmode.org/worg/org-contrib/org-protocol.php' for detailed +documentation and setup instructions. + + +File: org, Node: Refile and copy, Next: Archiving, Prev: Protocols, Up: Capture - Refile - Archive + +9.5 Refile and copy +=================== + +When reviewing the captured data, you may want to refile or to copy +some of the entries into a different list, for example into a project. +Cutting, finding the right location, and then pasting the note is +cumbersome. To simplify this process, you can use the following +special command: + +`C-c M-w (`org-copy')' + Copying works like refiling, except that the original note is not + deleted. + +`C-c C-w (`org-refile')' + Refile the entry or region at point. This command offers possible + locations for refiling the entry and lets you select one with + completion. The item (or all items in the region) is filed below + the target heading as a subitem. Depending on + `org-reverse-note-order', it will be either the first or last + subitem. + By default, all level 1 headlines in the current buffer are + considered to be targets, but you can have more complex + definitions across a number of files. See the variable + `org-refile-targets' for details. If you would like to select a + location via a file-path-like completion along the outline path, + see the variables `org-refile-use-outline-path' and + `org-outline-path-complete-in-steps'. If you would like to be + able to create new nodes as new parents for refiling on the fly, + check the variable `org-refile-allow-creating-parent-nodes'. When + the variable `org-log-refile'(1) is set, a timestamp or a note + will be recorded when an entry has been refiled. + +`C-u C-c C-w' + Use the refile interface to jump to a heading. + +`C-u C-u C-c C-w (`org-refile-goto-last-stored')' + Jump to the location where `org-refile' last moved a tree to. + +`C-2 C-c C-w' + Refile as the child of the item currently being clocked. + +`C-3 C-c C-w' + Refile and keep the entry in place. Also see `org-refile-keep' to + make this the default behavior, and beware that this may result in + duplicated `ID' properties. + +`C-0 C-c C-w or C-u C-u C-u C-c C-w (`org-refile-cache-clear')' + Clear the target cache. Caching of refile targets can be turned + on by setting `org-refile-use-cache'. To make the command see new + possible targets, you have to clear the cache with this command. + + ---------- Footnotes ---------- + + (1) with corresponding `#+STARTUP' keywords `logrefile', +`lognoterefile', and `nologrefile' + + +File: org, Node: Archiving, Prev: Refile and copy, Up: Capture - Refile - Archive + +9.6 Archiving +============= + +When a project represented by a (sub)tree is finished, you may want to +move the tree out of the way and to stop it from contributing to the +agenda. Archiving is important to keep your working files compact and +global searches like the construction of agenda views fast. + +`C-c C-x C-a (`org-archive-subtree-default')' + Archive the current entry using the command specified in the + variable `org-archive-default-command'. + +* Menu: + +* Moving subtrees:: Moving a tree to an archive file +* Internal archiving:: Switch off a tree but keep it in the file + + +File: org, Node: Moving subtrees, Next: Internal archiving, Prev: Archiving, Up: Archiving + +9.6.1 Moving a tree to the archive file +--------------------------------------- + +The most common archiving action is to move a project tree to another +file, the archive file. + +`C-c C-x C-s or short C-c $ (`org-archive-subtree')' + Archive the subtree starting at the cursor position to the location + given by `org-archive-location'. + +`C-u C-c C-x C-s' + Check if any direct children of the current headline could be + moved to the archive. To do this, each subtree is checked for + open TODO entries. If none are found, the command offers to move + it to the archive location. If the cursor is _not_ on a headline + when this command is invoked, the level 1 trees will be checked. + + The default archive location is a file in the same directory as the +current file, with the name derived by appending `_archive' to the +current file name. You can also choose what heading to file archived +items under, with the possibility to add them to a datetree in a file. +For information and examples on how to specify the file and the heading, +see the documentation string of the variable `org-archive-location'. + + There is also an in-buffer option for setting this variable, for +example(1): + + #+ARCHIVE: %s_done:: + +If you would like to have a special ARCHIVE location for a single entry +or a (sub)tree, give the entry an `:ARCHIVE:' property with the +location as the value (*note Properties and Columns::). + + When a subtree is moved, it receives a number of special properties +that record context information like the file from where the entry +came, its outline path the archiving time etc. Configure the variable +`org-archive-save-context-info' to adjust the amount of information +added. + + ---------- Footnotes ---------- + + (1) For backward compatibility, the following also works: If there +are several such lines in a file, each specifies the archive location +for the text below it. The first such line also applies to any text +before its definition. However, using this method is _strongly_ +deprecated as it is incompatible with the outline structure of the +document. The correct method for setting multiple archive locations in +a buffer is using properties. + + +File: org, Node: Internal archiving, Prev: Moving subtrees, Up: Archiving + +9.6.2 Internal archiving +------------------------ + +If you want to just switch off (for agenda views) certain subtrees +without moving them to a different file, you can use the `ARCHIVE tag'. + + A headline that is marked with the ARCHIVE tag (*note Tags::) stays +at its location in the outline tree, but behaves in the following way: + - It does not open when you attempt to do so with a visibility + cycling command (*note Visibility cycling::). You can force + cycling archived subtrees with `C-', or by setting the option + `org-cycle-open-archived-trees'. Also normal outline commands like + `show-all' will open archived subtrees. + + - During sparse tree construction (*note Sparse trees::), matches in + archived subtrees are not exposed, unless you configure the option + `org-sparse-tree-open-archived-trees'. + + - During agenda view construction (*note Agenda Views::), the + content of archived trees is ignored unless you configure the + option `org-agenda-skip-archived-trees', in which case these trees + will always be included. In the agenda you can press `v a' to get + archives temporarily included. + + - Archived trees are not exported (*note Exporting::), only the + headline is. Configure the details using the variable + `org-export-with-archived-trees'. + + - Archived trees are excluded from column view unless the variable + `org-columns-skip-archived-trees' is configured to `nil'. + + The following commands help manage the ARCHIVE tag: + +`C-c C-x a (`org-toggle-archive-tag')' + Toggle the ARCHIVE tag for the current headline. When the tag is + set, the headline changes to a shadowed face, and the subtree + below it is hidden. + +`C-u C-c C-x a' + Check if any direct children of the current headline should be + archived. To do this, each subtree is checked for open TODO + entries. If none are found, the command offers to set the ARCHIVE + tag for the child. If the cursor is _not_ on a headline when this + command is invoked, the level 1 trees will be checked. + +`C-TAB (`org-force-cycle-archived')' + Cycle a tree even if it is tagged with ARCHIVE. + +`C-c C-x A (`org-archive-to-archive-sibling')' + Move the current entry to the _Archive Sibling_. This is a + sibling of the entry with the heading `Archive' and the tag + `ARCHIVE'. The entry becomes a child of that sibling and in this + way retains a lot of its original context, including inherited + tags and approximate position in the outline. + + +File: org, Node: Agenda Views, Next: Markup, Prev: Capture - Refile - Archive, Up: Top + +10 Agenda views +*************** + +Due to the way Org works, TODO items, time-stamped items, and tagged +headlines can be scattered throughout a file or even a number of files. +To get an overview of open action items, or of events that are +important for a particular date, this information must be collected, +sorted and displayed in an organized way. + + Org can select items based on various criteria and display them in a +separate buffer. Seven different view types are provided: + + * an _agenda_ that is like a calendar and shows information for + specific dates, + + * a _TODO list_ that covers all unfinished action items, + + * a _match view_, showings headlines based on the tags, properties, + and TODO state associated with them, + + * a _timeline view_ that shows all events in a single Org file, in + time-sorted view, + + * a _text search view_ that shows all entries from multiple files + that contain specified keywords, + + * a _stuck projects view_ showing projects that currently don't move + along, and + + * _custom views_ that are special searches and combinations of + different views. + +The extracted information is displayed in a special _agenda buffer_. +This buffer is read-only, but provides commands to visit the +corresponding locations in the original Org files, and even to edit +these files remotely. + + Two variables control how the agenda buffer is displayed and whether +the window configuration is restored when the agenda exits: +`org-agenda-window-setup' and `org-agenda-restore-windows-after-quit'. + +* Menu: + +* Agenda files:: Files being searched for agenda information +* Agenda dispatcher:: Keyboard access to agenda views +* Built-in agenda views:: What is available out of the box? +* Presentation and sorting:: How agenda items are prepared for display +* Agenda commands:: Remote editing of Org trees +* Custom agenda views:: Defining special searches and views +* Exporting Agenda Views:: Writing a view to a file +* Agenda column view:: Using column view for collected entries + + +File: org, Node: Agenda files, Next: Agenda dispatcher, Prev: Agenda Views, Up: Agenda Views + +10.1 Agenda files +================= + +The information to be shown is normally collected from all _agenda +files_, the files listed in the variable `org-agenda-files'(1). If a +directory is part of this list, all files with the extension `.org' in +this directory will be part of the list. + + Thus, even if you only work with a single Org file, that file should +be put into the list(2). You can customize `org-agenda-files', but the +easiest way to maintain it is through the following commands + +`C-c [ (`org-agenda-file-to-front')' + Add current file to the list of agenda files. The file is added to + the front of the list. If it was already in the list, it is moved + to the front. With a prefix argument, file is added/moved to the + end. + +`C-c ] (`org-remove-file')' + Remove current file from the list of agenda files. + +`C-' (`org-cycle-agenda-files')' +`C-,' + Cycle through agenda file list, visiting one file after the other. + +`M-x org-iswitchb RET' + Command to use an `iswitchb'-like interface to switch to and + between Org buffers. + +The Org menu contains the current list of files and can be used to +visit any of them. + + If you would like to focus the agenda temporarily on a file not in +this list, or on just one file in the list, or even on only a subtree +in a file, then this can be done in different ways. For a single +agenda command, you may press `<' once or several times in the +dispatcher (*note Agenda dispatcher::). To restrict the agenda scope +for an extended period, use the following commands: + +`C-c C-x < (`org-agenda-set-restriction-lock')' + Permanently restrict the agenda to the current subtree. When with + a prefix argument, or with the cursor before the first headline in + a file, the agenda scope is set to the entire file. This + restriction remains in effect until removed with `C-c C-x >', or + by typing either `<' or `>' in the agenda dispatcher. If there is + a window displaying an agenda view, the new restriction takes + effect immediately. + +`C-c C-x > (`org-agenda-remove-restriction-lock')' + Remove the permanent restriction created by `C-c C-x <'. + +When working with `speedbar.el', you can use the following commands in +the Speedbar frame: + +`< in the speedbar frame (`org-speedbar-set-agenda-restriction')' + Permanently restrict the agenda to the item--either an Org file or + a subtree in such a file--at the cursor in the Speedbar frame. If + there is a window displaying an agenda view, the new restriction + takes effect immediately. + +`> in the speedbar frame (`org-agenda-remove-restriction-lock')' + Lift the restriction. + + ---------- Footnotes ---------- + + (1) If the value of that variable is not a list, but a single file +name, then the list of agenda files will be maintained in that external +file. + + (2) When using the dispatcher, pressing `<' before selecting a +command will actually limit the command to the current file, and ignore +`org-agenda-files' until the next dispatcher command. + + +File: org, Node: Agenda dispatcher, Next: Built-in agenda views, Prev: Agenda files, Up: Agenda Views + +10.2 The agenda dispatcher +========================== + +The views are created through a dispatcher, which should be bound to a +global key--for example `C-c a' (*note Activation::). In the following +we will assume that `C-c a' is indeed how the dispatcher is accessed +and list keyboard access to commands accordingly. After pressing `C-c +a', an additional letter is required to execute a command. The +dispatcher offers the following default commands: + +`a' + Create the calendar-like agenda (*note Weekly/daily agenda::). + +`t / T' + Create a list of all TODO items (*note Global TODO list::). + +`m / M' + Create a list of headlines matching a TAGS expression (*note + Matching tags and properties::). + +`L' + Create the timeline view for the current buffer (*note Timeline::). + +`s' + Create a list of entries selected by a boolean expression of + keywords and/or regular expressions that must or must not occur in + the entry. + +`/' + Search for a regular expression in all agenda files and + additionally in the files listed in + `org-agenda-text-search-extra-files'. This uses the Emacs command + `multi-occur'. A prefix argument can be used to specify the + number of context lines for each match, default is 1. + +`# / !' + Create a list of stuck projects (*note Stuck projects::). + +`<' + Restrict an agenda command to the current buffer(1). After + pressing `<', you still need to press the character selecting the + command. + +`< <' + If there is an active region, restrict the following agenda + command to the region. Otherwise, restrict it to the current + subtree(2). After pressing `< <', you still need to press the + character selecting the command. + +`*' + Toggle sticky agenda views. By default, Org maintains only a + single agenda buffer and rebuilds it each time you change the + view, to make sure everything is always up to date. If you switch + between views often and the build time bothers you, you can turn + on sticky agenda buffers (make this the default by customizing the + variable `org-agenda-sticky'). With sticky agendas, the + dispatcher only switches to the selected view, you need to update + it by hand with `r' or `g'. You can toggle sticky agenda view any + time with `org-toggle-sticky-agenda'. + + You can also define custom commands that will be accessible through +the dispatcher, just like the default commands. This includes the +possibility to create extended agenda buffers that contain several +blocks together, for example the weekly agenda, the global TODO list and +a number of special tags matches. *Note Custom agenda views::. + + ---------- Footnotes ---------- + + (1) For backward compatibility, you can also press `1' to restrict +to the current buffer. + + (2) For backward compatibility, you can also press `0' to restrict +to the current region/subtree. + + +File: org, Node: Built-in agenda views, Next: Presentation and sorting, Prev: Agenda dispatcher, Up: Agenda Views + +10.3 The built-in agenda views +============================== + +In this section we describe the built-in views. + +* Menu: + +* Weekly/daily agenda:: The calendar page with current tasks +* Global TODO list:: All unfinished action items +* Matching tags and properties:: Structured information with fine-tuned search +* Timeline:: Time-sorted view for single file +* Search view:: Find entries by searching for text +* Stuck projects:: Find projects you need to review + + +File: org, Node: Weekly/daily agenda, Next: Global TODO list, Prev: Built-in agenda views, Up: Built-in agenda views + +10.3.1 The weekly/daily agenda +------------------------------ + +The purpose of the weekly/daily _agenda_ is to act like a page of a +paper agenda, showing all the tasks for the current week or day. + +`C-c a a (`org-agenda-list')' + Compile an agenda for the current week from a list of Org files. + The agenda shows the entries for each day. With a numeric + prefix(1) (like `C-u 2 1 C-c a a') you may set the number of days + to be displayed. + + The default number of days displayed in the agenda is set by the +variable `org-agenda-span' (or the obsolete `org-agenda-ndays'). This +variable can be set to any number of days you want to see by default in +the agenda, or to a span name, such as `day', `week', `month' or +`year'. For weekly agendas, the default is to start on the previous +monday (see `org-agenda-start-on-weekday'). You can also set the start +date using a date shift: `(setq org-agenda-start-day "+10d")' will +start the agenda ten days from today in the future. + + Remote editing from the agenda buffer means, for example, that you +can change the dates of deadlines and appointments from the agenda +buffer. The commands available in the Agenda buffer are listed in +*note Agenda commands::. + +Calendar/Diary integration +.......................... + +Emacs contains the calendar and diary by Edward M. Reingold. The +calendar displays a three-month calendar with holidays from different +countries and cultures. The diary allows you to keep track of +anniversaries, lunar phases, sunrise/set, recurrent appointments +(weekly, monthly) and more. In this way, it is quite complementary to +Org. It can be very useful to combine output from Org with the diary. + + In order to include entries from the Emacs diary into Org mode's +agenda, you only need to customize the variable + + (setq org-agenda-include-diary t) + +After that, everything will happen automatically. All diary entries +including holidays, anniversaries, etc., will be included in the agenda +buffer created by Org mode. , , and can be used from +the agenda buffer to jump to the diary file in order to edit existing +diary entries. The `i' command to insert new entries for the current +date works in the agenda buffer, as well as the commands `S', `M', and +`C' to display Sunrise/Sunset times, show lunar phases and to convert +to other calendars, respectively. `c' can be used to switch back and +forth between calendar and agenda. + + If you are using the diary only for sexp entries and holidays, it is +faster to not use the above setting, but instead to copy or even move +the entries into an Org file. Org mode evaluates diary-style sexp +entries, and does it faster because there is no overhead for first +creating the diary display. Note that the sexp entries must start at +the left margin, no whitespace is allowed before them. For example, +the following segment of an Org file will be processed and entries will +be made in the agenda: + + * Birthdays and similar stuff + #+CATEGORY: Holiday + %%(org-calendar-holiday) ; special function for holiday names + #+CATEGORY: Ann + %%(org-anniversary 1956 5 14)(2) Arthur Dent is %d years old + %%(org-anniversary 1869 10 2) Mahatma Gandhi would be %d years old + +Anniversaries from BBDB +....................... + +If you are using the Big Brothers Database to store your contacts, you +will very likely prefer to store anniversaries in BBDB rather than in a +separate Org or diary file. Org supports this and will show BBDB +anniversaries as part of the agenda. All you need to do is to add the +following to one of your agenda files: + + * Anniversaries + :PROPERTIES: + :CATEGORY: Anniv + :END: + %%(org-bbdb-anniversaries) + + You can then go ahead and define anniversaries for a BBDB record. +Basically, you need to press `C-o anniversary ' with the cursor in +a BBDB record and then add the date in the format `YYYY-MM-DD' or +`MM-DD', followed by a space and the class of the anniversary +(`birthday' or `wedding', or a format string). If you omit the class, +it will default to `birthday'. Here are a few examples, the header for +the file `org-bbdb.el' contains more detailed information. + + 1973-06-22 + 06-22 + 1955-08-02 wedding + 2008-04-14 %s released version 6.01 of org mode, %d years ago + + After a change to BBDB, or for the first agenda display during an +Emacs session, the agenda display will suffer a short delay as Org +updates its hash with anniversaries. However, from then on things will +be very fast--much faster in fact than a long list of +`%%(diary-anniversary)' entries in an Org or Diary file. + +Appointment reminders +..................... + +Org can interact with Emacs appointments notification facility. To add +the appointments of your agenda files, use the command +`org-agenda-to-appt'. This command lets you filter through the list of +your appointments and add only those belonging to a specific category +or matching a regular expression. It also reads a `APPT_WARNTIME' +property which will then override the value of +`appt-message-warning-time' for this appointment. See the docstring +for details. + + ---------- Footnotes ---------- + + (1) For backward compatibility, the universal prefix `C-u' causes +all TODO entries to be listed before the agenda. This feature is +deprecated, use the dedicated TODO list, or a block agenda instead +(*note Block agenda::). + + (2) `org-anniversary' is just like `diary-anniversary', but the +argument order is always according to ISO and therefore independent of +the value of `calendar-date-style'. + + +File: org, Node: Global TODO list, Next: Matching tags and properties, Prev: Weekly/daily agenda, Up: Built-in agenda views + +10.3.2 The global TODO list +--------------------------- + +The global TODO list contains all unfinished TODO items formatted and +collected into a single place. + +`C-c a t (`org-todo-list')' + Show the global TODO list. This collects the TODO items from all + agenda files (*note Agenda Views::) into a single buffer. By + default, this lists items with a state the is not a DONE state. + The buffer is in `agenda-mode', so there are commands to examine + and manipulate the TODO entries directly from that buffer (*note + Agenda commands::). + +`C-c a T (`org-todo-list')' + Like the above, but allows selection of a specific TODO keyword. + You can also do this by specifying a prefix argument to `C-c a t'. + You are prompted for a keyword, and you may also specify several + keywords by separating them with `|' as the boolean OR operator. + With a numeric prefix, the Nth keyword in `org-todo-keywords' is + selected. The `r' key in the agenda buffer regenerates it, and + you can give a prefix argument to this command to change the + selected TODO keyword, for example `3 r'. If you often need a + search for a specific keyword, define a custom command for it + (*note Agenda dispatcher::). + Matching specific TODO keywords can also be done as part of a tags + search (*note Tag searches::). + + Remote editing of TODO items means that you can change the state of a +TODO entry with a single key press. The commands available in the TODO +list are described in *note Agenda commands::. + + Normally the global TODO list simply shows all headlines with TODO +keywords. This list can become very long. There are two ways to keep +it more compact: + - Some people view a TODO item that has been _scheduled_ for + execution or have a _deadline_ (*note Timestamps::) as no longer + _open_. Configure the variables + `org-agenda-todo-ignore-scheduled', + `org-agenda-todo-ignore-deadlines', + `org-agenda-todo-ignore-timestamp' and/or + `org-agenda-todo-ignore-with-date' to exclude such items from the + global TODO list. + + - TODO items may have sublevels to break up the task into subtasks. + In such cases it may be enough to list only the highest level TODO + headline and omit the sublevels from the global list. Configure + the variable `org-agenda-todo-list-sublevels' to get this behavior. + + +File: org, Node: Matching tags and properties, Next: Timeline, Prev: Global TODO list, Up: Built-in agenda views + +10.3.3 Matching tags and properties +----------------------------------- + +If headlines in the agenda files are marked with _tags_ (*note Tags::), +or have properties (*note Properties and Columns::), you can select +headlines based on this metadata and collect them into an agenda +buffer. The match syntax described here also applies when creating +sparse trees with `C-c / m'. + +`C-c a m (`org-tags-view')' + Produce a list of all headlines that match a given set of tags. + The command prompts for a selection criterion, which is a boolean + logic expression with tags, like `+work+urgent-withboss' or + `work|home' (*note Tags::). If you often need a specific search, + define a custom command for it (*note Agenda dispatcher::). + +`C-c a M (`org-tags-view')' + Like `C-c a m', but only select headlines that are also TODO items + in a not-DONE state and force checking subitems (see variable + `org-tags-match-list-sublevels'). To exclude scheduled/deadline + items, see the variable + `org-agenda-tags-todo-honor-ignore-options'. Matching specific + TODO keywords together with a tags match is also possible, see + *note Tag searches::. + + The commands available in the tags list are described in *note +Agenda commands::. + +Match syntax +............ + +A search string can use Boolean operators `&' for `AND' and `|' for +`OR'. `&' binds more strongly than `|'. Parentheses are not +implemented. Each element in the search is either a tag, a regular +expression matching tags, or an expression like `PROPERTY OPERATOR +VALUE' with a comparison operator, accessing a property value. Each +element may be preceded by `-', to select against it, and `+' is +syntactic sugar for positive selection. The `AND' operator `&' is +optional when `+' or `-' is present. Here are some examples, using +only tags. + +`work' + Select headlines tagged `:work:'. + +`work&boss' + Select headlines tagged `:work:' and `:boss:'. + +`+work-boss' + Select headlines tagged `:work:', but discard those also tagged + `:boss:'. + +`work|laptop' + Selects lines tagged `:work:' or `:laptop:'. + +`work|laptop+night' + Like before, but require the `:laptop:' lines to be tagged also + `:night:'. + + Instead of a tag, you may also specify a regular expression enclosed +in curly braces. For example, `work+{^boss.*}' matches headlines that +contain the tag `:work:' and any tag starting with `boss'. + + Group tags (*note Tag groups::) are expanded as regular expressions. +E.g., if `:work:' is a group tag for the group `:work:lab:conf:', then +searching for `work' will search for `{\(?:work\|lab\|conf\)}' and +searching for `-work' will search for all headlines but those with one +of the tag in the group (i.e., `-{\(?:work\|lab\|conf\)}'). + + You may also test for properties (*note Properties and Columns::) at +the same time as matching tags. The properties may be real properties, +or special properties that represent other metadata (*note Special +properties::). For example, the "property" `TODO' represents the TODO +keyword of the entry and the "property" `PRIORITY' represents the +PRIORITY keyword of the entry. The ITEM special property cannot +currently be used in tags/property searches(1). + + Except the *note Special properties::, one other "property" can also +be used. `LEVEL' represents the level of an entry. So a search +`+LEVEL=3+boss-TODO="DONE"' lists all level three headlines that have +the tag `boss' and are _not_ marked with the TODO keyword DONE. In +buffers with `org-odd-levels-only' set, `LEVEL' does not count the +number of stars, but `LEVEL=2' will correspond to 3 stars etc. + + Here are more examples: + +`work+TODO="WAITING"' + Select `:work:'-tagged TODO lines with the specific TODO keyword + `WAITING'. + +`work+TODO="WAITING"|home+TODO="WAITING"' + Waiting tasks both at work and at home. + + When matching properties, a number of different operators can be +used to test the value of a property. Here is a complex example: + + +work-boss+PRIORITY="A"+Coffee="unlimited"+Effort<2 \ + +With={Sarah\|Denny}+SCHEDULED>="<2008-10-11>" + +The type of comparison will depend on how the comparison value is +written: + - If the comparison value is a plain number, a numerical comparison + is done, and the allowed operators are `<', `=', `>', `<=', `>=', + and `<>'. + + - If the comparison value is enclosed in double-quotes, a string + comparison is done, and the same operators are allowed. + + - If the comparison value is enclosed in double-quotes _and_ angular + brackets (like `DEADLINE<="<2008-12-24 18:30>"'), both values are + assumed to be date/time specifications in the standard Org way, + and the comparison will be done accordingly. Special values that + will be recognized are `""' for now (including time), and + `""', and `""' for these days at 0:00 hours, + i.e., without a time specification. Also strings like `"<+5d>"' + or `"<-2m>"' with units `d', `w', `m', and `y' for day, week, + month, and year, respectively, can be used. + + - If the comparison value is enclosed in curly braces, a regexp + match is performed, with `=' meaning that the regexp matches the + property value, and `<>' meaning that it does not match. + + So the search string in the example finds entries tagged `:work:' but +not `:boss:', which also have a priority value `A', a `:Coffee:' +property with the value `unlimited', an `Effort' property that is +numerically smaller than 2, a `:With:' property that is matched by the +regular expression `Sarah\|Denny', and that are scheduled on or after +October 11, 2008. + + Accessing TODO, LEVEL, and CATEGORY during a search is fast. +Accessing any other properties will slow down the search. However, +once you have paid the price by accessing one property, testing +additional properties is cheap again. + + You can configure Org mode to use property inheritance during a +search, but beware that this can slow down searches considerably. See +*note Property inheritance::, for details. + + For backward compatibility, and also for typing speed, there is also +a different way to test TODO states in a search. For this, terminate +the tags/property part of the search string (which may include several +terms connected with `|') with a `/' and then specify a Boolean +expression just for TODO keywords. The syntax is then similar to that +for tags, but should be applied with care: for example, a positive +selection on several TODO keywords cannot meaningfully be combined with +boolean AND. However, _negative selection_ combined with AND can be +meaningful. To make sure that only lines are checked that actually +have any TODO keyword (resulting in a speed-up), use `C-c a M', or +equivalently start the TODO part after the slash with `!'. Using `C-c +a M' or `/!' will not match TODO keywords in a DONE state. Examples: + +`work/WAITING' + Same as `work+TODO="WAITING"' + +`work/!-WAITING-NEXT' + Select `:work:'-tagged TODO lines that are neither `WAITING' nor + `NEXT' + +`work/!+WAITING|+NEXT' + Select `:work:'-tagged TODO lines that are either `WAITING' or + `NEXT'. + + ---------- Footnotes ---------- + + (1) But *note skipping entries based on regexp: +x-agenda-skip-entry-regexp. + + +File: org, Node: Timeline, Next: Search view, Prev: Matching tags and properties, Up: Built-in agenda views + +10.3.4 Timeline for a single file +--------------------------------- + +The timeline summarizes all time-stamped items from a single Org mode +file in a _time-sorted view_. The main purpose of this command is to +give an overview over events in a project. + +`C-c a L (`org-timeline')' + Show a time-sorted view of the Org file, with all time-stamped + items. When called with a `C-u' prefix, all unfinished TODO + entries (scheduled or not) are also listed under the current date. + +The commands available in the timeline buffer are listed in *note +Agenda commands::. + + +File: org, Node: Search view, Next: Stuck projects, Prev: Timeline, Up: Built-in agenda views + +10.3.5 Search view +------------------ + +This agenda view is a general text search facility for Org mode entries. +It is particularly useful to find notes. + +`C-c a s (`org-search-view')' + This is a special search that lets you select entries by matching + a substring or specific words using a boolean logic. + For example, the search string `computer equipment' will find entries +that contain `computer equipment' as a substring. If the two words are +separated by more space or a line break, the search will still match. +Search view can also search for specific keywords in the entry, using +Boolean logic. The search string `+computer +wifi -ethernet +-{8\.11[bg]}' will search for note entries that contain the keywords +`computer' and `wifi', but not the keyword `ethernet', and which are +also not matched by the regular expression `8\.11[bg]', meaning to +exclude both 8.11b and 8.11g. The first `+' is necessary to turn on +word search, other `+' characters are optional. For more details, see +the docstring of the command `org-search-view'. + + Note that in addition to the agenda files, this command will also +search the files listed in `org-agenda-text-search-extra-files'. + + +File: org, Node: Stuck projects, Prev: Search view, Up: Built-in agenda views + +10.3.6 Stuck projects +--------------------- + +If you are following a system like David Allen's GTD to organize your +work, one of the "duties" you have is a regular review to make sure +that all projects move along. A _stuck_ project is a project that has +no defined next actions, so it will never show up in the TODO lists Org +mode produces. During the review, you need to identify such projects +and define next actions for them. + +`C-c a # (`org-agenda-list-stuck-projects')' + List projects that are stuck. + +`C-c a !' + Customize the variable `org-stuck-projects' to define what a stuck + project is and how to find it. + + You almost certainly will have to configure this view before it will +work for you. The built-in default assumes that all your projects are +level-2 headlines, and that a project is not stuck if it has at least +one entry marked with a TODO keyword TODO or NEXT or NEXTACTION. + + Let's assume that you, in your own way of using Org mode, identify +projects with a tag PROJECT, and that you use a TODO keyword MAYBE to +indicate a project that should not be considered yet. Let's further +assume that the TODO keyword DONE marks finished projects, and that NEXT +and TODO indicate next actions. The tag @SHOP indicates shopping and +is a next action even without the NEXT tag. Finally, if the project +contains the special word IGNORE anywhere, it should not be listed +either. In this case you would start by identifying eligible projects +with a tags/todo match(1) `+PROJECT/-MAYBE-DONE', and then check for +TODO, NEXT, @SHOP, and IGNORE in the subtree to identify projects that +are not stuck. The correct customization for this is + + (setq org-stuck-projects + '("+PROJECT/-MAYBE-DONE" ("NEXT" "TODO") ("@SHOP") + "\\")) + + Note that if a project is identified as non-stuck, the subtree of +this entry will still be searched for stuck projects. + + ---------- Footnotes ---------- + + (1) *Note Tag searches::. + + +File: org, Node: Presentation and sorting, Next: Agenda commands, Prev: Built-in agenda views, Up: Agenda Views + +10.4 Presentation and sorting +============================= + +Before displaying items in an agenda view, Org mode visually prepares +the items and sorts them. Each item occupies a single line. The line +starts with a _prefix_ that contains the _category_ (*note Categories::) +of the item and other important information. You can customize in which +column tags will be displayed through `org-agenda-tags-column'. You can +also customize the prefix using the option `org-agenda-prefix-format'. +This prefix is followed by a cleaned-up version of the outline headline +associated with the item. + +* Menu: + +* Categories:: Not all tasks are equal +* Time-of-day specifications:: How the agenda knows the time +* Sorting agenda items:: The order of things +* Filtering/limiting agenda items:: Dynamically narrow the agenda + + +File: org, Node: Categories, Next: Time-of-day specifications, Prev: Presentation and sorting, Up: Presentation and sorting + +10.4.1 Categories +----------------- + +The category is a broad label assigned to each agenda item. By default, +the category is simply derived from the file name, but you can also +specify it with a special line in the buffer, like this(1): + + #+CATEGORY: Thesis + +If you would like to have a special CATEGORY for a single entry or a +(sub)tree, give the entry a `:CATEGORY:' property with the special +category you want to apply as the value. + +The display in the agenda buffer looks best if the category is not +longer than 10 characters. + +You can set up icons for category by customizing the +`org-agenda-category-icon-alist' variable. + + ---------- Footnotes ---------- + + (1) For backward compatibility, the following also works: if there +are several such lines in a file, each specifies the category for the +text below it. The first category also applies to any text before the +first CATEGORY line. However, using this method is _strongly_ +deprecated as it is incompatible with the outline structure of the +document. The correct method for setting multiple categories in a +buffer is using a property. + + +File: org, Node: Time-of-day specifications, Next: Sorting agenda items, Prev: Categories, Up: Presentation and sorting + +10.4.2 Time-of-day specifications +--------------------------------- + +Org mode checks each agenda item for a time-of-day specification. The +time can be part of the timestamp that triggered inclusion into the +agenda, for example as in `<2005-05-10 Tue 19:00>'. Time ranges can be +specified with two timestamps, like +`<2005-05-10 Tue 20:30>--<2005-05-10 Tue 22:15>'. + + In the headline of the entry itself, a time(range) may also appear as +plain text (like `12:45' or a `8:30-1pm'). If the agenda integrates +the Emacs diary (*note Weekly/daily agenda::), time specifications in +diary entries are recognized as well. + + For agenda display, Org mode extracts the time and displays it in a +standard 24 hour format as part of the prefix. The example times in +the previous paragraphs would end up in the agenda like this: + + 8:30-13:00 Arthur Dent lies in front of the bulldozer + 12:45...... Ford Prefect arrives and takes Arthur to the pub + 19:00...... The Vogon reads his poem + 20:30-22:15 Marvin escorts the Hitchhikers to the bridge + + If the agenda is in single-day mode, or for the display of today, the +timed entries are embedded in a time grid, like + + 8:00...... ------------------ + 8:30-13:00 Arthur Dent lies in front of the bulldozer + 10:00...... ------------------ + 12:00...... ------------------ + 12:45...... Ford Prefect arrives and takes Arthur to the pub + 14:00...... ------------------ + 16:00...... ------------------ + 18:00...... ------------------ + 19:00...... The Vogon reads his poem + 20:00...... ------------------ + 20:30-22:15 Marvin escorts the Hitchhikers to the bridge + + The time grid can be turned on and off with the variable +`org-agenda-use-time-grid', and can be configured with +`org-agenda-time-grid'. + + +File: org, Node: Sorting agenda items, Next: Filtering/limiting agenda items, Prev: Time-of-day specifications, Up: Presentation and sorting + +10.4.3 Sorting agenda items +--------------------------- + +Before being inserted into a view, the items are sorted. How this is +done depends on the type of view. + * For the daily/weekly agenda, the items for each day are sorted. + The default order is to first collect all items containing an + explicit time-of-day specification. These entries will be shown + at the beginning of the list, as a _schedule_ for the day. After + that, items remain grouped in categories, in the sequence given by + `org-agenda-files'. Within each category, items are sorted by + priority (*note Priorities::), which is composed of the base + priority (2000 for priority `A', 1000 for `B', and 0 for `C'), + plus additional increments for overdue scheduled or deadline items. + + * For the TODO list, items remain in the order of categories, but + within each category, sorting takes place according to priority + (*note Priorities::). The priority used for sorting derives from + the priority cookie, with additions depending on how close an item + is to its due or scheduled date. + + * For tags matches, items are not sorted at all, but just appear in + the sequence in which they are found in the agenda files. + + Sorting can be customized using the variable +`org-agenda-sorting-strategy', and may also include criteria based on +the estimated effort of an entry (*note Effort estimates::). + + +File: org, Node: Filtering/limiting agenda items, Prev: Sorting agenda items, Up: Presentation and sorting + +10.4.4 Filtering/limiting agenda items +-------------------------------------- + +Agenda built-in or customized commands are statically defined. Agenda +filters and limits provide two ways of dynamically narrowing down the +list of agenda entries: _fitlers_ and _limits_. Filters only act on the +display of the items, while limits take effect before the list of agenda +entries is built. Filter are more often used interactively, while +limits are mostly useful when defined as local variables within custom +agenda commands. + +Filtering in the agenda +....................... + +`/ (`org-agenda-filter-by-tag')' + Filter the agenda view with respect to a tag and/or effort + estimates. The difference between this and a custom agenda + command is that filtering is very fast, so that you can switch + quickly between different filters without having to recreate the + agenda.(1) + + You will be prompted for a tag selection letter; will mean + any tag at all. Pressing at that prompt will offer use + completion to select a tag (including any tags that do not have a + selection character). The command then hides all entries that do + not contain or inherit this tag. When called with prefix arg, + remove the entries that _do_ have the tag. A second `/' at the + prompt will turn off the filter and unhide any hidden entries. If + the first key you press is either `+' or `-', the previous filter + will be narrowed by requiring or forbidding the selected + additional tag. Instead of pressing `+' or `-' after `/', you can + also immediately use the `\' command. + + In order to filter for effort estimates, you should set up allowed + efforts globally, for example + (setq org-global-properties + '(("Effort_ALL". "0 0:10 0:30 1:00 2:00 3:00 4:00"))) + You can then filter for an effort by first typing an operator, one + of `<', `>', and `=', and then the one-digit index of an effort + estimate in your array of allowed values, where `0' means the 10th + value. The filter will then restrict to entries with effort + smaller-or-equal, equal, or larger-or-equal than the selected + value. If the digits 0-9 are not used as fast access keys to + tags, you can also simply press the index digit directly without + an operator. In this case, `<' will be assumed. For application + of the operator, entries without a defined effort will be treated + according to the value of `org-sort-agenda-noeffort-is-high'. To + filter for tasks without effort definition, press `?' as the + operator. + + Org also supports automatic, context-aware tag filtering. If the + variable `org-agenda-auto-exclude-function' is set to a + user-defined function, that function can decide which tags should + be excluded from the agenda automatically. Once this is set, the + `/' command then accepts `RET' as a sub-option key and runs the + auto exclusion logic. For example, let's say you use a `Net' tag + to identify tasks which need network access, an `Errand' tag for + errands in town, and a `Call' tag for making phone calls. You + could auto-exclude these tags based on the availability of the + Internet, and outside of business hours, with something like this: + + (defun org-my-auto-exclude-function (tag) + (and (cond + ((string= tag "Net") + (/= 0 (call-process "/sbin/ping" nil nil nil + "-c1" "-q" "-t1" "mail.gnu.org"))) + ((or (string= tag "Errand") (string= tag "Call")) + (let ((hour (nth 2 (decode-time)))) + (or (< hour 8) (> hour 21))))) + (concat "-" tag))) + + (setq org-agenda-auto-exclude-function 'org-my-auto-exclude-function) + +`\ (`org-agenda-filter-by-tag-refine')' + Narrow the current agenda filter by an additional condition. When + called with prefix arg, remove the entries that _do_ have the tag, + or that do match the effort criterion. You can achieve the same + effect by pressing `+' or `-' as the first key after the `/' + command. + +`[ ] { }' + + in search view + add new search words (`[' and `]') or new regular expressions + (`{' and `}') to the query string. The opening bracket/brace + will add a positive search term prefixed by `+', indicating + that this search term must occur/match in the entry. The + closing bracket/brace will add a negative search term which + must not occur/match in the entry for it to be selected. + +`< (`org-agenda-filter-by-category')' + Filter the current agenda view with respect to the category of the + item at point. Pressing `<' another time will remove this filter. + You can add a filter preset through the option + `org-agenda-category-filter-preset' (see below.) + +`^ (`org-agenda-filter-by-top-headline')' + Filter the current agenda view and only display the siblings and + the parent headline of the one at point. + +`= (`org-agenda-filter-by-regexp')' + Filter the agenda view by a regular expression: only show agenda + entries matching the regular expression the user entered. When + called with a prefix argument, it will filter _out_ entries + matching the regexp. With two universal prefix arguments, it will + remove all the regexp filters, which can be accumulated. You can + add a filter preset through the option + `org-agenda-category-filter-preset' (see below.) + +`| (`org-agenda-filter-remove-all')' + Remove all filters in the current agenda view. + +Setting limits for the agenda +............................. + +Here is a list of options that you can set, either globally, or locally +in your custom agenda views*note Custom agenda views::. + +ORG-AGENDA-MAX-ENTRIES + Limit the number of entries. + +ORG-AGENDA-MAX-EFFORT + Limit the duration of accumulated efforts (as minutes). + +ORG-AGENDA-MAX-TODOS + Limit the number of entries with TODO keywords. + +ORG-AGENDA-MAX-TAGS + Limit the number of tagged entries. + + When set to a positive integer, each option will exclude entries +from other categories: for example, `(setq org-agenda-max-effort 100)' +will limit the agenda to 100 minutes of effort and exclude any entry +that as no effort property. If you want to include entries with no +effort property, use a negative value for `org-agenda-max-effort'. + + One useful setup is to use `org-agenda-max-entries' locally in a +custom command. For example, this custom command will display the next +five entries with a `NEXT' TODO keyword. + + (setq org-agenda-custom-commands + '(("n" todo "NEXT" + ((org-agenda-max-entries 5))))) + + Once you mark one of these five entry as `DONE', rebuilding the +agenda will again the next five entries again, including the first +entry that was excluded so far. + + You can also dynamically set temporary limits(2): + +`~ (`org-agenda-limit-interactively')' + This prompts for the type of limit to apply and its value. + + ---------- Footnotes ---------- + + (1) Custom commands can preset a filter by binding the variable +`org-agenda-tag-filter-preset' as an option. This filter will then be +applied to the view and persist as a basic filter through refreshes and +more secondary filtering. The filter is a global property of the +entire agenda view--in a block agenda, you should only set this in the +global options section, not in the section of an individual block. + + (2) Those temporary limits are lost when rebuilding the agenda. + + +File: org, Node: Agenda commands, Next: Custom agenda views, Prev: Presentation and sorting, Up: Agenda Views + +10.5 Commands in the agenda buffer +================================== + +Entries in the agenda buffer are linked back to the Org file or diary +file where they originate. You are not allowed to edit the agenda +buffer itself, but commands are provided to show and jump to the +original entry location, and to edit the Org files "remotely" from the +agenda buffer. In this way, all information is stored only once, +removing the risk that your agenda and note files may diverge. + + Some commands can be executed with mouse clicks on agenda lines. For +the other commands, the cursor needs to be in the desired line. + +Motion +...... + +`n (`org-agenda-next-line')' + Next line (same as and `C-n'). + +`p (`org-agenda-previous-line')' + Previous line (same as and `C-p'). + +View/Go to Org file +................... + +` or mouse-3 (`org-agenda-show-and-scroll-up')' + Display the original location of the item in another window. With + prefix arg, make sure that the entire entry is made visible in the + outline, not only the heading. + +`L (`org-agenda-recenter')' + Display original location and recenter that window. + +` or mouse-2 (`org-agenda-goto')' + Go to the original location of the item in another window. + +` (`org-agenda-switch-to')' + Go to the original location of the item and delete other windows. + +`F (`org-agenda-follow-mode')' + Toggle Follow mode. In Follow mode, as you move the cursor through + the agenda buffer, the other window always shows the corresponding + location in the Org file. The initial setting for this mode in new + agenda buffers can be set with the variable + `org-agenda-start-with-follow-mode'. + +`C-c C-x b (`org-agenda-tree-to-indirect-buffer')' + Display the entire subtree of the current item in an indirect + buffer. With a numeric prefix argument N, go up to level N and + then take that tree. If N is negative, go up that many levels. + With a `C-u' prefix, do not remove the previously used indirect + buffer. + +`C-c C-o (`org-agenda-open-link')' + Follow a link in the entry. This will offer a selection of any + links in the text belonging to the referenced Org node. If there + is only one link, it will be followed without a selection prompt. + +Change display +.............. + +`A' + Interactively select another agenda view and append it to the + current view. + +`o' + Delete other windows. + +`v d or short d (`org-agenda-day-view')' +`v w or short w (`org-agenda-week-view')' +`v t (`org-agenda-fortnight-view')' +`v m (`org-agenda-month-view')' +`v y (`org-agenda-year-view')' +`v SPC (`org-agenda-reset-view')' + Switch to day/week/month/year view. When switching to day or week + view, this setting becomes the default for subsequent agenda + refreshes. Since month and year views are slow to create, they do + not become the default. A numeric prefix argument may be used to + jump directly to a specific day of the year, ISO week, month, or + year, respectively. For example, `32 d' jumps to February 1st, `9 + w' to ISO week number 9. When setting day, week, or month view, a + year may be encoded in the prefix argument as well. For example, + `200712 w' will jump to week 12 in 2007. If such a year + specification has only one or two digits, it will be mapped to the + interval 1938-2037. `v ' will reset to what is set in + `org-agenda-span'. + +`f (`org-agenda-later')' + Go forward in time to display the following + `org-agenda-current-span' days. For example, if the display + covers a week, switch to the following week. With prefix arg, go + forward that many times `org-agenda-current-span' days. + +`b (`org-agenda-earlier')' + Go backward in time to display earlier dates. + +`. (`org-agenda-goto-today')' + Go to today. + +`j (`org-agenda-goto-date')' + Prompt for a date and go there. + +`J (`org-agenda-clock-goto')' + Go to the currently clocked-in task in the agenda buffer. + +`D (`org-agenda-toggle-diary')' + Toggle the inclusion of diary entries. See *note Weekly/daily + agenda::. + +`v l or short l (`org-agenda-log-mode')' + Toggle Logbook mode. In Logbook mode, entries that were marked + DONE while logging was on (variable `org-log-done') are shown in + the agenda, as are entries that have been clocked on that day. + You can configure the entry types that should be included in log + mode using the variable `org-agenda-log-mode-items'. When called + with a `C-u' prefix, show all possible logbook entries, including + state changes. When called with two prefix arguments `C-u C-u', + show only logging information, nothing else. `v L' is equivalent + to `C-u v l'. + +`v [ or short [ (`org-agenda-manipulate-query-add')' + Include inactive timestamps into the current view. Only for + weekly/daily agenda and timeline views. + +`v a (`org-agenda-archives-mode')' +`v A (`org-agenda-archives-mode 'files')' + Toggle Archives mode. In Archives mode, trees that are marked + `ARCHIVED' are also scanned when producing the agenda. When you + use the capital `A', even all archive files are included. To exit + archives mode, press `v a' again. + +`v R or short R (`org-agenda-clockreport-mode')' + Toggle Clockreport mode. In Clockreport mode, the daily/weekly + agenda will always show a table with the clocked times for the + time span and file scope covered by the current agenda view. The + initial setting for this mode in new agenda buffers can be set + with the variable `org-agenda-start-with-clockreport-mode'. By + using a prefix argument when toggling this mode (i.e., `C-u R'), + the clock table will not show contributions from entries that are + hidden by agenda filtering(1). See also the variable + `org-clock-report-include-clocking-task'. + +`v c' + Show overlapping clock entries, clocking gaps, and other clocking + problems in the current agenda range. You can then visit clocking + lines and fix them manually. See the variable + `org-agenda-clock-consistency-checks' for information on how to + customize the definition of what constituted a clocking problem. + To return to normal agenda display, press `l' to exit Logbook mode. + +`v E or short E (`org-agenda-entry-text-mode')' + Toggle entry text mode. In entry text mode, a number of lines + from the Org outline node referenced by an agenda line will be + displayed below the line. The maximum number of lines is given by + the variable `org-agenda-entry-text-maxlines'. Calling this + command with a numeric prefix argument will temporarily modify + that number to the prefix value. + +`G (`org-agenda-toggle-time-grid')' + Toggle the time grid on and off. See also the variables + `org-agenda-use-time-grid' and `org-agenda-time-grid'. + +`r (`org-agenda-redo')' + Recreate the agenda buffer, for example to reflect the changes + after modification of the timestamps of items with `S-' and + `S-'. When the buffer is the global TODO list, a prefix + argument is interpreted to create a selective list for a specific + TODO keyword. + +`g (`org-agenda-redo')' + Same as `r'. + +`C-x C-s or short s (`org-save-all-org-buffers')' + Save all Org buffers in the current Emacs session, and also the + locations of IDs. + +`C-c C-x C-c (`org-agenda-columns')' + Invoke column view (*note Column view::) in the agenda buffer. + The column view format is taken from the entry at point, or (if + there is no entry at point), from the first entry in the agenda + view. So whatever the format for that entry would be in the + original buffer (taken from a property, from a `#+COLUMNS' line, + or from the default variable `org-columns-default-format'), will + be used in the agenda. + +`C-c C-x > (`org-agenda-remove-restriction-lock')' + Remove the restriction lock on the agenda, if it is currently + restricted to a file or subtree (*note Agenda files::). + +Secondary filtering and query editing +..................................... + + For a detailed description of these commands, see *note + Filtering/limiting agenda items::. + +`/ (`org-agenda-filter-by-tag')' + Filter the agenda view with respect to a tag and/or effort + estimates. + +`\ (`org-agenda-filter-by-tag-refine')' + Narrow the current agenda filter by an additional condition. + +`< (`org-agenda-filter-by-category')' + Filter the current agenda view with respect to the category of the + item at point. Pressing `<' another time will remove this filter. + +`^ (`org-agenda-filter-by-top-headline')' + Filter the current agenda view and only display the siblings and + the parent headline of the one at point. + +`= (`org-agenda-filter-by-regexp')' + Filter the agenda view by a regular expression: only show agenda + entries matching the regular expression the user entered. When + called with a prefix argument, it will filter _out_ entries + matching the regexp. With two universal prefix arguments, it will + remove all the regexp filters, which can be accumulated. You can + add a filter preset through the option + `org-agenda-category-filter-preset' (see below.) + +`| (`org-agenda-filter-remove-all')' + Remove all filters in the current agenda view. + +Remote editing +.............. + +`0--9' + Digit argument. + +`C-_ (`org-agenda-undo')' + Undo a change due to a remote editing command. The change is + undone both in the agenda buffer and in the remote buffer. + +`t (`org-agenda-todo')' + Change the TODO state of the item, both in the agenda and in the + original org file. + +`C-S- (`org-agenda-todo-nextset')' + +`C-S- (`org-agenda-todo-previousset')' + Switch to the next/previous set of TODO keywords. + +`C-k (`org-agenda-kill')' + Delete the current agenda item along with the entire subtree + belonging to it in the original Org file. If the text to be + deleted remotely is longer than one line, the kill needs to be + confirmed by the user. See variable `org-agenda-confirm-kill'. + +`C-c C-w (`org-agenda-refile')' + Refile the entry at point. + +`C-c C-x C-a or short a (`org-agenda-archive-default-with-confirmation')' + Archive the subtree corresponding to the entry at point using the + default archiving command set in `org-archive-default-command'. + When using the `a' key, confirmation will be required. + +`C-c C-x a (`org-agenda-toggle-archive-tag')' + Toggle the ARCHIVE tag for the current headline. + +`C-c C-x A (`org-agenda-archive-to-archive-sibling')' + Move the subtree corresponding to the current entry to its _archive + sibling_. + +`C-c C-x C-s or short $ (`org-agenda-archive')' + Archive the subtree corresponding to the current headline. This + means the entry will be moved to the configured archive location, + most likely a different file. + +`T (`org-agenda-show-tags')' + Show all tags associated with the current item. This is useful if + you have turned off `org-agenda-show-inherited-tags', but still + want to see all tags of a headline occasionally. + +`: (`org-agenda-set-tags')' + Set tags for the current headline. If there is an active region + in the agenda, change a tag for all headings in the region. + +`,' + Set the priority for the current item (`org-agenda-priority'). + Org mode prompts for the priority character. If you reply with + , the priority cookie is removed from the entry. + +`P (`org-agenda-show-priority')' + Display weighted priority of current item. + +`+ or S- (`org-agenda-priority-up')' + Increase the priority of the current item. The priority is + changed in the original buffer, but the agenda is not resorted. + Use the `r' key for this. + +`- or S- (`org-agenda-priority-down')' + Decrease the priority of the current item. + +`z or C-c C-z (`org-agenda-add-note')' + Add a note to the entry. This note will be recorded, and then + filed to the same location where state change notes are put. + Depending on `org-log-into-drawer', this may be inside a drawer. + +`C-c C-a (`org-attach')' + Dispatcher for all command related to attachments. + +`C-c C-s (`org-agenda-schedule')' + Schedule this item. With prefix arg remove the scheduling + timestamp + +`C-c C-d (`org-agenda-deadline')' + Set a deadline for this item. With prefix arg remove the deadline. + +`S- (`org-agenda-do-date-later')' + Change the timestamp associated with the current line by one day + into the future. If the date is in the past, the first call to + this command will move it to today. + With a numeric prefix argument, change it by that many days. For + example, `3 6 5 S-' will change it by a year. With a `C-u' + prefix, change the time by one hour. If you immediately repeat + the command, it will continue to change hours even without the + prefix arg. With a double `C-u C-u' prefix, do the same for + changing minutes. + The stamp is changed in the original Org file, but the change is + not directly reflected in the agenda buffer. Use `r' or `g' to + update the buffer. + +`S- (`org-agenda-do-date-earlier')' + Change the timestamp associated with the current line by one day + into the past. + +`> (`org-agenda-date-prompt')' + Change the timestamp associated with the current line. The key + `>' has been chosen, because it is the same as `S-.' on my + keyboard. + +`I (`org-agenda-clock-in')' + Start the clock on the current item. If a clock is running + already, it is stopped first. + +`O (`org-agenda-clock-out')' + Stop the previously started clock. + +`X (`org-agenda-clock-cancel')' + Cancel the currently running clock. + +`J (`org-agenda-clock-goto')' + Jump to the running clock in another window. + +`k (`org-agenda-capture')' + Like `org-capture', but use the date at point as the default date + for the capture template. See `org-capture-use-agenda-date' to + make this the default behavior of `org-capture'. + +Dragging agenda lines forward/backward +...................................... + +`M- (`org-agenda-drag-line-backward')' + Drag the line at point backward one line(2). With a numeric + prefix argument, drag backward by that many lines. + +`M- (`org-agenda-drag-line-forward')' + Drag the line at point forward one line. With a numeric prefix + argument, drag forward by that many lines. + +Bulk remote editing selected entries +.................................... + +`m (`org-agenda-bulk-mark')' + Mark the entry at point for bulk action. With numeric prefix + argument, mark that many successive entries. + +`* (`org-agenda-bulk-mark-all')' + Mark all visible agenda entries for bulk action. + +`u (`org-agenda-bulk-unmark')' + Unmark entry at point for bulk action. + +`U (`org-agenda-bulk-remove-all-marks')' + Unmark all marked entries for bulk action. + +`M-m (`org-agenda-bulk-toggle')' + Toggle mark of the entry at point for bulk action. + +`M-* (`org-agenda-bulk-toggle-all')' + Toggle marks of all visible entries for bulk action. + +`% (`org-agenda-bulk-mark-regexp')' + Mark entries matching a regular expression for bulk action. + +`B (`org-agenda-bulk-action')' + Bulk action: act on all marked entries in the agenda. This will + prompt for another key to select the action to be applied. The + prefix arg to `B' will be passed through to the `s' and `d' + commands, to bulk-remove these special timestamps. By default, + marks are removed after the bulk. If you want them to persist, + set `org-agenda-bulk-persistent-marks' to `t' or hit `p' at the + prompt. + + `*' + Toggle persistent marks. + + `$' + Archive all selected entries. + + `A' + Archive entries by moving them to their respective archive + siblings. + + `t' + Change TODO state. This prompts for a single TODO keyword + and changes the state of all selected entries, bypassing + blocking and suppressing logging notes (but not timestamps). + + `+' + Add a tag to all selected entries. + + `-' + Remove a tag from all selected entries. + + `s' + Schedule all items to a new date. To shift existing schedule + dates by a fixed number of days, use something starting with + double plus at the prompt, for example `++8d' or `++2w'. + + `d' + Set deadline to a specific date. + + `r' + Prompt for a single refile target and move all entries. The + entries will no longer be in the agenda; refresh (`g') to + bring them back. + + `S' + Reschedule randomly into the coming N days. N will be + prompted for. With prefix arg (`C-u B S'), scatter only + across weekdays. + + `f' + Apply a function(3) to marked entries. For example, the + function below sets the CATEGORY property of the entries to + web. + + (defun set-category () + (interactive "P") + (let* ((marker (or (org-get-at-bol 'org-hd-marker) + (org-agenda-error))) + (buffer (marker-buffer marker))) + (with-current-buffer buffer + (save-excursion + (save-restriction + (widen) + (goto-char marker) + (org-back-to-heading t) + (org-set-property "CATEGORY" "web")))))) + +Calendar commands +................. + +`c (`org-agenda-goto-calendar')' + Open the Emacs calendar and move to the date at the agenda cursor. + +`c (`org-calendar-goto-agenda')' + When in the calendar, compute and show the Org mode agenda for the + date at the cursor. + +`i (`org-agenda-diary-entry')' + Insert a new entry into the diary, using the date at the cursor + and (for block entries) the date at the mark. This will add to + the Emacs diary file(4), in a way similar to the `i' command in + the calendar. The diary file will pop up in another window, where + you can add the entry. + + If you configure `org-agenda-diary-file' to point to an Org mode + file, Org will create entries (in Org mode syntax) in that file + instead. Most entries will be stored in a date-based outline tree + that will later make it easy to archive appointments from previous + months/years. The tree will be built under an entry with a + `DATE_TREE' property, or else with years as top-level entries. + Emacs will prompt you for the entry text--if you specify it, the + entry will be created in `org-agenda-diary-file' without further + interaction. If you directly press at the prompt without + typing text, the target file will be shown in another window for + you to finish the entry there. See also the `k r' command. + +`M (`org-agenda-phases-of-moon')' + Show the phases of the moon for the three months around current + date. + +`S (`org-agenda-sunrise-sunset')' + Show sunrise and sunset times. The geographical location must be + set with calendar variables, see the documentation for the Emacs + calendar. + +`C (`org-agenda-convert-date')' + Convert the date at cursor into many other cultural and historic + calendars. + +`H (`org-agenda-holidays')' + Show holidays for three months around the cursor date. + +`M-x org-icalendar-combine-agenda-files RET' + Export a single iCalendar file containing entries from all agenda + files. This is a globally available command, and also available + in the agenda menu. + +Exporting to a file +................... + +`C-x C-w (`org-agenda-write')' + Write the agenda view to a file. Depending on the extension of + the selected file name, the view will be exported as HTML (`.html' + or `.htm'), Postscript (`.ps'), PDF (`.pdf'), Org (`.org') and + plain text (any other extension). When exporting to Org, only the + body of original headlines are exported, not subtrees or inherited + tags. When called with a `C-u' prefix argument, immediately open + the newly created file. Use the variable + `org-agenda-exporter-settings' to set options for `ps-print' and + for `htmlize' to be used during export. + +Quit and Exit +............. + +`q (`org-agenda-quit')' + Quit agenda, remove the agenda buffer. + +`x (`org-agenda-exit')' + Exit agenda, remove the agenda buffer and all buffers loaded by + Emacs for the compilation of the agenda. Buffers created by the + user to visit Org files will not be removed. + + ---------- Footnotes ---------- + + (1) Only tags filtering will be respected here, effort filtering is +ignored. + + (2) Moving agenda lines does not persist after an agenda refresh and +does not modify the contributing `.org' files + + (3) You can also create persistent custom functions through +`org-agenda-bulk-custom-functions'. + + (4) This file is parsed for the agenda when +`org-agenda-include-diary' is set. + + +File: org, Node: Custom agenda views, Next: Exporting Agenda Views, Prev: Agenda commands, Up: Agenda Views + +10.6 Custom agenda views +======================== + +Custom agenda commands serve two purposes: to store and quickly access +frequently used TODO and tags searches, and to create special composite +agenda buffers. Custom agenda commands will be accessible through the +dispatcher (*note Agenda dispatcher::), just like the default commands. + +* Menu: + +* Storing searches:: Type once, use often +* Block agenda:: All the stuff you need in a single buffer +* Setting Options:: Changing the rules + + +File: org, Node: Storing searches, Next: Block agenda, Prev: Custom agenda views, Up: Custom agenda views + +10.6.1 Storing searches +----------------------- + +The first application of custom searches is the definition of keyboard +shortcuts for frequently used searches, either creating an agenda +buffer, or a sparse tree (the latter covering of course only the current +buffer). + + Custom commands are configured in the variable +`org-agenda-custom-commands'. You can customize this variable, for +example by pressing `C-c a C'. You can also directly set it with Emacs +Lisp in `.emacs'. The following example contains all valid agenda +views: + + (setq org-agenda-custom-commands + '(("x" agenda) + ("y" agenda*) + ("w" todo "WAITING") + ("W" todo-tree "WAITING") + ("u" tags "+boss-urgent") + ("v" tags-todo "+boss-urgent") + ("U" tags-tree "+boss-urgent") + ("f" occur-tree "\\") + ("h" . "HOME+Name tags searches") ; description for "h" prefix + ("hl" tags "+home+Lisa") + ("hp" tags "+home+Peter") + ("hk" tags "+home+Kim"))) + +The initial string in each entry defines the keys you have to press +after the dispatcher command `C-c a' in order to access the command. +Usually this will be just a single character, but if you have many +similar commands, you can also define two-letter combinations where the +first character is the same in several combinations and serves as a +prefix key(1). The second parameter is the search type, followed by +the string or regular expression to be used for the matching. The +example above will therefore define: + +`C-c a x' + as a global search for agenda entries planned(2) this week/day. + +`C-c a y' + as a global search for agenda entries planned this week/day, but + only those with an hour specification like `[h]h:mm'--think of + them as appointments. + +`C-c a w' + as a global search for TODO entries with `WAITING' as the TODO + keyword + +`C-c a W' + as the same search, but only in the current buffer and displaying + the results as a sparse tree + +`C-c a u' + as a global tags search for headlines marked `:boss:' but not + `:urgent:' + +`C-c a v' + as the same search as `C-c a u', but limiting the search to + headlines that are also TODO items + +`C-c a U' + as the same search as `C-c a u', but only in the current buffer and + displaying the result as a sparse tree + +`C-c a f' + to create a sparse tree (again: current buffer only) with all + entries containing the word `FIXME' + +`C-c a h' + as a prefix command for a HOME tags search where you have to press + an additional key (`l', `p' or `k') to select a name (Lisa, Peter, + or Kim) as additional tag to match. + + Note that the `*-tree' agenda views need to be called from an Org +buffer as they operate on the current buffer only. + + ---------- Footnotes ---------- + + (1) You can provide a description for a prefix key by inserting a +cons cell with the prefix and the description. + + (2) _Planned_ means here that these entries have some planning +information attached to them, like a time-stamp, a scheduled or a +deadline string. See `org-agenda-entry-types' on how to set what +planning information will be taken into account. + + +File: org, Node: Block agenda, Next: Setting Options, Prev: Storing searches, Up: Custom agenda views + +10.6.2 Block agenda +------------------- + +Another possibility is the construction of agenda views that comprise +the results of _several_ commands, each of which creates a block in the +agenda buffer. The available commands include `agenda' for the daily +or weekly agenda (as created with `C-c a a'), `alltodo' for the global +TODO list (as constructed with `C-c a t'), and the matching commands +discussed above: `todo', `tags', and `tags-todo'. Here are two +examples: + + (setq org-agenda-custom-commands + '(("h" "Agenda and Home-related tasks" + ((agenda "") + (tags-todo "home") + (tags "garden"))) + ("o" "Agenda and Office-related tasks" + ((agenda "") + (tags-todo "work") + (tags "office"))))) + +This will define `C-c a h' to create a multi-block view for stuff you +need to attend to at home. The resulting agenda buffer will contain +your agenda for the current week, all TODO items that carry the tag +`home', and also all lines tagged with `garden'. Finally the command +`C-c a o' provides a similar view for office tasks. + + +File: org, Node: Setting Options, Prev: Block agenda, Up: Custom agenda views + +10.6.3 Setting options for custom commands +------------------------------------------ + +Org mode contains a number of variables regulating agenda construction +and display. The global variables define the behavior for all agenda +commands, including the custom commands. However, if you want to change +some settings just for a single custom view, you can do so. Setting +options requires inserting a list of variable names and values at the +right spot in `org-agenda-custom-commands'. For example: + + (setq org-agenda-custom-commands + '(("w" todo "WAITING" + ((org-agenda-sorting-strategy '(priority-down)) + (org-agenda-prefix-format " Mixed: "))) + ("U" tags-tree "+boss-urgent" + ((org-show-following-heading nil) + (org-show-hierarchy-above nil))) + ("N" search "" + ((org-agenda-files '("~org/notes.org")) + (org-agenda-text-search-extra-files nil))))) + +Now the `C-c a w' command will sort the collected entries only by +priority, and the prefix format is modified to just say ` Mixed: ' +instead of giving the category of the entry. The sparse tags tree of +`C-c a U' will now turn out ultra-compact, because neither the headline +hierarchy above the match, nor the headline following the match will be +shown. The command `C-c a N' will do a text search limited to only a +single file. + + For command sets creating a block agenda, +`org-agenda-custom-commands' has two separate spots for setting +options. You can add options that should be valid for just a single +command in the set, and options that should be valid for all commands in +the set. The former are just added to the command entry; the latter +must come after the list of command entries. Going back to the block +agenda example (*note Block agenda::), let's change the sorting strategy +for the `C-c a h' commands to `priority-down', but let's sort the +results for GARDEN tags query in the opposite order, `priority-up'. +This would look like this: + + (setq org-agenda-custom-commands + '(("h" "Agenda and Home-related tasks" + ((agenda) + (tags-todo "home") + (tags "garden" + ((org-agenda-sorting-strategy '(priority-up))))) + ((org-agenda-sorting-strategy '(priority-down)))) + ("o" "Agenda and Office-related tasks" + ((agenda) + (tags-todo "work") + (tags "office"))))) + + As you see, the values and parentheses setting is a little complex. +When in doubt, use the customize interface to set this variable--it +fully supports its structure. Just one caveat: when setting options in +this interface, the _values_ are just Lisp expressions. So if the +value is a string, you need to add the double-quotes around the value +yourself. + + To control whether an agenda command should be accessible from a +specific context, you can customize +`org-agenda-custom-commands-contexts'. Let's say for example that you +have an agenda commands `"o"' displaying a view that you only need when +reading emails. Then you would configure this option like this: + + (setq org-agenda-custom-commands-contexts + '(("o" (in-mode . "message-mode")))) + + You can also tell that the command key `"o"' should refer to another +command key `"r"'. In that case, add this command key like this: + + (setq org-agenda-custom-commands-contexts + '(("o" "r" (in-mode . "message-mode")))) + + See the docstring of the variable for more information. + + +File: org, Node: Exporting Agenda Views, Next: Agenda column view, Prev: Custom agenda views, Up: Agenda Views + +10.7 Exporting Agenda Views +=========================== + +If you are away from your computer, it can be very useful to have a +printed version of some agenda views to carry around. Org mode can +export custom agenda views as plain text, HTML(1), Postscript, PDF(2), +and iCalendar files. If you want to do this only occasionally, use the +command + +`C-x C-w (`org-agenda-write')' + Write the agenda view to a file. Depending on the extension of + the selected file name, the view will be exported as HTML + (extension `.html' or `.htm'), Postscript (extension `.ps'), + iCalendar (extension `.ics'), or plain text (any other extension). + Use the variable `org-agenda-exporter-settings' to set options for + `ps-print' and for `htmlize' to be used during export, for example + + (setq org-agenda-exporter-settings + '((ps-number-of-columns 2) + (ps-landscape-mode t) + (org-agenda-add-entry-text-maxlines 5) + (htmlize-output-type 'css))) + + If you need to export certain agenda views frequently, you can +associate any custom agenda command with a list of output file names +(3). Here is an example that first defines custom commands for the +agenda and the global TODO list, together with a number of files to +which to export them. Then we define two block agenda commands and +specify file names for them as well. File names can be relative to the +current working directory, or absolute. + + (setq org-agenda-custom-commands + '(("X" agenda "" nil ("agenda.html" "agenda.ps")) + ("Y" alltodo "" nil ("todo.html" "todo.txt" "todo.ps")) + ("h" "Agenda and Home-related tasks" + ((agenda "") + (tags-todo "home") + (tags "garden")) + nil + ("~/views/home.html")) + ("o" "Agenda and Office-related tasks" + ((agenda) + (tags-todo "work") + (tags "office")) + nil + ("~/views/office.ps" "~/calendars/office.ics")))) + + The extension of the file name determines the type of export. If it +is `.html', Org mode will use the `htmlize.el' package to convert the +buffer to HTML and save it to this file name. If the extension is +`.ps', `ps-print-buffer-with-faces' is used to produce Postscript +output. If the extension is `.ics', iCalendar export is run export +over all files that were used to construct the agenda, and limit the +export to entries listed in the agenda. Any other extension produces a +plain ASCII file. + + The export files are _not_ created when you use one of those +commands interactively because this might use too much overhead. +Instead, there is a special command to produce _all_ specified files in +one step: + +`C-c a e (`org-store-agenda-views')' + Export all agenda views that have export file names associated with + them. + + You can use the options section of the custom agenda commands to also +set options for the export commands. For example: + + (setq org-agenda-custom-commands + '(("X" agenda "" + ((ps-number-of-columns 2) + (ps-landscape-mode t) + (org-agenda-prefix-format " [ ] ") + (org-agenda-with-colors nil) + (org-agenda-remove-tags t)) + ("theagenda.ps")))) + +This command sets two options for the Postscript exporter, to make it +print in two columns in landscape format--the resulting page can be cut +in two and then used in a paper agenda. The remaining settings modify +the agenda prefix to omit category and scheduling information, and +instead include a checkbox to check off items. We also remove the tags +to make the lines compact, and we don't want to use colors for the +black-and-white printer. Settings specified in +`org-agenda-exporter-settings' will also apply, but the settings in +`org-agenda-custom-commands' take precedence. + +From the command line you may also use + emacs -eval (org-batch-store-agenda-views) -kill + or, if you need to modify some parameters(4) + emacs -eval '(org-batch-store-agenda-views \ + org-agenda-span (quote month) \ + org-agenda-start-day "2007-11-01" \ + org-agenda-include-diary nil \ + org-agenda-files (quote ("~/org/project.org")))' \ + -kill + which will create the agenda views restricted to the file +`~/org/project.org', without diary entries and with a 30-day extent. + + You can also extract agenda information in a way that allows further +processing by other programs. See *note Extracting agenda +information::, for more information. + + ---------- Footnotes ---------- + + (1) You need to install Hrvoje Niksic's `htmlize.el'. + + (2) To create PDF output, the ghostscript `ps2pdf' utility must be +installed on the system. Selecting a PDF file will also create the +postscript file. + + (3) If you want to store standard views like the weekly agenda or +the global TODO list as well, you need to define custom commands for +them in order to be able to specify file names. + + (4) Quoting depends on the system you use, please check the FAQ for +examples. + + +File: org, Node: Agenda column view, Prev: Exporting Agenda Views, Up: Agenda Views + +10.8 Using column view in the agenda +==================================== + +Column view (*note Column view::) is normally used to view and edit +properties embedded in the hierarchical structure of an Org file. It +can be quite useful to use column view also from the agenda, where +entries are collected by certain criteria. + +`C-c C-x C-c (`org-agenda-columns')' + Turn on column view in the agenda. + + To understand how to use this properly, it is important to realize +that the entries in the agenda are no longer in their proper outline +environment. This causes the following issues: + + 1. Org needs to make a decision which `COLUMNS' format to use. Since + the entries in the agenda are collected from different files, and + different files may have different `COLUMNS' formats, this is a + non-trivial problem. Org first checks if the variable + `org-agenda-overriding-columns-format' is currently set, and if + so, takes the format from there. Otherwise it takes the format + associated with the first item in the agenda, or, if that item + does not have a specific format (defined in a property, or in its + file), it uses `org-columns-default-format'. + + 2. If any of the columns has a summary type defined (*note Column + attributes::), turning on column view in the agenda will visit all + relevant agenda files and make sure that the computations of this + property are up to date. This is also true for the special + `CLOCKSUM' property. Org will then sum the values displayed in + the agenda. In the daily/weekly agenda, the sums will cover a + single day; in all other views they cover the entire block. It is + vital to realize that the agenda may show the same entry _twice_ + (for example as scheduled and as a deadline), and it may show two + entries from the same hierarchy (for example a _parent_ and its + _child_). In these cases, the summation in the agenda will lead + to incorrect results because some values will count double. + + 3. When the column view in the agenda shows the `CLOCKSUM', that is + always the entire clocked time for this item. So even in the + daily/weekly agenda, the clocksum listed in column view may + originate from times outside the current view. This has the + advantage that you can compare these values with a column listing + the planned total effort for a task--one of the major applications + for column view in the agenda. If you want information about + clocked time in the displayed period use clock table mode (press + `R' in the agenda). + + 4. When the column view in the agenda shows the `CLOCKSUM_T', that is + always today's clocked time for this item. So even in the weekly + agenda, the clocksum listed in column view only originates from + today. This lets you compare the time you spent on a task for + today, with the time already spent (via `CLOCKSUM') and with the + planned total effort for it. + + +File: org, Node: Markup, Next: Exporting, Prev: Agenda Views, Up: Top + +11 Markup for rich export +************************* + +When exporting Org mode documents, the exporter tries to reflect the +structure of the document as accurately as possible in the back-end. +Since export targets like HTML, LaTeX allow much richer formatting, Org +mode has rules on how to prepare text for rich export. This section +summarizes the markup rules used in an Org mode buffer. + +* Menu: + +* Structural markup elements:: The basic structure as seen by the exporter +* Images and tables:: Images, tables and caption mechanism +* Literal examples:: Source code examples with special formatting +* Include files:: Include additional files into a document +* Index entries:: Making an index +* Macro replacement:: Use macros to create templates +* Embedded LaTeX:: LaTeX can be freely used inside Org documents +* Special blocks:: Containers targeted at export back-ends + + +File: org, Node: Structural markup elements, Next: Images and tables, Prev: Markup, Up: Markup + +11.1 Structural markup elements +=============================== + +* Menu: + +* Document title:: Where the title is taken from +* Headings and sections:: The document structure as seen by the exporter +* Table of contents:: The if and where of the table of contents +* Lists:: Lists +* Paragraphs:: Paragraphs +* Footnote markup:: Footnotes +* Emphasis and monospace:: Bold, italic, etc. +* Horizontal rules:: Make a line +* Comment lines:: What will *not* be exported + + +File: org, Node: Document title, Next: Headings and sections, Prev: Structural markup elements, Up: Structural markup elements + +Document title +-------------- + +The title of the exported document is taken from the special line + + #+TITLE: This is the title of the document + +If this line does not exist, the title will be the name of the file +associated to buffer, without extension, or the buffer name. + + If you are exporting only a subtree, its heading will become the +title of the document. If the subtree has a property `EXPORT_TITLE', +that will take precedence. + + +File: org, Node: Headings and sections, Next: Table of contents, Prev: Document title, Up: Structural markup elements + +Headings and sections +--------------------- + +The outline structure of the document as described in *note Document +Structure::, forms the basis for defining sections of the exported +document. However, since the outline structure is also used for (for +example) lists of tasks, only the first three outline levels will be +used as headings. Deeper levels will become itemized lists. You can +change the location of this switch globally by setting the variable +`org-export-headline-levels', or on a per-file basis with a line + + #+OPTIONS: H:4 + + +File: org, Node: Table of contents, Next: Lists, Prev: Headings and sections, Up: Structural markup elements + +Table of contents +----------------- + +The table of contents is normally inserted directly before the first +headline of the file. The depth of the table is by default the same as +the number of headline levels, but you can choose a smaller number, or +turn off the table of contents entirely, by configuring the variable +`org-export-with-toc', or on a per-file basis with a line like + + #+OPTIONS: toc:2 (only to two levels in TOC) + #+OPTIONS: toc:nil (no default TOC at all) + + If you would like to move the table of contents to a different +location, you should turn off the default table using +`org-export-with-toc' or `#+OPTIONS' and insert `#+TOC: headlines N' at +the desired location(s). + + #+OPTIONS: toc:nil (no default TOC) + ... + #+TOC: headlines 2 (insert TOC here, with two headline levels) + + Multiple `#+TOC: headline' lines are allowed. The same `TOC' +keyword can also generate a list of all tables (resp. all listings) +with a caption in the buffer. + + #+TOC: listings (build a list of listings) + #+TOC: tables (build a list of tables) + + The headline's title usually determines its corresponding entry in a +table of contents. However, it is possible to specify an alternative +title by setting `ALT_TITLE' property accordingly. It will then be +used when building the table. + + +File: org, Node: Lists, Next: Paragraphs, Prev: Table of contents, Up: Structural markup elements + +Lists +----- + +Plain lists as described in *note Plain lists::, are translated to the +back-end's syntax for such lists. Most back-ends support unordered, +ordered, and description lists. + + +File: org, Node: Paragraphs, Next: Footnote markup, Prev: Lists, Up: Structural markup elements + +Paragraphs, line breaks, and quoting +------------------------------------ + +Paragraphs are separated by at least one empty line. If you need to +enforce a line break within a paragraph, use `\\' at the end of a line. + + To keep the line breaks in a region, but otherwise use normal +formatting, you can use this construct, which can also be used to +format poetry. + + #+BEGIN_VERSE + Great clouds overhead + Tiny black birds rise and fall + Snow covers Emacs + + -- AlexSchroeder + #+END_VERSE + + When quoting a passage from another document, it is customary to +format this as a paragraph that is indented on both the left and the +right margin. You can include quotations in Org mode documents like +this: + + #+BEGIN_QUOTE + Everything should be made as simple as possible, + but not any simpler -- Albert Einstein + #+END_QUOTE + + If you would like to center some text, do it like this: + #+BEGIN_CENTER + Everything should be made as simple as possible, \\ + but not any simpler + #+END_CENTER + + +File: org, Node: Footnote markup, Next: Emphasis and monospace, Prev: Paragraphs, Up: Structural markup elements + +Footnote markup +--------------- + +Footnotes defined in the way described in *note Footnotes::, will be +exported by all back-ends. Org allows multiple references to the same +note, and multiple footnotes side by side. + + +File: org, Node: Emphasis and monospace, Next: Horizontal rules, Prev: Footnote markup, Up: Structural markup elements + +Emphasis and monospace +---------------------- + +You can make words *bold*, /italic/, _underlined_, `=verbatim=' and +`~code~', and, if you must, `+strike-through+'. Text in the code and +verbatim string is not processed for Org mode specific syntax, it is +exported verbatim. + + To turn off fontification for marked up text, you can set +`org-fontify-emphasized-text' to `nil'. To narrow down the list of +available markup syntax, you can customize `org-emphasis-alist'. To +fine tune what characters are allowed before and after the markup +characters, you can tweak `org-emphasis-regexp-components'. Beware +that changing one of the above variables will no take effect until you +reload Org, for which you may need to restart Emacs. + + +File: org, Node: Horizontal rules, Next: Comment lines, Prev: Emphasis and monospace, Up: Structural markup elements + +Horizontal rules +---------------- + +A line consisting of only dashes, and at least 5 of them, will be +exported as a horizontal line. + + +File: org, Node: Comment lines, Prev: Horizontal rules, Up: Structural markup elements + +Comment lines +------------- + +Lines starting with zero or more whitespace characters followed by one +`#' and a whitespace are treated as comments and will never be exported. +Also entire subtrees starting with the word `COMMENT' will never be +exported. Finally, regions surrounded by `#+BEGIN_COMMENT' ... +`#+END_COMMENT' will not be exported. + +`C-c ;' + Toggle the COMMENT keyword at the beginning of an entry. + + +File: org, Node: Images and tables, Next: Literal examples, Prev: Structural markup elements, Up: Markup + +11.2 Images and Tables +====================== + +Both the native Org mode tables (*note Tables::) and tables formatted +with the `table.el' package will be exported properly. For Org mode +tables, the lines before the first horizontal separator line will +become table header lines. You can use the following lines somewhere +before the table to assign a caption and a label for cross references, +and in the text you can refer to the object with `[[tab:basic-data]]' +(*note Internal links::): + + #+CAPTION: This is the caption for the next table (or link) + #+NAME: tab:basic-data + | ... | ...| + |-----|----| + + Optionally, the caption can take the form: + #+CAPTION[Caption for list of tables]: Caption for table. + + Some back-ends allow you to directly include images into the exported +document. Org does this, if a link to an image files does not have a +description part, for example `[[./img/a.jpg]]'. If you wish to define +a caption for the image and maybe a label for internal cross +references, make sure that the link is on a line by itself and precede +it with `#+CAPTION' and `#+NAME' as follows: + + #+CAPTION: This is the caption for the next figure link (or table) + #+NAME: fig:SED-HR4049 + [[./img/a.jpg]] + +Such images can be displayed within the buffer. *Note the discussion +of image links: Handling links. + + Even though images and tables are prominent examples of captioned +structures, the same caption mechanism can apply to many others (e.g., +LaTeX equations, source code blocks). Depending on the export +back-end, those may or may not be handled. + + +File: org, Node: Literal examples, Next: Include files, Prev: Images and tables, Up: Markup + +11.3 Literal examples +===================== + +You can include literal examples that should not be subjected to +markup. Such examples will be typeset in monospace, so this is well +suited for source code and similar examples. + + #+BEGIN_EXAMPLE + Some example from a text file. + #+END_EXAMPLE + + Note that such blocks may be indented in order to align nicely with +indented text and in particular with plain list structure (*note Plain +lists::). For simplicity when using small examples, you can also start +the example lines with a colon followed by a space. There may also be +additional whitespace before the colon: + + Here is an example + : Some example from a text file. + + If the example is source code from a programming language, or any +other text that can be marked up by font-lock in Emacs, you can ask for +the example to look like the fontified Emacs buffer(1). This is done +with the `src' block, where you also need to specify the name of the +major mode that should be used to fontify the example(2), see *note +Easy Templates:: for shortcuts to easily insert code blocks. + + #+BEGIN_SRC emacs-lisp + (defun org-xor (a b) + "Exclusive or." + (if a (not b) b)) + #+END_SRC + + Both in `example' and in `src' snippets, you can add a `-n' switch +to the end of the `BEGIN' line, to get the lines of the example +numbered. If you use a `+n' switch, the numbering from the previous +numbered snippet will be continued in the current one. In literal +examples, Org will interpret strings like `(ref:name)' as labels, and +use them as targets for special hyperlinks like `[[(name)]]' (i.e., the +reference name enclosed in single parenthesis). In HTML, hovering the +mouse over such a link will remote-highlight the corresponding code +line, which is kind of cool. + + You can also add a `-r' switch which removes the labels from the +source code(3). With the `-n' switch, links to these references will +be labeled by the line numbers from the code listing, otherwise links +will use the labels with no parentheses. Here is an example: + + #+BEGIN_SRC emacs-lisp -n -r + (save-excursion (ref:sc) + (goto-char (point-min))) (ref:jump) + #+END_SRC + In line [[(sc)]] we remember the current position. [[(jump)][Line (jump)]] + jumps to point-min. + + If the syntax for the label format conflicts with the language +syntax, use a `-l' switch to change the format, for example +`#+BEGIN_SRC pascal -n -r -l "((%s))"'. See also the variable +`org-coderef-label-format'. + + HTML export also allows examples to be published as text areas +(*note Text areas in HTML export::). + + Because the `#+BEGIN_...' and `#+END_...' patterns need to be added +so often, shortcuts are provided using the Easy Templates facility +(*note Easy Templates::). + +`C-c '' + Edit the source code example at point in its native mode. This + works by switching to a temporary buffer with the source code. + You need to exit by pressing `C-c '' again(4). The edited version + will then replace the old version in the Org buffer. Fixed-width + regions (where each line starts with a colon followed by a space) + will be edited using `artist-mode'(5) to allow creating ASCII + drawings easily. Using this command in an empty line will create + a new fixed-width region. + +`C-c l' + Calling `org-store-link' while editing a source code example in a + temporary buffer created with `C-c '' will prompt for a label. + Make sure that it is unique in the current buffer, and insert it + with the proper formatting like `(ref:label)' at the end of the + current line. Then the label is stored as a link `(label)', for + retrieval with `C-c C-l'. + + ---------- Footnotes ---------- + + (1) This works automatically for the HTML back-end (it requires +version 1.34 of the `htmlize.el' package, which is distributed with +Org). Fontified code chunks in LaTeX can be achieved using either the +listings or the minted (http://code.google.com/p/minted) package. +Refer to `org-latex-listings' documentation for details. + + (2) Code in `src' blocks may also be evaluated either interactively +or on export. See *note Working With Source Code:: for more +information on evaluating code blocks. + + (3) Adding `-k' to `-n -r' will keep the labels in the source code +while using line numbers for the links, which might be useful to +explain those in an Org mode example code. + + (4) Upon exit, lines starting with `*', `,*', `#+' and `,#+' will +get a comma prepended, to keep them from being interpreted by Org as +outline nodes or special syntax. These commas will be stripped for +editing with `C-c '', and also for export. + + (5) You may select a different-mode with the variable +`org-edit-fixed-width-region-mode'. + + +File: org, Node: Include files, Next: Index entries, Prev: Literal examples, Up: Markup + +11.4 Include files +================== + +During export, you can include the content of another file. For +example, to include your `.emacs' file, you could use: + + #+INCLUDE: "~/.emacs" src emacs-lisp + +The optional second and third parameter are the markup (i.e., `example' +or `src'), and, if the markup is `src', the language for formatting the +contents. The markup is optional; if it is not given, the text will be +assumed to be in Org mode format and will be processed normally. + + Contents of the included file will belong to the same structure +(headline, item) containing the `INCLUDE' keyword. In particular, +headlines within the file will become children of the current section. +That behavior can be changed by providing an additional keyword +parameter, `:minlevel'. In that case, all headlines in the included +file will be shifted so the one with the lowest level reaches that +specified level. For example, to make a file become a sibling of the +current top-level headline, use + + #+INCLUDE: "~/my-book/chapter2.org" :minlevel 1 + + You can also include a portion of a file by specifying a lines range +using the `:lines' parameter. The line at the upper end of the range +will not be included. The start and/or the end of the range may be +omitted to use the obvious defaults. + + #+INCLUDE: "~/.emacs" :lines "5-10" Include lines 5 to 10, 10 excluded + #+INCLUDE: "~/.emacs" :lines "-10" Include lines 1 to 10, 10 excluded + #+INCLUDE: "~/.emacs" :lines "10-" Include lines from 10 to EOF + +`C-c '' + Visit the include file at point. + + +File: org, Node: Index entries, Next: Macro replacement, Prev: Include files, Up: Markup + +11.5 Index entries +================== + +You can specify entries that will be used for generating an index during +publishing. This is done by lines starting with `#+INDEX'. An entry +the contains an exclamation mark will create a sub item. See *note +Generating an index:: for more information. + + * Curriculum Vitae + #+INDEX: CV + #+INDEX: Application!CV + + +File: org, Node: Macro replacement, Next: Embedded LaTeX, Prev: Index entries, Up: Markup + +11.6 Macro replacement +====================== + +You can define text snippets with + + #+MACRO: name replacement text $1, $2 are arguments + +which can be referenced in paragraphs, verse blocks, table cells and +some keywords with `{{{name(arg1,arg2)}}}'(1). In addition to defined +macros, `{{{title}}}', `{{{author}}}', etc., will reference information +set by the `#+TITLE:', `#+AUTHOR:', and similar lines. Also, +`{{{time(FORMAT)}}}' and `{{{modification-time(FORMAT)}}}' refer to +current date time and to the modification time of the file being +exported, respectively. FORMAT should be a format string understood by +`format-time-string'. + + Macro expansion takes place during export. + + ---------- Footnotes ---------- + + (1) Since commas separate arguments, commas within arguments have to +be escaped with a backslash character. Conversely, backslash +characters before a comma, and only them, need to be escaped with +another backslash character. + + +File: org, Node: Embedded LaTeX, Next: Special blocks, Prev: Macro replacement, Up: Markup + +11.7 Embedded LaTeX +=================== + +Plain ASCII is normally sufficient for almost all note taking. +Exceptions include scientific notes, which often require mathematical +symbols and the occasional formula. LaTeX(1) is widely used to +typeset scientific documents. Org mode supports embedding LaTeX code +into its files, because many academics are used to writing and reading +LaTeX source code, and because it can be readily processed to produce +pretty output for a number of export back-ends. + +* Menu: + +* Special symbols:: Greek letters and other symbols +* Subscripts and superscripts:: Simple syntax for raising/lowering text +* LaTeX fragments:: Complex formulas made easy +* Previewing LaTeX fragments:: What will this snippet look like? +* CDLaTeX mode:: Speed up entering of formulas + + ---------- Footnotes ---------- + + (1) LaTeX is a macro system based on Donald E. Knuth's TeX system. +Many of the features described here as "LaTeX" are really from TeX, but +for simplicity I am blurring this distinction. + + +File: org, Node: Special symbols, Next: Subscripts and superscripts, Prev: Embedded LaTeX, Up: Embedded LaTeX + +11.7.1 Special symbols +---------------------- + +You can use LaTeX-like syntax to insert special symbols like `\alpha' +to indicate the Greek letter, or `\to' to indicate an arrow. Completion +for these symbols is available, just type `\' and maybe a few letters, +and press `M-' to see possible completions. Unlike LaTeX code, +Org mode allows these symbols to be present without surrounding math +delimiters, for example: + + Angles are written as Greek letters \alpha, \beta and \gamma. + + During export, these symbols will be transformed into the native +format of the exporter back-end. Strings like `\alpha' will be +exported as `α' in the HTML output, and as `$\alpha$' in the LaTeX +output. Similarly, `\nbsp' will become ` ' in HTML and `~' in +LaTeX. If you need such a symbol inside a word, terminate it like +this: `\Aacute{}stor'. + + A large number of entities is provided, with names taken from both +HTML and LaTeX; see the variable `org-entities' for the complete list. +`\-' is treated as a shy hyphen, and `--', `---', and `...' are all +converted into special commands creating hyphens of different lengths +or a compact set of dots. + + If you would like to see entities displayed as UTF-8 characters, use +the following command(1): + +`C-c C-x \' + Toggle display of entities as UTF-8 characters. This does not + change the buffer content which remains plain ASCII, but it + overlays the UTF-8 character for display purposes only. + + ---------- Footnotes ---------- + + (1) You can turn this on by default by setting the variable +`org-pretty-entities', or on a per-file base with the `#+STARTUP' +option `entitiespretty'. + + +File: org, Node: Subscripts and superscripts, Next: LaTeX fragments, Prev: Special symbols, Up: Embedded LaTeX + +11.7.2 Subscripts and superscripts +---------------------------------- + +Just like in LaTeX, `^' and `_' are used to indicate super- and +subscripts. Again, these can be used without embedding them in +math-mode delimiters. To increase the readability of ASCII text, it is +not necessary (but OK) to surround multi-character sub- and +superscripts with curly braces. For example + + The mass of the sun is M_sun = 1.989 x 10^30 kg. The radius of + the sun is R_{sun} = 6.96 x 10^8 m. + + If you write a text where the underscore is often used in a different +context, Org's convention to always interpret these as subscripts can +get in your way. Configure the variable `org-use-sub-superscripts' to +change this convention. For example, when setting this variable to +`{}', `a_b' will not be interpreted as a subscript, but `a_{b}' will. + +`C-c C-x \' + In addition to showing entities as UTF-8 characters, this command + will also format sub- and superscripts in a WYSIWYM way. + + +File: org, Node: LaTeX fragments, Next: Previewing LaTeX fragments, Prev: Subscripts and superscripts, Up: Embedded LaTeX + +11.7.3 LaTeX fragments +---------------------- + +Going beyond symbols and sub- and superscripts, a full formula language +is needed. Org mode can contain LaTeX math fragments, and it supports +ways to process these for several export back-ends. When exporting to +LaTeX, the code is obviously left as it is. When exporting to HTML, +Org invokes the MathJax library (http://www.mathjax.org) (*note Math +formatting in HTML export::) to process and display the math(1). +Finally, it can also process the mathematical expressions into +images(2) that can be displayed in a browser. + + LaTeX fragments don't need any special marking at all. The following +snippets will be identified as LaTeX source code: + * Environments of any kind(3). The only requirement is that the + `\begin' and `\end' statements appear on a new line, at the + beginning of the line or after whitespaces only. + + * Text within the usual LaTeX math delimiters. To avoid conflicts + with currency specifications, single `$' characters are only + recognized as math delimiters if the enclosed text contains at + most two line breaks, is directly attached to the `$' characters + with no whitespace in between, and if the closing `$' is followed + by whitespace, punctuation or a dash. For the other delimiters, + there is no such restriction, so when in doubt, use `\(...\)' as + inline math delimiters. + +For example: + + \begin{equation} + x=\sqrt{b} + \end{equation} + + If $a^2=b$ and \( b=2 \), then the solution must be + either $$ a=+\sqrt{2} $$ or \[ a=-\sqrt{2} \]. + + LaTeX processing can be configured with the variable +`org-export-with-latex'. The default setting is `t' which means +`MathJax' for HTML, and no processing for ASCII and LaTeX back-ends. +You can also set this variable on a per-file basis using one of these +lines: + + #+OPTIONS: tex:t Do the right thing automatically (MathJax) + #+OPTIONS: tex:nil Do not process LaTeX fragments at all + #+OPTIONS: tex:verbatim Verbatim export, for jsMath or so + + ---------- Footnotes ---------- + + (1) If you plan to use this regularly or on pages with significant +page views, you should install `MathJax' on your own server in order to +limit the load of our server. + + (2) For this to work you need to be on a system with a working LaTeX +installation. You also need the `dvipng' program or the `convert', +respectively available at `http://sourceforge.net/projects/dvipng/' and +from the `imagemagick' suite. The LaTeX header that will be used when +processing a fragment can be configured with the variable +`org-format-latex-header'. + + (3) When `MathJax' is used, only the environments recognized by +`MathJax' will be processed. When `dvipng' program or `imagemagick' +suite is used to create images, any LaTeX environment will be handled. + + +File: org, Node: Previewing LaTeX fragments, Next: CDLaTeX mode, Prev: LaTeX fragments, Up: Embedded LaTeX + +11.7.4 Previewing LaTeX fragments +--------------------------------- + +If you have `dvipng' or `imagemagick' installed(1), LaTeX fragments can +be processed to produce preview images of the typeset expressions: + +`C-c C-x C-l' + Produce a preview image of the LaTeX fragment at point and overlay + it over the source code. If there is no fragment at point, + process all fragments in the current entry (between two + headlines). When called with a prefix argument, process the + entire subtree. When called with two prefix arguments, or when + the cursor is before the first headline, process the entire buffer. + +`C-c C-c' + Remove the overlay preview images. + + You can customize the variable `org-format-latex-options' to +influence some aspects of the preview. In particular, the `:scale' +(and for HTML export, `:html-scale') property can be used to adjust the +size of the preview images. + + You can turn on the previewing of all LaTeX fragments in a file with + + #+STARTUP: latexpreview + + To disable it, simply use + + #+STARTUP: nolatexpreview + + ---------- Footnotes ---------- + + (1) Choose the converter by setting the variable +`org-latex-create-formula-image-program' accordingly. + + +File: org, Node: CDLaTeX mode, Prev: Previewing LaTeX fragments, Up: Embedded LaTeX + +11.7.5 Using CDLaTeX to enter math +---------------------------------- + +CDLaTeX mode is a minor mode that is normally used in combination with a +major LaTeX mode like AUCTeX in order to speed-up insertion of +environments and math templates. Inside Org mode, you can make use of +some of the features of CDLaTeX mode. You need to install `cdlatex.el' +and `texmathp.el' (the latter comes also with AUCTeX) from +`http://www.astro.uva.nl/~dominik/Tools/cdlatex'. Don't use CDLaTeX +mode itself under Org mode, but use the light version +`org-cdlatex-mode' that comes as part of Org mode. Turn it on for the +current buffer with `M-x org-cdlatex-mode RET', or for all Org files +with + + (add-hook 'org-mode-hook 'turn-on-org-cdlatex) + + When this mode is enabled, the following features are present (for +more details see the documentation of CDLaTeX mode): + * Environment templates can be inserted with `C-c {'. + + * The key will do template expansion if the cursor is inside a + LaTeX fragment(1). For example, will expand `fr' to + `\frac{}{}' and position the cursor correctly inside the first + brace. Another will get you into the second brace. Even + outside fragments, will expand environment abbreviations at + the beginning of a line. For example, if you write `equ' at the + beginning of a line and press , this abbreviation will be + expanded to an `equation' environment. To get a list of all + abbreviations, type `M-x cdlatex-command-help RET'. + + * Pressing `_' and `^' inside a LaTeX fragment will insert these + characters together with a pair of braces. If you use to + move out of the braces, and if the braces surround only a single + character or macro, they are removed again (depending on the + variable `cdlatex-simplify-sub-super-scripts'). + + * Pressing the backquote ``' followed by a character inserts math + macros, also outside LaTeX fragments. If you wait more than 1.5 + seconds after the backquote, a help window will pop up. + + * Pressing the single-quote `'' followed by another character + modifies the symbol before point with an accent or a font. If you + wait more than 1.5 seconds after the single-quote, a help window + will pop up. Character modification will work only inside LaTeX + fragments; outside the quote is normal. + + ---------- Footnotes ---------- + + (1) Org mode has a method to test if the cursor is inside such a +fragment, see the documentation of the function +`org-inside-LaTeX-fragment-p'. + + +File: org, Node: Special blocks, Prev: Embedded LaTeX, Up: Markup + +11.8 Special blocks +=================== + +Org syntax includes pre-defined blocks (*note Paragraphs:: and *note +Literal examples::). It is also possible to create blocks containing +raw code targeted at a specific back-ends (e.g., `#+BEGIN_LATEX'). + + Any other block is a _special block_. + + For example, `#+BEGIN_ABSTRACT' and `#+BEGIN_VIDEO' are special +blocks. The first one is useful when exporting to LaTeX, the second one +when exporting to HTML5. + + Each export back-end decides if they should be exported, and how. +When the block is ignored, its contents are still exported, as if the +opening and closing block lines were not there. For example, when +exporting a `#+BEGIN_TEST' block, HTML back-end wraps its contents +within a `
' tag. + + Refer to back-end specific documentation for more information. + + +File: org, Node: Exporting, Next: Publishing, Prev: Markup, Up: Top + +12 Exporting +************ + +The Org mode export facilities can be used to export Org documents or +parts of Org documents to a variety of other formats. In addition, +these facilities can be used with `orgtbl-mode' and/or `orgstruct-mode' +in foreign buffers so you can author tables and lists in Org syntax and +convert them in place to the target language. + + ASCII export produces a readable and simple version of an Org file +for printing and sharing notes. HTML export allows you to easily +publish notes on the web, or to build full-fledged websites. LaTeX +export lets you use Org mode and its structured editing functions to +create arbitrarily complex LaTeX files for any kind of document. +OpenDocument Text (ODT) export allows seamless collaboration across +organizational boundaries. Markdown export lets you seamlessly +collaborate with other developers. Finally, iCal export can extract +entries with deadlines or appointments to produce a file in the +iCalendar format. + +* Menu: + +* The Export Dispatcher:: The main exporter interface +* Export back-ends:: Built-in export formats +* Export settings:: Generic export settings +* ASCII/Latin-1/UTF-8 export:: Exporting to flat files with encoding +* Beamer export:: Exporting as a Beamer presentation +* HTML export:: Exporting to HTML +* LaTeX and PDF export:: Exporting to LaTeX, and processing to PDF +* Markdown export:: Exporting to Markdown +* OpenDocument Text export:: Exporting to OpenDocument Text +* Org export:: Exporting to Org +* Texinfo export:: Exporting to Texinfo +* iCalendar export:: Exporting to iCalendar +* Other built-in back-ends:: Exporting to a man page +* Export in foreign buffers:: Author tables and lists in Org syntax +* Advanced configuration:: Fine-tuning the export output + + +File: org, Node: The Export Dispatcher, Next: Export back-ends, Prev: Exporting, Up: Exporting + +12.1 The Export Dispatcher +========================== + +The main entry point for export related tasks is the dispatcher, a +hierarchical menu from which it is possible to select an export format +and toggle export options(1) from which it is possible to select an +export format and to toggle export options. + +`C-c C-e' (`org-export-dispatch') + Dispatch for export and publishing commands. When called with a + `C-u' prefix argument, repeat the last export command on the + current buffer while preserving toggled options. If the current + buffer hasn't changed and subtree export was activated, the + command will affect that same subtree. + + Normally the entire buffer is exported, but if there is an active +region only that part of the buffer will be exported. + + Several export options (*note Export settings::) can be toggled from +the export dispatcher with the following key combinations: + +`C-a' + Toggle asynchronous export. Asynchronous export uses an external + Emacs process that is configured with a specified initialization + file. + + While exporting asynchronously, the output is not displayed, but + stored in a place called "the export stack". This stack can be + displayed by calling the dispatcher with a double `C-u' prefix + argument, or with `&' key from the dispatcher menu. + + To make this behavior the default, customize the variable + `org-export-in-background'. + +`C-b' + Toggle body-only export. Its effect depends on the back-end used. + Typically, if the back-end has a header section (like + `...' in the HTML back-end), a body-only export will + not include this header. + +`C-s' + Toggle subtree export. The top heading becomes the document title. + + You can change the default state of this option by setting + `org-export-initial-scope'. + +`C-v' + Toggle visible-only export. Only export the text that is currently + visible, i.e. not hidden by outline visibility in the buffer. + + + With the exception of asynchronous export, a successful export +process writes its output to the kill-ring. You can configure this +behavior by altering the option `org-export-copy-to-kill-ring'. + + ---------- Footnotes ---------- + + (1) It is also possible to use a less intrusive interface by setting +`org-export-dispatch-use-expert-ui' to a non-`nil' value. In that +case, only a prompt is visible from the minibuffer. From there one can +still switch back to regular menu by pressing . + + +File: org, Node: Export back-ends, Next: Export settings, Prev: The Export Dispatcher, Up: Exporting + +12.2 Export back-ends +===================== + +An export back-end is a library that translates Org syntax into a +foreign format. An export format is not available until the proper +back-end has been loaded. + + By default, the following four back-ends are loaded: `ascii', +`html', `icalendar' and `latex'. It is possible to add more (or remove +some) by customizing `org-export-backends'. + + Built-in back-ends include: + + * ascii (ASCII format) + + * beamer (LaTeX Beamer format) + + * html (HTML format) + + * icalendar (iCalendar format) + + * latex (LaTeX format) + + * man (Man page format) + + * md (Markdown format) + + * odt (OpenDocument Text format) + + * org (Org format) + + * texinfo (Texinfo format) + + Other back-ends might be found in the `contrib/' directory (*note +Installation::). + + +File: org, Node: Export settings, Next: ASCII/Latin-1/UTF-8 export, Prev: Export back-ends, Up: Exporting + +12.3 Export settings +==================== + +Export options can be set: globally with variables; for an individual +file by making variables buffer-local with in-buffer settings (*note +In-buffer settings::), by setting individual keywords, or by specifying +them in a compact form with the `#+OPTIONS' keyword; or for a tree by +setting properties (*note Properties and Columns::). Options set at a +specific level override options set at a more general level. + + In-buffer settings may appear anywhere in the file, either directly +or indirectly through a file included using `#+SETUPFILE: filename' +syntax. Option keyword sets tailored to a particular back-end can be +inserted from the export dispatcher (*note The Export Dispatcher::) +using the `Insert template' command by pressing <#>. To insert +keywords individually, a good way to make sure the keyword is correct +is to type `#+' and then to use `M-' for completion. + + The export keywords available for every back-end, and their +equivalent global variables, include: + +`AUTHOR' + The document author (`user-full-name'). + +`CREATOR' + Entity responsible for output generation + (`org-export-creator-string'). + +`DATE' + A date or a time-stamp(1). + +`DESCRIPTION' + The document description. Back-ends handle it as they see fit + (e.g., for the XHTML meta tag), if at all. You can use several + such keywords for long descriptions. + +`EMAIL' + The email address (`user-mail-address'). + +`KEYWORDS' + The keywords defining the contents of the document. Back-ends + handle it as they see fit (e.g., for the XHTML meta tag), if at + all. You can use several such keywords if the list is long. + +`LANGUAGE' + The language used for translating some strings + (`org-export-default-language'). E.g., `#+LANGUAGE: fr' will tell + Org to translate _File_ (english) into _Fichier_ (french) in the + clocktable. + +`SELECT_TAGS' + The tags that select a tree for export (`org-export-select-tags'). + The default value is `:export:'. Within a subtree tagged with + `:export:', you can still exclude entries with `:noexport:' (see + below). When headlines are selectively exported with `:export:' + anywhere in a file, text before the first headline is ignored. + +`EXCLUDE_TAGS' + The tags that exclude a tree from export + (`org-export-exclude-tags'). The default value is `:noexport:'. + Entries with the `:noexport:' tag will be unconditionally excluded + from the export, even if they have an `:export:' tag. + +`TITLE' + The title to be shown (otherwise derived from buffer's name). You + can use several such keywords for long titles. + + The `#+OPTIONS' keyword is a compact(2) form that recognizes the +following arguments: + +`':' + Toggle smart quotes (`org-export-with-smart-quotes'). + +`*:' + Toggle emphasized text (`org-export-with-emphasize'). + +`-:' + Toggle conversion of special strings + (`org-export-with-special-strings'). + +`::' + Toggle fixed-width sections (`org-export-with-fixed-width'). + +`<:' + Toggle inclusion of any time/date active/inactive stamps + (`org-export-with-timestamps'). + +`\n:' + Toggle line-break-preservation (`org-export-preserve-breaks'). + +`^:' + Toggle TeX-like syntax for sub- and superscripts. If you write + "^:{}", `a_{b}' will be interpreted, but the simple `a_b' will be + left as it is (`org-export-with-sub-superscripts'). + +`arch:' + Configure export of archived trees. Can be set to `headline' to + only process the headline, skipping its contents + (`org-export-with-archived-trees'). + +`author:' + Toggle inclusion of author name into exported file + (`org-export-with-author'). + +`c:' + Toggle inclusion of CLOCK keywords (`org-export-with-clocks'). + +`creator:' + Configure inclusion of creator info into exported file. It may be + set to `comment' (`org-export-with-creator'). + +`d:' + Toggle inclusion of drawers, or list drawers to include + (`org-export-with-drawers'). + +`e:' + Toggle inclusion of entities (`org-export-with-entities'). + +`email:' + Toggle inclusion of the author's e-mail into exported file + (`org-export-with-email'). + +`f:' + Toggle the inclusion of footnotes (`org-export-with-footnotes'). + +`H:' + Set the number of headline levels for export + (`org-export-headline-levels'). Below that level, headlines are + treated differently. In most back-ends, they become list items. + +`inline:' + Toggle inclusion of inlinetasks (`org-export-with-inlinetasks'). + +`num:' + Toggle section-numbers (`org-export-with-section-numbers'). It + can also be set to a number `n', so only headlines at that level + or above will be numbered. + +`p:' + Toggle export of planning information (`org-export-with-planning'). + "Planning information" is the line containing the `SCHEDULED:', the + `DEADLINE:' or the `CLOSED:' cookies or a combination of them. + +`pri:' + Toggle inclusion of priority cookies (`org-export-with-priority'). + +`stat:' + Toggle inclusion of statistics cookies + (`org-export-with-statistics-cookies'). + +`tags:' + Toggle inclusion of tags, may also be `not-in-toc' + (`org-export-with-tags'). + +`tasks:' + Toggle inclusion of tasks (TODO items), can be `nil' to remove all + tasks, `todo' to remove DONE tasks, or a list of keywords to keep + (`org-export-with-tasks'). + +`tex:' + Configure export of LaTeX fragments and environments. It may be + set to `verbatim' (`org-export-with-latex'). + +`timestamp:' + Toggle inclusion of the creation time into exported file + (`org-export-time-stamp-file'). + +`toc:' + Toggle inclusion of the table of contents, or set the level limit + (`org-export-with-toc'). + +`todo:' + Toggle inclusion of TODO keywords into exported text + (`org-export-with-todo-keywords'). + +`|:' + Toggle inclusion of tables (`org-export-with-tables'). + + When exporting only a subtree, each of the previous keywords(3) can +be overridden locally by special node properties. These begin with +`EXPORT_', followed by the name of the keyword they supplant. For +example, `DATE' and `OPTIONS' keywords become, respectively, +`EXPORT_DATE' and `EXPORT_OPTIONS' properties. + + If `org-export-allow-bind-keywords' is non-`nil', Emacs variables +can become buffer-local during export by using the BIND keyword. Its +syntax is `#+BIND: variable value'. This is particularly useful for +in-buffer settings that cannot be changed using specific keywords. + + The name of the output file to be generated is taken from the file +associated to the buffer, when possible, or asked to you otherwise. +For subtree export, you can also set `EXPORT_FILE_NAME' property. In +all cases, only the base name of the file is retained, and a back-end +specific extension is added. + + ---------- Footnotes ---------- + + (1) The variable `org-export-date-timestamp-format' defines how this +time-stamp will be exported. + + (2) If you want to configure many options this way, you can use +several `#+OPTIONS' lines. + + (3) With the exception of `SETUPFILE'. + + +File: org, Node: ASCII/Latin-1/UTF-8 export, Next: Beamer export, Prev: Export settings, Up: Exporting + +12.4 ASCII/Latin-1/UTF-8 export +=============================== + +ASCII export produces a simple and very readable version of an Org mode +file, containing only plain ASCII. Latin-1 and UTF-8 export augment +the file with special characters and symbols available in these +encodings. + + Links are exported in a footnote-like style, with the descriptive +part in the text and the link in a note before the next heading. See +the variable `org-ascii-links-to-notes' for details and other options. + +ASCII export commands +--------------------- + +`C-c C-e t a/l/u (`org-ascii-export-to-ascii')' + Export as an ASCII file. For an Org file, `myfile.org', the ASCII + file will be `myfile.txt'. The file will be overwritten without + warning. When the original file is `myfile.txt', the resulting + file becomes `myfile.txt.txt' in order to prevent data loss. + +`C-c C-e t A/L/U (`org-ascii-export-as-ascii')' + Export to a temporary buffer. Do not create a file. + +Header and sectioning structure +------------------------------- + +In the exported version, the first three outline levels become +headlines, defining a general document structure. Additional levels +are exported as lists. The transition can also occur at a different +level (*note Export settings::). + +Quoting ASCII text +------------------ + +You can insert text that will only appear when using `ASCII' back-end +with the following constructs: + + Text @@ascii:and additional text@@ within a paragraph. + + #+ASCII: Some text + + #+BEGIN_ASCII + All lines in this block will appear only when using this back-end. + #+END_ASCII + +ASCII specific attributes +------------------------- + +`ASCII' back-end only understands one attribute, `:width', which +specifies the length, in characters, of a given horizontal rule. It +must be specified using an `ATTR_ASCII' line, directly preceding the +rule. + + #+ATTR_ASCII: :width 10 + ----- + + +File: org, Node: Beamer export, Next: HTML export, Prev: ASCII/Latin-1/UTF-8 export, Up: Exporting + +12.5 Beamer export +================== + +The LaTeX class _Beamer_ allows production of high quality +presentations using LaTeX and pdf processing. Org mode has special +support for turning an Org mode file or tree into a Beamer presentation. + +Beamer export commands +---------------------- + +`C-c C-e l b (`org-beamer-export-to-latex')' + Export as a LaTeX file. For an Org file `myfile.org', the LaTeX + file will be `myfile.tex'. The file will be overwritten without + warning. + +`C-c C-e l B (`org-beamer-export-as-latex')' + Export to a temporary buffer. Do not create a file. + +`C-c C-e l P (`org-beamer-export-to-pdf')' + Export as LaTeX and then process to PDF. + +`C-c C-e l O' + Export as LaTeX and then process to PDF, then open the resulting + PDF file. + +Sectioning, Frames and Blocks +----------------------------- + +Any tree with not-too-deep level nesting should in principle be +exportable as a Beamer presentation. Headlines fall into three +categories: sectioning elements, frames and blocks. + + - Headlines become frames when their level is equal to + `org-beamer-frame-level' or `H' value in an `OPTIONS' line (*note + Export settings::). + + Though, if a headline in the current tree has a `BEAMER_ENV' + property set to either to `frame' or `fullframe', its level + overrides the variable. A `fullframe' is a frame with an empty + (ignored) title. + + - All frame's children become `block' environments. Special block + types can be enforced by setting headline's `BEAMER_ENV' + property(1) to an appropriate value (see + `org-beamer-environments-default' for supported values and + `org-beamer-environments-extra' for adding more). + + - As a special case, if the `BEAMER_ENV' property is set to either + `appendix', `note', `noteNH' or `againframe', the headline will + become, respectively, an appendix, a note (within frame or between + frame, depending on its level), a note with its title ignored or an + `\againframe' command. In the latter case, a `BEAMER_REF' property + is mandatory in order to refer to the frame being resumed, and + contents are ignored. + + Also, a headline with an `ignoreheading' environment will have its + contents only inserted in the output. This special value is + useful to have data between frames, or to properly close a + `column' environment. + + Headlines also support `BEAMER_ACT' and `BEAMER_OPT' properties. +The former is translated as an overlay/action specification, or a +default overlay specification when enclosed within square brackets. +The latter specifies options(2) for the current frame or block. The +export back-end will automatically wrap properties within angular or +square brackets when appropriate. + + Moreover, headlines handle the `BEAMER_COL' property. Its value +should be a decimal number representing the width of the column as a +fraction of the total text width. If the headline has no specific +environment, its title will be ignored and its contents will fill the +column created. Otherwise, the block will fill the whole column and +the title will be preserved. Two contiguous headlines with a non-`nil' +`BEAMER_COL' value share the same `columns' LaTeX environment. It will +end before the next headline without such a property. This environment +is generated automatically. Although, it can also be explicitly +created, with a special `columns' value for `BEAMER_ENV' property (if +it needs to be set up with some specific options, for example). + +Beamer specific syntax +---------------------- + +Beamer back-end is an extension of LaTeX back-end. As such, all LaTeX +specific syntax (e.g., `#+LATEX:' or `#+ATTR_LATEX:') is recognized. +See *note LaTeX and PDF export:: for more information. + + Beamer export introduces a number of keywords to insert code in the +document's header. Four control appearance of the presentation: +`#+BEAMER_THEME', `#+BEAMER_COLOR_THEME', `#+BEAMER_FONT_THEME', +`#+BEAMER_INNER_THEME' and `#+BEAMER_OUTER_THEME'. All of them accept +optional arguments within square brackets. The last one, +`#+BEAMER_HEADER', is more generic and allows you to append any line of +code in the header. + + #+BEAMER_THEME: Rochester [height=20pt] + #+BEAMER_COLOR_THEME: spruce + + Table of contents generated from `toc:t' `OPTION' keyword are +wrapped within a `frame' environment. Those generated from a `TOC' +keyword (*note Table of contents::) are not. In that case, it is also +possible to specify options, enclosed within square brackets. + + #+TOC: headlines [currentsection] + + Beamer specific code can be inserted with the following constructs: + + #+BEAMER: \pause + + #+BEGIN_BEAMER + All lines in this block will appear only when using this back-end. + #+END_BEAMER + + Text @@beamer:some code@@ within a paragraph. + + In particular, this last example can be used to add overlay +specifications to objects whose type is among `bold', `item', `link', +`radio-target' and `target', when the value is enclosed within angular +brackets and put at the beginning the object. + + A *@@beamer:<2->@@useful* feature + + Eventually, every plain list has support for `:environment', +`:overlay' and `:options' attributes through `ATTR_BEAMER' affiliated +keyword. The first one allows the use of a different environment, the +second sets overlay specifications and the last one inserts optional +arguments in current list environment. + + #+ATTR_BEAMER: :overlay +- + - item 1 + - item 2 + +Editing support +--------------- + +You can turn on a special minor mode `org-beamer-mode' for faster +editing with: + + #+STARTUP: beamer + +`C-c C-b (`org-beamer-select-environment')' + In `org-beamer-mode', this key offers fast selection of a Beamer + environment or the `BEAMER_COL' property. + + Also, a template for useful in-buffer settings or properties can be +inserted into the buffer with `M-x org-beamer-insert-options-template'. +Among other things, this will install a column view format which is +very handy for editing special properties used by Beamer. + +An example +---------- + +Here is a simple example Org document that is intended for Beamer +export. + + #+TITLE: Example Presentation + #+AUTHOR: Carsten Dominik + #+OPTIONS: H:2 + #+LATEX_CLASS: beamer + #+LATEX_CLASS_OPTIONS: [presentation] + #+BEAMER_THEME: Madrid + #+COLUMNS: %45ITEM %10BEAMER_ENV(Env) %10BEAMER_ACT(Act) %4BEAMER_COL(Col) %8BEAMER_OPT(Opt) + + * This is the first structural section + + ** Frame 1 + *** Thanks to Eric Fraga :B_block:BMCOL: + :PROPERTIES: + :BEAMER_COL: 0.48 + :BEAMER_ENV: block + :END: + for the first viable Beamer setup in Org + *** Thanks to everyone else :B_block:BMCOL: + :PROPERTIES: + :BEAMER_COL: 0.48 + :BEAMER_ACT: <2-> + :BEAMER_ENV: block + :END: + for contributing to the discussion + **** This will be formatted as a beamer note :B_note: + :PROPERTIES: + :BEAMER_env: note + :END: + ** Frame 2 (where we will not use columns) + *** Request + Please test this stuff! + + ---------- Footnotes ---------- + + (1) If this property is set, the entry will also get a +`:B_environment:' tag to make this visible. This tag has no semantic +meaning, it is only a visual aid. + + (2) The `fragile' option is added automatically if it contains code +that requires a verbatim environment, though. + + +File: org, Node: HTML export, Next: LaTeX and PDF export, Prev: Beamer export, Up: Exporting + +12.6 HTML export +================ + +Org mode contains an HTML (XHTML 1.0 strict) exporter with extensive +HTML formatting, in ways similar to John Gruber's _markdown_ language, +but with additional support for tables. + +* Menu: + +* HTML Export commands:: How to invoke HTML export +* HTML doctypes:: Org can export to various (X)HTML flavors +* HTML preamble and postamble:: How to insert a preamble and a postamble +* Quoting HTML tags:: Using direct HTML in Org mode +* Links in HTML export:: How links will be interpreted and formatted +* Tables in HTML export:: How to modify the formatting of tables +* Images in HTML export:: How to insert figures into HTML output +* Math formatting in HTML export:: Beautiful math also on the web +* Text areas in HTML export:: An alternative way to show an example +* CSS support:: Changing the appearance of the output +* JavaScript support:: Info and Folding in a web browser + + +File: org, Node: HTML Export commands, Next: HTML doctypes, Prev: HTML export, Up: HTML export + +12.6.1 HTML export commands +--------------------------- + +`C-c C-e h h (`org-html-export-to-html')' + Export as an HTML file. For an Org file `myfile.org', the HTML + file will be `myfile.html'. The file will be overwritten without + warning. `C-c C-e h o' Export as an HTML file and immediately + open it with a browser. + +`C-c C-e h H (`org-html-export-as-html')' + Export to a temporary buffer. Do not create a file. + + +File: org, Node: HTML doctypes, Next: HTML preamble and postamble, Prev: HTML Export commands, Up: HTML export + +12.6.2 HTML doctypes +-------------------- + +Org can export to various (X)HTML flavors. + + Setting the variable `org-html-doctype' allows you to export to +different (X)HTML variants. The exported HTML will be adjusted +according to the syntax requirements of that variant. You can either +set this variable to a doctype string directly, in which case the +exporter will try to adjust the syntax automatically, or you can use a +ready-made doctype. The ready-made options are: + + * "html4-strict" + + * "html4-transitional" + + * "html4-frameset" + + * "xhtml-strict" + + * "xhtml-transitional" + + * "xhtml-frameset" + + * "xhtml-11" + + * "html5" + + * "xhtml5" + + See the variable `org-html-doctype-alist' for details. The default +is "xhtml-strict". + +Fancy HTML5 export +.................. + +HTML5 introduces several new element types. By default, Org will not +make use of these element types, but you can set `org-html-html5-fancy' +to `t' (or set `html5-fancy' item in an `OPTIONS' line), to enable a +few new block-level elements. These are created using arbitrary +#+BEGIN and #+END blocks. For instance: + + #+BEGIN_ASIDE + Lorem ipsum + #+END_ASIDE + + Will export to: + + + + While this: + + #+ATTR_HTML: :controls controls :width 350 + #+BEGIN_VIDEO + #+HTML: + #+HTML: + Your browser does not support the video tag. + #+END_VIDEO + + Becomes: + + + + Special blocks that do not correspond to HTML5 elements (see +`org-html-html5-elements') will revert to the usual behavior, i.e., +`#+BEGIN_LEDERHOSEN' will still export to `
'. + + Headlines cannot appear within special blocks. To wrap a headline +and its contents in e.g., `
' or `
' tags, set the +`HTML_CONTAINER' property on the headline itself. + + +File: org, Node: HTML preamble and postamble, Next: Quoting HTML tags, Prev: HTML doctypes, Up: HTML export + +12.6.3 HTML preamble and postamble +---------------------------------- + +The HTML exporter lets you define a preamble and a postamble. + + The default value for `org-html-preamble' is `t', which means that +the preamble is inserted depending on the relevant format string in +`org-html-preamble-format'. + + Setting `org-html-preamble' to a string will override the default +format string. If you set it to a function, it will insert the output +of the function, which must be a string. Setting to `nil' will not +insert any preamble. + + The default value for `org-html-postamble' is `'auto', which means +that the HTML exporter will look for information about the author, the +email, the creator and the date, and build the postamble from these +values. Setting `org-html-postamble' to `t' will insert the postamble +from the relevant format string found in `org-html-postamble-format'. +Setting it to `nil' will not insert any postamble. + + +File: org, Node: Quoting HTML tags, Next: Links in HTML export, Prev: HTML preamble and postamble, Up: HTML export + +12.6.4 Quoting HTML tags +------------------------ + +Plain `<' and `>' are always transformed to `<' and `>' in HTML +export. If you want to include raw HTML code, which should only appear +in HTML export, mark it with `@@html:' as in `@@html:@@bold +text@@html:@@'. For more extensive HTML that should be copied +verbatim to the exported file use either + + #+HTML: Literal HTML code for export + +or + + #+BEGIN_HTML + All lines between these markers are exported literally + #+END_HTML + + +File: org, Node: Links in HTML export, Next: Tables in HTML export, Prev: Quoting HTML tags, Up: HTML export + +12.6.5 Links in HTML export +--------------------------- + +Internal links (*note Internal links::) will continue to work in HTML. +This includes automatic links created by radio targets (*note Radio +targets::). Links to external files will still work if the target file +is on the same relative path as the published Org file. Links to other +`.org' files will be translated into HTML links under the assumption +that an HTML version also exists of the linked file, at the same +relative path. `id:' links can then be used to jump to specific +entries across files. For information related to linking files while +publishing them to a publishing directory see *note Publishing links::. + + If you want to specify attributes for links, you can do so using a +special `#+ATTR_HTML' line to define attributes that will be added to +the `' or `' tags. Here is an example that sets `title' and +`style' attributes for a link: + + #+ATTR_HTML: :title The Org mode homepage :style color:red; + [[http://orgmode.org]] + + +File: org, Node: Tables in HTML export, Next: Images in HTML export, Prev: Links in HTML export, Up: HTML export + +12.6.6 Tables +------------- + +Org mode tables are exported to HTML using the table attributes defined +in `org-html-table-default-attributes'. The default setting makes +tables without cell borders and frame. If you would like to change +this for individual tables, place something like the following before +the table: + + #+CAPTION: This is a table with lines around and between cells + #+ATTR_HTML: :border 2 :rules all :frame border + + You can also modify the default tags used for each row by setting +`org-html-table-row-tags'. See the docstring for an example on how to +use this option. + + +File: org, Node: Images in HTML export, Next: Math formatting in HTML export, Prev: Tables in HTML export, Up: HTML export + +12.6.7 Images in HTML export +---------------------------- + +HTML export can inline images given as links in the Org file, and it +can make an image the clickable part of a link. By default(1), images +are inlined if a link does not have a description. So +`[[file:myimg.jpg]]' will be inlined, while `[[file:myimg.jpg][the +image]]' will just produce a link `the image' that points to the image. +If the description part itself is a `file:' link or a `http:' URL +pointing to an image, this image will be inlined and activated so that +clicking on the image will activate the link. For example, to include +a thumbnail that will link to a high resolution version of the image, +you could use: + + [[file:highres.jpg][file:thumb.jpg]] + + If you need to add attributes to an inlined image, use a +`#+ATTR_HTML'. In the example below we specify the `alt' and `title' +attributes to support text viewers and accessibility, and align it to +the right. + + #+CAPTION: A black cat stalking a spider + #+ATTR_HTML: :alt cat/spider image :title Action! :align right + [[./img/a.jpg]] + +You could use `http' addresses just as well. + + ---------- Footnotes ---------- + + (1) But see the variable `org-html-inline-images'. + + +File: org, Node: Math formatting in HTML export, Next: Text areas in HTML export, Prev: Images in HTML export, Up: HTML export + +12.6.8 Math formatting in HTML export +------------------------------------- + +LaTeX math snippets (*note LaTeX fragments::) can be displayed in two +different ways on HTML pages. The default is to use the MathJax system +(http://www.mathjax.org) which should work out of the box with Org mode +installation because `http://orgmode.org' serves `MathJax' for Org mode +users for small applications and for testing purposes. If you plan to +use this regularly or on pages with significant page views, you should +install(1) MathJax on your own server in order to limit the load of our +server. To configure `MathJax', use the variable +`org-html-mathjax-options' or insert something like the following into +the buffer: + + #+HTML_MATHJAX: align:"left" mathml:t path:"/MathJax/MathJax.js" + +See the docstring of the variable `org-html-mathjax-options' for the +meaning of the parameters in this line. + + If you prefer, you can also request that LaTeX fragments are +processed into small images that will be inserted into the browser +page. Before the availability of MathJax, this was the default method +for Org files. This method requires that the `dvipng' program or +`imagemagick' suite is available on your system. You can still get +this processing with + + #+OPTIONS: tex:dvipng + + or: + + #+OPTIONS: tex:imagemagick + + ---------- Footnotes ---------- + + (1) Installation instructions can be found on the MathJax website, +see `http://www.mathjax.org/resources/docs/?installation.html'. + + +File: org, Node: Text areas in HTML export, Next: CSS support, Prev: Math formatting in HTML export, Up: HTML export + +12.6.9 Text areas in HTML export +-------------------------------- + +An alternative way to publish literal code examples in HTML is to use +text areas, where the example can even be edited before pasting it into +an application. It is triggered by `:textarea' attribute at an +`example' or `src' block. + + You may also use `:height' and `:width' attributes to specify the +height and width of the text area, which default to the number of lines +in the example, and 80, respectively. For example + + #+ATTR_HTML: :textarea t :width 40 + #+BEGIN_EXAMPLE + (defun org-xor (a b) + "Exclusive or." + (if a (not b) b)) + #+END_EXAMPLE + + +File: org, Node: CSS support, Next: JavaScript support, Prev: Text areas in HTML export, Up: HTML export + +12.6.10 CSS support +------------------- + +You can modify the CSS style definitions for the exported file. The +HTML exporter assigns the following special CSS classes(1) to +appropriate parts of the document--your style specifications may change +these, in addition to any of the standard classes like for headlines, +tables, etc. + p.author author information, including email + p.date publishing date + p.creator creator info, about org mode version + .title document title + .todo TODO keywords, all not-done states + .done the DONE keywords, all states that count as done + .WAITING each TODO keyword also uses a class named after itself + .timestamp timestamp + .timestamp-kwd keyword associated with a timestamp, like SCHEDULED + .timestamp-wrapper span around keyword plus timestamp + .tag tag in a headline + ._HOME each tag uses itself as a class, "@" replaced by "_" + .target target for links + .linenr the line number in a code example + .code-highlighted for highlighting referenced code lines + div.outline-N div for outline level N (headline plus text)) + div.outline-text-N extra div for text at outline level N + .section-number-N section number in headlines, different for each level + .figure-number label like "Figure 1:" + .table-number label like "Table 1:" + .listing-number label like "Listing 1:" + div.figure how to format an inlined image + pre.src formatted source code + pre.example normal example + p.verse verse paragraph + div.footnotes footnote section headline + p.footnote footnote definition paragraph, containing a footnote + .footref a footnote reference number (always a ) + .footnum footnote number in footnote definition (always ) + + Each exported file contains a compact default style that defines +these classes in a basic way(2). You may overwrite these settings, or +add to them by using the variables `org-html-head' and +`org-html-head-extra'. You can override the global values of these +variables for each file by using these keywords: + + #+HTML_HEAD: + #+HTML_HEAD_EXTRA: + +For longer style definitions, you can use several such lines. You +could also directly write a `' section in this way, +without referring to an external file. + + In order to add styles to a subtree, use the `:HTML_CONTAINER_CLASS:' +property to assign a class to the tree. In order to specify CSS styles +for a particular headline, you can use the id specified in a +`:CUSTOM_ID:' property. + + ---------- Footnotes ---------- + + (1) If the classes on TODO keywords and tags lead to conflicts, use +the variables `org-html-todo-kwd-class-prefix' and +`org-html-tag-class-prefix' to make them unique. + + (2) This style is defined in the constant `org-html-style-default', +which you should not modify. To turn inclusion of these defaults off, +customize `org-html-head-include-default-style' or set `html-style' to +`nil' in an `OPTIONS' line. + + +File: org, Node: JavaScript support, Prev: CSS support, Up: HTML export + +12.6.11 JavaScript supported display of web pages +------------------------------------------------- + +Sebastian Rose has written a JavaScript program especially designed to +enhance the web viewing experience of HTML files created with Org. This +program allows you to view large files in two different ways. The +first one is an _Info_-like mode where each section is displayed +separately and navigation can be done with the `n' and `p' keys (and +some other keys as well, press `?' for an overview of the available +keys). The second view type is a _folding_ view much like Org provides +inside Emacs. The script is available at +`http://orgmode.org/org-info.js' and you can find the documentation for +it at `http://orgmode.org/worg/code/org-info-js/'. We host the script +at our site, but if you use it a lot, you might not want to be +dependent on `http://orgmode.org' and prefer to install a local copy on +your own web server. + + All it then takes to use this program is adding a single line to the +Org file: + + #+INFOJS_OPT: view:info toc:nil + +If this line is found, the HTML header will automatically contain the +code needed to invoke the script. Using the line above, you can set +the following viewing options: + + path: The path to the script. The default is to grab the script from + `http://orgmode.org/org-info.js', but you might want to have + a local copy and use a path like `../scripts/org-info.js'. + view: Initial view when the website is first shown. Possible values are: + info Info-like interface with one section per page. + overview Folding interface, initially showing only top-level. + content Folding interface, starting with all headlines visible. + showall Folding interface, all headlines and text visible. + sdepth: Maximum headline level that will still become an independent + section for info and folding modes. The default is taken from + `org-export-headline-levels' (= the `H' switch in `#+OPTIONS'). + If this is smaller than in `org-export-headline-levels', each + info/folding section can still contain child headlines. + toc: Should the table of contents _initially_ be visible? + Even when `nil', you can always get to the "toc" with `i'. + tdepth: The depth of the table of contents. The defaults are taken from + the variables `org-export-headline-levels' and `org-export-with-toc'. + ftoc: Does the CSS of the page specify a fixed position for the "toc"? + If yes, the toc will never be displayed as a section. + ltoc: Should there be short contents (children) in each section? + Make this `above' if the section should be above initial text. + mouse: Headings are highlighted when the mouse is over them. Should be + `underline' (default) or a background color like `#cccccc'. + buttons: Should view-toggle buttons be everywhere? When `nil' (the + default), only one such button will be present. + You can choose default values for these options by customizing the +variable `org-html-infojs-options'. If you always want to apply the +script to your pages, configure the variable `org-html-use-infojs'. + + +File: org, Node: LaTeX and PDF export, Next: Markdown export, Prev: HTML export, Up: Exporting + +12.7 LaTeX and PDF export +========================= + +LaTeX export can produce an arbitrarily complex LaTeX document of any +standard or custom document class. With further processing(1), which +the LaTeX exporter is able to control, this back-end is able to produce +PDF output. Because the LaTeX exporter can be configured to use the +`hyperref' package, the default setup produces fully-linked PDF output. + + As in LaTeX, blank lines are meaningful for this back-end: a +paragraph will not be started if two contiguous syntactical elements +are not separated by an empty line. + + This back-end also offers enhanced support for footnotes. Thus, it +handles nested footnotes, footnotes in tables and footnotes in a list +item's description. + +* Menu: + +* LaTeX export commands:: How to export to LaTeX and PDF +* Header and sectioning:: Setting up the export file structure +* Quoting LaTeX code:: Incorporating literal LaTeX code +* LaTeX specific attributes:: Controlling LaTeX output + + ---------- Footnotes ---------- + + (1) The default LaTeX output is designed for processing with +`pdftex' or LaTeX. It includes packages that are not compatible with +`xetex' and possibly `luatex'. The LaTeX exporter can be configured to +support alternative TeX engines, see the options +`org-latex-default-packages-alist' and `org-latex-packages-alist'. + + +File: org, Node: LaTeX export commands, Next: Header and sectioning, Prev: LaTeX and PDF export, Up: LaTeX and PDF export + +12.7.1 LaTeX export commands +---------------------------- + +`C-c C-e l l (`org-latex-export-to-latex')' + Export as a LaTeX file. For an Org file `myfile.org', the LaTeX + file will be `myfile.tex'. The file will be overwritten without + warning. + +`C-c C-e l L (`org-latex-export-as-latex')' + Export to a temporary buffer. Do not create a file. + +`C-c C-e l p (`org-latex-export-to-pdf')' + Export as LaTeX and then process to PDF. + +`C-c C-e l o' + Export as LaTeX and then process to PDF, then open the resulting + PDF file. + + +File: org, Node: Header and sectioning, Next: Quoting LaTeX code, Prev: LaTeX export commands, Up: LaTeX and PDF export + +12.7.2 Header and sectioning structure +-------------------------------------- + +By default, the first three outline levels become headlines, defining a +general document structure. Additional levels are exported as `itemize' +or `enumerate' lists. The transition can also occur at a different +level (*note Export settings::). + + By default, the LaTeX output uses the class `article'. + + You can change this globally by setting a different value for +`org-latex-default-class' or locally by adding an option like +`#+LATEX_CLASS: myclass' in your file, or with a `EXPORT_LATEX_CLASS' +property that applies when exporting a region containing only this +(sub)tree. The class must be listed in `org-latex-classes'. This +variable defines a header template for each class(1), and allows you to +define the sectioning structure for each class. You can also define +your own classes there. + + The `LATEX_CLASS_OPTIONS' keyword or `EXPORT_LATEX_CLASS_OPTIONS' +property can specify the options for the `\documentclass' macro. These +options have to be provided, as expected by LaTeX, within square +brackets. + + You can also use the `LATEX_HEADER' and `LATEX_HEADER_EXTRA'(2) +keywords in order to add lines to the header. See the docstring of +`org-latex-classes' for more information. + + An example is shown below. + + #+LATEX_CLASS: article + #+LATEX_CLASS_OPTIONS: [a4paper] + #+LATEX_HEADER: \usepackage{xyz} + + * Headline 1 + some text + + ---------- Footnotes ---------- + + (1) Into which the values of `org-latex-default-packages-alist' and +`org-latex-packages-alist' are spliced. + + (2) Unlike `LATEX_HEADER', contents from `LATEX_HEADER_EXTRA' +keywords will not be loaded when previewing LaTeX snippets (*note +Previewing LaTeX fragments::). + + +File: org, Node: Quoting LaTeX code, Next: LaTeX specific attributes, Prev: Header and sectioning, Up: LaTeX and PDF export + +12.7.3 Quoting LaTeX code +------------------------- + +Embedded LaTeX as described in *note Embedded LaTeX::, will be correctly +inserted into the LaTeX file. Furthermore, you can add special code +that should only be present in LaTeX export with the following +constructs: + + Code within @@latex:some code@@ a paragraph. + + #+LATEX: Literal LaTeX code for export + + #+BEGIN_LATEX + All lines between these markers are exported literally + #+END_LATEX + + +File: org, Node: LaTeX specific attributes, Prev: Quoting LaTeX code, Up: LaTeX and PDF export + +12.7.4 LaTeX specific attributes +-------------------------------- + +LaTeX understands attributes specified in an `ATTR_LATEX' line. They +affect tables, images, plain lists, special blocks and source blocks. + +Tables in LaTeX export +...................... + +For LaTeX export of a table, you can specify a label and a caption +(*note Images and tables::). You can also use attributes to control +table layout and contents. Valid LaTeX attributes include: + +`:mode' + Nature of table's contents. It can be set to `table', `math', + `inline-math' or `verbatim'. In particular, when in `math' or + `inline-math' mode, every cell is exported as-is, horizontal rules + are ignored and the table will be wrapped in a math environment. + Also, contiguous tables sharing the same math mode will be wrapped + within the same environment. Default mode is determined in + `org-latex-default-table-mode'. + +`:environment' + Environment used for the table. It can be set to any LaTeX table + environment, like `tabularx'(1), `longtable', `array', `tabu'(2), + `bmatrix'... It defaults to `org-latex-default-table-environment' + value. + +`:caption' + `#+CAPTION' keyword is the simplest way to set a caption for a + table (*note Images and tables::). If you need more advanced + commands for that task, you can use `:caption' attribute instead. + Its value should be raw LaTeX code. It has precedence over + `#+CAPTION'. + +`:float' +`:placement' + Float environment for the table. Possible values are + `sidewaystable', `multicolumn', `t' and `nil'. When unspecified, + a table with a caption will have a `table' environment. Moreover, + `:placement' attribute can specify the positioning of the float. + +`:align' +`:font' +`:width' + Set, respectively, the alignment string of the table, its font + size and its width. They only apply on regular tables. + +`:spread' + Boolean specific to the `tabu' and `longtabu' environments, and + only takes effect when used in conjunction with the `:width' + attribute. When `:spread' is non-`nil', the table will be spread + or shrunk by the value of `:width'. + +`:booktabs' +`:center' +`:rmlines' + They toggle, respectively, `booktabs' usage (assuming the package + is properly loaded), table centering and removal of every + horizontal rule but the first one (in a "table.el" table only). + In particular, `org-latex-tables-booktabs' (respectively + `org-latex-tables-centered') activates the first (respectively + second) attribute globally. + +`:math-prefix' +`:math-suffix' +`:math-arguments' + A string that will be inserted, respectively, before the table + within the math environment, after the table within the math + environment, and between the macro name and the contents of the + table. The `:math-arguments' attribute is used for matrix macros + that require more than one argument (e.g., `qbordermatrix'). + + Thus, attributes can be used in a wide array of situations, like +writing a table that will span over multiple pages, or a matrix product: + + #+ATTR_LATEX: :environment longtable :align l|lp{3cm}r|l + | ..... | ..... | + | ..... | ..... | + + #+ATTR_LATEX: :mode math :environment bmatrix :math-suffix \times + | a | b | + | c | d | + #+ATTR_LATEX: :mode math :environment bmatrix + | 1 | 2 | + | 3 | 4 | + + In the example below, LaTeX command `\bicaption{HeadingA}{HeadingB}' +will set the caption. + + #+ATTR_LATEX: :caption \bicaption{HeadingA}{HeadingB} + | ..... | ..... | + | ..... | ..... | + +Images in LaTeX export +...................... + +Images that are linked to without a description part in the link, like +`[[file:img.jpg]]' or `[[./img.jpg]]' will be inserted into the PDF +output file resulting from LaTeX processing. Org will use an +`\includegraphics' macro to insert the image(3). + + You can specify specify image width or height with, respectively, +`:width' and `:height' attributes. It is also possible to add any +other option with the `:options' attribute, as shown in the following +example: + + #+ATTR_LATEX: :width 5cm :options angle=90 + [[./img/sed-hr4049.pdf]] + + If you need a specific command for the caption, use `:caption' +attribute. It will override standard `#+CAPTION' value, if any. + + #+ATTR_LATEX: :caption \bicaption{HeadingA}{HeadingB} + [[./img/sed-hr4049.pdf]] + + If you have specified a caption as described in *note Images and +tables::, the picture will be wrapped into a `figure' environment and +thus become a floating element. You can also ask Org to export an +image as a float without specifying caption by setting the `:float' +attribute. You may also set it to: + - `t': if you want to use the standard `figure' environment. It is + used by default if you provide a caption to the image. + + - `multicolumn': if you wish to include an image which spans multiple + columns in a page. This will export the image wrapped in a + `figure*' environment. + + - `wrap': if you would like to let text flow around the image. It + will make the figure occupy the left half of the page. + + - `nil': if you need to avoid any floating environment, even when a + caption is provided. + To modify the placement option of any floating environment, set the +`placement' attribute. + + #+ATTR_LATEX: :float wrap :width 0.38\textwidth :placement {r}{0.4\textwidth} + [[./img/hst.png]] + + If the `:comment-include' attribute is set to a non-`nil' value, the +LaTeX `\includegraphics' macro will be commented out. + +Plain lists in LaTeX export +........................... + +Plain lists accept two optional attributes: `:environment' and +`:options'. The first one allows the use of a non-standard environment +(e.g., `inparaenum'). The second one specifies additional arguments for +that environment. + + #+ATTR_LATEX: :environment compactitem :options [$\circ$] + - you need ``paralist'' package to reproduce this example. + +Source blocks in LaTeX export +............................. + +In addition to syntax defined in *note Literal examples::, names and +captions (*note Images and tables::), source blocks also accept a +`:float' attribute. You may set it to: + - `t': if you want to make the source block a float. It is the + default value when a caption is provided. + + - `multicolumn': if you wish to include a source block which spans + multiple columns in a page. + + - `nil': if you need to avoid any floating environment, even when a + caption is provided. It is useful for source code that may not + fit in a single page. + + #+ATTR_LATEX: :float nil + #+BEGIN_SRC emacs-lisp + Code that may not fit in a single page. + #+END_SRC + +Special blocks in LaTeX export +.............................. + +In LaTeX back-end, special blocks become environments of the same name. +Value of `:options' attribute will be appended as-is to that +environment's opening string. For example: + + #+BEGIN_ABSTRACT + We demonstrate how to solve the Syracuse problem. + #+END_ABSTRACT + + #+ATTR_LATEX: :options [Proof of important theorem] + #+BEGIN_PROOF + ... + Therefore, any even number greater than 2 is the sum of two primes. + #+END_PROOF + +becomes + + \begin{abstract} + We demonstrate how to solve the Syracuse problem. + \end{abstract} + + \begin{proof}[Proof of important theorem] + ... + Therefore, any even number greater than 2 is the sum of two primes. + \end{proof} + + If you need to insert a specific caption command, use `:caption' +attribute. It will override standard `#+CAPTION' value, if any. For +example: + + #+ATTR_LATEX: :caption \MyCaption{HeadingA} + #+BEGIN_PROOF + ... + #+END_PROOF + +Horizontal rules +................ + +Width and thickness of a given horizontal rule can be controlled with, +respectively, `:width' and `:thickness' attributes: + + #+ATTR_LATEX: :width .6\textwidth :thickness 0.8pt + ----- + + ---------- Footnotes ---------- + + (1) Requires adding the `tabularx' package to +`org-latex-packages-alist'. + + (2) Requires adding the `tabu' package to `org-latex-packages-alist'. + + (3) In the case of TikZ (`http://sourceforge.net/projects/pgf/') +images, it will become an `\input' macro wrapped within a `tikzpicture' +environment. + + +File: org, Node: Markdown export, Next: OpenDocument Text export, Prev: LaTeX and PDF export, Up: Exporting + +12.8 Markdown export +==================== + +`md' export back-end generates Markdown syntax(1) for an Org mode +buffer. + + It is built over HTML back-end: any construct not supported by +Markdown syntax (e.g., tables) will be controlled and translated by +`html' back-end (*note HTML export::). + +Markdown export commands +------------------------ + +`C-c C-e m m (`org-md-export-to-markdown')' + Export as a text file written in Markdown syntax. For an Org file, + `myfile.org', the resulting file will be `myfile.md'. The file + will be overwritten without warning. + +`C-c C-e m M (`org-md-export-as-markdown')' + Export to a temporary buffer. Do not create a file. + +`C-c C-e m o' + Export as a text file with Markdown syntax, then open it. + +Header and sectioning structure +------------------------------- + +Markdown export can generate both `atx' and `setext' types for +headlines, according to `org-md-headline-style'. The former introduces +a hard limit of two levels, whereas the latter pushes it to six. +Headlines below that limit are exported as lists. You can also set a +soft limit before that one (*note Export settings::). + + ---------- Footnotes ---------- + + (1) Vanilla flavor, as defined at +`http://daringfireball.net/projects/markdown/'. + + +File: org, Node: OpenDocument Text export, Next: Org export, Prev: Markdown export, Up: Exporting + +12.9 OpenDocument Text export +============================= + +Org mode(1) supports export to OpenDocument Text (ODT) format. +Documents created by this exporter use the `OpenDocument-v1.2 +specification'(2) and are compatible with LibreOffice 3.4. + +* Menu: + +* Pre-requisites for ODT export:: What packages ODT exporter relies on +* ODT export commands:: How to invoke ODT export +* Extending ODT export:: How to produce `doc', `pdf' files +* Applying custom styles:: How to apply custom styles to the output +* Links in ODT export:: How links will be interpreted and formatted +* Tables in ODT export:: How Tables are exported +* Images in ODT export:: How to insert images +* Math formatting in ODT export:: How LaTeX fragments are formatted +* Labels and captions in ODT export:: How captions are rendered +* Literal examples in ODT export:: How source and example blocks are formatted +* Advanced topics in ODT export:: Read this if you are a power user + + ---------- Footnotes ---------- + + (1) Versions 7.8 or later + + (2) Open Document Format for Office Applications (OpenDocument) +Version 1.2 +(http://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html) + + +File: org, Node: Pre-requisites for ODT export, Next: ODT export commands, Prev: OpenDocument Text export, Up: OpenDocument Text export + +12.9.1 Pre-requisites for ODT export +------------------------------------ + +The ODT exporter relies on the `zip' program to create the final +output. Check the availability of this program before proceeding +further. + + +File: org, Node: ODT export commands, Next: Extending ODT export, Prev: Pre-requisites for ODT export, Up: OpenDocument Text export + +12.9.2 ODT export commands +-------------------------- + +Exporting to ODT +................ + +`C-c C-e o o (`org-odt-export-to-odt')' + Export as OpenDocument Text file. + + If `org-odt-preferred-output-format' is specified, automatically + convert the exported file to that format. *Note Automatically + exporting to other formats: x-export-to-other-formats. + + For an Org file `myfile.org', the ODT file will be `myfile.odt'. + The file will be overwritten without warning. If there is an + active region,(1) only the region will be exported. If the + selected region is a single tree,(2) the tree head will become the + document title. If the tree head entry has, or inherits, an + `EXPORT_FILE_NAME' property, that name will be used for the export. + + `C-c C-e o O' Export as an OpenDocument Text file and open the + resulting file. + + If `org-odt-preferred-output-format' is specified, open the + converted file instead. *Note Automatically exporting to other + formats: x-export-to-other-formats. + + ---------- Footnotes ---------- + + (1) This requires `transient-mark-mode' to be turned on + + (2) To select the current subtree, use `C-c @' + + +File: org, Node: Extending ODT export, Next: Applying custom styles, Prev: ODT export commands, Up: OpenDocument Text export + +12.9.3 Extending ODT export +--------------------------- + +The ODT exporter can interface with a variety of document converters +and supports popular converters out of the box. As a result, you can +use it to export to formats like `doc' or convert a document from one +format (say `csv') to another format (say `ods' or `xls'). + + If you have a working installation of LibreOffice, a document +converter is pre-configured for you and you can use it right away. If +you would like to use `unoconv' as your preferred converter, customize +the variable `org-odt-convert-process' to point to `unoconv'. You can +also use your own favorite converter or tweak the default settings of +the `LibreOffice' and `unoconv' converters. *Note Configuring a +document converter::. + +12.9.3.1 Automatically exporting to other formats +................................................. + +Very often, you will find yourself exporting to ODT format, only to +immediately save the exported document to other formats like `doc', +`docx', `rtf', `pdf' etc. In such cases, you can specify your +preferred output format by customizing the variable +`org-odt-preferred-output-format'. This way, the export commands +(*note Exporting to ODT: x-export-to-odt.) can be extended to export to +a format that is of immediate interest to you. + +12.9.3.2 Converting between document formats +............................................ + +There are many document converters in the wild which support conversion +to and from various file formats, including, but not limited to the ODT +format. LibreOffice converter, mentioned above, is one such converter. +Once a converter is configured, you can interact with it using the +following command. + +`M-x org-odt-convert RET' + Convert an existing document from one format to another. With a + prefix argument, also open the newly produced file. + + +File: org, Node: Applying custom styles, Next: Links in ODT export, Prev: Extending ODT export, Up: OpenDocument Text export + +12.9.4 Applying custom styles +----------------------------- + +The ODT exporter ships with a set of OpenDocument styles (*note Working +with OpenDocument style files::) that ensure a well-formatted output. +These factory styles, however, may not cater to your specific tastes. +To customize the output, you can either modify the above styles files +directly, or generate the required styles using an application like +LibreOffice. The latter method is suitable for expert and non-expert +users alike, and is described here. + +12.9.4.1 Applying custom styles: the easy way +............................................. + + 1. Create a sample `example.org' file with the below settings and + export it to ODT format. + + #+OPTIONS: H:10 num:t + + 2. Open the above `example.odt' using LibreOffice. Use the `Stylist' + to locate the target styles--these typically have the `Org' + prefix--and modify those to your taste. Save the modified file + either as an OpenDocument Text (`.odt') or OpenDocument Template + (`.ott') file. + + 3. Customize the variable `org-odt-styles-file' and point it to the + newly created file. For additional configuration options *note + Overriding factory styles: x-overriding-factory-styles. + + If you would like to choose a style on a per-file basis, you can + use the `#+ODT_STYLES_FILE' option. A typical setting will look + like + + #+ODT_STYLES_FILE: "/path/to/example.ott" + + or + + #+ODT_STYLES_FILE: ("/path/to/file.ott" ("styles.xml" "image/hdr.png")) + + +12.9.4.2 Using third-party styles and templates +............................................... + +You can use third-party styles and templates for customizing your +output. This will produce the desired output only if the template +provides all style names that the `ODT' exporter relies on. Unless +this condition is met, the output is going to be less than +satisfactory. So it is highly recommended that you only work with +templates that are directly derived from the factory settings. + + +File: org, Node: Links in ODT export, Next: Tables in ODT export, Prev: Applying custom styles, Up: OpenDocument Text export + +12.9.5 Links in ODT export +-------------------------- + +ODT exporter creates native cross-references for internal links. It +creates Internet-style links for all other links. + + A link with no description and destined to a regular (un-itemized) +outline heading is replaced with a cross-reference and section number +of the heading. + + A `\ref{label}'-style reference to an image, table etc. is replaced +with a cross-reference and sequence number of the labeled entity. +*Note Labels and captions in ODT export::. + + +File: org, Node: Tables in ODT export, Next: Images in ODT export, Prev: Links in ODT export, Up: OpenDocument Text export + +12.9.6 Tables in ODT export +--------------------------- + +Export of native Org mode tables (*note Tables::) and simple `table.el' +tables is supported. However, export of complex `table.el' +tables--tables that have column or row spans--is not supported. Such +tables are stripped from the exported document. + + By default, a table is exported with top and bottom frames and with +rules separating row and column groups (*note Column groups::). +Furthermore, all tables are typeset to occupy the same width. If the +table specifies alignment and relative width for its columns (*note +Column width and alignment::) then these are honored on export.(1) + + You can control the width of the table by specifying `:rel-width' +property using an `#+ATTR_ODT' line. + + For example, consider the following table which makes use of all the +rules mentioned above. + + #+ATTR_ODT: :rel-width 50 + | Area/Month | Jan | Feb | Mar | Sum | + |---------------+-------+-------+-------+-------| + | / | < | | | < | + | | | | | | + | North America | 1 | 21 | 926 | 948 | + | Middle East | 6 | 75 | 844 | 925 | + | Asia Pacific | 9 | 27 | 790 | 826 | + |---------------+-------+-------+-------+-------| + | Sum | 16 | 123 | 2560 | 2699 | + + On export, the table will occupy 50% of text area. The columns will +be sized (roughly) in the ratio of 13:5:5:5:6. The first column will +be left-aligned and rest of the columns will be right-aligned. There +will be vertical rules after separating the header and last columns +from other columns. There will be horizontal rules separating the +header and last rows from other rows. + + If you are not satisfied with the above formatting options, you can +create custom table styles and associate them with a table using the +`#+ATTR_ODT' line. *Note Customizing tables in ODT export::. + + ---------- Footnotes ---------- + + (1) The column widths are interpreted as weighted ratios with the +default weight being 1 + + +File: org, Node: Images in ODT export, Next: Math formatting in ODT export, Prev: Tables in ODT export, Up: OpenDocument Text export + +12.9.7 Images in ODT export +--------------------------- + +Embedding images +................ + +You can embed images within the exported document by providing a link +to the desired image file with no link description. For example, to +embed `img.png' do either of the following: + + [[file:img.png]] + + [[./img.png]] + +Embedding clickable images +.......................... + +You can create clickable images by providing a link whose description +is a link to an image file. For example, to embed a image +`org-mode-unicorn.png' which when clicked jumps to `http://Orgmode.org' +website, do the following + + [[http://orgmode.org][./org-mode-unicorn.png]] + +Sizing and scaling of embedded images +..................................... + +You can control the size and scale of the embedded images using the +`#+ATTR_ODT' attribute. + + The exporter specifies the desired size of the image in the final +document in units of centimeters. In order to scale the embedded +images, the exporter queries for pixel dimensions of the images using +one of a) ImageMagick's `identify' program or b) Emacs `create-image' +and `image-size' APIs(1). The pixel dimensions are subsequently +converted in to units of centimeters using `org-odt-pixels-per-inch'. +The default value of this variable is set to `display-pixels-per-inch'. +You can tweak this variable to achieve the best results. + + The examples below illustrate the various possibilities. + +Explicitly size the image + To embed `img.png' as a 10 cm x 10 cm image, do the following: + + #+ATTR_ODT: :width 10 :height 10 + [[./img.png]] + +Scale the image + To embed `img.png' at half its size, do the following: + + #+ATTR_ODT: :scale 0.5 + [[./img.png]] + +Scale the image to a specific width + To embed `img.png' with a width of 10 cm while retaining the + original height:width ratio, do the following: + + #+ATTR_ODT: :width 10 + [[./img.png]] + +Scale the image to a specific height + To embed `img.png' with a height of 10 cm while retaining the + original height:width ratio, do the following + + #+ATTR_ODT: :height 10 + [[./img.png]] + +Anchoring of images +................... + +You can control the manner in which an image is anchored by setting the +`:anchor' property of it's `#+ATTR_ODT' line. You can specify one of +the following three values for the `:anchor' property: `"as-char"', +`"paragraph"' and `"page"'. + + To create an image that is anchored to a page, do the following: + #+ATTR_ODT: :anchor "page" + [[./img.png]] + + ---------- Footnotes ---------- + + (1) Use of `ImageMagick' is only desirable. However, if you +routinely produce documents that have large images or you export your +Org files that has images using a Emacs batch script, then the use of +`ImageMagick' is mandatory. + + +File: org, Node: Math formatting in ODT export, Next: Labels and captions in ODT export, Prev: Images in ODT export, Up: OpenDocument Text export + +12.9.8 Math formatting in ODT export +------------------------------------ + +The ODT exporter has special support for handling math. + +* Menu: + +* Working with LaTeX math snippets:: How to embed LaTeX math fragments +* Working with MathML or OpenDocument formula files:: How to embed equations in native format + + +File: org, Node: Working with LaTeX math snippets, Next: Working with MathML or OpenDocument formula files, Prev: Math formatting in ODT export, Up: Math formatting in ODT export + +12.9.8.1 Working with LaTeX math snippets +......................................... + +LaTeX math snippets (*note LaTeX fragments::) can be embedded in the ODT +document in one of the following ways: + + 1. MathML + + This option is activated on a per-file basis with + + #+OPTIONS: LaTeX:t + + With this option, LaTeX fragments are first converted into MathML + fragments using an external LaTeX-to-MathML converter program. The + resulting MathML fragments are then embedded as an OpenDocument + Formula in the exported document. + + You can specify the LaTeX-to-MathML converter by customizing the + variables `org-latex-to-mathml-convert-command' and + `org-latex-to-mathml-jar-file'. + + If you prefer to use `MathToWeb'(1) as your converter, you can + configure the above variables as shown below. + + (setq org-latex-to-mathml-convert-command + "java -jar %j -unicode -force -df %o %I" + org-latex-to-mathml-jar-file + "/path/to/mathtoweb.jar") + + You can use the following commands to quickly verify the + reliability of the LaTeX-to-MathML converter. + + `M-x org-odt-export-as-odf RET' + Convert a LaTeX math snippet to an OpenDocument formula + (`.odf') file. + + `M-x org-odt-export-as-odf-and-open RET' + Convert a LaTeX math snippet to an OpenDocument formula + (`.odf') file and open the formula file with the + system-registered application. + + 2. PNG images + + This option is activated on a per-file basis with + + #+OPTIONS: tex:dvipng + + or: + + #+OPTIONS: tex:imagemagick + + With this option, LaTeX fragments are processed into PNG images + and the resulting images are embedded in the exported document. + This method requires that the `dvipng' program or `imagemagick' + suite be available on your system. + + ---------- Footnotes ---------- + + (1) See MathToWeb +(http://www.mathtoweb.com/cgi-bin/mathtoweb_home.pl) + + +File: org, Node: Working with MathML or OpenDocument formula files, Prev: Working with LaTeX math snippets, Up: Math formatting in ODT export + +12.9.8.2 Working with MathML or OpenDocument formula files +.......................................................... + +For various reasons, you may find embedding LaTeX math snippets in an +ODT document less than reliable. In that case, you can embed a math +equation by linking to its MathML (`.mml') source or its OpenDocument +formula (`.odf') file as shown below: + + [[./equation.mml]] + + or + + [[./equation.odf]] + + +File: org, Node: Labels and captions in ODT export, Next: Literal examples in ODT export, Prev: Math formatting in ODT export, Up: OpenDocument Text export + +12.9.9 Labels and captions in ODT export +---------------------------------------- + +You can label and caption various category of objects--an inline image, +a table, a LaTeX fragment or a Math formula--using `#+LABEL' and +`#+CAPTION' lines. *Note Images and tables::. ODT exporter enumerates +each labeled or captioned object of a given category separately. As a +result, each such object is assigned a sequence number based on order +of it's appearance in the Org file. + + In the exported document, a user-provided caption is augmented with +the category and sequence number. Consider the following inline image +in an Org file. + + #+CAPTION: Bell curve + #+LABEL: fig:SED-HR4049 + [[./img/a.png]] + + It could be rendered as shown below in the exported document. + + Figure 2: Bell curve + + You can modify the category component of the caption by customizing +the option `org-odt-category-map-alist'. For example, to tag all +embedded images with the string `Illustration' (instead of the default +`Figure') use the following setting: + + (setq org-odt-category-map-alist + (("__Figure__" "Illustration" "value" "Figure" org-odt--enumerable-image-p))) + + With this, previous image will be captioned as below in the exported +document. + + Illustration 2: Bell curve + + +File: org, Node: Literal examples in ODT export, Next: Advanced topics in ODT export, Prev: Labels and captions in ODT export, Up: OpenDocument Text export + +12.9.10 Literal examples in ODT export +-------------------------------------- + +Export of literal examples (*note Literal examples::) with full +fontification is supported. Internally, the exporter relies on +`htmlfontify.el' to generate all style definitions needed for a fancy +listing.(1) The auto-generated styles have `OrgSrc' as prefix and +inherit their color from the faces used by Emacs `font-lock' library +for the source language. + + If you prefer to use your own custom styles for fontification, you +can do so by customizing the option +`org-odt-create-custom-styles-for-srcblocks'. + + You can turn off fontification of literal examples by customizing the +option `org-odt-fontify-srcblocks'. + + ---------- Footnotes ---------- + + (1) Your `htmlfontify.el' library must at least be at Emacs 24.1 +levels for fontification to be turned on. + + +File: org, Node: Advanced topics in ODT export, Prev: Literal examples in ODT export, Up: OpenDocument Text export + +12.9.11 Advanced topics in ODT export +------------------------------------- + +If you rely heavily on ODT export, you may want to exploit the full set +of features that the exporter offers. This section describes features +that would be of interest to power users. + +* Menu: + +* Configuring a document converter:: How to register a document converter +* Working with OpenDocument style files:: Explore the internals +* Creating one-off styles:: How to produce custom highlighting etc +* Customizing tables in ODT export:: How to define and use Table templates +* Validating OpenDocument XML:: How to debug corrupt OpenDocument files + + +File: org, Node: Configuring a document converter, Next: Working with OpenDocument style files, Prev: Advanced topics in ODT export, Up: Advanced topics in ODT export + +12.9.11.1 Configuring a document converter +.......................................... + +The ODT exporter can work with popular converters with little or no +extra configuration from your side. *Note Extending ODT export::. If +you are using a converter that is not supported by default or if you +would like to tweak the default converter settings, proceed as below. + + 1. Register the converter + + Name your converter and add it to the list of known converters by + customizing the option `org-odt-convert-processes'. Also specify + how the converter can be invoked via command-line to effect the + conversion. + + 2. Configure its capabilities + + Specify the set of formats the converter can handle by customizing + the variable `org-odt-convert-capabilities'. Use the default + value for this variable as a guide for configuring your converter. + As suggested by the default setting, you can specify the full set + of formats supported by the converter and not limit yourself to + specifying formats that are related to just the OpenDocument Text + format. + + 3. Choose the converter + + Select the newly added converter as the preferred one by + customizing the option `org-odt-convert-process'. + + +File: org, Node: Working with OpenDocument style files, Next: Creating one-off styles, Prev: Configuring a document converter, Up: Advanced topics in ODT export + +12.9.11.2 Working with OpenDocument style files +............................................... + +This section explores the internals of the ODT exporter and the means +by which it produces styled documents. Read this section if you are +interested in exploring the automatic and custom OpenDocument styles +used by the exporter. + +Factory styles +.............. + +The ODT exporter relies on two files for generating its output. These +files are bundled with the distribution under the directory pointed to +by the variable `org-odt-styles-dir'. The two files are: + + * `OrgOdtStyles.xml' + + This file contributes to the `styles.xml' file of the final `ODT' + document. This file gets modified for the following purposes: + 1. To control outline numbering based on user settings. + + 2. To add styles generated by `htmlfontify.el' for fontification + of code blocks. + + * `OrgOdtContentTemplate.xml' + + This file contributes to the `content.xml' file of the final `ODT' + document. The contents of the Org outline are inserted between the + `'...`' elements of this file. + + Apart from serving as a template file for the final `content.xml', + the file serves the following purposes: + 1. It contains automatic styles for formatting of tables which + are referenced by the exporter. + + 2. It contains `'...`' + elements that control how various entities--tables, images, + equations, etc.--are numbered. + +Overriding factory styles +......................... + +The following two variables control the location from which the ODT +exporter picks up the custom styles and content template files. You can +customize these variables to override the factory styles used by the +exporter. + + * `org-odt-styles-file' + + Use this variable to specify the `styles.xml' that will be used in + the final output. You can specify one of the following values: + + 1. A `styles.xml' file + + Use this file instead of the default `styles.xml' + + 2. A `.odt' or `.ott' file + + Use the `styles.xml' contained in the specified OpenDocument + Text or Template file + + 3. A `.odt' or `.ott' file and a subset of files contained + within them + + Use the `styles.xml' contained in the specified OpenDocument + Text or Template file. Additionally extract the specified + member files and embed those within the final `ODT' document. + + Use this option if the `styles.xml' file references + additional files like header and footer images. + + 4. `nil' + + Use the default `styles.xml' + + * `org-odt-content-template-file' + + Use this variable to specify the blank `content.xml' that will be + used in the final output. + + +File: org, Node: Creating one-off styles, Next: Customizing tables in ODT export, Prev: Working with OpenDocument style files, Up: Advanced topics in ODT export + +12.9.11.3 Creating one-off styles +................................. + +There are times when you would want one-off formatting in the exported +document. You can achieve this by embedding raw OpenDocument XML in +the Org file. The use of this feature is better illustrated with +couple of examples. + + 1. Embedding ODT tags as part of regular text + + You can inline OpenDocument syntax by enclosing it within + `@@odt:...@@' markup. For example, to highlight a region of text + do the following: + + @@odt:This is a highlighted + text@@. But this is a regular text. + + *Hint:* To see the above example in action, edit your `styles.xml' + (*note Factory styles: x-orgodtstyles-xml.) and add a custom + `Highlight' style as shown below. + + + + + + 2. Embedding a one-line OpenDocument XML + + You can add a simple OpenDocument one-liner using the `#+ODT:' + directive. For example, to force a page break do the following: + + #+ODT: + + *Hint:* To see the above example in action, edit your `styles.xml' + (*note Factory styles: x-orgodtstyles-xml.) and add a custom + `PageBreak' style as shown below. + + + + + + 3. Embedding a block of OpenDocument XML + + You can add a large block of OpenDocument XML using the + `#+BEGIN_ODT'...`#+END_ODT' construct. + + For example, to create a one-off paragraph that uses bold text, do + the following: + + #+BEGIN_ODT + + This paragraph is specially formatted and uses bold text. + + #+END_ODT + + + +File: org, Node: Customizing tables in ODT export, Next: Validating OpenDocument XML, Prev: Creating one-off styles, Up: Advanced topics in ODT export + +12.9.11.4 Customizing tables in ODT export +.......................................... + +You can override the default formatting of the table by specifying a +custom table style with the `#+ATTR_ODT' line. For a discussion on +default formatting of tables *note Tables in ODT export::. + + This feature closely mimics the way table templates are defined in +the OpenDocument-v1.2 specification.(1) + +Custom table styles: an illustration +.................................... + +To have a quick preview of this feature, install the below setting and +export the table that follows: + + (setq org-odt-table-styles + (append org-odt-table-styles + '(("TableWithHeaderRowAndColumn" "Custom" + ((use-first-row-styles . t) + (use-first-column-styles . t))) + ("TableWithFirstRowandLastRow" "Custom" + ((use-first-row-styles . t) + (use-last-row-styles . t)))))) + + #+ATTR_ODT: :style "TableWithHeaderRowAndColumn" + | Name | Phone | Age | + | Peter | 1234 | 17 | + | Anna | 4321 | 25 | + + In the above example, you used a template named `Custom' and +installed two table styles with the names `TableWithHeaderRowAndColumn' +and `TableWithFirstRowandLastRow'. (*Important:* The OpenDocument +styles needed for producing the above template have been pre-defined for +you. These styles are available under the section marked `Custom Table +Template' in `OrgOdtContentTemplate.xml' (*note Factory styles: +x-orgodtcontenttemplate-xml.). If you need additional templates you +have to define these styles yourselves. + +Custom table styles: the nitty-gritty +..................................... + +To use this feature proceed as follows: + + 1. Create a table template(2) + + A table template is nothing but a set of `table-cell' and + `paragraph' styles for each of the following table cell categories: + + - Body + + - First column + + - Last column + + - First row + + - Last row + + - Even row + + - Odd row + + - Even column + + - Odd Column + + The names for the above styles must be chosen based on the name of + the table template using a well-defined convention. + + The naming convention is better illustrated with an example. For + a table template with the name `Custom', the needed style names + are listed in the following table. + + Table cell type `table-cell' style `paragraph' style + ------------------------------------------------------------------------------- + + Body `CustomTableCell' `CustomTableParagraph' + First column `CustomFirstColumnTableCell'`CustomFirstColumnTableParagraph' + Last column `CustomLastColumnTableCell' `CustomLastColumnTableParagraph' + First row `CustomFirstRowTableCell' `CustomFirstRowTableParagraph' + Last row `CustomLastRowTableCell' `CustomLastRowTableParagraph' + Even row `CustomEvenRowTableCell' `CustomEvenRowTableParagraph' + Odd row `CustomOddRowTableCell' `CustomOddRowTableParagraph' + Even column `CustomEvenColumnTableCell' `CustomEvenColumnTableParagraph' + Odd column `CustomOddColumnTableCell' `CustomOddColumnTableParagraph' + + To create a table template with the name `Custom', define the above + styles in the + `'...`' element + of the content template file (*note Factory styles: + x-orgodtcontenttemplate-xml.). + + 2. Define a table style(3) + + To define a table style, create an entry for the style in the + variable `org-odt-table-styles' and specify the following: + + - the name of the table template created in step (1) + + - the set of cell styles in that template that are to be + activated + + For example, the entry below defines two different table styles + `TableWithHeaderRowAndColumn' and `TableWithFirstRowandLastRow' + based on the same template `Custom'. The styles achieve their + intended effect by selectively activating the individual cell + styles in that template. + + (setq org-odt-table-styles + (append org-odt-table-styles + '(("TableWithHeaderRowAndColumn" "Custom" + ((use-first-row-styles . t) + (use-first-column-styles . t))) + ("TableWithFirstRowandLastRow" "Custom" + ((use-first-row-styles . t) + (use-last-row-styles . t)))))) + + 3. Associate a table with the table style + + To do this, specify the table style created in step (2) as part of + the `ATTR_ODT' line as shown below. + + #+ATTR_ODT: :style "TableWithHeaderRowAndColumn" + | Name | Phone | Age | + | Peter | 1234 | 17 | + | Anna | 4321 | 25 | + + ---------- Footnotes ---------- + + (1) OpenDocument-v1.2 Specification +(http://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html) + + (2) See the `' element of the +OpenDocument-v1.2 specification + + (3) See the attributes `table:template-name', +`table:use-first-row-styles', `table:use-last-row-styles', +`table:use-first-column-styles', `table:use-last-column-styles', +`table:use-banding-rows-styles', and `table:use-banding-column-styles' +of the `' element in the OpenDocument-v1.2 specification + + +File: org, Node: Validating OpenDocument XML, Prev: Customizing tables in ODT export, Up: Advanced topics in ODT export + +12.9.11.5 Validating OpenDocument XML +..................................... + +Occasionally, you will discover that the document created by the ODT +exporter cannot be opened by your favorite application. One of the +common reasons for this is that the `.odt' file is corrupt. In such +cases, you may want to validate the document against the OpenDocument +RELAX NG Compact Syntax (RNC) schema. + + For de-compressing the `.odt' file(1): *note (emacs)File Archives::. +For general help with validation (and schema-sensitive editing) of XML +files: *note (nxml-mode)Introduction::. + + If you have ready access to OpenDocument `.rnc' files and the needed +schema-locating rules in a single folder, you can customize the variable +`org-odt-schema-dir' to point to that directory. The ODT exporter will +take care of updating the `rng-schema-locating-files' for you. + + ---------- Footnotes ---------- + + (1) `.odt' files are nothing but `zip' archives + + +File: org, Node: Org export, Next: Texinfo export, Prev: OpenDocument Text export, Up: Exporting + +12.10 Org export +================ + +`org' export back-end creates a normalized version of the Org document +in current buffer. In particular, it evaluates Babel code (*note +Evaluating code blocks::) and removes other back-ends specific contents. + +Org export commands +------------------- + +`C-c C-e O o (`org-org-export-to-org')' + Export as an Org document. For an Org file, `myfile.org', the + resulting file will be `myfile.org.org'. The file will be + overwritten without warning. + +`C-c C-e O O (`org-org-export-as-org')' + Export to a temporary buffer. Do not create a file. + +`C-c C-e O v' + Export to an Org file, then open it. + + +File: org, Node: Texinfo export, Next: iCalendar export, Prev: Org export, Up: Exporting + +12.11 Texinfo export +==================== + +`texinfo' export back-end generates Texinfo code and can compile it into +an Info file. + +* Menu: + +* Texinfo export commands:: How to invoke Texinfo export +* Document preamble:: File header, title and copyright page +* Headings and sectioning structure:: Building document structure +* Indices:: Creating indices +* Quoting Texinfo code:: Incorporating literal Texinfo code +* Texinfo specific attributes:: Controlling Texinfo output +* An example:: + + +File: org, Node: Texinfo export commands, Next: Document preamble, Prev: Texinfo export, Up: Texinfo export + +12.11.1 Texinfo export commands +------------------------------- + +`C-c C-e i t (`org-texinfo-export-to-texinfo')' + Export as a Texinfo file. For an Org file, `myfile.org', the + resulting file will be `myfile.texi'. The file will be + overwritten without warning. + +`C-c C-e i i (`org-texinfo-export-to-info')' + Export to Texinfo and then process to an Info file(1). + + ---------- Footnotes ---------- + + (1) By setting `org-texinfo-info-process', it is possible to +generate other formats, including DocBook. + + +File: org, Node: Document preamble, Next: Headings and sectioning structure, Prev: Texinfo export commands, Up: Texinfo export + +12.11.2 Document preamble +------------------------- + +When processing a document, `texinfo' back-end generates a minimal file +header along with a title page, a copyright page, and a menu. You +control the latter through the structure of the document (*note +Headings and sectioning structure::). Various keywords allow to tweak +the other parts. It is also possible to give directions to install the +document in the `Top' node. + +File header +........... + +Upon creating the header of a Texinfo file, the back-end guesses a name +for the Info file to be compiled. This may not be a sensible choice, +e.g., if you want to produce the final document in a different +directory. Specify an alternate path with `#+TEXINFO_FILENAME' keyword +to override the default destination. + + Along with the output file name, the header contains information +about the language (*note Export settings::) and current encoding +used(1). Insert a `#+TEXINFO_HEADER' keyword for each additional +command needed, e.g., @code{@synindex}. + + If you happen to regularly install the same set of commands, it may +be easier to define your own class in `org-texinfo-classes', which see. +Set `#+TEXINFO_CLASS' keyword accordingly in your document to activate +it. + +Title and copyright page +........................ + +The default template includes a title page for hard copy output. The +title and author displayed on this page are extracted from, +respectively, `#+TITLE' and `#+AUTHOR' keywords (*note Export +settings::). It is also possible to print a different, more specific, +title with `#+TEXINFO_PRINTED_TITLE' keyword, and add subtitles with +`#+SUBTITLE' keyword. Both expect raw Texinfo code in their value. + + Likewise, information brought by `#+AUTHOR' may not be enough. You +can include other authors with several `#+SUBAUTHOR' keywords. Values +are also expected to be written in Texinfo code. + + #+AUTHOR: Jane Smith + #+SUBAUTHOR: John Doe + #+TEXINFO_PRINTED_TITLE: This Long Title@inlinefmt{tex,@*} Is Broken in @TeX{} + + Copying material is defined in a dedicated headline with a non-nil +`:COPYING:' property. The contents are inserted within a `@copying' +command at the beginning of the document whereas the heading itself +does not appear in the structure of the document. + + Copyright information is printed on the back of the title page. + + * Copying + :PROPERTIES: + :COPYING: t + :END: + + This is a short example of a complete Texinfo file, version 1.0. + + Copyright \copy 2014 Free Software Foundation, Inc. + +The Top node +............ + +You may ultimately want to install your new Info file in your system. +You can write an appropriate entry in the top level directory +specifying its category and title with, respectively, +`#+TEXINFO_DIR_CATEGORY' and `#+TEXINFO_DIR_TITLE'. Optionally, you +can add a short description using `#+TEXINFO_DIR_DESC'. The following +example would write an entry similar to Org's in the `Top' node. + + #+TEXINFO_DIR_CATEGORY: Emacs + #+TEXINFO_DIR_TITLE: Org Mode: (org) + #+TEXINFO_DIR_DESC: Outline-based notes management and organizer + + ---------- Footnotes ---------- + + (1) See `org-texinfo-coding-system' for more information. + + +File: org, Node: Headings and sectioning structure, Next: Indices, Prev: Document preamble, Up: Texinfo export + +12.11.3 Headings and sectioning structure +----------------------------------------- + +`texinfo' uses a pre-defined scheme, or class, to convert headlines into +Texinfo structuring commands. For example, a top level headline +appears as `@chapter' if it should be numbered or as `@unnumbered' +otherwise. If you need to use a different set of commands, e.g., to +start with `@part' instead of `@chapter', install a new class in +`org-texinfo-classes', then activate it with `#+TEXINFO_CLASS' keyword. +Export process defaults to `org-texinfo-default-class' when there is no +such keyword in the document. + + If a headline's level has no associated structuring command, or is +below a certain threshold (*note Export settings::), that headline +becomes a list in Texinfo output. + + As an exception, a headline with a non-nil `:APPENDIX:' property +becomes an appendix, independently on its level and the class used. + + Each regular sectioning structure creates a menu entry, named after +the heading. You can provide a different, e.g., shorter, title in +`:ALT_TITLE:' property (*note Table of contents::). Optionally, you can +specify a description for the item in `:DESCRIPTION:' property. E.g., + + * Controlling Screen Display + :PROPERTIES: + :ALT_TITLE: Display + :DESCRIPTION: Controlling Screen Display + :END: + + +File: org, Node: Indices, Next: Quoting Texinfo code, Prev: Headings and sectioning structure, Up: Texinfo export + +12.11.4 Indices +--------------- + +Index entries are created using dedicated keywords. `texinfo' back-end +provides one for each predefined type: `#+CINDEX', `#+FINDEX', +`#+KINDEX', `#+PINDEX', `#+TINDEX' and `#+VINDEX'. For custom indices, +you can write raw Texinfo code (*note Quoting Texinfo code::). + + #+CINDEX: Defining indexing entries + + To generate an index, you need to set the `:INDEX:' property of a +headline to an appropriate abbreviation (e.g., `cp' or `vr'). The +headline is then exported as an unnumbered chapter or section command +and the index is inserted after its contents. + + * Concept Index + :PROPERTIES: + :INDEX: cp + :END: + + +File: org, Node: Quoting Texinfo code, Next: Texinfo specific attributes, Prev: Indices, Up: Texinfo export + +12.11.5 Quoting Texinfo code +---------------------------- + +It is possible to insert raw Texinfo code using any of the following +constructs + + Richard @@texinfo:@sc{@@Stallman@@texinfo:}@@ commence' GNU. + + #+TEXINFO: @need800 + This paragraph is preceded by... + + #+BEGIN_TEXINFO + @auindex Johnson, Mark + @auindex Lakoff, George + #+END_TEXINFO + + +File: org, Node: Texinfo specific attributes, Next: An example, Prev: Quoting Texinfo code, Up: Texinfo export + +12.11.6 Texinfo specific attributes +----------------------------------- + +`texinfo' back-end understands several attributes in plain lists and +tables. They must be specified using an `#+ATTR_TEXINFO' keyword, +written just above the list or table. + +Plain lists +........... + +In Texinfo output, description lists appear as two-column tables, using +the default command `@table'. You can use `@ftable' or `@vtable'(1) +instead with `:table-type' attribute. + + In any case, these constructs require a highlighting command for +entries in the list. You can provide one with `:indic' attribute. If +you do not, it defaults to the value stored in +`org-texinfo-def-table-markup', which see. + + #+ATTR_TEXINFO: :indic @asis + - foo :: This is the text for /foo/, with no highlighting. + +Tables +...... + +When exporting a table, column widths are deduced from the longest cell +in each column. You can also define them explicitly as fractions of +the line length, using `:columns' attribute. + + #+ATTR_TEXINFO: :columns .5 .5 + | a cell | another cell | + + ---------- Footnotes ---------- + + (1) For more information, *note (texinfo)Two-column Tables::. + + +File: org, Node: An example, Prev: Texinfo specific attributes, Up: Texinfo export + +12.11.7 An example +------------------ + +Here is a thorough example, taken from *note (texinfo)GNU Sample +Texts::. + + #+MACRO: version 2.0 + #+MACRO: updated last updated 4 March 2014 + + #+OPTIONS: ':t toc:t author:t email:t + #+TITLE: GNU Sample {{{version}}} + #+AUTHOR: A.U. Thor + #+EMAIL: bug-sample@gnu.org + #+LANGUAGE: en + + #+TEXINFO_FILENAME: sample.info + #+TEXINFO_HEADER: @syncodeindex pg cp + + #+TEXINFO_DIR_CATEGORY: Texinfo documentation system + #+TEXINFO_DIR_TITLE: sample: (sample) + #+TEXINFO_DIR_DESC: Invoking sample + + #+TEXINFO_PRINTED_TITLE: GNU Sample + #+SUBTITLE: for version 2.0, last updated 4 March 2014 + + * Copying + :PROPERTIES: + :COPYING: t + :END: + + This manual is for GNU Sample (version {{{version}}}, + {{{updated}}}), which is an example in the Texinfo documentation. + + Copyright @@texinfo:@copyright{}@@ 2013 Free Software Foundation, + Inc. + + #+BEGIN_QUOTE + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with no Invariant Sections, with no Front-Cover Texts, + and with no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + #+END_QUOTE + + * Invoking sample + + #+PINDEX: sample + #+CINDEX: invoking @command{sample} + + This is a sample manual. There is no sample program to invoke, but + if there were, you could see its basic usage and command line + options here. + + * GNU Free Documentation License + :PROPERTIES: + :APPENDIX: t + :END: + + #+TEXINFO: @include fdl.texi + + * Index + :PROPERTIES: + :INDEX: cp + :END: + + +File: org, Node: iCalendar export, Next: Other built-in back-ends, Prev: Texinfo export, Up: Exporting + +12.12 iCalendar export +====================== + +Some people use Org mode for keeping track of projects, but still +prefer a standard calendar application for anniversaries and +appointments. In this case it can be useful to show deadlines and +other time-stamped items in Org files in the calendar application. Org +mode can export calendar information in the standard iCalendar format. +If you also want to have TODO entries included in the export, configure +the variable `org-icalendar-include-todo'. Plain timestamps are +exported as VEVENT, and TODO items as VTODO. It will also create +events from deadlines that are in non-TODO items. Deadlines and +scheduling dates in TODO items will be used to set the start and due +dates for the TODO entry(1). As categories, it will use the tags +locally defined in the heading, and the file/tree category(2). See the +variable `org-icalendar-alarm-time' for a way to assign alarms to +entries with a time. + + The iCalendar standard requires each entry to have a globally unique +identifier (UID). Org creates these identifiers during export. If you +set the variable `org-icalendar-store-UID', the UID will be stored in +the `:ID:' property of the entry and re-used next time you report this +entry. Since a single entry can give rise to multiple iCalendar +entries (as a timestamp, a deadline, a scheduled item, and as a TODO +item), Org adds prefixes to the UID, depending on what triggered the +inclusion of the entry. In this way the UID remains unique, but a +synchronization program can still figure out from which entry all the +different instances originate. + +`C-c C-e c f (`org-icalendar-export-to-ics')' + Create iCalendar entries for the current buffer and store them in + the same directory, using a file extension `.ics'. + +`C-c C-e c a (`org-icalendar-export-agenda-files')' + Like `C-c C-e c f', but do this for all files in + `org-agenda-files'. For each of these files, a separate iCalendar + file will be written. + +`C-c C-e c c (`org-icalendar-combine-agenda-files')' + Create a single large iCalendar file from all files in + `org-agenda-files' and write it to the file given by + `org-icalendar-combined-agenda-file'. + + The export will honor SUMMARY, DESCRIPTION and LOCATION(3) +properties if the selected entries have them. If not, the summary will +be derived from the headline, and the description from the body +(limited to `org-icalendar-include-body' characters). + + How this calendar is best read and updated, depends on the +application you are using. The FAQ covers this issue. + + ---------- Footnotes ---------- + + (1) See the variables `org-icalendar-use-deadline' and +`org-icalendar-use-scheduled'. + + (2) To add inherited tags or the TODO state, configure the variable +`org-icalendar-categories'. + + (3) The LOCATION property can be inherited from higher in the +hierarchy if you configure `org-use-property-inheritance' accordingly. + + +File: org, Node: Other built-in back-ends, Next: Export in foreign buffers, Prev: iCalendar export, Up: Exporting + +12.13 Other built-in back-ends +============================== + +On top of the aforementioned back-ends, Org comes with other built-in +ones: + + * `ox-man.el': export to a man page. + + To activate these export back-end, customize `org-export-backends' or +load them directly with e.g., `(require 'ox-man)'. This will add new +keys in the export dispatcher (*note The Export Dispatcher::). + + See the comment section of these files for more information on how +to use them. + + +File: org, Node: Export in foreign buffers, Next: Advanced configuration, Prev: Other built-in back-ends, Up: Exporting + +12.14 Export in foreign buffers +=============================== + +Most built-in back-ends come with a command to convert the selected +region into a selected format and replace this region by the exported +output. Here is a list of such conversion commands: + +`org-html-convert-region-to-html' + Convert the selected region into HTML. + +`org-latex-convert-region-to-latex' + Convert the selected region into LaTeX. + +`org-texinfo-convert-region-to-texinfo' + Convert the selected region into `Texinfo'. + +`org-md-convert-region-to-md' + Convert the selected region into `MarkDown'. + + This is particularly useful for converting tables and lists in +foreign buffers. E.g., in an HTML buffer, you can turn on +`orgstruct-mode', then use Org commands for editing a list, and finally +select and convert the list with `M-x org-html-convert-region-to-html +RET'. + + +File: org, Node: Advanced configuration, Prev: Export in foreign buffers, Up: Exporting + +12.15 Advanced configuration +============================ + +Hooks +----- + +Two hooks are run during the first steps of the export process. The +first one, `org-export-before-processing-hook' is called before +expanding macros, Babel code and include keywords in the buffer. The +second one, `org-export-before-parsing-hook', as its name suggests, +happens just before parsing the buffer. Their main use is for heavy +duties, that is duties involving structural modifications of the +document. For example, one may want to remove every headline in the +buffer during export. The following code can achieve this: + + (defun my-headline-removal (backend) + "Remove all headlines in the current buffer. + BACKEND is the export back-end being used, as a symbol." + (org-map-entries + (lambda () (delete-region (point) (progn (forward-line) (point)))))) + + (add-hook 'org-export-before-parsing-hook 'my-headline-removal) + + Note that functions used in these hooks require a mandatory argument, +a symbol representing the back-end used. + +Filters +------- + +Filters are lists of functions applied on a specific part of the output +from a given back-end. More explicitly, each time a back-end +transforms an Org object or element into another language, all +functions within a given filter type are called in turn on the string +produced. The string returned by the last function will be the one +used in the final output. + + There are filters sets for each type of element or object, for plain +text, for the parse tree, for the export options and for the final +output. They are all named after the same scheme: +`org-export-filter-TYPE-functions', where `TYPE' is the type targeted +by the filter. Valid types are: + +bold babel-call center-block +clock code comment +comment-block diary-sexp drawer +dynamic-block entity example-block +export-block export-snippet final-output +fixed-width footnote-definition footnote-reference +headline horizontal-rule inline-babel-call +inline-src-block inlinetask italic +item keyword latex-environment +latex-fragment line-break link +node-property options paragraph +parse-tree plain-list plain-text +planning property-drawer quote-block +quote-section radio-target section +special-block src-block statistics-cookie +strike-through subscript superscript +table table-cell table-row +target timestamp underline +verbatim verse-block + + For example, the following snippet allows me to use non-breaking +spaces in the Org buffer and get them translated into LaTeX without +using the `\nbsp' macro (where `_' stands for the non-breaking space): + + (defun my-latex-filter-nobreaks (text backend info) + "Ensure \" \" are properly handled in LaTeX export." + (when (org-export-derived-backend-p backend 'latex) + (replace-regexp-in-string " " "~" text))) + + (add-to-list 'org-export-filter-plain-text-functions + 'my-latex-filter-nobreaks) + + Three arguments must be provided to a filter: the code being +changed, the back-end used, and some information about the export +process. You can safely ignore the third argument for most purposes. +Note the use of `org-export-derived-backend-p', which ensures that the +filter will only be applied when using `latex' back-end or any other +back-end derived from it (e.g., `beamer'). + +Extending an existing back-end +------------------------------ + +This is obviously the most powerful customization, since the changes +happen at the parser level. Indeed, some export back-ends are built as +extensions of other ones (e.g. Markdown back-end an extension of HTML +back-end). + + Extending a back-end means that if an element type is not transcoded +by the new back-end, it will be handled by the original one. Hence you +can extend specific parts of a back-end without too much work. + + As an example, imagine we want the `ascii' back-end to display the +language used in a source block, when it is available, but only when +some attribute is non-`nil', like the following: + + #+ATTR_ASCII: :language t + + Because that back-end is lacking in that area, we are going to +create a new back-end, `my-ascii' that will do the job. + + (defun my-ascii-src-block (src-block contents info) + "Transcode a SRC-BLOCK element from Org to ASCII. + CONTENTS is nil. INFO is a plist used as a communication + channel." + (if (not (org-export-read-attribute :attr_ascii src-block :language)) + (org-export-with-backend 'ascii src-block contents info) + (concat + (format ",--[ %s ]--\n%s`----" + (org-element-property :language src-block) + (replace-regexp-in-string + "^" "| " + (org-element-normalize-string + (org-export-format-code-default src-block info))))))) + + (org-export-define-derived-backend 'my-ascii 'ascii + :translate-alist '((src-block . my-ascii-src-block))) + + The `my-ascii-src-block' function looks at the attribute above the +element. If it isn't true, it gives hand to the `ascii' back-end. +Otherwise, it creates a box around the code, leaving room for the +language. A new back-end is then created. It only changes its +behavior when translating `src-block' type element. Now, all it takes +to use the new back-end is calling the following from an Org buffer: + + (org-export-to-buffer 'my-ascii "*Org MY-ASCII Export*") + + It is obviously possible to write an interactive function for this, +install it in the export dispatcher menu, and so on. + + +File: org, Node: Publishing, Next: Working With Source Code, Prev: Exporting, Up: Top + +13 Publishing +************* + +Org includes a publishing management system that allows you to configure +automatic HTML conversion of _projects_ composed of interlinked org +files. You can also configure Org to automatically upload your +exported HTML pages and related attachments, such as images and source +code files, to a web server. + + You can also use Org to convert files into PDF, or even combine HTML +and PDF conversion so that files are available in both formats on the +server. + + Publishing has been contributed to Org by David O'Toole. + +* Menu: + +* Configuration:: Defining projects +* Uploading files:: How to get files up on the server +* Sample configuration:: Example projects +* Triggering publication:: Publication commands + + +File: org, Node: Configuration, Next: Uploading files, Prev: Publishing, Up: Publishing + +13.1 Configuration +================== + +Publishing needs significant configuration to specify files, destination +and many other properties of a project. + +* Menu: + +* Project alist:: The central configuration variable +* Sources and destinations:: From here to there +* Selecting files:: What files are part of the project? +* Publishing action:: Setting the function doing the publishing +* Publishing options:: Tweaking HTML/LaTeX export +* Publishing links:: Which links keep working after publishing? +* Sitemap:: Generating a list of all pages +* Generating an index:: An index that reaches across pages + + +File: org, Node: Project alist, Next: Sources and destinations, Prev: Configuration, Up: Configuration + +13.1.1 The variable `org-publish-project-alist' +----------------------------------------------- + +Publishing is configured almost entirely through setting the value of +one variable, called `org-publish-project-alist'. Each element of the +list configures one project, and may be in one of the two following +forms: + + ("project-name" :property value :property value ...) + i.e., a well-formed property list with alternating keys and values + or + ("project-name" :components ("project-name" "project-name" ...)) + + In both cases, projects are configured by specifying property +values. A project defines the set of files that will be published, as +well as the publishing configuration to use when publishing those +files. When a project takes the second form listed above, the +individual members of the `:components' property are taken to be +sub-projects, which group together files requiring different publishing +options. When you publish such a "meta-project", all the components +will also be published, in the sequence given. + + +File: org, Node: Sources and destinations, Next: Selecting files, Prev: Project alist, Up: Configuration + +13.1.2 Sources and destinations for files +----------------------------------------- + +Most properties are optional, but some should always be set. In +particular, Org needs to know where to look for source files, and where +to put published files. + +`:base-directory' Directory containing publishing source files +`:publishing-directory'Directory where output files will be published. + You can directly publish to a web server using a + file name syntax appropriate for the Emacs + `tramp' package. Or you can publish to a local + directory and use external tools to upload your + website (*note Uploading files::). +`:preparation-function'Function or list of functions to be called before + starting the publishing process, for example, to + run `make' for updating files to be published. + The project property list is scoped into this + call as the variable `project-plist'. +`:completion-function' Function or list of functions called after + finishing the publishing process, for example, to + change permissions of the resulting files. The + project property list is scoped into this call as + the variable `project-plist'. + + +File: org, Node: Selecting files, Next: Publishing action, Prev: Sources and destinations, Up: Configuration + +13.1.3 Selecting files +---------------------- + +By default, all files with extension `.org' in the base directory are +considered part of the project. This can be modified by setting the +properties +`:base-extension' Extension (without the dot!) of source files. This + actually is a regular expression. Set this to the + symbol `any' if you want to get all files in + `:base-directory', even without extension. +`:exclude' Regular expression to match file names that should + not be published, even though they have been selected + on the basis of their extension. +`:include' List of files to be included regardless of + `:base-extension' and `:exclude'. +`:recursive' non-`nil' means, check base-directory recursively for + files to publish. + + +File: org, Node: Publishing action, Next: Publishing options, Prev: Selecting files, Up: Configuration + +13.1.4 Publishing action +------------------------ + +Publishing means that a file is copied to the destination directory and +possibly transformed in the process. The default transformation is to +export Org files as HTML files, and this is done by the function +`org-html-publish-to-html', which calls the HTML exporter (*note HTML +export::). But you also can publish your content as PDF files using +`org-latex-publish-to-pdf' or as `ascii', `Texinfo', etc., using the +corresponding functions. + + If you want to publish the Org file as an `.org' file but with the +archived, commented and tag-excluded trees removed, use the function +`org-org-publish-to-org'. This will produce `file.org' and put it in +the publishing directory. If you want a htmlized version of this file, +set the parameter `:htmlized-source' to `t', it will produce +`file.org.html' in the publishing directory(1). + + Other files like images only need to be copied to the publishing +destination. For this you can use `org-publish-attachment'. For +non-org files, you always need to specify the publishing function: + +`:publishing-function' Function executing the publication of a file. + This may also be a list of functions, which will + all be called in turn. +`:htmlized-source' non-`nil' means, publish htmlized source. + + The function must accept three arguments: a property list containing +at least a `:publishing-directory' property, the name of the file to be +published and the path to the publishing directory of the output file. +It should take the specified file, make the necessary transformation +(if any) and place the result into the destination folder. + + ---------- Footnotes ---------- + + (1) If the publishing directory is the same than the source +directory, `file.org' will be exported as `file.org.org', so probably +don't want to do this. + + +File: org, Node: Publishing options, Next: Publishing links, Prev: Publishing action, Up: Configuration + +13.1.5 Options for the exporters +-------------------------------- + +The property list can be used to set many export options for the +exporters. In most cases, these properties correspond to user +variables in Org. The first table below lists these properties along +with the variable they belong to. The second table list HTML specific +properties. See the documentation string of these options for details. + +`:archived-trees' `org-export-with-archived-trees' +`:exclude-tags' `org-export-exclude-tags' +`:headline-levels' `org-export-headline-levels' +`:language' `org-export-default-language' +`:preserve-breaks' `org-export-preserve-breaks' +`:section-numbers' `org-export-with-section-numbers' +`:select-tags' `org-export-select-tags' +`:with-author' `org-export-with-author' +`:with-creator' `org-export-with-creator' +`:with-drawers' `org-export-with-drawers' +`:with-email' `org-export-with-email' +`:with-emphasize' `org-export-with-emphasize' +`:with-fixed-width' `org-export-with-fixed-width' +`:with-footnotes' `org-export-with-footnotes' +`:with-latex' `org-export-with-latex' +`:with-planning' `org-export-with-planning' +`:with-priority' `org-export-with-priority' +`:with-special-strings' `org-export-with-special-strings' +`:with-sub-superscript' `org-export-with-sub-superscripts' +`:with-tables' `org-export-with-tables' +`:with-tags' `org-export-with-tags' +`:with-tasks' `org-export-with-tasks' +`:with-timestamps' `org-export-with-timestamps' +`:with-toc' `org-export-with-toc' +`:with-todo-keywords' `org-export-with-todo-keywords' + +`:html-doctype' `org-html-doctype' +`:html-container' `org-html-container-element' +`:html-html5-fancy' `org-html-html5-fancy' +`:html-xml-declaration' `org-html-xml-declaration' +`:html-link-up' `org-html-link-up' +`:html-link-home' `org-html-link-home' +`:html-link-org-as-html'`org-html-link-org-files-as-html' +`:html-link-use-abs-url'`org-html-link-use-abs-url' +`:html-head' `org-html-head' +`:html-head-extra' `org-html-head-extra' +`:html-inline-images' `org-html-inline-images' +`:html-extension' `org-html-extension' +`:html-preamble' `org-html-preamble' +`:html-postamble' `org-html-postamble' +`:html-table-attributes'`org-html-table-default-attributes' +`:html-table-row-tags' `org-html-table-row-tags' +`:html-head-include-default-style'`org-html-head-include-default-style' +`:html-head-include-scripts'`org-html-head-include-scripts' + + Most of the `org-export-with-*' variables have the same effect in +each exporter. + + When a property is given a value in `org-publish-project-alist', its +setting overrides the value of the corresponding user variable (if any) +during publishing. Options set within a file (*note Export settings::), +however, override everything. + + +File: org, Node: Publishing links, Next: Sitemap, Prev: Publishing options, Up: Configuration + +13.1.6 Links between published files +------------------------------------ + +To create a link from one Org file to another, you would use something +like `[[file:foo.org][The foo]]' or simply `file:foo.org.' (*note +Hyperlinks::). When published, this link becomes a link to `foo.html'. +You can thus interlink the pages of your "org web" project and the +links will work as expected when you publish them to HTML. If you also +publish the Org source file and want to link to it, use an `http:' link +instead of a `file:' link, because `file:' links are converted to link +to the corresponding `html' file. + + You may also link to related files, such as images. Provided you +are careful with relative file names, and provided you have also +configured Org to upload the related files, these links will work too. +See *note Complex example::, for an example of this usage. + + +File: org, Node: Sitemap, Next: Generating an index, Prev: Publishing links, Up: Configuration + +13.1.7 Generating a sitemap +--------------------------- + +The following properties may be used to control publishing of a map of +files for a given project. + +`:auto-sitemap' When non-`nil', publish a sitemap during + `org-publish-current-project' or + `org-publish-all'. +`:sitemap-filename' Filename for output of sitemap. Defaults to + `sitemap.org' (which becomes `sitemap.html'). +`:sitemap-title' Title of sitemap page. Defaults to name of + file. +`:sitemap-function' Plug-in function to use for generation of the + sitemap. Defaults to + `org-publish-org-sitemap', which generates a + plain list of links to all files in the + project. +`:sitemap-sort-folders' Where folders should appear in the sitemap. + Set this to `first' (default) or `last' to + display folders first or last, respectively. + Any other value will mix files and folders. +`:sitemap-sort-files' How the files are sorted in the site map. Set + this to `alphabetically' (default), + `chronologically' or `anti-chronologically'. + `chronologically' sorts the files with older + date first while `anti-chronologically' sorts + the files with newer date first. + `alphabetically' sorts the files + alphabetically. The date of a file is + retrieved with `org-publish-find-date'. +`:sitemap-ignore-case' Should sorting be case-sensitive? Default + `nil'. +`:sitemap-file-entry-format'With this option one can tell how a sitemap's + entry is formatted in the sitemap. This is a + format string with some escape sequences: `%t' + stands for the title of the file, `%a' stands + for the author of the file and `%d' stands for + the date of the file. The date is retrieved + with the `org-publish-find-date' function and + formatted with + `org-publish-sitemap-date-format'. Default + `%t'. +`:sitemap-date-format' Format string for the `format-time-string' + function that tells how a sitemap entry's date + is to be formatted. This property bypasses + `org-publish-sitemap-date-format' which + defaults to `%Y-%m-%d'. +`:sitemap-sans-extension' When non-`nil', remove filenames' extensions + from the generated sitemap. Useful to have + cool URIs (see + `http://www.w3.org/Provider/Style/URI'). + Defaults to `nil'. + + +File: org, Node: Generating an index, Prev: Sitemap, Up: Configuration + +13.1.8 Generating an index +-------------------------- + +Org mode can generate an index across the files of a publishing project. + +`:makeindex' When non-`nil', generate in index in the file + `theindex.org' and publish it as `theindex.html'. + + The file will be created when first publishing a project with the +`:makeindex' set. The file only contains a statement `#+INCLUDE: +"theindex.inc"'. You can then build around this include statement by +adding a title, style information, etc. + + +File: org, Node: Uploading files, Next: Sample configuration, Prev: Configuration, Up: Publishing + +13.2 Uploading files +==================== + +For those people already utilizing third party sync tools such as +`rsync' or `unison', it might be preferable not to use the built in +remote publishing facilities of Org mode which rely heavily on Tramp. +Tramp, while very useful and powerful, tends not to be so efficient for +multiple file transfer and has been known to cause problems under heavy +usage. + + Specialized synchronization utilities offer several advantages. In +addition to timestamp comparison, they also do content and +permissions/attribute checks. For this reason you might prefer to +publish your web to a local directory (possibly even in place with your +Org files) and then use `unison' or `rsync' to do the synchronization +with the remote host. + + Since Unison (for example) can be configured as to which files to +transfer to a certain remote destination, it can greatly simplify the +project publishing definition. Simply keep all files in the correct +location, process your Org files with `org-publish' and let the +synchronization tool do the rest. You do not need, in this scenario, +to include attachments such as `jpg', `css' or `gif' files in the +project definition since the 3rd party tool syncs them. + + Publishing to a local directory is also much faster than to a remote +one, so that you can afford more easily to republish entire projects. +If you set `org-publish-use-timestamps-flag' to `nil', you gain the main +benefit of re-including any changed external files such as source +example files you might include with `#+INCLUDE:'. The timestamp +mechanism in Org is not smart enough to detect if included files have +been modified. + + +File: org, Node: Sample configuration, Next: Triggering publication, Prev: Uploading files, Up: Publishing + +13.3 Sample configuration +========================= + +Below we provide two example configurations. The first one is a simple +project publishing only a set of Org files. The second example is more +complex, with a multi-component project. + +* Menu: + +* Simple example:: One-component publishing +* Complex example:: A multi-component publishing example + + +File: org, Node: Simple example, Next: Complex example, Prev: Sample configuration, Up: Sample configuration + +13.3.1 Example: simple publishing configuration +----------------------------------------------- + +This example publishes a set of Org files to the `public_html' +directory on the local machine. + + (setq org-publish-project-alist + '(("org" + :base-directory "~/org/" + :publishing-directory "~/public_html" + :section-numbers nil + :with-toc nil + :html-head ""))) + + +File: org, Node: Complex example, Prev: Simple example, Up: Sample configuration + +13.3.2 Example: complex publishing configuration +------------------------------------------------ + +This more complicated example publishes an entire website, including +Org files converted to HTML, image files, Emacs Lisp source code, and +style sheets. The publishing directory is remote and private files are +excluded. + + To ensure that links are preserved, care should be taken to replicate +your directory structure on the web server, and to use relative file +paths. For example, if your Org files are kept in `~/org' and your +publishable images in `~/images', you would link to an image with + file:../images/myimage.png + On the web server, the relative path to the image should be the +same. You can accomplish this by setting up an "images" folder in the +right place on the web server, and publishing images to it. + + (setq org-publish-project-alist + '(("orgfiles" + :base-directory "~/org/" + :base-extension "org" + :publishing-directory "/ssh:user@host:~/html/notebook/" + :publishing-function org-html-publish-to-html + :exclude "PrivatePage.org" ;; regexp + :headline-levels 3 + :section-numbers nil + :with-toc nil + :html-head "" + :html-preamble t) + + ("images" + :base-directory "~/images/" + :base-extension "jpg\\|gif\\|png" + :publishing-directory "/ssh:user@host:~/html/images/" + :publishing-function org-publish-attachment) + + ("other" + :base-directory "~/other/" + :base-extension "css\\|el" + :publishing-directory "/ssh:user@host:~/html/other/" + :publishing-function org-publish-attachment) + ("website" :components ("orgfiles" "images" "other")))) + + +File: org, Node: Triggering publication, Prev: Sample configuration, Up: Publishing + +13.4 Triggering publication +=========================== + +Once properly configured, Org can publish with the following commands: + +`C-c C-e P x (`org-publish')' + Prompt for a specific project and publish all files that belong to + it. + +`C-c C-e P p (`org-publish-current-project')' + Publish the project containing the current file. + +`C-c C-e P f (`org-publish-current-file')' + Publish only the current file. + +`C-c C-e P a (`org-publish-all')' + Publish every project. + + Org uses timestamps to track when a file has changed. The above +functions normally only publish changed files. You can override this +and force publishing of all files by giving a prefix argument to any of +the commands above, or by customizing the variable +`org-publish-use-timestamps-flag'. This may be necessary in particular +if files include other files via `#+SETUPFILE:' or `#+INCLUDE:'. + + +File: org, Node: Working With Source Code, Next: Miscellaneous, Prev: Publishing, Up: Top + +14 Working with source code +*************************** + +Source code can be included in Org mode documents using a `src' block, +e.g.: + + #+BEGIN_SRC emacs-lisp + (defun org-xor (a b) + "Exclusive or." + (if a (not b) b)) + #+END_SRC + + Org mode provides a number of features for working with live source +code, including editing of code blocks in their native major-mode, +evaluation of code blocks, converting code blocks into source files +(known as "tangling" in literate programming), and exporting code +blocks and their results in several formats. This functionality was +contributed by Eric Schulte and Dan Davison, and was originally named +Org-babel. + + The following sections describe Org mode's code block handling +facilities. + +* Menu: + +* Structure of code blocks:: Code block syntax described +* Editing source code:: Language major-mode editing +* Exporting code blocks:: Export contents and/or results +* Extracting source code:: Create pure source code files +* Evaluating code blocks:: Place results of evaluation in the Org mode buffer +* Library of Babel:: Use and contribute to a library of useful code blocks +* Languages:: List of supported code block languages +* Header arguments:: Configure code block functionality +* Results of evaluation:: How evaluation results are handled +* Noweb reference syntax:: Literate programming in Org mode +* Key bindings and useful functions:: Work quickly with code blocks +* Batch execution:: Call functions from the command line + + +File: org, Node: Structure of code blocks, Next: Editing source code, Prev: Working With Source Code, Up: Working With Source Code + +14.1 Structure of code blocks +============================= + +Live code blocks can be specified with a `src' block or inline.(1) The +structure of a `src' block is + + #+NAME: + #+BEGIN_SRC
+ + #+END_SRC + + The `#+NAME:' line is optional, and can be used to name the code +block. Live code blocks require that a language be specified on the +`#+BEGIN_SRC' line. Switches and header arguments are optional. + + Live code blocks can also be specified inline using + + src_{} + + or + + src_[
]{} + +`<#+NAME: name>' + This line associates a name with the code block. This is similar + to the `#+NAME: Name' lines that can be used to name tables in Org + mode files. Referencing the name of a code block makes it + possible to evaluate the block from other places in the file, from + other files, or from Org mode table formulas (see *note The + spreadsheet::). Names are assumed to be unique and the behavior + of Org mode when two or more blocks share the same name is + undefined. + +`' + The language of the code in the block (see *note Languages::). + +`' + Optional switches control code block export (see the discussion of + switches in *note Literal examples::) + +`
' + Optional header arguments control many aspects of evaluation, + export and tangling of code blocks (see *note Header arguments::). + Header arguments can also be set on a per-buffer or per-subtree + basis using properties. + +`source code, header arguments' + +`' + Source code in the specified language. + + ---------- Footnotes ---------- + + (1) Note that `src' blocks may be inserted using Org mode's *note +Easy Templates:: system + + +File: org, Node: Editing source code, Next: Exporting code blocks, Prev: Structure of code blocks, Up: Working With Source Code + +14.2 Editing source code +======================== + +Use `C-c '' to edit the current code block. This brings up a language +major-mode edit buffer containing the body of the code block. Manually +saving this buffer with will write the contents back to the +Org buffer. You can also set `org-edit-src-auto-save-idle-delay' to +save the base buffer after some idle delay, or +`org-edit-src-turn-on-auto-save' to auto-save this buffer into a +separate file using `auto-save-mode'. Use `C-c '' again to exit. + + The `org-src-mode' minor mode will be active in the edit buffer. The +following variables can be used to configure the behavior of the edit +buffer. See also the customization group `org-edit-structure' for +further configuration options. + +`org-src-lang-modes' + If an Emacs major-mode named `-mode' exists, where `' + is the language named in the header line of the code block, then + the edit buffer will be placed in that major-mode. This variable + can be used to map arbitrary language names to existing major + modes. + +`org-src-window-setup' + Controls the way Emacs windows are rearranged when the edit buffer + is created. + +`org-src-preserve-indentation' + By default, the value is `nil', which means that when code blocks + are evaluated during export or tangled, they are re-inserted into + the code block, which may replace sequences of spaces with tab + characters. When non-nil, whitespace in code blocks will be + preserved during export or tangling, exactly as it appears. This + variable is especially useful for tangling languages such as + Python, in which whitespace indentation in the output is critical. + +`org-src-ask-before-returning-to-edit-buffer' + By default, Org will ask before returning to an open edit buffer. + Set this variable to `nil' to switch without asking. + + To turn on native code fontification in the _Org_ buffer, configure +the variable `org-src-fontify-natively'. + + +File: org, Node: Exporting code blocks, Next: Extracting source code, Prev: Editing source code, Up: Working With Source Code + +14.3 Exporting code blocks +========================== + +It is possible to export the _code_ of code blocks, the _results_ of +code block evaluation, _both_ the code and the results of code block +evaluation, or _none_. For most languages, the default exports code. +However, for some languages (e.g., `ditaa') the default exports the +results of code block evaluation. For information on exporting code +block bodies, see *note Literal examples::. + + The `:exports' header argument can be used to specify export +behavior: + +Header arguments: +................. + +`:exports code' + The default in most languages. The body of the code block is + exported, as described in *note Literal examples::. + +`:exports results' + The code block will be evaluated and the results will be placed in + the Org mode buffer for export, either updating previous results + of the code block located anywhere in the buffer or, if no + previous results exist, placing the results immediately after the + code block. The body of the code block will not be exported. + +`:exports both' + Both the code block and its results will be exported. + +`:exports none' + Neither the code block nor its results will be exported. + + It is possible to inhibit the evaluation of code blocks during +export. Setting the `org-export-babel-evaluate' variable to `nil' will +ensure that no code blocks are evaluated as part of the export process. +This can be useful in situations where potentially untrusted Org mode +files are exported in an automated fashion, for example when Org mode +is used as the markup language for a wiki. It is also possible to set +this variable to `'inline-only'. In that case, only inline code blocks +will be evaluated, in order to insert their results. Non-inline code +blocks are assumed to have their results already inserted in the buffer +by manual evaluation. This setting is useful to avoid expensive +recalculations during export, not to provide security. + + +File: org, Node: Extracting source code, Next: Evaluating code blocks, Prev: Exporting code blocks, Up: Working With Source Code + +14.4 Extracting source code +=========================== + +Creating pure source code files by extracting code from source blocks is +referred to as "tangling"--a term adopted from the literate programming +community. During "tangling" of code blocks their bodies are expanded +using `org-babel-expand-src-block' which can expand both variable and +"noweb" style references (see *note Noweb reference syntax::). + +Header arguments +................ + +`:tangle no' + The default. The code block is not included in the tangled output. + +`:tangle yes' + Include the code block in the tangled output. The output file + name is the name of the org file with the extension `.org' + replaced by the extension for the block language. + +`:tangle filename' + Include the code block in the tangled output to file `filename'. + +Functions +......... + +`org-babel-tangle' + Tangle the current file. Bound to `C-c C-v t'. + + With prefix argument only tangle the current code block. + +`org-babel-tangle-file' + Choose a file to tangle. Bound to `C-c C-v f'. + +Hooks +..... + +`org-babel-post-tangle-hook' + This hook is run from within code files tangled by + `org-babel-tangle'. Example applications could include + post-processing, compilation or evaluation of tangled code files. + +Jumping between code and Org +............................ + +When tangling code from an Org-mode buffer to a source code file, you'll +frequently find yourself viewing the file of tangled source code (e.g., +many debuggers point to lines of the source code file). It is useful +to be able to navigate from the tangled source to the Org-mode buffer +from which the code originated. + + The `org-babel-tangle-jump-to-org' function provides this jumping +from code to Org-mode functionality. Two header arguments are required +for jumping to work, first the `padline' (*note padline::) option must +be set to true (the default setting), second the `comments' (*note +comments::) header argument must be set to `links', which will insert +comments into the source code buffer which point back to the original +Org-mode file. + + +File: org, Node: Evaluating code blocks, Next: Library of Babel, Prev: Extracting source code, Up: Working With Source Code + +14.5 Evaluating code blocks +=========================== + +Code blocks can be evaluated(1) and the results of evaluation +optionally placed in the Org mode buffer. The results of evaluation +are placed following a line that begins by default with `#+RESULTS' and +optionally a cache identifier and/or the name of the evaluated code +block. The default value of `#+RESULTS' can be changed with the +customizable variable `org-babel-results-keyword'. + + By default, the evaluation facility is only enabled for Lisp code +blocks specified as `emacs-lisp'. However, source code blocks in many +languages can be evaluated within Org mode (see *note Languages:: for a +list of supported languages and *note Structure of code blocks:: for +information on the syntax used to define a code block). + + There are a number of ways to evaluate code blocks. The simplest is +to press `C-c C-c' or `C-c C-v e' with the point on a code block(2). +This will call the `org-babel-execute-src-block' function to evaluate +the block and insert its results into the Org mode buffer. + + It is also possible to evaluate named code blocks from anywhere in +an Org mode buffer or an Org mode table. Live code blocks located in +the current Org mode buffer or in the "Library of Babel" (see *note +Library of Babel::) can be executed. Named code blocks can be executed +with a separate `#+CALL:' line or inline within a block of text. + + The syntax of the `#+CALL:' line is + + #+CALL: () + #+CALL: []() + + The syntax for inline evaluation of named code blocks is + + ... call_() ... + ... call_[]()[] ... + +`' + The name of the code block to be evaluated (see *note Structure of + code blocks::). + +`' + Arguments specified in this section will be passed to the code + block. These arguments use standard function call syntax, rather + than header argument syntax. For example, a `#+CALL:' line that + passes the number four to a code block named `double', which + declares the header argument `:var n=2', would be written as + `#+CALL: double(n=4)'. + +`' + Inside header arguments are passed through and applied to the + named code block. These arguments use header argument syntax + rather than standard function call syntax. Inside header + arguments affect how the code block is evaluated. For example, + `[:results output]' will collect the results of everything printed + to `STDOUT' during execution of the code block. + +`' + End header arguments are applied to the calling instance and do + not affect evaluation of the named code block. They affect how + the results are incorporated into the Org mode buffer and how the + call line is exported. For example, `:results html' will insert + the results of the call line evaluation in the Org buffer, wrapped + in a `BEGIN_HTML:' block. + + For more examples of passing header arguments to `#+CALL:' lines + see *note Header arguments in function calls::. + + ---------- Footnotes ---------- + + (1) Whenever code is evaluated there is a potential for that code to +do harm. Org mode provides safeguards to ensure that code is only +evaluated after explicit confirmation from the user. For information +on these safeguards (and on how to disable them) see *note Code +evaluation security::. + + (2) The option `org-babel-no-eval-on-ctrl-c-ctrl-c' can be used to +remove code evaluation from the `C-c C-c' key binding. + + +File: org, Node: Library of Babel, Next: Languages, Prev: Evaluating code blocks, Up: Working With Source Code + +14.6 Library of Babel +===================== + +The "Library of Babel" consists of code blocks that can be called from +any Org mode file. Code blocks defined in the "Library of Babel" can +be called remotely as if they were in the current Org mode buffer (see +*note Evaluating code blocks:: for information on the syntax of remote +code block evaluation). + + The central repository of code blocks in the "Library of Babel" is +housed in an Org mode file located in the `contrib' directory of Org +mode. + + Users can add code blocks they believe to be generally useful to +their "Library of Babel." The code blocks can be stored in any Org +mode file and then loaded into the library with `org-babel-lob-ingest'. + + Code blocks located in any Org mode file can be loaded into the +"Library of Babel" with the `org-babel-lob-ingest' function, bound to +`C-c C-v i'. + + +File: org, Node: Languages, Next: Header arguments, Prev: Library of Babel, Up: Working With Source Code + +14.7 Languages +============== + +Code blocks in the following languages are supported. + +Language Identifier Language Identifier +Asymptote asymptote Awk awk +Emacs Calc calc C C +C++ C++ Clojure clojure +CSS css ditaa ditaa +Graphviz dot Emacs Lisp emacs-lisp +gnuplot gnuplot Haskell haskell +Java java +Javascript js LaTeX latex +Ledger ledger Lisp lisp +Lilypond lilypond MATLAB matlab +Mscgen mscgen Objective Caml ocaml +Octave octave Org mode org +Oz oz Perl perl +Plantuml plantuml Python python +R R Ruby ruby +Sass sass Scheme scheme +GNU Screen screen shell sh +SQL sql SQLite sqlite + + Language-specific documentation is available for some languages. If +available, it can be found at +`http://orgmode.org/worg/org-contrib/babel/languages.html'. + + The option `org-babel-load-languages' controls which languages are +enabled for evaluation (by default only `emacs-lisp' is enabled). This +variable can be set using the customization interface or by adding code +like the following to your emacs configuration. + + The following disables `emacs-lisp' evaluation and enables + evaluation of `R' code blocks. + + (org-babel-do-load-languages + 'org-babel-load-languages + '((emacs-lisp . nil) + (R . t))) + + It is also possible to enable support for a language by loading the +related elisp file with `require'. + + The following adds support for evaluating `clojure' code blocks. + + (require 'ob-clojure) + + +File: org, Node: Header arguments, Next: Results of evaluation, Prev: Languages, Up: Working With Source Code + +14.8 Header arguments +===================== + +Code block functionality can be configured with header arguments. This +section provides an overview of the use of header arguments, and then +describes each header argument in detail. + +* Menu: + +* Using header arguments:: Different ways to set header arguments +* Specific header arguments:: List of header arguments + + +File: org, Node: Using header arguments, Next: Specific header arguments, Prev: Header arguments, Up: Header arguments + +14.8.1 Using header arguments +----------------------------- + +The values of header arguments can be set in several way. When the +header arguments in each layer have been determined, they are combined +in order from the first, least specific (having the lowest priority) up +to the last, most specific (having the highest priority). A header +argument with a higher priority replaces the same header argument +specified at lower priority. + +* Menu: + +* System-wide header arguments:: Set global default values +* Language-specific header arguments:: Set default values by language +* Header arguments in Org mode properties:: Set default values for a buffer or heading +* Language-specific header arguments in Org mode properties:: Set language-specific default values for a buffer or heading +* Code block specific header arguments:: The most common way to set values +* Header arguments in function calls:: The most specific level + + +File: org, Node: System-wide header arguments, Next: Language-specific header arguments, Prev: Using header arguments, Up: Using header arguments + +System-wide header arguments +............................ + +System-wide values of header arguments can be specified by adapting the +`org-babel-default-header-args' variable: + + :session => "none" + :results => "replace" + :exports => "code" + :cache => "no" + :noweb => "no" + + For example, the following example could be used to set the default +value of `:noweb' header arguments to `yes'. This would have the +effect of expanding `:noweb' references by default when evaluating +source code blocks. + + (setq org-babel-default-header-args + (cons '(:noweb . "yes") + (assq-delete-all :noweb org-babel-default-header-args))) + + +File: org, Node: Language-specific header arguments, Next: Header arguments in Org mode properties, Prev: System-wide header arguments, Up: Using header arguments + +Language-specific header arguments +.................................. + +Each language can define its own set of default header arguments in +variable `org-babel-default-header-args:', where `' is the +name of the language. See the language-specific documentation +available online at `http://orgmode.org/worg/org-contrib/babel'. + + +File: org, Node: Header arguments in Org mode properties, Next: Language-specific header arguments in Org mode properties, Prev: Language-specific header arguments, Up: Using header arguments + +Header arguments in Org mode properties +....................................... + +Buffer-wide header arguments may be specified as properties through the +use of `#+PROPERTY:' lines placed anywhere in an Org mode file (see +*note Property syntax::). + + For example the following would set `session' to `*R*' (only for R +code blocks), and `results' to `silent' for every code block in the +buffer, ensuring that all execution took place in the same session, and +no results would be inserted into the buffer. + + #+PROPERTY: header-args:R :session *R* + #+PROPERTY: header-args :results silent + + Header arguments read from Org mode properties can also be set on a +per-subtree basis using property drawers (see *note Property syntax::). When +properties are used to set default header arguments, they are always +looked up with inheritance, regardless of the value of +`org-use-property-inheritance'. Properties are evaluated as seen by the +outermost call or source block.(1) + + In the following example the value of the `:cache' header argument +will default to `yes' in all code blocks in the subtree rooted at the +following heading: + + * outline header + :PROPERTIES: + :header-args: :cache yes + :END: + + Properties defined in this way override the properties set in +`org-babel-default-header-args' and are applied for all activated +languages. It is convenient to use the `org-set-property' function +bound to `C-c C-x p' to set properties in Org mode documents. + + ---------- Footnotes ---------- + + (1) The deprecated syntax for default header argument properties, +using the name of the header argument as a property name directly, +evaluates the property as seen by the corresponding source block +definition. This behavior has been kept for backwards compatibility. + + +File: org, Node: Language-specific header arguments in Org mode properties, Next: Code block specific header arguments, Prev: Header arguments in Org mode properties, Up: Using header arguments + +Language-specific header arguments in Org mode properties +......................................................... + +Language-specific header arguments are also read from properties +`header-args:' where `' is the name of the language +targeted. As an example + + * Heading + :PROPERTIES: + :header-args:clojure: :session *clojure-1* + :header-args:R: :session *R* + :END: + ** Subheading + :PROPERTIES: + :header-args:clojure: :session *clojure-2* + :END: + + would independently set a default session header argument for R and +clojure for calls and source blocks under subtree "Heading" and change +to a different clojure setting for evaluations under subtree +"Subheading", while the R session is inherited from "Heading" and +therefore unchanged. + + +File: org, Node: Code block specific header arguments, Next: Header arguments in function calls, Prev: Language-specific header arguments in Org mode properties, Up: Using header arguments + +Code block specific header arguments +.................................... + +The most common way to assign values to header arguments is at the code +block level. This can be done by listing a sequence of header +arguments and their values as part of the `#+BEGIN_SRC' line. +Properties set in this way override both the values of +`org-babel-default-header-args' and header arguments specified as +properties. In the following example, the `:results' header argument +is set to `silent', meaning the results of execution will not be +inserted in the buffer, and the `:exports' header argument is set to +`code', meaning only the body of the code block will be preserved on +export to HTML or LaTeX. + + #+NAME: factorial + #+BEGIN_SRC haskell :results silent :exports code :var n=0 + fac 0 = 1 + fac n = n * fac (n-1) + #+END_SRC + Similarly, it is possible to set header arguments for inline code +blocks + + src_haskell[:exports both]{fac 5} + + Code block header arguments can span multiple lines using +`#+HEADER:' or `#+HEADERS:' lines preceding a code block or nested +between the `#+NAME:' line and the `#+BEGIN_SRC' line of a named code +block. + + Multi-line header arguments on an un-named code block: + + #+HEADERS: :var data1=1 + #+BEGIN_SRC emacs-lisp :var data2=2 + (message "data1:%S, data2:%S" data1 data2) + #+END_SRC + + #+RESULTS: + : data1:1, data2:2 + + Multi-line header arguments on a named code block: + + #+NAME: named-block + #+HEADER: :var data=2 + #+BEGIN_SRC emacs-lisp + (message "data:%S" data) + #+END_SRC + + #+RESULTS: named-block + : data:2 + + +File: org, Node: Header arguments in function calls, Prev: Code block specific header arguments, Up: Using header arguments + +Header arguments in function calls +.................................. + +At the most specific level, header arguments for "Library of Babel" or +`#+CALL:' lines can be set as shown in the two examples below. For more +information on the structure of `#+CALL:' lines see *note Evaluating +code blocks::. + + The following will apply the `:exports results' header argument to +the evaluation of the `#+CALL:' line. + + #+CALL: factorial(n=5) :exports results + + The following will apply the `:session special' header argument to +the evaluation of the `factorial' code block. + + #+CALL: factorial[:session special](n=5) + + +File: org, Node: Specific header arguments, Prev: Using header arguments, Up: Header arguments + +14.8.2 Specific header arguments +-------------------------------- + +Header arguments consist of an initial colon followed by the name of the +argument in lowercase letters. The following header arguments are +defined: + +* Menu: + +* var:: Pass arguments to code blocks +* results:: Specify the type of results and how they will + be collected and handled +* file:: Specify a path for file output +* file-desc:: Specify a description for file results +* dir:: Specify the default (possibly remote) + directory for code block execution +* exports:: Export code and/or results +* tangle:: Toggle tangling and specify file name +* mkdirp:: Toggle creation of parent directories of target + files during tangling +* comments:: Toggle insertion of comments in tangled + code files +* padline:: Control insertion of padding lines in tangled + code files +* no-expand:: Turn off variable assignment and noweb + expansion during tangling +* session:: Preserve the state of code evaluation +* noweb:: Toggle expansion of noweb references +* noweb-ref:: Specify block's noweb reference resolution target +* noweb-sep:: String used to separate noweb references +* cache:: Avoid re-evaluating unchanged code blocks +* sep:: Delimiter for writing tabular results outside Org +* hlines:: Handle horizontal lines in tables +* colnames:: Handle column names in tables +* rownames:: Handle row names in tables +* shebang:: Make tangled files executable +* tangle-mode:: Set permission of tangled files +* eval:: Limit evaluation of specific code blocks +* wrap:: Mark source block evaluation results +* post:: Post processing of code block results +* prologue:: Text to prepend to code block body +* epilogue:: Text to append to code block body + + Additional header arguments are defined on a language-specific +basis, see *note Languages::. + + +File: org, Node: var, Next: results, Prev: Specific header arguments, Up: Specific header arguments + +14.8.2.1 `:var' +............... + +The `:var' header argument is used to pass arguments to code blocks. +The specifics of how arguments are included in a code block vary by +language; these are addressed in the language-specific documentation. +However, the syntax used to specify arguments is the same across all +languages. In every case, variables require a default value when they +are declared. + + The values passed to arguments can either be literal values, +references, or Emacs Lisp code (see *note Emacs Lisp evaluation of +variables: var.). References include anything in the Org mode file +that takes a `#+NAME:' or `#+RESULTS:' line: tables, lists, +`#+BEGIN_EXAMPLE' blocks, other code blocks and the results of other +code blocks. + + Note: When a reference is made to another code block, the referenced +block will be evaluated unless it has current cached results (see *note +cache::). + + Argument values can be indexed in a manner similar to arrays (see +*note Indexable variable values: var.). + + The following syntax is used to pass arguments to code blocks using +the `:var' header argument. + + :var name=assign + + The argument, `assign', can either be a literal value, such as a +string `"string"' or a number `9', or a reference to a table, a list, a +literal example, another code block (with or without arguments), or the +results of evaluating another code block. + + Here are examples of passing values by reference: + +"table" + an Org mode table named with either a `#+NAME:' line + + #+NAME: example-table + | 1 | + | 2 | + | 3 | + | 4 | + + #+NAME: table-length + #+BEGIN_SRC emacs-lisp :var table=example-table + (length table) + #+END_SRC + + #+RESULTS: table-length + : 4 + +"list" + a simple list named with a `#+NAME:' line (note that nesting is not + carried through to the source code block) + + #+NAME: example-list + - simple + - not + - nested + - list + + #+BEGIN_SRC emacs-lisp :var x=example-list + (print x) + #+END_SRC + + #+RESULTS: + | simple | list | + +"code block without arguments" + a code block name (from the example above), as assigned by + `#+NAME:', optionally followed by parentheses + + #+BEGIN_SRC emacs-lisp :var length=table-length() + (* 2 length) + #+END_SRC + + #+RESULTS: + : 8 + +"code block with arguments" + a code block name, as assigned by `#+NAME:', followed by + parentheses and optional arguments passed within the parentheses + following the code block name using standard function call syntax + + #+NAME: double + #+BEGIN_SRC emacs-lisp :var input=8 + (* 2 input) + #+END_SRC + + #+RESULTS: double + : 16 + + #+NAME: squared + #+BEGIN_SRC emacs-lisp :var input=double(input=1) + (* input input) + #+END_SRC + + #+RESULTS: squared + : 4 + +"literal example" + a literal example block named with a `#+NAME:' line + + #+NAME: literal-example + #+BEGIN_EXAMPLE + A literal example + on two lines + #+END_EXAMPLE + + #+NAME: read-literal-example + #+BEGIN_SRC emacs-lisp :var x=literal-example + (concatenate 'string x " for you.") + #+END_SRC + + #+RESULTS: read-literal-example + : A literal example + : on two lines for you. + + +Indexable variable values +......................... + +It is possible to reference portions of variable values by "indexing" +into the variables. Indexes are 0 based with negative values counting +back from the end. If an index is separated by `,'s then each +subsequent section will index into the next deepest nesting or +dimension of the value. Note that this indexing occurs _before_ other +table related header arguments like `:hlines', `:colnames' and +`:rownames' are applied. The following example assigns the last cell +of the first row the table `example-table' to the variable `data': + + #+NAME: example-table + | 1 | a | + | 2 | b | + | 3 | c | + | 4 | d | + + #+BEGIN_SRC emacs-lisp :var data=example-table[0,-1] + data + #+END_SRC + + #+RESULTS: + : a + + Ranges of variable values can be referenced using two integers +separated by a `:', in which case the entire inclusive range is +referenced. For example the following assigns the middle three rows of +`example-table' to `data'. + + #+NAME: example-table + | 1 | a | + | 2 | b | + | 3 | c | + | 4 | d | + | 5 | 3 | + + #+BEGIN_SRC emacs-lisp :var data=example-table[1:3] + data + #+END_SRC + + #+RESULTS: + | 2 | b | + | 3 | c | + | 4 | d | + + Additionally, an empty index, or the single character `*', are both +interpreted to mean the entire range and as such are equivalent to +`0:-1', as shown in the following example in which the entire first +column is referenced. + + #+NAME: example-table + | 1 | a | + | 2 | b | + | 3 | c | + | 4 | d | + + #+BEGIN_SRC emacs-lisp :var data=example-table[,0] + data + #+END_SRC + + #+RESULTS: + | 1 | 2 | 3 | 4 | + + It is possible to index into the results of code blocks as well as +tables. Any number of dimensions can be indexed. Dimensions are +separated from one another by commas, as shown in the following example. + + #+NAME: 3D + #+BEGIN_SRC emacs-lisp + '(((1 2 3) (4 5 6) (7 8 9)) + ((10 11 12) (13 14 15) (16 17 18)) + ((19 20 21) (22 23 24) (25 26 27))) + #+END_SRC + + #+BEGIN_SRC emacs-lisp :var data=3D[1,,1] + data + #+END_SRC + + #+RESULTS: + | 11 | 14 | 17 | + +Emacs Lisp evaluation of variables +.................................. + +Emacs lisp code can be used to initialize variable values. When a +variable value starts with `(', `[', `'' or ``' it will be evaluated as +Emacs Lisp and the result of the evaluation will be assigned as the +variable value. The following example demonstrates use of this +evaluation to reliably pass the file-name of the Org mode buffer to a +code block--note that evaluation of header arguments is guaranteed to +take place in the original Org mode file, while there is no such +guarantee for evaluation of the code block body. + + #+BEGIN_SRC sh :var filename=(buffer-file-name) :exports both + wc -w $filename + #+END_SRC + + Note that values read from tables and lists will not be evaluated as +Emacs Lisp, as shown in the following example. + + #+NAME: table + | (a b c) | + + #+HEADERS: :var data=table[0,0] + #+BEGIN_SRC perl + $data + #+END_SRC + + #+RESULTS: + : (a b c) + + +File: org, Node: results, Next: file, Prev: var, Up: Specific header arguments + +14.8.2.2 `:results' +................... + +There are four classes of `:results' header argument. Only one option +per class may be supplied per code block. + + * collection header arguments specify how the results should be + collected from the code block + + * type header arguments specify what type of result the code block + will return--which has implications for how they will be processed + before insertion into the Org mode buffer + + * format header arguments specify what type of result the code block + will return--which has implications for how they will be inserted + into the Org mode buffer + + * handling header arguments specify how the results of evaluating + the code block should be handled. + +Collection +.......... + +The following options are mutually exclusive, and specify how the +results should be collected from the code block. + + * `value' This is the default. The result is the value of the last + statement in the code block. This header argument places the + evaluation in functional mode. Note that in some languages, e.g., + Python, use of this result type requires that a `return' statement + be included in the body of the source code block. E.g., `:results + value'. + + * `output' The result is the collection of everything printed to + STDOUT during the execution of the code block. This header + argument places the evaluation in scripting mode. E.g., `:results + output'. + +Type +.... + +The following options are mutually exclusive and specify what type of +results the code block will return. By default, results are inserted +as either a table or scalar depending on their value. + + * `table', `vector' The results should be interpreted as an Org mode + table. If a single value is returned, it will be converted into a + table with one row and one column. E.g., `:results value table'. + + * `list' The results should be interpreted as an Org mode list. If + a single scalar value is returned it will be converted into a list + with only one element. + + * `scalar', `verbatim' The results should be interpreted + literally--they will not be converted into a table. The results + will be inserted into the Org mode buffer as quoted text. E.g., + `:results value verbatim'. + + * `file' The results will be interpreted as the path to a file, and + will be inserted into the Org mode buffer as a file link. E.g., + `:results value file'. + +Format +...... + +The following options are mutually exclusive and specify what type of +results the code block will return. By default, results are inserted +according to the type as specified above. + + * `raw' The results are interpreted as raw Org mode code and are + inserted directly into the buffer. If the results look like a + table they will be aligned as such by Org mode. E.g., `:results + value raw'. + + * `org' The results are will be enclosed in a `BEGIN_SRC org' block. + They are not comma-escaped by default but they will be if you hit + `TAB' in the block and/or if you export the file. E.g., `:results + value org'. + + * `html' Results are assumed to be HTML and will be enclosed in a + `BEGIN_HTML' block. E.g., `:results value html'. + + * `latex' Results assumed to be LaTeX and are enclosed in a + `BEGIN_LaTeX' block. E.g., `:results value latex'. + + * `code' Result are assumed to be parsable code and are enclosed in + a code block. E.g., `:results value code'. + + * `pp' The result is converted to pretty-printed code and is + enclosed in a code block. This option currently supports Emacs + Lisp, Python, and Ruby. E.g., `:results value pp'. + + * `drawer' The result is wrapped in a RESULTS drawer. This can be + useful for inserting `raw' or `org' syntax results in such a way + that their extent is known and they can be automatically removed + or replaced. + +Handling +........ + +The following results options indicate what happens with the results +once they are collected. + + * `silent' The results will be echoed in the minibuffer but will not + be inserted into the Org mode buffer. E.g., `:results output + silent'. + + * `replace' The default value. Any existing results will be + removed, and the new results will be inserted into the Org mode + buffer in their place. E.g., `:results output replace'. + + * `append' If there are pre-existing results of the code block then + the new results will be appended to the existing results. + Otherwise the new results will be inserted as with `replace'. + + * `prepend' If there are pre-existing results of the code block then + the new results will be prepended to the existing results. + Otherwise the new results will be inserted as with `replace'. + + +File: org, Node: file, Next: file-desc, Prev: results, Up: Specific header arguments + +14.8.2.3 `:file' +................ + +The header argument `:file' is used to specify an external file in which +to save code block results. After code block evaluation an Org mode +style `[[file:]]' link (see *note Link format::) to the file will be +inserted into the Org mode buffer. Some languages including R, +gnuplot, dot, and ditaa provide special handling of the `:file' header +argument automatically wrapping the code block body in the boilerplate +code required to save output to the specified file. This is often +useful for saving graphical output of a code block to the specified +file. + + The argument to `:file' should be either a string specifying the +path to a file, or a list of two strings in which case the first +element of the list should be the path to a file and the second a +description for the link. + + +File: org, Node: file-desc, Next: dir, Prev: file, Up: Specific header arguments + +14.8.2.4 `:file-desc' +..................... + +The value of the `:file-desc' header argument is used to provide a +description for file code block results which are inserted as Org mode +links (see *note Link format::). If the `:file-desc' header argument +is given with no value the link path will be placed in both the "link" +and the "description" portion of the Org mode link. + + +File: org, Node: dir, Next: exports, Prev: file-desc, Up: Specific header arguments + +14.8.2.5 `:dir' and remote execution +.................................... + +While the `:file' header argument can be used to specify the path to the +output file, `:dir' specifies the default directory during code block +execution. If it is absent, then the directory associated with the +current buffer is used. In other words, supplying `:dir path' +temporarily has the same effect as changing the current directory with +`M-x cd path RET', and then not supplying `:dir'. Under the surface, +`:dir' simply sets the value of the Emacs variable `default-directory'. + + When using `:dir', you should supply a relative path for file output +(e.g., `:file myfile.jpg' or `:file results/myfile.jpg') in which case +that path will be interpreted relative to the default directory. + + In other words, if you want your plot to go into a folder called +`Work' in your home directory, you could use + + #+BEGIN_SRC R :file myplot.png :dir ~/Work + matplot(matrix(rnorm(100), 10), type="l") + #+END_SRC + +Remote execution +................ + +A directory on a remote machine can be specified using tramp file +syntax, in which case the code will be evaluated on the remote machine. +An example is + + #+BEGIN_SRC R :file plot.png :dir /dand@yakuba.princeton.edu: + plot(1:10, main=system("hostname", intern=TRUE)) + #+END_SRC + + Text results will be returned to the local Org mode buffer as usual, +and file output will be created on the remote machine with relative +paths interpreted relative to the remote directory. An Org mode link +to the remote file will be created. + + So, in the above example a plot will be created on the remote +machine, and a link of the following form will be inserted in the org +buffer: + + [[file:/scp:dand@yakuba.princeton.edu:/home/dand/plot.png][plot.png]] + + Most of this functionality follows immediately from the fact that +`:dir' sets the value of the Emacs variable `default-directory', thanks +to tramp. Those using XEmacs, or GNU Emacs prior to version 23 may +need to install tramp separately in order for these features to work +correctly. + +Further points +.............. + + * If `:dir' is used in conjunction with `:session', although it will + determine the starting directory for a new session as expected, no + attempt is currently made to alter the directory associated with + an existing session. + + * `:dir' should typically not be used to create files during export + with `:exports results' or `:exports both'. The reason is that, + in order to retain portability of exported material between + machines, during export links inserted into the buffer will _not_ + be expanded against `default directory'. Therefore, if + `default-directory' is altered using `:dir', it is probable that + the file will be created in a location to which the link does not + point. + + +File: org, Node: exports, Next: tangle, Prev: dir, Up: Specific header arguments + +14.8.2.6 `:exports' +................... + +The `:exports' header argument specifies what should be included in HTML +or LaTeX exports of the Org mode file. + + * `code' The default. The body of code is included into the + exported file. E.g., `:exports code'. + + * `results' The result of evaluating the code is included in the + exported file. E.g., `:exports results'. + + * `both' Both the code and results are included in the exported + file. E.g., `:exports both'. + + * `none' Nothing is included in the exported file. E.g., `:exports + none'. + + +File: org, Node: tangle, Next: mkdirp, Prev: exports, Up: Specific header arguments + +14.8.2.7 `:tangle' +.................. + +The `:tangle' header argument specifies whether or not the code block +should be included in tangled extraction of source code files. + + * `tangle' The code block is exported to a source code file named + after the full path (including the directory) and file name (w/o + extension) of the Org mode file. E.g., `:tangle yes'. + + * `no' The default. The code block is not exported to a source code + file. E.g., `:tangle no'. + + * other Any other string passed to the `:tangle' header argument is + interpreted as a path (directory and file name relative to the + directory of the Org mode file) to which the block will be + exported. E.g., `:tangle path'. + + +File: org, Node: mkdirp, Next: comments, Prev: tangle, Up: Specific header arguments + +14.8.2.8 `:mkdirp' +.................. + +The `:mkdirp' header argument can be used to create parent directories +of tangled files when missing. This can be set to `yes' to enable +directory creation or to `no' to inhibit directory creation. + + +File: org, Node: comments, Next: padline, Prev: mkdirp, Up: Specific header arguments + +14.8.2.9 `:comments' +.................... + +By default code blocks are tangled to source-code files without any +insertion of comments beyond those which may already exist in the body +of the code block. The `:comments' header argument can be set as +follows to control the insertion of extra comments into the tangled +code file. + + * `no' The default. No extra comments are inserted during tangling. + + * `link' The code block is wrapped in comments which contain + pointers back to the original Org file from which the code was + tangled. + + * `yes' A synonym for "link" to maintain backwards compatibility. + + * `org' Include text from the Org mode file as a comment. The text + is picked from the leading context of the tangled code and is + limited by the nearest headline or source block as the case may be. + + * `both' Turns on both the "link" and "org" comment options. + + * `noweb' Turns on the "link" comment option, and additionally wraps + expanded noweb references in the code block body in link comments. + + +File: org, Node: padline, Next: no-expand, Prev: comments, Up: Specific header arguments + +14.8.2.10 `:padline' +.................... + +Control in insertion of padding lines around code block bodies in +tangled code files. The default value is `yes' which results in +insertion of newlines before and after each tangled code block. The +following arguments are accepted. + + * `yes' Insert newlines before and after each code block body in + tangled code files. + + * `no' Do not insert any newline padding in tangled output. + + +File: org, Node: no-expand, Next: session, Prev: padline, Up: Specific header arguments + +14.8.2.11 `:no-expand' +...................... + +By default, code blocks are expanded with `org-babel-expand-src-block' +during tangling. This has the effect of assigning values to variables +specified with `:var' (see *note var::), and of replacing "noweb" +references (see *note Noweb reference syntax::) with their targets. The +`:no-expand' header argument can be used to turn off this behavior. + + +File: org, Node: session, Next: noweb, Prev: no-expand, Up: Specific header arguments + +14.8.2.12 `:session' +.................... + +The `:session' header argument starts a session for an interpreted +language where state is preserved. + + By default, a session is not started. + + A string passed to the `:session' header argument will give the +session a name. This makes it possible to run concurrent sessions for +each interpreted language. + + +File: org, Node: noweb, Next: noweb-ref, Prev: session, Up: Specific header arguments + +14.8.2.13 `:noweb' +.................. + +The `:noweb' header argument controls expansion of "noweb" syntax +references (see *note Noweb reference syntax::) when the code block is +evaluated, tangled, or exported. The `:noweb' header argument can have +one of the five values: `no', `yes', `tangle', or `no-export' +`strip-export'. + + * `no' The default. "Noweb" syntax references in the body of the + code block will not be expanded before the code block is + evaluated, tangled or exported. + + * `yes' "Noweb" syntax references in the body of the code block will + be expanded before the code block is evaluated, tangled or + exported. + + * `tangle' "Noweb" syntax references in the body of the code block + will be expanded before the code block is tangled. However, + "noweb" syntax references will not be expanded when the code block + is evaluated or exported. + + * `no-export' "Noweb" syntax references in the body of the code + block will be expanded before the block is evaluated or tangled. + However, "noweb" syntax references will not be expanded when the + code block is exported. + + * `strip-export' "Noweb" syntax references in the body of the code + block will be expanded before the block is evaluated or tangled. + However, "noweb" syntax references will be removed when the code + block is exported. + + * `eval' "Noweb" syntax references in the body of the code block + will only be expanded before the block is evaluated. + +Noweb prefix lines +.................. + +Noweb insertions are now placed behind the line prefix of the +`<>'. This behavior is illustrated in the following +example. Because the `<>' noweb reference appears behind the +SQL comment syntax, each line of the expanded noweb reference will be +commented. + + This code block: + + -- <> + + expands to: + + -- this is the + -- multi-line body of example + + Note that noweb replacement text that does not contain any newlines +will not be affected by this change, so it is still possible to use +inline noweb references. + + +File: org, Node: noweb-ref, Next: noweb-sep, Prev: noweb, Up: Specific header arguments + +14.8.2.14 `:noweb-ref' +...................... + +When expanding "noweb" style references the bodies of all code block +with _either_ a block name matching the reference name _or_ a +`:noweb-ref' header argument matching the reference name will be +concatenated together to form the replacement text. + + By setting this header argument at the sub-tree or file level, +simple code block concatenation may be achieved. For example, when +tangling the following Org mode file, the bodies of code blocks will be +concatenated into the resulting pure code file(1). + + #+BEGIN_SRC sh :tangle yes :noweb yes :shebang #!/bin/sh + <> + #+END_SRC + * the mount point of the fullest disk + :PROPERTIES: + :noweb-ref: fullest-disk + :END: + + ** query all mounted disks + #+BEGIN_SRC sh + df \ + #+END_SRC + + ** strip the header row + #+BEGIN_SRC sh + |sed '1d' \ + #+END_SRC + + ** sort by the percent full + #+BEGIN_SRC sh + |awk '{print $5 " " $6}'|sort -n |tail -1 \ + #+END_SRC + + ** extract the mount point + #+BEGIN_SRC sh + |awk '{print $2}' + #+END_SRC + + The `:noweb-sep' (see *note noweb-sep::) header argument holds the +string used to separate accumulate noweb references like those above. +By default a newline is used. + + ---------- Footnotes ---------- + + (1) (The example needs property inheritance to be turned on for the +`noweb-ref' property, see *note Property inheritance::). + + +File: org, Node: noweb-sep, Next: cache, Prev: noweb-ref, Up: Specific header arguments + +14.8.2.15 `:noweb-sep' +...................... + +The `:noweb-sep' header argument holds the string used to separate +accumulate noweb references (see *note noweb-ref::). By default a +newline is used. + + +File: org, Node: cache, Next: sep, Prev: noweb-sep, Up: Specific header arguments + +14.8.2.16 `:cache' +.................. + +The `:cache' header argument controls the use of in-buffer caching of +the results of evaluating code blocks. It can be used to avoid +re-evaluating unchanged code blocks. Note that the `:cache' header +argument will not attempt to cache results when the `:session' header +argument is used, because the results of the code block execution may +be stored in the session outside of the Org mode buffer. The `:cache' +header argument can have one of two values: `yes' or `no'. + + * `no' The default. No caching takes place, and the code block will + be evaluated every time it is called. + + * `yes' Every time the code block is run a SHA1 hash of the code and + arguments passed to the block will be generated. This hash is + packed into the `#+RESULTS:' line and will be checked on subsequent + executions of the code block. If the code block has not changed + since the last time it was evaluated, it will not be re-evaluated. + + Code block caches notice if the value of a variable argument to the +code block has changed. If this is the case, the cache is invalidated +and the code block is re-run. In the following example, `caller' will +not be re-run unless the results of `random' have changed since it was +last run. + + #+NAME: random + #+BEGIN_SRC R :cache yes + runif(1) + #+END_SRC + + #+RESULTS[a2a72cd647ad44515fab62e144796432793d68e1]: random + 0.4659510825295 + + #+NAME: caller + #+BEGIN_SRC emacs-lisp :var x=random :cache yes + x + #+END_SRC + + #+RESULTS[bec9c8724e397d5df3b696502df3ed7892fc4f5f]: caller + 0.254227238707244 + + +File: org, Node: sep, Next: hlines, Prev: cache, Up: Specific header arguments + +14.8.2.17 `:sep' +................ + +The `:sep' header argument can be used to control the delimiter used +when writing tabular results out to files external to Org mode. This +is used either when opening tabular results of a code block by calling +the `org-open-at-point' function bound to `C-c C-o' on the code block, +or when writing code block results to an external file (see *note +file::) header argument. + + By default, when `:sep' is not specified output tables are tab +delimited. + + +File: org, Node: hlines, Next: colnames, Prev: sep, Up: Specific header arguments + +14.8.2.18 `:hlines' +................... + +Tables are frequently represented with one or more horizontal lines, or +hlines. The `:hlines' argument to a code block accepts the values +`yes' or `no', with a default value of `no'. + + * `no' Strips horizontal lines from the input table. In most + languages this is the desired effect because an `hline' symbol is + interpreted as an unbound variable and raises an error. Setting + `:hlines no' or relying on the default value yields the following + results. + + #+NAME: many-cols + | a | b | c | + |---+---+---| + | d | e | f | + |---+---+---| + | g | h | i | + + #+NAME: echo-table + #+BEGIN_SRC python :var tab=many-cols + return tab + #+END_SRC + + #+RESULTS: echo-table + | a | b | c | + | d | e | f | + | g | h | i | + + * `yes' Leaves hlines in the table. Setting `:hlines yes' has this + effect. + + #+NAME: many-cols + | a | b | c | + |---+---+---| + | d | e | f | + |---+---+---| + | g | h | i | + + #+NAME: echo-table + #+BEGIN_SRC python :var tab=many-cols :hlines yes + return tab + #+END_SRC + + #+RESULTS: echo-table + | a | b | c | + |---+---+---| + | d | e | f | + |---+---+---| + | g | h | i | + + +File: org, Node: colnames, Next: rownames, Prev: hlines, Up: Specific header arguments + +14.8.2.19 `:colnames' +..................... + +The `:colnames' header argument accepts the values `yes', `no', or +`nil' for unassigned. The default value is `nil'. Note that the +behavior of the `:colnames' header argument may differ across languages. + + * `nil' If an input table looks like it has column names (because + its second row is an hline), then the column names will be removed + from the table before processing, then reapplied to the results. + + #+NAME: less-cols + | a | + |---| + | b | + | c | + + #+NAME: echo-table-again + #+BEGIN_SRC python :var tab=less-cols + return [[val + '*' for val in row] for row in tab] + #+END_SRC + + #+RESULTS: echo-table-again + | a | + |----| + | b* | + | c* | + + Please note that column names are not removed before the table is + indexed using variable indexing *Note Indexable variable values: + var. + + * `no' No column name pre-processing takes place + + * `yes' Column names are removed and reapplied as with `nil' even if + the table does not "look like" it has column names (i.e., the + second row is not an hline) + + +File: org, Node: rownames, Next: shebang, Prev: colnames, Up: Specific header arguments + +14.8.2.20 `:rownames' +..................... + +The `:rownames' header argument can take on the values `yes' or `no', +with a default value of `no'. Note that Emacs Lisp code blocks ignore +the `:rownames' header argument entirely given the ease with which +tables with row names may be handled directly in Emacs Lisp. + + * `no' No row name pre-processing will take place. + + * `yes' The first column of the table is removed from the table + before processing, and is then reapplied to the results. + + #+NAME: with-rownames + | one | 1 | 2 | 3 | 4 | 5 | + | two | 6 | 7 | 8 | 9 | 10 | + + #+NAME: echo-table-once-again + #+BEGIN_SRC python :var tab=with-rownames :rownames yes + return [[val + 10 for val in row] for row in tab] + #+END_SRC + + #+RESULTS: echo-table-once-again + | one | 11 | 12 | 13 | 14 | 15 | + | two | 16 | 17 | 18 | 19 | 20 | + + Please note that row names are not removed before the table is + indexed using variable indexing *Note Indexable variable values: + var. + + + +File: org, Node: shebang, Next: tangle-mode, Prev: rownames, Up: Specific header arguments + +14.8.2.21 `:shebang' +.................... + +Setting the `:shebang' header argument to a string value (e.g., +`:shebang "#!/bin/bash"') causes the string to be inserted as the first +line of any tangled file holding the code block, and the file +permissions of the tangled file are set to make it executable. + + +File: org, Node: tangle-mode, Next: eval, Prev: shebang, Up: Specific header arguments + +14.8.2.22 `:tangle-mode' +........................ + +The `tangle-mode' header argument controls the permission set on tangled +files. The value of this header argument will be passed to +`set-file-modes'. For example, to set a tangled file as read only use +`:tangle-mode (identity #o444)', or to set a tangled file as executable +use `:tangle-mode (identity #o755)'. Blocks with `shebang' (*note +shebang::) header arguments will automatically be made executable unless +the `tangle-mode' header argument is also used. The behavior is +undefined if multiple code blocks with different values for the +`tangle-mode' header argument are tangled to the same file. + + +File: org, Node: eval, Next: wrap, Prev: tangle-mode, Up: Specific header arguments + +14.8.2.23 `:eval' +................. + +The `:eval' header argument can be used to limit the evaluation of +specific code blocks. The `:eval' header argument can be useful for +protecting against the evaluation of dangerous code blocks or to ensure +that evaluation will require a query regardless of the value of the +`org-confirm-babel-evaluate' variable. The possible values of `:eval' +and their effects are shown below. + +`never or no' + The code block will not be evaluated under any circumstances. + +`query' + Evaluation of the code block will require a query. + +`never-export or no-export' + The code block will not be evaluated during export but may still + be called interactively. + +`query-export' + Evaluation of the code block during export will require a query. + + If this header argument is not set then evaluation is determined by +the value of the `org-confirm-babel-evaluate' variable see *note Code +evaluation security::. + + +File: org, Node: wrap, Next: post, Prev: eval, Up: Specific header arguments + +14.8.2.24 `:wrap' +................. + +The `:wrap' header argument is used to mark the results of source block +evaluation. The header argument can be passed a string that will be +appended to `#+BEGIN_' and `#+END_', which will then be used to wrap the +results. If not string is specified then the results will be wrapped +in a `#+BEGIN/END_RESULTS' block. + + +File: org, Node: post, Next: prologue, Prev: wrap, Up: Specific header arguments + +14.8.2.25 `:post' +................. + +The `:post' header argument is used to post-process the results of a +code block execution. When a post argument is given, the results of +the code block will temporarily be bound to the `*this*' variable. +This variable may then be included in header argument forms such as +those used in *note var:: header argument specifications allowing +passing of results to other code blocks, or direct execution via Emacs +Lisp. + + The following example illustrates the usage of the `:post' header +argument. + + #+name: attr_wrap + #+begin_src sh :var data="" :var width="\\textwidth" :results output + echo "#+ATTR_LATEX :width $width" + echo "$data" + #+end_src + + #+header: :file /tmp/it.png + #+begin_src dot :post attr_wrap(width="5cm", data=*this*) :results drawer + digraph{ + a -> b; + b -> c; + c -> a; + } + #+end_src + + #+RESULTS: + :RESULTS: + #+ATTR_LATEX :width 5cm + [[file:/tmp/it.png]] + :END: + + +File: org, Node: prologue, Next: epilogue, Prev: post, Up: Specific header arguments + +14.8.2.26 `:prologue' +..................... + +The value of the `prologue' header argument will be prepended to the +code block body before execution. For example, `:prologue "reset"' may +be used to reset a gnuplot session before execution of a particular code +block, or the following configuration may be used to do this for all +gnuplot code blocks. Also see *note epilogue::. + + (add-to-list 'org-babel-default-header-args:gnuplot + '((:prologue . "reset"))) + + +File: org, Node: epilogue, Prev: prologue, Up: Specific header arguments + +14.8.2.27 `:epilogue' +..................... + +The value of the `epilogue' header argument will be appended to the code +block body before execution. Also see *note prologue::. + + +File: org, Node: Results of evaluation, Next: Noweb reference syntax, Prev: Header arguments, Up: Working With Source Code + +14.9 Results of evaluation +========================== + +The way in which results are handled depends on whether a session is +invoked, as well as on whether `:results value' or `:results output' is +used. The following table shows the table possibilities. For a full +listing of the possible results header arguments see *note results::. + + Non-session Session +`:results value' value of last value of last expression + expression +`:results output' contents of STDOUT concatenation of interpreter + output + + Note: With `:results value', the result in both `:session' and +non-session is returned to Org mode as a table (a one- or +two-dimensional vector of strings or numbers) when appropriate. + +14.9.1 Non-session +------------------ + +14.9.1.1 `:results value' +......................... + +This is the default. Internally, the value is obtained by wrapping the +code in a function definition in the external language, and evaluating +that function. Therefore, code should be written as if it were the +body of such a function. In particular, note that Python does not +automatically return a value from a function unless a `return' +statement is present, and so a `return' statement will usually be +required in Python. + + This is the only one of the four evaluation contexts in which the +code is automatically wrapped in a function definition. + +14.9.1.2 `:results output' +.......................... + +The code is passed to the interpreter as an external process, and the +contents of the standard output stream are returned as text. (In +certain languages this also contains the error output stream; this is +an area for future work.) + +14.9.2 Session +-------------- + +14.9.2.1 `:results value' +......................... + +The code is passed to an interpreter running as an interactive Emacs +inferior process. Only languages which provide tools for interactive +evaluation of code have session support, so some language (e.g., C and +ditaa) do not support the `:session' header argument, and in other +languages (e.g., Python and Haskell) which have limitations on the code +which may be entered into interactive sessions, those limitations apply +to the code in code blocks using the `:session' header argument as well. + + Unless the `:results output' option is supplied (see below) the +result returned is the result of the last evaluation performed by the +interpreter. (This is obtained in a language-specific manner: the +value of the variable `_' in Python and Ruby, and the value of +`.Last.value' in R). + +14.9.2.2 `:results output' +.......................... + +The code is passed to the interpreter running as an interactive Emacs +inferior process. The result returned is the concatenation of the +sequence of (text) output from the interactive interpreter. Notice +that this is not necessarily the same as what would be sent to `STDOUT' +if the same code were passed to a non-interactive interpreter running +as an external process. For example, compare the following two blocks: + + #+BEGIN_SRC python :results output + print "hello" + 2 + print "bye" + #+END_SRC + + #+RESULTS: + : hello + : bye + + In non-session mode, the `2' is not printed and does not appear. + + #+BEGIN_SRC python :results output :session + print "hello" + 2 + print "bye" + #+END_SRC + + #+RESULTS: + : hello + : 2 + : bye + + But in `:session' mode, the interactive interpreter receives input +`2' and prints out its value, `2'. (Indeed, the other print statements +are unnecessary here). + + +File: org, Node: Noweb reference syntax, Next: Key bindings and useful functions, Prev: Results of evaluation, Up: Working With Source Code + +14.10 Noweb reference syntax +============================ + +The "noweb" (see `http://www.cs.tufts.edu/~nr/noweb/') Literate +Programming system allows named blocks of code to be referenced by +using the familiar Noweb syntax: + + <> + + When a code block is tangled or evaluated, whether or not "noweb" +references are expanded depends upon the value of the `:noweb' header +argument. If `:noweb yes', then a Noweb reference is expanded before +evaluation. If `:noweb no', the default, then the reference is not +expanded before evaluation. See the *note noweb-ref:: header argument +for a more flexible way to resolve noweb references. + + It is possible to include the _results_ of a code block rather than +the body. This is done by appending parenthesis to the code block name +which may optionally contain arguments to the code block as shown below. + + <> + + Note: the default value, `:noweb no', was chosen to ensure that +correct code is not broken in a language, such as Ruby, where `<>' +is a syntactically valid construct. If `<>' is not syntactically +valid in languages that you use, then please consider setting the +default value. + + Note: if noweb tangling is slow in large Org mode files consider +setting the `org-babel-use-quick-and-dirty-noweb-expansion' variable to +`t'. This will result in faster noweb reference resolution at the +expense of not correctly resolving inherited values of the `:noweb-ref' +header argument. + + +File: org, Node: Key bindings and useful functions, Next: Batch execution, Prev: Noweb reference syntax, Up: Working With Source Code + +14.11 Key bindings and useful functions +======================================= + +Many common Org mode key sequences are re-bound depending on the +context. + + Within a code block, the following key bindings are active: + +`C-c C-c' `org-babel-execute-src-block' +`C-c C-o' `org-babel-open-src-block-result' +`M-' `org-babel-load-in-session' +`M-' `org-babel-switch-to-session' + + In an Org mode buffer, the following key bindings are active: + +`C-c C-v p' or `C-c C-v `org-babel-previous-src-block' +C-p' +`C-c C-v n' or `C-c C-v `org-babel-next-src-block' +C-n' +`C-c C-v e' or `C-c C-v `org-babel-execute-maybe' +C-e' +`C-c C-v o' or `C-c C-v `org-babel-open-src-block-result' +C-o' +`C-c C-v v' or `C-c C-v `org-babel-expand-src-block' +C-v' +`C-c C-v u' or `C-c C-v `org-babel-goto-src-block-head' +C-u' +`C-c C-v g' or `C-c C-v `org-babel-goto-named-src-block' +C-g' +`C-c C-v r' or `C-c C-v `org-babel-goto-named-result' +C-r' +`C-c C-v b' or `C-c C-v `org-babel-execute-buffer' +C-b' +`C-c C-v s' or `C-c C-v `org-babel-execute-subtree' +C-s' +`C-c C-v d' or `C-c C-v `org-babel-demarcate-block' +C-d' +`C-c C-v t' or `C-c C-v `org-babel-tangle' +C-t' +`C-c C-v f' or `C-c C-v `org-babel-tangle-file' +C-f' +`C-c C-v c' or `C-c C-v `org-babel-check-src-block' +C-c' +`C-c C-v j' or `C-c C-v `org-babel-insert-header-arg' +C-j' +`C-c C-v l' or `C-c C-v `org-babel-load-in-session' +C-l' +`C-c C-v i' or `C-c C-v `org-babel-lob-ingest' +C-i' +`C-c C-v I' or `C-c C-v `org-babel-view-src-block-info' +C-I' +`C-c C-v z' or `C-c C-v `org-babel-switch-to-session-with-code' +C-z' +`C-c C-v a' or `C-c C-v `org-babel-sha1-hash' +C-a' +`C-c C-v h' or `C-c C-v `org-babel-describe-bindings' +C-h' +`C-c C-v x' or `C-c C-v `org-babel-do-key-sequence-in-edit-buffer' +C-x' + + +File: org, Node: Batch execution, Prev: Key bindings and useful functions, Up: Working With Source Code + +14.12 Batch execution +===================== + +It is possible to call functions from the command line. This shell +script calls `org-babel-tangle' on every one of its arguments. + + Be sure to adjust the paths to fit your system. + + #!/bin/sh + # -*- mode: shell-script -*- + # + # tangle files with org-mode + # + DIR=`pwd` + FILES="" + + # wrap each argument in the code required to call tangle on it + for i in $@; do + FILES="$FILES \"$i\"" + done + + emacs -Q --batch \ + --eval "(progn + (add-to-list 'load-path (expand-file-name \"~/src/org/lisp/\")) + (add-to-list 'load-path (expand-file-name \"~/src/org/contrib/lisp/\" t)) + (require 'org)(require 'org-exp)(require 'ob)(require 'ob-tangle) + (mapc (lambda (file) + (find-file (expand-file-name file \"$DIR\")) + (org-babel-tangle) + (kill-buffer)) '($FILES)))" 2>&1 |grep tangled + + +File: org, Node: Miscellaneous, Next: Hacking, Prev: Working With Source Code, Up: Top + +15 Miscellaneous +**************** + +* Menu: + +* Completion:: M-TAB knows what you need +* Easy Templates:: Quick insertion of structural elements +* Speed keys:: Electric commands at the beginning of a headline +* Code evaluation security:: Org mode files evaluate inline code +* Customization:: Adapting Org to your taste +* In-buffer settings:: Overview of the #+KEYWORDS +* The very busy C-c C-c key:: When in doubt, press C-c C-c +* Clean view:: Getting rid of leading stars in the outline +* TTY keys:: Using Org on a tty +* Interaction:: Other Emacs packages +* org-crypt:: Encrypting Org files + + +File: org, Node: Completion, Next: Easy Templates, Prev: Miscellaneous, Up: Miscellaneous + +15.1 Completion +=============== + +Emacs would not be Emacs without completion, and Org mode uses it +whenever it makes sense. If you prefer an iswitchb- or ido-like +interface for some of the completion prompts, you can specify your +preference by setting at most one of the variables +`org-completion-use-iswitchb' `org-completion-use-ido'. + + Org supports in-buffer completion. This type of completion does not +make use of the minibuffer. You simply type a few letters into the +buffer and use the key to complete text right there. + +`M-' + Complete word at point + * At the beginning of a headline, complete TODO keywords. + + * After `\', complete TeX symbols supported by the exporter. + + * After `*', complete headlines in the current buffer so that + they can be used in search links like `[[*find this + headline]]'. + + * After `:' in a headline, complete tags. The list of tags is + taken from the variable `org-tag-alist' (possibly set through + the `#+TAGS' in-buffer option, *note Setting tags::), or it + is created dynamically from all tags used in the current + buffer. + + * After `:' and not in a headline, complete property keys. The + list of keys is constructed dynamically from all keys used in + the current buffer. + + * After `[', complete link abbreviations (*note Link + abbreviations::). + + * After `#+', complete the special keywords like `TYP_TODO' or + `OPTIONS' which set file-specific options for Org mode. When + the option keyword is already complete, pressing `M-' + again will insert example settings for this keyword. + + * In the line after `#+STARTUP: ', complete startup keywords, + i.e., valid keys for this line. + + * Elsewhere, complete dictionary words using Ispell. + + +File: org, Node: Easy Templates, Next: Speed keys, Prev: Completion, Up: Miscellaneous + +15.2 Easy Templates +=================== + +Org mode supports insertion of empty structural elements (like +`#+BEGIN_SRC' and `#+END_SRC' pairs) with just a few key strokes. This +is achieved through a native template expansion mechanism. Note that +Emacs has several other template mechanisms which could be used in a +similar way, for example `yasnippet'. + + To insert a structural element, type a `<', followed by a template +selector and `'. Completion takes effect only when the above +keystrokes are typed on a line by itself. + + The following template selectors are currently supported. + +`s' `#+BEGIN_SRC ... #+END_SRC' +`e' `#+BEGIN_EXAMPLE ... #+END_EXAMPLE' +`q' `#+BEGIN_QUOTE ... #+END_QUOTE' +`v' `#+BEGIN_VERSE ... #+END_VERSE' +`c' `#+BEGIN_CENTER ... #+END_CENTER' +`l' `#+BEGIN_LaTeX ... #+END_LaTeX' +`L' `#+LaTeX:' +`h' `#+BEGIN_HTML ... #+END_HTML' +`H' `#+HTML:' +`a' `#+BEGIN_ASCII ... #+END_ASCII' +`A' `#+ASCII:' +`i' `#+INDEX:' line +`I' `#+INCLUDE:' line + + For example, on an empty line, typing "Customization' menu. Many settings can also be +activated on a per-file basis, by putting special lines into the buffer +(*note In-buffer settings::). + + +File: org, Node: In-buffer settings, Next: The very busy C-c C-c key, Prev: Customization, Up: Miscellaneous + +15.6 Summary of in-buffer settings +================================== + +Org mode uses special lines in the buffer to define settings on a +per-file basis. These lines start with a `#+' followed by a keyword, a +colon, and then individual words defining a setting. Several setting +words can be in the same line, but you can also have multiple lines for +the keyword. While these settings are described throughout the manual, +here is a summary. After changing any of those lines in the buffer, +press `C-c C-c' with the cursor still in the line to activate the +changes immediately. Otherwise they become effective only when the +file is visited again in a new Emacs session. + +`#+ARCHIVE: %s_done::' + This line sets the archive location for the agenda file. It + applies for all subsequent lines until the next `#+ARCHIVE' line, + or the end of the file. The first such line also applies to any + entries before it. The corresponding variable is + `org-archive-location'. + +`#+CATEGORY:' + This line sets the category for the agenda file. The category + applies for all subsequent lines until the next `#+CATEGORY' line, + or the end of the file. The first such line also applies to any + entries before it. + +`#+COLUMNS: %25ITEM ...' + Set the default format for columns view. This format applies when + columns view is invoked in locations where no `COLUMNS' property + applies. + +`#+CONSTANTS: name1=value1 ...' + Set file-local values for constants to be used in table formulas. + This line sets the local variable + `org-table-formula-constants-local'. The global version of this + variable is `org-table-formula-constants'. + +`#+FILETAGS: :tag1:tag2:tag3:' + Set tags that can be inherited by any entry in the file, including + the top-level entries. + +`#+DRAWERS: NAME1 ...' + Set the file-local set of additional drawers. The corresponding + global variable is `org-drawers'. + +`#+LINK: linkword replace' + These lines (several are allowed) specify link abbreviations. + *Note Link abbreviations::. The corresponding variable is + `org-link-abbrev-alist'. + +`#+PRIORITIES: highest lowest default' + This line sets the limits and the default for the priorities. All + three must be either letters A-Z or numbers 0-9. The highest + priority must have a lower ASCII number than the lowest priority. + +`#+PROPERTY: Property_Name Value' + This line sets a default inheritance value for entries in the + current buffer, most useful for specifying the allowed values of a + property. + +`#+SETUPFILE: file' + This line defines a file that holds more in-buffer setup. + Normally this is entirely ignored. Only when the buffer is parsed + for option-setting lines (i.e., when starting Org mode for a file, + when pressing `C-c C-c' in a settings line, or when exporting), + then the contents of this file are parsed as if they had been + included in the buffer. In particular, the file can be any other + Org mode file with internal setup. You can visit the file the + cursor is in the line with `C-c ''. + +`#+STARTUP:' + This line sets options to be used at startup of Org mode, when an + Org file is being visited. + + The first set of options deals with the initial visibility of the + outline tree. The corresponding variable for global default + settings is `org-startup-folded', with a default value `t', which + means `overview'. + overview top-level headlines only + content all headlines + showall no folding of any entries + showeverything show even drawer contents + + Dynamic virtual indentation is controlled by the variable + `org-startup-indented'(1) + indent start with `org-indent-mode' turned on + noindent start with `org-indent-mode' turned off + + Then there are options for aligning tables upon visiting a file. + This is useful in files containing narrowed table columns. The + corresponding variable is `org-startup-align-all-tables', with a + default value `nil'. + align align all tables + noalign don't align tables on startup + + When visiting a file, inline images can be automatically + displayed. The corresponding variable is + `org-startup-with-inline-images', with a default value `nil' to + avoid delays when visiting a file. + inlineimages show inline images + noinlineimages don't show inline images on startup + + When visiting a file, LaTeX fragments can be converted to images + automatically. The variable `org-startup-with-latex-preview' which + controls this behavior, is set to `nil' by default to avoid delays + on startup. + latexpreview preview LaTeX fragments + nolatexpreview don't preview LaTeX fragments + + Logging the closing and reopening of TODO items and clock + intervals can be configured using these options (see variables + `org-log-done', `org-log-note-clock-out' and `org-log-repeat') + logdone record a timestamp when an item is marked DONE + lognotedone record timestamp and a note when DONE + nologdone don't record when items are marked DONE + logrepeat record a time when reinstating a repeating item + lognoterepeat record a note when reinstating a repeating item + nologrepeat do not record when reinstating repeating item + lognoteclock-out record a note when clocking out + nolognoteclock-out don't record a note when clocking out + logreschedule record a timestamp when scheduling time changes + lognotereschedule record a note when scheduling time changes + nologreschedule do not record when a scheduling date changes + logredeadline record a timestamp when deadline changes + lognoteredeadline record a note when deadline changes + nologredeadline do not record when a deadline date changes + logrefile record a timestamp when refiling + lognoterefile record a note when refiling + nologrefile do not record when refiling + logdrawer store log into drawer + nologdrawer store log outside of drawer + logstatesreversed reverse the order of states notes + nologstatesreversed do not reverse the order of states notes + + Here are the options for hiding leading stars in outline headings, + and for indenting outlines. The corresponding variables are + `org-hide-leading-stars' and `org-odd-levels-only', both with a + default setting `nil' (meaning `showstars' and `oddeven'). + hidestars make all but one of the stars starting a headline invisible. + showstars show all stars starting a headline + indent virtual indentation according to outline level + noindent no virtual indentation according to outline level + odd allow only odd outline levels (1,3,...) + oddeven allow all outline levels + + To turn on custom format overlays over timestamps (variables + `org-put-time-stamp-overlays' and + `org-time-stamp-overlay-formats'), use + customtime overlay custom time format + + The following options influence the table spreadsheet (variable + `constants-unit-system'). + constcgs `constants.el' should use the c-g-s unit system + constSI `constants.el' should use the SI unit system + + To influence footnote settings, use the following keywords. The + corresponding variables are `org-footnote-define-inline', + `org-footnote-auto-label', and `org-footnote-auto-adjust'. + fninline define footnotes inline + fnnoinline define footnotes in separate section + fnlocal define footnotes near first reference, but not inline + fnprompt prompt for footnote labels + fnauto create `[fn:1]'-like labels automatically (default) + fnconfirm offer automatic label for editing or confirmation + fnplain create `[1]'-like labels automatically + fnadjust automatically renumber and sort footnotes + nofnadjust do not renumber and sort automatically + + To hide blocks on startup, use these keywords. The corresponding + variable is `org-hide-block-startup'. + hideblocks Hide all begin/end blocks on startup + nohideblocks Do not hide blocks on startup + + The display of entities as UTF-8 characters is governed by the + variable `org-pretty-entities' and the keywords + entitiespretty Show entities as UTF-8 characters where possible + entitiesplain Leave entities plain + +`#+TAGS: TAG1(c1) TAG2(c2)' + These lines (several such lines are allowed) specify the valid + tags in this file, and (potentially) the corresponding _fast tag + selection_ keys. The corresponding variable is `org-tag-alist'. + +`#+TBLFM:' + This line contains the formulas for the table directly above the + line. + + Table can have multiple lines containing `#+TBLFM:'. Note that + only the first line of `#+TBLFM:' will be applied when you + recalculate the table. For more details see *note Using multiple + #+TBLFM lines:: in *note Editing and debugging formulas::. + +`#+TITLE:, #+AUTHOR:, #+EMAIL:, #+LANGUAGE:, #+DATE:,' +`#+OPTIONS:, #+BIND:,' +`#+DESCRIPTION:, #+KEYWORDS:,' +`#+LaTeX_HEADER:, #+LaTeX_HEADER_EXTRA:,' +`#+HTML_HEAD:, #+HTML_HEAD_EXTRA:, #+HTML_LINK_UP:, #+HTML_LINK_HOME:,' +`#+SELECT_TAGS:, #+EXCLUDE_TAGS:' + These lines provide settings for exporting files. For more + details see *note Export settings::. + +`#+TODO: #+SEQ_TODO: #+TYP_TODO:' + These lines set the TODO keywords and their interpretation in the + current file. The corresponding variable is `org-todo-keywords'. + + ---------- Footnotes ---------- + + (1) Emacs 23 and Org mode 6.29 are required + + +File: org, Node: The very busy C-c C-c key, Next: Clean view, Prev: In-buffer settings, Up: Miscellaneous + +15.7 The very busy C-c C-c key +============================== + +The key `C-c C-c' has many purposes in Org, which are all mentioned +scattered throughout this manual. One specific function of this key is +to add _tags_ to a headline (*note Tags::). In many other +circumstances it means something like _"Hey Org, look here and update +according to what you see here"_. Here is a summary of what this means +in different contexts. + + - If there are highlights in the buffer from the creation of a sparse + tree, or from clock display, remove these highlights. + + - If the cursor is in one of the special `#+KEYWORD' lines, this + triggers scanning the buffer for these lines and updating the + information. + + - If the cursor is inside a table, realign the table. This command + works even if the automatic table editor has been turned off. + + - If the cursor is on a `#+TBLFM' line, re-apply the formulas to the + entire table. + + - If the current buffer is a capture buffer, close the note and file + it. With a prefix argument, file it, without further interaction, + to the default location. + + - If the cursor is on a `<<>>', update radio targets and + corresponding links in this buffer. + + - If the cursor is in a property line or at the start or end of a + property drawer, offer property commands. + + - If the cursor is at a footnote reference, go to the corresponding + definition, and _vice versa_. + + - If the cursor is on a statistics cookie, update it. + + - If the cursor is in a plain list item with a checkbox, toggle the + status of the checkbox. + + - If the cursor is on a numbered item in a plain list, renumber the + ordered list. + + - If the cursor is on the `#+BEGIN' line of a dynamic block, the + block is updated. + + - If the cursor is at a timestamp, fix the day name in the timestamp. + + +File: org, Node: Clean view, Next: TTY keys, Prev: The very busy C-c C-c key, Up: Miscellaneous + +15.8 A cleaner outline view +=========================== + +Some people find it noisy and distracting that the Org headlines start +with a potentially large number of stars, and that text below the +headlines is not indented. While this is no problem when writing a +_book-like_ document where the outline headings are really section +headings, in a more _list-oriented_ outline, indented structure is a +lot cleaner: + + * Top level headline | * Top level headline + ** Second level | * Second level + *** 3rd level | * 3rd level + some text | some text + *** 3rd level | * 3rd level + more text | more text + * Another top level headline | * Another top level headline + +If you are using at least Emacs 23.2(1) and version 6.29 of Org, this +kind of view can be achieved dynamically at display time using +`org-indent-mode'. In this minor mode, all lines are prefixed for +display with the necessary amount of space(2). Also headlines are +prefixed with additional stars, so that the amount of indentation +shifts by two(3) spaces per level. All headline stars but the last +one are made invisible using the `org-hide' face(4); see below under +`2.' for more information on how this works. You can turn on +`org-indent-mode' for all files by customizing the variable +`org-startup-indented', or you can turn it on for individual files using + + #+STARTUP: indent + + If you want a similar effect in an earlier version of Emacs and/or +Org, or if you want the indentation to be hard space characters so that +the plain text file looks as similar as possible to the Emacs display, +Org supports you in the following way: + + 1. _Indentation of text below headlines_ + You may indent text below each headline to make the left boundary + line up with the headline, like + + *** 3rd level + more text, now indented + + Org supports this with paragraph filling, line wrapping, and + structure editing(5), preserving or adapting the indentation as + appropriate. + + 2. _Hiding leading stars_ + You can modify the display in such a way that all leading stars + become invisible. To do this in a global way, configure the + variable `org-hide-leading-stars' or change this on a per-file + basis with + + #+STARTUP: hidestars + #+STARTUP: showstars + + With hidden stars, the tree becomes: + + * Top level headline + * Second level + * 3rd level + ... + + The leading stars are not truly replaced by whitespace, they are + only fontified with the face `org-hide' that uses the background + color as font color. If you are not using either white or black + background, you may have to customize this face to get the wanted + effect. Another possibility is to set this font such that the + extra stars are almost invisible, for example using the color + `grey90' on a white background. + + 3. Things become cleaner still if you skip all the even levels and + use only odd levels 1, 3, 5..., effectively adding two stars to go + from one outline level to the next(6). In this way we get the + outline view shown at the beginning of this section. In order to + make the structure editing and export commands handle this + convention correctly, configure the variable + `org-odd-levels-only', or set this on a per-file basis with one of + the following lines: + + #+STARTUP: odd + #+STARTUP: oddeven + + You can convert an Org file from single-star-per-level to the + double-star-per-level convention with `M-x + org-convert-to-odd-levels RET' in that file. The reverse + operation is `M-x org-convert-to-oddeven-levels'. + + ---------- Footnotes ---------- + + (1) Emacs 23.1 can actually crash with `org-indent-mode' + + (2) `org-indent-mode' also sets the `wrap-prefix' property, such +that `visual-line-mode' (or purely setting `word-wrap') wraps long +lines (including headlines) correctly indented. + + (3) See the variable `org-indent-indentation-per-level'. + + (4) Turning on `org-indent-mode' sets `org-hide-leading-stars' to +`t' and `org-adapt-indentation' to `nil'. + + (5) See also the variable `org-adapt-indentation'. + + (6) When you need to specify a level for a property search or refile +targets, `LEVEL=2' will correspond to 3 stars, etc. + + +File: org, Node: TTY keys, Next: Interaction, Prev: Clean view, Up: Miscellaneous + +15.9 Using Org on a tty +======================= + +Because Org contains a large number of commands, by default many of +Org's core commands are bound to keys that are generally not accessible +on a tty, such as the cursor keys (, , , ), + and , in particular when used together with modifiers like + and/or . To access these commands on a tty when special +keys are unavailable, the following alternative bindings can be used. +The tty bindings below will likely be more cumbersome; you may find for +some of the bindings below that a customized workaround suits you +better. For example, changing a timestamp is really only fun with +`S-' keys, whereas on a tty you would rather use `C-c .' to +re-insert the timestamp. + +Default Alternative 1 Speed Alternative 2 + key +`S-' `C-u ' `C' +`M-' `C-c C-x l' `l' ` ' +`M-S-'`C-c C-x L' `L' +`M-' `C-c C-x r' `r' ` + ' +`M-S-'`C-c C-x R' `R' +`M-' `C-c C-x u' ` ' ` ' +`M-S-' `C-c C-x U' `U' +`M-' `C-c C-x d' ` ' ` ' +`M-S-'`C-c C-x D' `D' +`S-' `C-c C-x c' ` ' +`M-' `C-c C-x m' ` ' ` ' +`M-S-' `C-c C-x M' ` ' +`S-' `C-c ' ` ' +`S-' `C-c ' ` ' +`S-' `C-c ' ` ' +`S-' `C-c ' ` ' +`C-S-'`C-c C-x ` ' + ' +`C-S-'`C-c C-x ` ' + ' + + +File: org, Node: Interaction, Next: org-crypt, Prev: TTY keys, Up: Miscellaneous + +15.10 Interaction with other packages +===================================== + +Org lives in the world of GNU Emacs and interacts in various ways with +other code out there. + +* Menu: + +* Cooperation:: Packages Org cooperates with +* Conflicts:: Packages that lead to conflicts + + +File: org, Node: Cooperation, Next: Conflicts, Prev: Interaction, Up: Interaction + +15.10.1 Packages that Org cooperates with +----------------------------------------- + +`calc.el' by Dave Gillespie + Org uses the Calc package for implementing spreadsheet + functionality in its tables (*note The spreadsheet::). Org checks + for the availability of Calc by looking for the function + `calc-eval' which will have been autoloaded during setup if Calc + has been installed properly. As of Emacs 22, Calc is part of the + Emacs distribution. Another possibility for interaction between + the two packages is using Calc for embedded calculations. *Note + Embedded Mode: (calc)Embedded Mode. + +`constants.el' by Carsten Dominik + In a table formula (*note The spreadsheet::), it is possible to use + names for natural constants or units. Instead of defining your own + constants in the variable `org-table-formula-constants', install + the `constants' package which defines a large number of constants + and units, and lets you use unit prefixes like `M' for `Mega', + etc. You will need version 2.0 of this package, available at + `http://www.astro.uva.nl/~dominik/Tools'. Org checks for the + function `constants-get', which has to be autoloaded in your + setup. See the installation instructions in the file + `constants.el'. + +`cdlatex.el' by Carsten Dominik + Org mode can make use of the CDLaTeX package to efficiently enter + LaTeX fragments into Org files. See *note CDLaTeX mode::. + +`imenu.el' by Ake Stenhoff and Lars Lindberg + Imenu allows menu access to an index of items in a file. Org mode + supports Imenu--all you need to do to get the index is the + following: + (add-hook 'org-mode-hook + (lambda () (imenu-add-to-menubar "Imenu"))) + By default the index is two levels deep--you can modify the depth + using the option `org-imenu-depth'. + +`remember.el' by John Wiegley + Org used to use this package for capture, but no longer does. + +`speedbar.el' by Eric M. Ludlam + Speedbar is a package that creates a special frame displaying + files and index items in files. Org mode supports Speedbar and + allows you to drill into Org files directly from the Speedbar. It + also allows you to restrict the scope of agenda commands to a file + or a subtree by using the command `<' in the Speedbar frame. + +`table.el' by Takaaki Ota + Complex ASCII tables with automatic line wrapping, column- and + row-spanning, and alignment can be created using the Emacs table + package by Takaaki Ota (`http://sourceforge.net/projects/table', + and also part of Emacs 22). Org mode will recognize these tables + and export them properly. Because of interference with other Org + mode functionality, you unfortunately cannot edit these tables + directly in the buffer. Instead, you need to use the command `C-c + '' to edit them, similar to source code snippets. + + `C-c ' (`org-edit-special')' + Edit a `table.el' table. Works when the cursor is in a + table.el table. + + `C-c ~ (`org-table-create-with-table.el')' + Insert a `table.el' table. If there is already a table at + point, this command converts it between the `table.el' format + and the Org mode format. See the documentation string of the + command `org-convert-table' for the restrictions under which + this is possible. + `table.el' is part of Emacs since Emacs 22. + +`footnote.el' by Steven L. Baur + Org mode recognizes numerical footnotes as provided by this + package. However, Org mode also has its own footnote support + (*note Footnotes::), which makes using `footnote.el' unnecessary. + + +File: org, Node: Conflicts, Prev: Cooperation, Up: Interaction + +15.10.2 Packages that lead to conflicts with Org mode +----------------------------------------------------- + + In Emacs 23, `shift-selection-mode' is on by default, meaning that + cursor motions combined with the shift key should start or enlarge + regions. This conflicts with the use of `S-' commands in + Org to change timestamps, TODO keywords, priorities, and item + bullet types if the cursor is at such a location. By default, + `S-' commands outside special contexts don't do anything, + but you can customize the variable `org-support-shift-select'. + Org mode then tries to accommodate shift selection by (i) using it + outside of the special contexts where special commands apply, and + by (ii) extending an existing active region even if the cursor + moves across a special context. + +`CUA.el' by Kim. F. Storm + Key bindings in Org conflict with the `S-' keys used by + CUA mode (as well as `pc-select-mode' and `s-region-mode') to + select and extend the region. In fact, Emacs 23 has this built-in + in the form of `shift-selection-mode', see previous paragraph. If + you are using Emacs 23, you probably don't want to use another + package for this purpose. However, if you prefer to leave these + keys to a different package while working in Org mode, configure + the variable `org-replace-disputed-keys'. When set, Org will move + the following key bindings in Org files, and in the agenda buffer + (but not during date selection). + + S-UP => M-p S-DOWN => M-n + S-LEFT => M-- S-RIGHT => M-+ + C-S-LEFT => M-S-- C-S-RIGHT => M-S-+ + + Yes, these are unfortunately more difficult to remember. If you + want to have other replacement keys, look at the variable + `org-disputed-keys'. + +`ecomplete.el' by Lars Magne Ingebrigtsen + Ecomplete provides "electric" address completion in address header + lines in message buffers. Sadly Orgtbl mode cuts ecompletes power + supply: No completion happens when Orgtbl mode is enabled in + message buffers while entering text in address header lines. If + one wants to use ecomplete one should _not_ follow the advice to + automagically turn on Orgtbl mode in message buffers (see *note + Orgtbl mode::), but instead--after filling in the message + headers--turn on Orgtbl mode manually when needed in the messages + body. + +`filladapt.el' by Kyle Jones + Org mode tries to do the right thing when filling paragraphs, list + items and other elements. Many users reported they had problems + using both `filladapt.el' and Org mode, so a safe thing to do is + to disable it like this: + + (add-hook 'org-mode-hook 'turn-off-filladapt-mode) + +`yasnippet.el' + The way Org mode binds the key (binding to `[tab]' instead of + `"\t"') overrules YASnippet's access to this key. The following + code fixed this problem: + + (add-hook 'org-mode-hook + (lambda () + (org-set-local 'yas/trigger-key [tab]) + (define-key yas/keymap [tab] 'yas/next-field-or-maybe-expand))) + + The latest version of yasnippet doesn't play well with Org mode. + If the above code does not fix the conflict, start by defining the + following function: + + (defun yas/org-very-safe-expand () + (let ((yas/fallback-behavior 'return-nil)) (yas/expand))) + + Then, tell Org mode what to do with the new function: + + (add-hook 'org-mode-hook + (lambda () + (make-variable-buffer-local 'yas/trigger-key) + (setq yas/trigger-key [tab]) + (add-to-list 'org-tab-first-hook 'yas/org-very-safe-expand) + (define-key yas/keymap [tab] 'yas/next-field))) + +`windmove.el' by Hovav Shacham + This package also uses the `S-' keys, so everything written + in the paragraph above about CUA mode also applies here. If you + want make the windmove function active in locations where Org mode + does not have special functionality on `S-', add this to + your configuration: + + ;; Make windmove work in org-mode: + (add-hook 'org-shiftup-final-hook 'windmove-up) + (add-hook 'org-shiftleft-final-hook 'windmove-left) + (add-hook 'org-shiftdown-final-hook 'windmove-down) + (add-hook 'org-shiftright-final-hook 'windmove-right) + +`viper.el' by Michael Kifer + Viper uses `C-c /' and therefore makes this key not access the + corresponding Org mode command `org-sparse-tree'. You need to find + another key for this command, or override the key in + `viper-vi-global-user-map' with + + (define-key viper-vi-global-user-map "C-c /" 'org-sparse-tree) + + + +File: org, Node: org-crypt, Prev: Interaction, Up: Miscellaneous + +15.11 org-crypt.el +================== + +Org-crypt will encrypt the text of an entry, but not the headline, or +properties. Org-crypt uses the Emacs EasyPG library to encrypt and +decrypt files. + + Any text below a headline that has a `:crypt:' tag will be +automatically be encrypted when the file is saved. If you want to use +a different tag just customize the `org-crypt-tag-matcher' setting. + + To use org-crypt it is suggested that you have the following in your +`.emacs': + + (require 'org-crypt) + (org-crypt-use-before-save-magic) + (setq org-tags-exclude-from-inheritance (quote ("crypt"))) + + (setq org-crypt-key nil) + ;; GPG key to use for encryption + ;; Either the Key ID or set to nil to use symmetric encryption. + + (setq auto-save-default nil) + ;; Auto-saving does not cooperate with org-crypt.el: so you need + ;; to turn it off if you plan to use org-crypt.el quite often. + ;; Otherwise, you'll get an (annoying) message each time you + ;; start Org. + + ;; To turn it off only locally, you can insert this: + ;; + ;; # -*- buffer-auto-save-file-name: nil; -*- + + Excluding the crypt tag from inheritance prevents already encrypted +text being encrypted again. + + +File: org, Node: Hacking, Next: MobileOrg, Prev: Miscellaneous, Up: Top + +Appendix A Hacking +****************** + +This appendix covers some aspects where users can extend the +functionality of Org. + +* Menu: + +* Hooks:: How to reach into Org's internals +* Add-on packages:: Available extensions +* Adding hyperlink types:: New custom link types +* Adding export back-ends:: How to write new export back-ends +* Context-sensitive commands:: How to add functionality to such commands +* Tables in arbitrary syntax:: Orgtbl for LaTeX and other programs +* Dynamic blocks:: Automatically filled blocks +* Special agenda views:: Customized views +* Speeding up your agendas:: Tips on how to speed up your agendas +* Extracting agenda information:: Post-processing of agenda information +* Using the property API:: Writing programs that use entry properties +* Using the mapping API:: Mapping over all or selected entries + + +File: org, Node: Hooks, Next: Add-on packages, Prev: Hacking, Up: Hacking + +A.1 Hooks +========= + +Org has a large number of hook variables that can be used to add +functionality. This appendix about hacking is going to illustrate the +use of some of them. A complete list of all hooks with documentation is +maintained by the Worg project and can be found at +`http://orgmode.org/worg/org-configs/org-hooks.php'. + + +File: org, Node: Add-on packages, Next: Adding hyperlink types, Prev: Hooks, Up: Hacking + +A.2 Add-on packages +=================== + +A large number of add-on packages have been written by various authors. + + These packages are not part of Emacs, but they are distributed as +contributed packages with the separate release available at +`http://orgmode.org'. See the `contrib/README' file in the source code +directory for a list of contributed files. You may also find some more +information on the Worg page: `http://orgmode.org/worg/org-contrib/'. + + +File: org, Node: Adding hyperlink types, Next: Adding export back-ends, Prev: Add-on packages, Up: Hacking + +A.3 Adding hyperlink types +========================== + +Org has a large number of hyperlink types built-in (*note +Hyperlinks::). If you would like to add new link types, Org provides +an interface for doing so. Let's look at an example file, +`org-man.el', that will add support for creating links like +`[[man:printf][The printf manpage]]' to show Unix manual pages inside +Emacs: + + ;;; org-man.el - Support for links to manpages in Org + + (require 'org) + + (org-add-link-type "man" 'org-man-open) + (add-hook 'org-store-link-functions 'org-man-store-link) + + (defcustom org-man-command 'man + "The Emacs command to be used to display a man page." + :group 'org-link + :type '(choice (const man) (const woman))) + + (defun org-man-open (path) + "Visit the manpage on PATH. + PATH should be a topic that can be thrown at the man command." + (funcall org-man-command path)) + + (defun org-man-store-link () + "Store a link to a manpage." + (when (memq major-mode '(Man-mode woman-mode)) + ;; This is a man page, we do make this link + (let* ((page (org-man-get-page-name)) + (link (concat "man:" page)) + (description (format "Manpage for %s" page))) + (org-store-link-props + :type "man" + :link link + :description description)))) + + (defun org-man-get-page-name () + "Extract the page name from the buffer name." + ;; This works for both `Man-mode' and `woman-mode'. + (if (string-match " \\(\\S-+\\)\\*" (buffer-name)) + (match-string 1 (buffer-name)) + (error "Cannot create link to this man page"))) + + (provide 'org-man) + + ;;; org-man.el ends here + +You would activate this new link type in `.emacs' with + + (require 'org-man) + +Let's go through the file and see what it does. + 1. It does `(require 'org)' to make sure that `org.el' has been + loaded. + + 2. The next line calls `org-add-link-type' to define a new link type + with prefix `man'. The call also contains the name of a function + that will be called to follow such a link. + + 3. The next line adds a function to `org-store-link-functions', in + order to allow the command `C-c l' to record a useful link in a + buffer displaying a man page. + + The rest of the file defines the necessary variables and functions. +First there is a customization variable that determines which Emacs +command should be used to display man pages. There are two options, +`man' and `woman'. Then the function to follow a link is defined. It +gets the link path as an argument--in this case the link path is just a +topic for the manual command. The function calls the value of +`org-man-command' to display the man page. + + Finally the function `org-man-store-link' is defined. When you try +to store a link with `C-c l', this function will be called to try to +make a link. The function must first decide if it is supposed to +create the link for this buffer type; we do this by checking the value +of the variable `major-mode'. If not, the function must exit and +return the value `nil'. If yes, the link is created by getting the +manual topic from the buffer name and prefixing it with the string +`man:'. Then it must call the command `org-store-link-props' and set +the `:type' and `:link' properties. Optionally you can also set the +`:description' property to provide a default for the link description +when the link is later inserted into an Org buffer with `C-c C-l'. + + When it makes sense for your new link type, you may also define a +function `org-PREFIX-complete-link' that implements special (e.g., +completion) support for inserting such a link with `C-c C-l'. Such a +function should not accept any arguments, and return the full link with +prefix. + + +File: org, Node: Adding export back-ends, Next: Context-sensitive commands, Prev: Adding hyperlink types, Up: Hacking + +A.4 Adding export back-ends +=========================== + +Org 8.0 comes with a completely rewritten export engine which makes it +easy to write new export back-ends, either from scratch, or from +deriving them from existing ones. + + Your two entry points are respectively `org-export-define-backend' +and `org-export-define-derived-backend'. To grok these functions, you +should first have a look at `ox-latex.el' (for how to define a new +back-end from scratch) and `ox-beamer.el' (for how to derive a new +back-end from an existing one. + + When creating a new back-end from scratch, the basic idea is to set +the name of the back-end (as a symbol) and an an alist of elements and +export functions. On top of this, you will need to set additional +keywords like `:menu-entry' (to display the back-end in the export +dispatcher), `:export-block' (to specify what blocks should not be +exported by this back-end), and `:options-alist' (to let the user set +export options that are specific to this back-end.) + + Deriving a new back-end is similar, except that you need to set +`:translate-alist' to an alist of export functions that should be used +instead of the parent back-end functions. + + For a complete reference documentation, see the Org Export Reference +on Worg (http://orgmode.org/worg/dev/org-export-reference.html). + + +File: org, Node: Context-sensitive commands, Next: Tables in arbitrary syntax, Prev: Adding export back-ends, Up: Hacking + +A.5 Context-sensitive commands +============================== + +Org has several commands that act differently depending on context. +The most important example is the `C-c C-c' (*note The very busy C-c +C-c key::). Also the `M-cursor' and `M-S-cursor' keys have this +property. + + Add-ons can tap into this functionality by providing a function that +detects special context for that add-on and executes functionality +appropriate for the context. Here is an example from Dan Davison's +`org-R.el' which allows you to evaluate commands based on the `R' +programming language (1). For this package, special contexts are lines +that start with `#+R:' or `#+RR:'. + + (defun org-R-apply-maybe () + "Detect if this is context for org-R and execute R commands." + (if (save-excursion + (beginning-of-line 1) + (looking-at "#\\+RR?:")) + (progn (call-interactively 'org-R-apply) + t) ;; to signal that we took action + nil)) ;; to signal that we did not + + (add-hook 'org-ctrl-c-ctrl-c-hook 'org-R-apply-maybe) + + The function first checks if the cursor is in such a line. If that +is the case, `org-R-apply' is called and the function returns `t' to +signal that action was taken, and `C-c C-c' will stop looking for other +contexts. If the function finds it should do nothing locally, it +returns `nil' so that other, similar functions can have a try. + + ---------- Footnotes ---------- + + (1) `org-R.el' has been replaced by the Org mode functionality +described in *note Working With Source Code:: and is now obsolete. + + +File: org, Node: Tables in arbitrary syntax, Next: Dynamic blocks, Prev: Context-sensitive commands, Up: Hacking + +A.6 Tables and lists in arbitrary syntax +======================================== + +Since Orgtbl mode can be used as a minor mode in arbitrary buffers, a +frequent feature request has been to make it work with native tables in +specific languages, for example LaTeX. However, this is extremely hard +to do in a general way, would lead to a customization nightmare, and +would take away much of the simplicity of the Orgtbl mode table editor. + + This appendix describes a different approach. We keep the Orgtbl +mode table in its native format (the source table), and use a custom +function to translate the table to the correct syntax, and to install +it in the right location (the target table). This puts the burden of +writing conversion functions on the user, but it allows for a very +flexible system. + + Bastien added the ability to do the same with lists, in Orgstruct +mode. You can use Org's facilities to edit and structure lists by +turning `orgstruct-mode' on, then locally exporting such lists in +another format (HTML, LaTeX or Texinfo.) + +* Menu: + +* Radio tables:: Sending and receiving radio tables +* A LaTeX example:: Step by step, almost a tutorial +* Translator functions:: Copy and modify +* Radio lists:: Sending and receiving lists + + +File: org, Node: Radio tables, Next: A LaTeX example, Prev: Tables in arbitrary syntax, Up: Tables in arbitrary syntax + +A.6.1 Radio tables +------------------ + +To define the location of the target table, you first need to create two +lines that are comments in the current mode, but contain magic words +`BEGIN/END RECEIVE ORGTBL' for Orgtbl mode to find. Orgtbl mode will +insert the translated table between these lines, replacing whatever was +there before. For example in C mode where comments are between `/* ... +*/': + + /* BEGIN RECEIVE ORGTBL table_name */ + /* END RECEIVE ORGTBL table_name */ + +Just above the source table, we put a special line that tells Orgtbl +mode how to translate this table and where to install it. For example: + #+ORGTBL: SEND table_name translation_function arguments... + +`table_name' is the reference name for the table that is also used in +the receiver lines. `translation_function' is the Lisp function that +does the translation. Furthermore, the line can contain a list of +arguments (alternating key and value) at the end. The arguments will be +passed as a property list to the translation function for +interpretation. A few standard parameters are already recognized and +acted upon before the translation function is called: + +`:skip N' + Skip the first N lines of the table. Hlines do count as separate + lines for this parameter! + +`:skipcols (n1 n2 ...)' + List of columns that should be skipped. If the table has a column + with calculation marks, that column is automatically discarded as + well. Please note that the translator function sees the table + _after_ the removal of these columns, the function never knows + that there have been additional columns. + +`:no-escape t' + When non-`nil', do not escape special characters `&%#_^' when + exporting the table. The default value is `nil'. + +The one problem remaining is how to keep the source table in the buffer +without disturbing the normal workings of the file, for example during +compilation of a C file or processing of a LaTeX file. There are a +number of different solutions: + + * The table could be placed in a block comment if that is supported + by the language. For example, in C mode you could wrap the table + between `/*' and `*/' lines. + + * Sometimes it is possible to put the table after some kind of END + statement, for example `\bye' in TeX and `\end{document}' in LaTeX. + + * You can just comment the table line-by-line whenever you want to + process the file, and uncomment it whenever you need to edit the + table. This only sounds tedious--the command `M-x + orgtbl-toggle-comment RET' makes this comment-toggling very easy, + in particular if you bind it to a key. + + +File: org, Node: A LaTeX example, Next: Translator functions, Prev: Radio tables, Up: Tables in arbitrary syntax + +A.6.2 A LaTeX example of radio tables +------------------------------------- + +The best way to wrap the source table in LaTeX is to use the `comment' +environment provided by `comment.sty'. It has to be activated by +placing `\usepackage{comment}' into the document header. Orgtbl mode +can insert a radio table skeleton(1) with the command `M-x +orgtbl-insert-radio-table RET'. You will be prompted for a table name, +let's say we use `salesfigures'. You will then get the following +template: + + % BEGIN RECEIVE ORGTBL salesfigures + % END RECEIVE ORGTBL salesfigures + \begin{comment} + #+ORGTBL: SEND salesfigures orgtbl-to-latex + | | | + \end{comment} + +The `#+ORGTBL: SEND' line tells Orgtbl mode to use the function +`orgtbl-to-latex' to convert the table into LaTeX and to put it into +the receiver location with name `salesfigures'. You may now fill in +the table--feel free to use the spreadsheet features(2): + + % BEGIN RECEIVE ORGTBL salesfigures + % END RECEIVE ORGTBL salesfigures + \begin{comment} + #+ORGTBL: SEND salesfigures orgtbl-to-latex + | Month | Days | Nr sold | per day | + |-------+------+---------+---------| + | Jan | 23 | 55 | 2.4 | + | Feb | 21 | 16 | 0.8 | + | March | 22 | 278 | 12.6 | + #+TBLFM: $4=$3/$2;%.1f + % $ (optional extra dollar to keep font-lock happy, see footnote) + \end{comment} + +When you are done, press `C-c C-c' in the table to get the converted +table inserted between the two marker lines. + + Now let's assume you want to make the table header by hand, because +you want to control how columns are aligned, etc. In this case we make +sure that the table translator skips the first 2 lines of the source +table, and tell the command to work as a splice, i.e., to not produce +header and footer commands of the target table: + + \begin{tabular}{lrrr} + Month & \multicolumn{1}{c}{Days} & Nr.\ sold & per day\\ + % BEGIN RECEIVE ORGTBL salesfigures + % END RECEIVE ORGTBL salesfigures + \end{tabular} + % + \begin{comment} + #+ORGTBL: SEND salesfigures orgtbl-to-latex :splice t :skip 2 + | Month | Days | Nr sold | per day | + |-------+------+---------+---------| + | Jan | 23 | 55 | 2.4 | + | Feb | 21 | 16 | 0.8 | + | March | 22 | 278 | 12.6 | + #+TBLFM: $4=$3/$2;%.1f + \end{comment} + + The LaTeX translator function `orgtbl-to-latex' is already part of +Orgtbl mode. It uses a `tabular' environment to typeset the table and +marks horizontal lines with `\hline'. Furthermore, it interprets the +following parameters (see also *note Translator functions::): + +`:splice nil/t' + When set to t, return only table body lines, don't wrap them into a + tabular environment. Default is `nil'. + +`:fmt fmt' + A format to be used to wrap each field, it should contain `%s' for + the original field value. For example, to wrap each field value + in dollars, you could use `:fmt "$%s$"'. This may also be a + property list with column numbers and formats, for example `:fmt + (2 "$%s$" 4 "%s\\%%")'. A function of one argument can be used in + place of the strings; the function must return a formatted string. + +`:efmt efmt' + Use this format to print numbers with exponentials. The format + should have `%s' twice for inserting mantissa and exponent, for + example `"%s\\times10^{%s}"'. The default is `"%s\\,(%s)"'. This + may also be a property list with column numbers and formats, for + example `:efmt (2 "$%s\\times10^{%s}$" 4 "$%s\\cdot10^{%s}$")'. + After `efmt' has been applied to a value, `fmt' will also be + applied. Similar to `fmt', functions of two arguments can be + supplied instead of strings. + + ---------- Footnotes ---------- + + (1) By default this works only for LaTeX, HTML, and Texinfo. +Configure the variable `orgtbl-radio-table-templates' to install +templates for other modes. + + (2) If the `#+TBLFM' line contains an odd number of dollar +characters, this may cause problems with font-lock in LaTeX mode. As +shown in the example you can fix this by adding an extra line inside the +`comment' environment that is used to balance the dollar expressions. +If you are using AUCTeX with the font-latex library, a much better +solution is to add the `comment' environment to the variable +`LaTeX-verbatim-environments'. + + +File: org, Node: Translator functions, Next: Radio lists, Prev: A LaTeX example, Up: Tables in arbitrary syntax + +A.6.3 Translator functions +-------------------------- + +Orgtbl mode has several translator functions built-in: `orgtbl-to-csv' +(comma-separated values), `orgtbl-to-tsv' (TAB-separated values) +`orgtbl-to-latex', `orgtbl-to-html', and `orgtbl-to-texinfo'. Except +for `orgtbl-to-html'(1), these all use a generic translator, +`orgtbl-to-generic'. For example, `orgtbl-to-latex' itself is a very +short function that computes the column definitions for the `tabular' +environment, defines a few field and line separators and then hands +processing over to the generic translator. Here is the entire code: + + (defun orgtbl-to-latex (table params) + "Convert the Orgtbl mode TABLE to LaTeX." + (let* ((alignment (mapconcat (lambda (x) (if x "r" "l")) + org-table-last-alignment "")) + (params2 + (list + :tstart (concat "\\begin{tabular}{" alignment "}") + :tend "\\end{tabular}" + :lstart "" :lend " \\\\" :sep " & " + :efmt "%s\\,(%s)" :hline "\\hline"))) + (orgtbl-to-generic table (org-combine-plists params2 params)))) + + As you can see, the properties passed into the function (variable +PARAMS) are combined with the ones newly defined in the function +(variable PARAMS2). The ones passed into the function (i.e., the ones +set by the `ORGTBL SEND' line) take precedence. So if you would like +to use the LaTeX translator, but wanted the line endings to be +`\\[2mm]' instead of the default `\\', you could just overrule the +default with + + #+ORGTBL: SEND test orgtbl-to-latex :lend " \\\\[2mm]" + + For a new language, you can either write your own converter function +in analogy with the LaTeX translator, or you can use the generic +function directly. For example, if you have a language where a table +is started with `!BTBL!', ended with `!ETBL!', and where table lines are +started with `!BL!', ended with `!EL!', and where the field separator +is a TAB, you could call the generic translator like this (on a single +line!): + + #+ORGTBL: SEND test orgtbl-to-generic :tstart "!BTBL!" :tend "!ETBL!" + :lstart "!BL! " :lend " !EL!" :sep "\t" + +Please check the documentation string of the function +`orgtbl-to-generic' for a full list of parameters understood by that +function, and remember that you can pass each of them into +`orgtbl-to-latex', `orgtbl-to-texinfo', and any other function using +the generic function. + + Of course you can also write a completely new function doing +complicated things the generic translator cannot do. A translator +function takes two arguments. The first argument is the table, a list +of lines, each line either the symbol `hline' or a list of fields. The +second argument is the property list containing all parameters +specified in the `#+ORGTBL: SEND' line. The function must return a +single string containing the formatted table. If you write a generally +useful translator, please post it on so that +others can benefit from your work. + + ---------- Footnotes ---------- + + (1) The HTML translator uses the same code that produces tables +during HTML export. + + +File: org, Node: Radio lists, Prev: Translator functions, Up: Tables in arbitrary syntax + +A.6.4 Radio lists +----------------- + +Sending and receiving radio lists works exactly the same way as sending +and receiving radio tables (*note Radio tables::). As for radio +tables, you can insert radio list templates in HTML, LaTeX and Texinfo +modes by calling `org-list-insert-radio-list'. + + Here are the differences with radio tables: + + - Orgstruct mode must be active. + + - Use the `ORGLST' keyword instead of `ORGTBL'. + + - The available translation functions for radio lists don't take + parameters. + + - `C-c C-c' will work when pressed on the first item of the list. + + Here is a LaTeX example. Let's say that you have this in your LaTeX +file: + + % BEGIN RECEIVE ORGLST to-buy + % END RECEIVE ORGLST to-buy + \begin{comment} + #+ORGLST: SEND to-buy org-list-to-latex + - a new house + - a new computer + + a new keyboard + + a new mouse + - a new life + \end{comment} + + Pressing `C-c C-c' on `a new house' and will insert the converted +LaTeX list between the two marker lines. + + +File: org, Node: Dynamic blocks, Next: Special agenda views, Prev: Tables in arbitrary syntax, Up: Hacking + +A.7 Dynamic blocks +================== + +Org documents can contain _dynamic blocks_. These are specially marked +regions that are updated by some user-written function. A good example +for such a block is the clock table inserted by the command `C-c C-x +C-r' (*note Clocking work time::). + + Dynamic blocks are enclosed by a BEGIN-END structure that assigns a +name to the block and can also specify parameters for the function +producing the content of the block. + + #+BEGIN: myblock :parameter1 value1 :parameter2 value2 ... + + #+END: + + Dynamic blocks are updated with the following commands + +`C-c C-x C-u (`org-dblock-update')' + Update dynamic block at point. + +`C-u C-c C-x C-u' + Update all dynamic blocks in the current file. + + Updating a dynamic block means to remove all the text between BEGIN +and END, parse the BEGIN line for parameters and then call the specific +writer function for this block to insert the new content. If you want +to use the original content in the writer function, you can use the +extra parameter `:content'. + + For a block with name `myblock', the writer function is +`org-dblock-write:myblock' with as only parameter a property list with +the parameters given in the begin line. Here is a trivial example of a +block that keeps track of when the block update function was last run: + + #+BEGIN: block-update-time :format "on %m/%d/%Y at %H:%M" + + #+END: + +The corresponding block writer function could look like this: + + (defun org-dblock-write:block-update-time (params) + (let ((fmt (or (plist-get params :format) "%d. %m. %Y"))) + (insert "Last block update at: " + (format-time-string fmt (current-time))))) + + If you want to make sure that all dynamic blocks are always +up-to-date, you could add the function `org-update-all-dblocks' to a +hook, for example `before-save-hook'. `org-update-all-dblocks' is +written in a way such that it does nothing in buffers that are not in +`org-mode'. + + You can narrow the current buffer to the current dynamic block (like +any other block) with `org-narrow-to-block'. + + +File: org, Node: Special agenda views, Next: Speeding up your agendas, Prev: Dynamic blocks, Up: Hacking + +A.8 Special agenda views +======================== + +Org provides a special hook that can be used to narrow down the +selection made by these agenda views: `agenda', `agenda*'(1), `todo', +`alltodo', `tags', `tags-todo', `tags-tree'. You may specify a +function that is used at each match to verify if the match should +indeed be part of the agenda view, and if not, how much should be +skipped. You can specify a global condition that will be applied to +all agenda views, this condition would be stored in the variable +`org-agenda-skip-function-global'. More commonly, such a definition is +applied only to specific custom searches, using +`org-agenda-skip-function'. + + Let's say you want to produce a list of projects that contain a +WAITING tag anywhere in the project tree. Let's further assume that +you have marked all tree headings that define a project with the TODO +keyword PROJECT. In this case you would run a TODO search for the +keyword PROJECT, but skip the match unless there is a WAITING tag +anywhere in the subtree belonging to the project line. + + To achieve this, you must write a function that searches the subtree +for the tag. If the tag is found, the function must return `nil' to +indicate that this match should not be skipped. If there is no such +tag, return the location of the end of the subtree, to indicate that +search should continue from there. + + (defun my-skip-unless-waiting () + "Skip trees that are not waiting" + (let ((subtree-end (save-excursion (org-end-of-subtree t)))) + (if (re-search-forward ":waiting:" subtree-end t) + nil ; tag found, do not skip + subtree-end))) ; tag not found, continue after end of subtree + + Now you may use this function in an agenda custom command, for +example like this: + + (org-add-agenda-custom-command + '("b" todo "PROJECT" + ((org-agenda-skip-function 'my-skip-unless-waiting) + (org-agenda-overriding-header "Projects waiting for something: ")))) + + Note that this also binds `org-agenda-overriding-header' to get a +meaningful header in the agenda view. + + A general way to create custom searches is to base them on a search +for entries with a certain level limit. If you want to study all +entries with your custom search function, simply do a search for +`LEVEL>0'(2), and then use `org-agenda-skip-function' to select the +entries you really want to have. + + You may also put a Lisp form into `org-agenda-skip-function'. In +particular, you may use the functions `org-agenda-skip-entry-if' and +`org-agenda-skip-subtree-if' in this form, for example: + +`(org-agenda-skip-entry-if 'scheduled)' + Skip current entry if it has been scheduled. + +`(org-agenda-skip-entry-if 'notscheduled)' + Skip current entry if it has not been scheduled. + +`(org-agenda-skip-entry-if 'deadline)' + Skip current entry if it has a deadline. + +`(org-agenda-skip-entry-if 'scheduled 'deadline)' + Skip current entry if it has a deadline, or if it is scheduled. + +`(org-agenda-skip-entry-if 'todo '("TODO" "WAITING"))' + Skip current entry if the TODO keyword is TODO or WAITING. + +`(org-agenda-skip-entry-if 'todo 'done)' + Skip current entry if the TODO keyword marks a DONE state. + +`(org-agenda-skip-entry-if 'timestamp)' + Skip current entry if it has any timestamp, may also be deadline + or scheduled. + +`(org-agenda-skip-entry-if 'regexp "regular expression")' + Skip current entry if the regular expression matches in the entry. + +`(org-agenda-skip-entry-if 'notregexp "regular expression")' + Skip current entry unless the regular expression matches. + +`(org-agenda-skip-subtree-if 'regexp "regular expression")' + Same as above, but check and skip the entire subtree. + + Therefore we could also have written the search for WAITING projects +like this, even without defining a special function: + + (org-add-agenda-custom-command + '("b" todo "PROJECT" + ((org-agenda-skip-function '(org-agenda-skip-subtree-if + 'regexp ":waiting:")) + (org-agenda-overriding-header "Projects waiting for something: ")))) + + ---------- Footnotes ---------- + + (1) The `agenda*' view is the same than `agenda' except that it only +considers _appointments_, i.e., scheduled and deadline items that have a +time specification `[h]h:mm' in their time-stamps. + + (2) Note that, when using `org-odd-levels-only', a level number +corresponds to order in the hierarchy, not to the number of stars. + + +File: org, Node: Speeding up your agendas, Next: Extracting agenda information, Prev: Special agenda views, Up: Hacking + +A.9 Speeding up your agendas +============================ + +When your Org files grow in both number and size, agenda commands may +start to become slow. Below are some tips on how to speed up the +agenda commands. + + 1. Reduce the number of Org agenda files: this will reduce the + slowness caused by accessing a hard drive. + + 2. Reduce the number of DONE and archived headlines: this way the + agenda does not need to skip them. + + 3. Inhibit the dimming of blocked tasks: + (setq org-agenda-dim-blocked-tasks nil) + + 4. Inhibit agenda files startup options: + (setq org-agenda-inhibit-startup nil) + + 5. Disable tag inheritance in agenda: + (setq org-agenda-use-tag-inheritance nil) + + You can set these options for specific agenda views only. See the +docstrings of these variables for details on why they affect the agenda +generation, and this dedicated Worg page +(http://orgmode.org/worg/agenda-optimization.html) for further +explanations. + + +File: org, Node: Extracting agenda information, Next: Using the property API, Prev: Speeding up your agendas, Up: Hacking + +A.10 Extracting agenda information +================================== + +Org provides commands to access agenda information for the command line +in Emacs batch mode. This extracted information can be sent directly +to a printer, or it can be read by a program that does further +processing of the data. The first of these commands is the function +`org-batch-agenda', that produces an agenda view and sends it as ASCII +text to STDOUT. The command takes a single string as parameter. If +the string has length 1, it is used as a key to one of the commands you +have configured in `org-agenda-custom-commands', basically any key you +can use after `C-c a'. For example, to directly print the current TODO +list, you could use + + emacs -batch -l ~/.emacs -eval '(org-batch-agenda "t")' | lpr + + If the parameter is a string with 2 or more characters, it is used +as a tags/TODO match string. For example, to print your local shopping +list (all items with the tag `shop', but excluding the tag `NewYork'), +you could use + + emacs -batch -l ~/.emacs \ + -eval '(org-batch-agenda "+shop-NewYork")' | lpr + +You may also modify parameters on the fly like this: + + emacs -batch -l ~/.emacs \ + -eval '(org-batch-agenda "a" \ + org-agenda-span (quote month) \ + org-agenda-include-diary nil \ + org-agenda-files (quote ("~/org/project.org")))' \ + | lpr + +which will produce a 30-day agenda, fully restricted to the Org file +`~/org/projects.org', not even including the diary. + + If you want to process the agenda data in more sophisticated ways, +you can use the command `org-batch-agenda-csv' to get a comma-separated +list of values for each agenda item. Each line in the output will +contain a number of fields separated by commas. The fields in a line +are: + + category The category of the item + head The headline, without TODO keyword, TAGS and PRIORITY + type The type of the agenda entry, can be + todo selected in TODO match + tagsmatch selected in tags match + diary imported from diary + deadline a deadline + scheduled scheduled + timestamp appointment, selected by timestamp + closed entry was closed on date + upcoming-deadline warning about nearing deadline + past-scheduled forwarded scheduled item + block entry has date block including date + todo The TODO keyword, if any + tags All tags including inherited ones, separated by colons + date The relevant date, like 2007-2-14 + time The time, like 15:00-16:50 + extra String with extra planning info + priority-l The priority letter if any was given + priority-n The computed numerical priority + +Time and date will only be given if a timestamp (or deadline/scheduled) +led to the selection of the item. + + A CSV list like this is very easy to use in a post-processing script. +For example, here is a Perl program that gets the TODO list from +Emacs/Org and prints all the items, preceded by a checkbox: + + #!/usr/bin/perl + + # define the Emacs command to run + $cmd = "emacs -batch -l ~/.emacs -eval '(org-batch-agenda-csv \"t\")'"; + + # run it and capture the output + $agenda = qx{$cmd 2>/dev/null}; + + # loop over all lines + foreach $line (split(/\n/,$agenda)) { + # get the individual values + ($category,$head,$type,$todo,$tags,$date,$time,$extra, + $priority_l,$priority_n) = split(/,/,$line); + # process and print + print "[ ] $head\n"; + } + + +File: org, Node: Using the property API, Next: Using the mapping API, Prev: Extracting agenda information, Up: Hacking + +A.11 Using the property API +=========================== + +Here is a description of the functions that can be used to work with +properties. + + -- Function: org-entry-properties &optional pom which + Get all properties of the entry at point-or-marker POM. + This includes the TODO keyword, the tags, time strings for + deadline, scheduled, and clocking, and any additional properties + defined in the entry. The return value is an alist. Keys may + occur multiple times if the property key was used several times. + POM may also be `nil', in which case the current entry is used. + If WHICH is `nil' or `all', get all properties. If WHICH is + `special' or `standard', only get that subclass. + + -- Function: org-entry-get pom property &optional inherit + Get value of `PROPERTY' for entry at point-or-marker `POM'. By + default, this only looks at properties defined locally in the + entry. If `INHERIT' is non-`nil' and the entry does not have the + property, then also check higher levels of the hierarchy. If + `INHERIT' is the symbol `selective', use inheritance if and only + if the setting of `org-use-property-inheritance' selects + `PROPERTY' for inheritance. + + -- Function: org-entry-delete pom property + Delete the property `PROPERTY' from entry at point-or-marker POM. + + -- Function: org-entry-put pom property value + Set `PROPERTY' to `VALUE' for entry at point-or-marker POM. + + -- Function: org-buffer-property-keys &optional include-specials + Get all property keys in the current buffer. + + -- Function: org-insert-property-drawer + Insert a property drawer for the current entry. Also + + -- Function: org-entry-put-multivalued-property pom property &rest + values + Set `PROPERTY' at point-or-marker `POM' to `VALUES'. `VALUES' + should be a list of strings. They will be concatenated, with + spaces as separators. + + -- Function: org-entry-get-multivalued-property pom property + Treat the value of the property `PROPERTY' as a + whitespace-separated list of values and return the values as a + list of strings. + + -- Function: org-entry-add-to-multivalued-property pom property value + Treat the value of the property `PROPERTY' as a + whitespace-separated list of values and make sure that `VALUE' is + in this list. + + -- Function: org-entry-remove-from-multivalued-property pom property + value + Treat the value of the property `PROPERTY' as a + whitespace-separated list of values and make sure that `VALUE' is + _not_ in this list. + + -- Function: org-entry-member-in-multivalued-property pom property + value + Treat the value of the property `PROPERTY' as a + whitespace-separated list of values and check if `VALUE' is in + this list. + + -- User Option: org-property-allowed-value-functions + Hook for functions supplying allowed values for a specific + property. The functions must take a single argument, the name of + the property, and return a flat list of allowed values. If `:ETC' + is one of the values, use the values as completion help, but allow + also other values to be entered. The functions must return `nil' + if they are not responsible for this property. + + +File: org, Node: Using the mapping API, Prev: Using the property API, Up: Hacking + +A.12 Using the mapping API +========================== + +Org has sophisticated mapping capabilities to find all entries +satisfying certain criteria. Internally, this functionality is used to +produce agenda views, but there is also an API that can be used to +execute arbitrary functions for each or selected entries. The main +entry point for this API is: + + -- Function: org-map-entries func &optional match scope &rest skip + Call `FUNC' at each headline selected by `MATCH' in `SCOPE'. + + `FUNC' is a function or a Lisp form. The function will be called + without arguments, with the cursor positioned at the beginning of + the headline. The return values of all calls to the function will + be collected and returned as a list. + + The call to `FUNC' will be wrapped into a save-excursion form, so + `FUNC' does not need to preserve point. After evaluation, the + cursor will be moved to the end of the line (presumably of the + headline of the processed entry) and search continues from there. + Under some circumstances, this may not produce the wanted results. + For example, if you have removed (e.g., archived) the current + (sub)tree it could mean that the next entry will be skipped + entirely. In such cases, you can specify the position from where + search should continue by making `FUNC' set the variable + `org-map-continue-from' to the desired buffer position. + + `MATCH' is a tags/property/todo match as it is used in the agenda + match view. Only headlines that are matched by this query will be + considered during the iteration. When `MATCH' is `nil' or `t', all + headlines will be visited by the iteration. + + `SCOPE' determines the scope of this command. It can be any of: + + nil the current buffer, respecting the restriction if any + tree the subtree started with the entry at point + region The entries within the active region, if any + file the current buffer, without restriction + file-with-archives + the current buffer, and any archives associated with it + agenda all agenda files + agenda-with-archives + all agenda files with any archive files associated with them + (file1 file2 ...) + if this is a list, all files in the list will be scanned + The remaining args are treated as settings for the skipping + facilities of the scanner. The following items can be given here: + + archive skip trees with the archive tag + comment skip trees with the COMMENT keyword + function or Lisp form + will be used as value for `org-agenda-skip-function', + so whenever the function returns t, FUNC + will not be called for that entry and search will + continue from the point where the function leaves it + + The function given to that mapping routine can really do anything +you like. It can use the property API (*note Using the property API::) +to gather more information about the entry, or in order to change +metadata in the entry. Here are a couple of functions that might be +handy: + + -- Function: org-todo &optional arg + Change the TODO state of the entry. See the docstring of the + functions for the many possible values for the argument `ARG'. + + -- Function: org-priority &optional action + Change the priority of the entry. See the docstring of this + function for the possible values for `ACTION'. + + -- Function: org-toggle-tag tag &optional onoff + Toggle the tag `TAG' in the current entry. Setting `ONOFF' to + either `on' or `off' will not toggle tag, but ensure that it is + either on or off. + + -- Function: org-promote + Promote the current entry. + + -- Function: org-demote + Demote the current entry. + + Here is a simple example that will turn all entries in the current +file with a tag `TOMORROW' into TODO entries with the keyword +`UPCOMING'. Entries in comment trees and in archive trees will be +ignored. + + (org-map-entries + '(org-todo "UPCOMING") + "+TOMORROW" 'file 'archive 'comment) + + The following example counts the number of entries with TODO keyword +`WAITING', in all agenda files. + + (length (org-map-entries t "/+WAITING" 'agenda)) + + +File: org, Node: MobileOrg, Next: History and Acknowledgments, Prev: Hacking, Up: Top + +Appendix B MobileOrg +******************** + +MobileOrg is the name of the mobile companion app for Org mode, +currently available for iOS and for Android. MobileOrg offers offline +viewing and capture support for an Org mode system rooted on a "real" +computer. It does also allow you to record changes to existing +entries. The iOS implementation (https://github.com/MobileOrg/) for the +iPhone/iPod Touch/iPad series of devices, was started by Richard +Moreland and is now in the hands Sean Escriva. Android users should +check out MobileOrg Android +(http://wiki.github.com/matburt/mobileorg-android/) by Matt Jones. The +two implementations are not identical but offer similar features. + + This appendix describes the support Org has for creating agenda +views in a format that can be displayed by MobileOrg, and for +integrating notes captured and changes made by MobileOrg into the main +system. + + For changing tags and TODO states in MobileOrg, you should have set +up the customization variables `org-todo-keywords' and `org-tag-alist' +to cover all important tags and TODO keywords, even if individual files +use only part of these. MobileOrg will also offer you states and tags +set up with in-buffer settings, but it will understand the logistics of +TODO state sets (*note Per-file keywords::) and mutually exclusive tags +(*note Setting tags::) only for those set in these variables. + +* Menu: + +* Setting up the staging area:: Where to interact with the mobile device +* Pushing to MobileOrg:: Uploading Org files and agendas +* Pulling from MobileOrg:: Integrating captured and flagged items + + +File: org, Node: Setting up the staging area, Next: Pushing to MobileOrg, Prev: MobileOrg, Up: MobileOrg + +B.1 Setting up the staging area +=============================== + +MobileOrg needs to interact with Emacs through a directory on a server. +If you are using a public server, you should consider to encrypt the +files that are uploaded to the server. This can be done with Org mode +7.02 and with MobileOrg 1.5 (iPhone version), and you need an `openssl' +installation on your system. To turn on encryption, set a password in +MobileOrg and, on the Emacs side, configure the variable +`org-mobile-use-encryption'(1). + + The easiest way to create that directory is to use a free +Dropbox.com (http://dropbox.com) account(2). When MobileOrg first +connects to your Dropbox, it will create a directory MobileOrg inside +the Dropbox. After the directory has been created, tell Emacs about it: + + (setq org-mobile-directory "~/Dropbox/MobileOrg") + + Org mode has commands to put files for MobileOrg into that directory, +and to read captured notes from there. + + ---------- Footnotes ---------- + + (1) If you can safely store the password in your Emacs setup, you +might also want to configure `org-mobile-encryption-password'. Please +read the docstring of that variable. Note that encryption will apply +only to the contents of the `.org' files. The file names themselves +will remain visible. + + (2) If you cannot use Dropbox, or if your version of MobileOrg does +not support it, you can use a webdav server. For more information, +check out the documentation of MobileOrg and also this FAQ entry +(http://orgmode.org/worg/org-faq.html#mobileorg_webdav). + + +File: org, Node: Pushing to MobileOrg, Next: Pulling from MobileOrg, Prev: Setting up the staging area, Up: MobileOrg + +B.2 Pushing to MobileOrg +======================== + +This operation copies all files currently listed in `org-mobile-files' +to the directory `org-mobile-directory'. By default this list contains +all agenda files (as listed in `org-agenda-files'), but additional files +can be included by customizing `org-mobile-files'. File names will be +staged with paths relative to `org-directory', so all files should be +inside this directory(1). + + The push operation also creates a special Org file `agendas.org' with +all custom agenda view defined by the user(2). + + Finally, Org writes the file `index.org', containing links to all +other files. MobileOrg first reads this file from the server, and then +downloads all agendas and Org files listed in it. To speed up the +download, MobileOrg will only read files whose checksums(3) have +changed. + + ---------- Footnotes ---------- + + (1) Symbolic links in `org-directory' need to have the same name +than their targets. + + (2) While creating the agendas, Org mode will force ID properties on +all referenced entries, so that these entries can be uniquely +identified if MobileOrg flags them for further action. If you do not +want to get these properties in so many entries, you can set the +variable `org-mobile-force-id-on-agenda-items' to `nil'. Org mode will +then rely on outline paths, in the hope that these will be unique +enough. + + (3) Checksums are stored automatically in the file `checksums.dat' + + +File: org, Node: Pulling from MobileOrg, Prev: Pushing to MobileOrg, Up: MobileOrg + +B.3 Pulling from MobileOrg +========================== + +When MobileOrg synchronizes with the server, it not only pulls the Org +files for viewing. It also appends captured entries and pointers to +flagged and changed entries to the file `mobileorg.org' on the server. +Org has a _pull_ operation that integrates this information into an +inbox file and operates on the pointers to flagged entries. Here is +how it works: + + 1. Org moves all entries found in `mobileorg.org'(1) and appends them + to the file pointed to by the variable + `org-mobile-inbox-for-pull'. Each captured entry and each editing + event will be a top-level entry in the inbox file. + + 2. After moving the entries, Org will attempt to implement the + changes made in MobileOrg. Some changes are applied directly and + without user interaction. Examples are all changes to tags, TODO + state, headline and body text that can be cleanly applied. + Entries that have been flagged for further action will receive a + tag `:FLAGGED:', so that they can be easily found again. When + there is a problem finding an entry or applying the change, the + pointer entry will remain in the inbox and will be marked with an + error message. You need to later resolve these issues by hand. + + 3. Org will then generate an agenda view with all flagged entries. + The user should then go through these entries and do whatever + actions are necessary. If a note has been stored while flagging + an entry in MobileOrg, that note will be displayed in the echo + area when the cursor is on the corresponding agenda line. + + `?' + Pressing `?' in that special agenda will display the full + flagging note in another window and also push it onto the + kill ring. So you could use `? z C-y C-c C-c' to store that + flagging note as a normal note in the entry. Pressing `?' + twice in succession will offer to remove the `:FLAGGED:' tag + along with the recorded flagging note (which is stored in a + property). In this way you indicate that the intended + processing for this flagged entry is finished. + + If you are not able to process all flagged entries directly, you can +always return to this agenda view(2) using `C-c a ?'. + + ---------- Footnotes ---------- + + (1) `mobileorg.org' will be empty after this operation. + + (2) Note, however, that there is a subtle difference. The view +created automatically by `M-x org-mobile-pull RET' is guaranteed to +search all files that have been addressed by the last pull. This might +include a file that is not currently in your list of agenda files. If +you later use `C-c a ?' to regenerate the view, only the current agenda +files will be searched. + + +File: org, Node: History and Acknowledgments, Next: GNU Free Documentation License, Prev: MobileOrg, Up: Top + +Appendix C History and acknowledgments +************************************** + +C.1 From Carsten +================ + +Org was born in 2003, out of frustration over the user interface of the +Emacs Outline mode. I was trying to organize my notes and projects, +and using Emacs seemed to be the natural way to go. However, having to +remember eleven different commands with two or three keys per command, +only to hide and show parts of the outline tree, that seemed entirely +unacceptable to me. Also, when using outlines to take notes, I +constantly wanted to restructure the tree, organizing it parallel to my +thoughts and plans. _Visibility cycling_ and _structure editing_ were +originally implemented in the package `outline-magic.el', but quickly +moved to the more general `org.el'. As this environment became +comfortable for project planning, the next step was adding _TODO +entries_, basic _timestamps_, and _table support_. These areas +highlighted the two main goals that Org still has today: to be a new, +outline-based, plain text mode with innovative and intuitive editing +features, and to incorporate project planning functionality directly +into a notes file. + + Since the first release, literally thousands of emails to me or to + have provided a constant stream of bug reports, +feedback, new ideas, and sometimes patches and add-on code. Many +thanks to everyone who has helped to improve this package. I am trying +to keep here a list of the people who had significant influence in +shaping one or more aspects of Org. The list may not be complete, if I +have forgotten someone, please accept my apologies and let me know. + + Before I get to this list, a few special mentions are in order: + +Bastien Guerry + Bastien has written a large number of extensions to Org (most of + them integrated into the core by now), including the LaTeX + exporter and the plain list parser. His support during the early + days, when he basically acted as co-maintainer, was central to the + success of this project. Bastien also invented Worg, helped + establishing the Web presence of Org, and sponsored hosting costs + for the orgmode.org website. + +Eric Schulte and Dan Davison + Eric and Dan are jointly responsible for the Org-babel system, + which turns Org into a multi-language environment for evaluating + code and doing literate programming and reproducible research. + +John Wiegley + John has contributed a number of great ideas and patches directly + to Org, including the attachment system (`org-attach.el'), + integration with Apple Mail (`org-mac-message.el'), hierarchical + dependencies of TODO items, habit tracking (`org-habits.el'), and + encryption (`org-crypt.el'). Also, the capture system is really + an extended copy of his great `remember.el'. + +Sebastian Rose + Without Sebastian, the HTML/XHTML publishing of Org would be the + pitiful work of an ignorant amateur. Sebastian has pushed this + part of Org onto a much higher level. He also wrote + `org-info.js', a Java script for displaying web pages derived from + Org using an Info-like or a folding interface with single-key + navigation. + +See below for the full list of contributions! Again, please let me +know what I am missing here! + +C.2 From Bastien +================ + +I (Bastien) have been maintaining Org since January 2011. This appendix +would not be complete without adding a few more acknowledgements and +thanks to Carsten's ones above. + + I am first grateful to Carsten for his trust while handing me over +the maintainership of Org. His unremitting support is what really +helped me getting more confident over time, with both the community and +the code. + + When I took over maintainership, I knew I would have to make Org more +collaborative than ever, as I would have to rely on people that are more +knowledgeable than I am on many parts of the code. Here is a list of +the persons I could rely on, they should really be considered +co-maintainers, either of the code or the community: + +Eric Schulte + Eric is maintaining the Babel parts of Org. His reactivity here + kept me away from worrying about possible bugs here and let me + focus on other parts. + +Nicolas Goaziou + Nicolas is maintaining the consistency of the deepest parts of + Org. His work on `org-element.el' and `ox.el' has been + outstanding, and opened the doors for many new ideas and features. + He rewrote many of the old exporters to use the new export engine, + and helped with documenting this major change. More importantly + (if that's possible), he has been more than reliable during all + the work done for Org 8.0, and always very reactive on the mailing + list. + +Achim Gratz + Achim rewrote the building process of Org, turning some _ad hoc_ + tools into a flexible and conceptually clean process. He + patiently coped with the many hiccups that such a change can + create for users. + +Nick Dokos + The Org mode mailing list would not be such a nice place without + Nick, who patiently helped users so many times. It is impossible + to overestimate such a great help, and the list would not be so + active without him. + + I received support from so many users that it is clearly impossible +to be fair when shortlisting a few of them, but Org's history would not +be complete if the ones above were not mentioned in this manual. + +C.3 List of contributions +========================= + + * Russel Adams came up with the idea for drawers. + + * Suvayu Ali has steadily helped on the mailing list, providing + useful feedback on many features and several patches. + + * Luis Anaya wrote `ox-man.el'. + + * Thomas Baumann wrote `org-bbdb.el' and `org-mhe.el'. + + * Michael Brand helped by reporting many bugs and testing many + features. He also implemented the distinction between empty + fields and 0-value fields in Org's spreadsheets. + + * Christophe Bataillon created the great unicorn logo that we use on + the Org mode website. + + * Alex Bochannek provided a patch for rounding timestamps. + + * Jan Böcker wrote `org-docview.el'. + + * Brad Bozarth showed how to pull RSS feed data into Org mode files. + + * Tom Breton wrote `org-choose.el'. + + * Charles Cave's suggestion sparked the implementation of templates + for Remember, which are now templates for capture. + + * Pavel Chalmoviansky influenced the agenda treatment of items with + specified time. + + * Gregory Chernov patched support for Lisp forms into table + calculations and improved XEmacs compatibility, in particular by + porting `nouline.el' to XEmacs. + + * Sacha Chua suggested copying some linking code from Planner. + + * Toby S. Cubitt contributed to the code for clock formats. + + * Baoqiu Cui contributed the DocBook exporter. It has been deleted + from Org 8.0: you can now export to Texinfo and export the `.texi' + file to DocBook using `makeinfo'. + + * Eddward DeVilla proposed and tested checkbox statistics. He also + came up with the idea of properties, and that there should be an + API for them. + + * Nick Dokos tracked down several nasty bugs. + + * Kees Dullemond used to edit projects lists directly in HTML and so + inspired some of the early development, including HTML export. He + also asked for a way to narrow wide table columns. + + * Jason Dunsmore has been maintaining the Org-Mode server at + Rackspace for several years now. He also sponsored the hosting + costs until Rackspace started to host us for free. + + * Thomas S. Dye contributed documentation on Worg and helped + integrating the Org-Babel documentation into the manual. + + * Christian Egli converted the documentation into Texinfo format, + inspired the agenda, patched CSS formatting into the HTML + exporter, and wrote `org-taskjuggler.el', which has been rewritten + by Nicolas Goaziou as `ox-taskjuggler.el' for Org 8.0. + + * David Emery provided a patch for custom CSS support in exported + HTML agendas. + + * Sean Escriva took over MobileOrg development on the iPhone + platform. + + * Nic Ferrier contributed mailcap and XOXO support. + + * Miguel A. Figueroa-Villanueva implemented hierarchical checkboxes. + + * John Foerch figured out how to make incremental search show context + around a match in a hidden outline tree. + + * Raimar Finken wrote `org-git-line.el'. + + * Mikael Fornius works as a mailing list moderator. + + * Austin Frank works as a mailing list moderator. + + * Eric Fraga drove the development of BEAMER export with ideas and + testing. + + * Barry Gidden did proofreading the manual in preparation for the + book publication through Network Theory Ltd. + + * Niels Giesen had the idea to automatically archive DONE trees. + + * Nicolas Goaziou rewrote much of the plain list code. He also wrote + `org-element.el' and `org-export.el', which was a huge step forward + in implementing a clean framework for Org exporters. + + * Kai Grossjohann pointed out key-binding conflicts with other + packages. + + * Brian Gough of Network Theory Ltd publishes the Org mode manual as + a book. + + * Bernt Hansen has driven much of the support for auto-repeating + tasks, task state change logging, and the clocktable. His clear + explanations have been critical when we started to adopt the Git + version control system. + + * Manuel Hermenegildo has contributed various ideas, small fixes and + patches. + + * Phil Jackson wrote `org-irc.el'. + + * Scott Jaderholm proposed footnotes, control over whitespace between + folded entries, and column view for properties. + + * Matt Jones wrote MobileOrg Android. + + * Tokuya Kameshima wrote `org-wl.el' and `org-mew.el'. + + * Jonathan Leech-Pepin wrote `ox-texinfo.el'. + + * Shidai Liu ("Leo") asked for embedded LaTeX and tested it. He also + provided frequent feedback and some patches. + + * Matt Lundin has proposed last-row references for table formulas + and named invisible anchors. He has also worked a lot on the FAQ. + + * David Maus wrote `org-atom.el', maintains the issues file for Org, + and is a prolific contributor on the mailing list with competent + replies, small fixes and patches. + + * Jason F. McBrayer suggested agenda export to CSV format. + + * Max Mikhanosha came up with the idea of refiling and sticky + agendas. + + * Dmitri Minaev sent a patch to set priority limits on a per-file + basis. + + * Stefan Monnier provided a patch to keep the Emacs-Lisp compiler + happy. + + * Richard Moreland wrote MobileOrg for the iPhone. + + * Rick Moynihan proposed allowing multiple TODO sequences in a file + and being able to quickly restrict the agenda to a subtree. + + * Todd Neal provided patches for links to Info files and Elisp forms. + + * Greg Newman refreshed the unicorn logo into its current form. + + * Tim O'Callaghan suggested in-file links, search options for general + file links, and TAGS. + + * Osamu Okano wrote `orgcard2ref.pl', a Perl program to create a text + version of the reference card. + + * Takeshi Okano translated the manual and David O'Toole's tutorial + into Japanese. + + * Oliver Oppitz suggested multi-state TODO items. + + * Scott Otterson sparked the introduction of descriptive text for + links, among other things. + + * Pete Phillips helped during the development of the TAGS feature, + and provided frequent feedback. + + * Francesco Pizzolante provided patches that helped speeding up the + agenda generation. + + * Martin Pohlack provided the code snippet to bundle character + insertion into bundles of 20 for undo. + + * Rackspace.com is hosting our website for free. Thank you + Rackspace! + + * T.V. Raman reported bugs and suggested improvements. + + * Matthias Rempe (Oelde) provided ideas, Windows support, and quality + control. + + * Paul Rivier provided the basic implementation of named footnotes. + He also acted as mailing list moderator for some time. + + * Kevin Rogers contributed code to access VM files on remote hosts. + + * Frank Ruell solved the mystery of the `keymapp nil' bug, a + conflict with `allout.el'. + + * Jason Riedy generalized the send-receive mechanism for Orgtbl + tables with extensive patches. + + * Philip Rooke created the Org reference card, provided lots of + feedback, developed and applied standards to the Org documentation. + + * Christian Schlauer proposed angular brackets around links, among + other things. + + * Christopher Schmidt reworked `orgstruct-mode' so that users can + enjoy folding in non-org buffers by using Org headlines in + comments. + + * Paul Sexton wrote `org-ctags.el'. + + * Linking to VM/BBDB/Gnus was first inspired by Tom Shannon's + `organizer-mode.el'. + + * Ilya Shlyakhter proposed the Archive Sibling, line numbering in + literal examples, and remote highlighting for referenced code + lines. + + * Stathis Sideris wrote the `ditaa.jar' ASCII to PNG converter that + is now packaged into Org's `contrib' directory. + + * Daniel Sinder came up with the idea of internal archiving by + locking subtrees. + + * Dale Smith proposed link abbreviations. + + * James TD Smith has contributed a large number of patches for useful + tweaks and features. + + * Adam Spiers asked for global linking commands, inspired the link + extension system, added support for mairix, and proposed the + mapping API. + + * Ulf Stegemann created the table to translate special symbols to + HTML, LaTeX, UTF-8, Latin-1 and ASCII. + + * Andy Stewart contributed code to `org-w3m.el', to copy HTML content + with links transformation to Org syntax. + + * David O'Toole wrote `org-publish.el' and drafted the manual + chapter about publishing. + + * Jambunathan K contributed the ODT exporter and rewrote the HTML + exporter. + + * Sebastien Vauban reported many issues with LaTeX and BEAMER export + and enabled source code highlighting in Gnus. + + * Stefan Vollmar organized a video-recorded talk at the + Max-Planck-Institute for Neurology. He also inspired the creation + of a concept index for HTML export. + + * Jürgen Vollmer contributed code generating the table of contents + in HTML output. + + * Samuel Wales has provided important feedback and bug reports. + + * Chris Wallace provided a patch implementing the `QUOTE' keyword. + + * David Wainberg suggested archiving, and improvements to the linking + system. + + * Carsten Wimmer suggested some changes and helped fix a bug in + linking to Gnus. + + * Roland Winkler requested additional key bindings to make Org work + on a tty. + + * Piotr Zielinski wrote `org-mouse.el', proposed agenda blocks and + contributed various ideas and code snippets. + + +File: org, Node: GNU Free Documentation License, Next: Main Index, Prev: History and Acknowledgments, Up: Top + +Appendix D GNU Free Documentation License +***************************************** + + Version 1.3, 3 November 2008 + + Copyright (C) 2000, 2001, 2002, 2007, 2008, 2013, 2014 Free Software Foundation, Inc. + `http://fsf.org/' + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + 0. PREAMBLE + + The purpose of this License is to make a manual, textbook, or other + functional and useful document "free" in the sense of freedom: to + assure everyone the effective freedom to copy and redistribute it, + with or without modifying it, either commercially or + noncommercially. Secondarily, this License preserves for the + author and publisher a way to get credit for their work, while not + being considered responsible for modifications made by others. + + This License is a kind of "copyleft", which means that derivative + works of the document must themselves be free in the same sense. + It complements the GNU General Public License, which is a copyleft + license designed for free software. + + We have designed this License in order to use it for manuals for + free software, because free software needs free documentation: a + free program should come with manuals providing the same freedoms + that the software does. But this License is not limited to + software manuals; it can be used for any textual work, regardless + of subject matter or whether it is published as a printed book. + We recommend this License principally for works whose purpose is + instruction or reference. + + 1. APPLICABILITY AND DEFINITIONS + + This License applies to any manual or other work, in any medium, + that contains a notice placed by the copyright holder saying it + can be distributed under the terms of this License. Such a notice + grants a world-wide, royalty-free license, unlimited in duration, + to use that work under the conditions stated herein. The + "Document", below, refers to any such manual or work. Any member + of the public is a licensee, and is addressed as "you". You + accept the license if you copy, modify or distribute the work in a + way requiring permission under copyright law. + + A "Modified Version" of the Document means any work containing the + Document or a portion of it, either copied verbatim, or with + modifications and/or translated into another language. + + A "Secondary Section" is a named appendix or a front-matter section + of the Document that deals exclusively with the relationship of the + publishers or authors of the Document to the Document's overall + subject (or to related matters) and contains nothing that could + fall directly within that overall subject. (Thus, if the Document + is in part a textbook of mathematics, a Secondary Section may not + explain any mathematics.) The relationship could be a matter of + historical connection with the subject or with related matters, or + of legal, commercial, philosophical, ethical or political position + regarding them. + + The "Invariant Sections" are certain Secondary Sections whose + titles are designated, as being those of Invariant Sections, in + the notice that says that the Document is released under this + License. If a section does not fit the above definition of + Secondary then it is not allowed to be designated as Invariant. + The Document may contain zero Invariant Sections. If the Document + does not identify any Invariant Sections then there are none. + + The "Cover Texts" are certain short passages of text that are + listed, as Front-Cover Texts or Back-Cover Texts, in the notice + that says that the Document is released under this License. A + Front-Cover Text may be at most 5 words, and a Back-Cover Text may + be at most 25 words. + + A "Transparent" copy of the Document means a machine-readable copy, + represented in a format whose specification is available to the + general public, that is suitable for revising the document + straightforwardly with generic text editors or (for images + composed of pixels) generic paint programs or (for drawings) some + widely available drawing editor, and that is suitable for input to + text formatters or for automatic translation to a variety of + formats suitable for input to text formatters. A copy made in an + otherwise Transparent file format whose markup, or absence of + markup, has been arranged to thwart or discourage subsequent + modification by readers is not Transparent. An image format is + not Transparent if used for any substantial amount of text. A + copy that is not "Transparent" is called "Opaque". + + Examples of suitable formats for Transparent copies include plain + ASCII without markup, Texinfo input format, LaTeX input format, + SGML or XML using a publicly available DTD, and + standard-conforming simple HTML, PostScript or PDF designed for + human modification. Examples of transparent image formats include + PNG, XCF and JPG. Opaque formats include proprietary formats that + can be read and edited only by proprietary word processors, SGML or + XML for which the DTD and/or processing tools are not generally + available, and the machine-generated HTML, PostScript or PDF + produced by some word processors for output purposes only. + + The "Title Page" means, for a printed book, the title page itself, + plus such following pages as are needed to hold, legibly, the + material this License requires to appear in the title page. For + works in formats which do not have any title page as such, "Title + Page" means the text near the most prominent appearance of the + work's title, preceding the beginning of the body of the text. + + The "publisher" means any person or entity that distributes copies + of the Document to the public. + + A section "Entitled XYZ" means a named subunit of the Document + whose title either is precisely XYZ or contains XYZ in parentheses + following text that translates XYZ in another language. (Here XYZ + stands for a specific section name mentioned below, such as + "Acknowledgements", "Dedications", "Endorsements", or "History".) + To "Preserve the Title" of such a section when you modify the + Document means that it remains a section "Entitled XYZ" according + to this definition. + + The Document may include Warranty Disclaimers next to the notice + which states that this License applies to the Document. These + Warranty Disclaimers are considered to be included by reference in + this License, but only as regards disclaiming warranties: any other + implication that these Warranty Disclaimers may have is void and + has no effect on the meaning of this License. + + 2. VERBATIM COPYING + + You may copy and distribute the Document in any medium, either + commercially or noncommercially, provided that this License, the + copyright notices, and the license notice saying this License + applies to the Document are reproduced in all copies, and that you + add no other conditions whatsoever to those of this License. You + may not use technical measures to obstruct or control the reading + or further copying of the copies you make or distribute. However, + you may accept compensation in exchange for copies. If you + distribute a large enough number of copies you must also follow + the conditions in section 3. + + You may also lend copies, under the same conditions stated above, + and you may publicly display copies. + + 3. COPYING IN QUANTITY + + If you publish printed copies (or copies in media that commonly + have printed covers) of the Document, numbering more than 100, and + the Document's license notice requires Cover Texts, you must + enclose the copies in covers that carry, clearly and legibly, all + these Cover Texts: Front-Cover Texts on the front cover, and + Back-Cover Texts on the back cover. Both covers must also clearly + and legibly identify you as the publisher of these copies. The + front cover must present the full title with all words of the + title equally prominent and visible. You may add other material + on the covers in addition. Copying with changes limited to the + covers, as long as they preserve the title of the Document and + satisfy these conditions, can be treated as verbatim copying in + other respects. + + If the required texts for either cover are too voluminous to fit + legibly, you should put the first ones listed (as many as fit + reasonably) on the actual cover, and continue the rest onto + adjacent pages. + + If you publish or distribute Opaque copies of the Document + numbering more than 100, you must either include a + machine-readable Transparent copy along with each Opaque copy, or + state in or with each Opaque copy a computer-network location from + which the general network-using public has access to download + using public-standard network protocols a complete Transparent + copy of the Document, free of added material. If you use the + latter option, you must take reasonably prudent steps, when you + begin distribution of Opaque copies in quantity, to ensure that + this Transparent copy will remain thus accessible at the stated + location until at least one year after the last time you + distribute an Opaque copy (directly or through your agents or + retailers) of that edition to the public. + + It is requested, but not required, that you contact the authors of + the Document well before redistributing any large number of + copies, to give them a chance to provide you with an updated + version of the Document. + + 4. MODIFICATIONS + + You may copy and distribute a Modified Version of the Document + under the conditions of sections 2 and 3 above, provided that you + release the Modified Version under precisely this License, with + the Modified Version filling the role of the Document, thus + licensing distribution and modification of the Modified Version to + whoever possesses a copy of it. In addition, you must do these + things in the Modified Version: + + A. Use in the Title Page (and on the covers, if any) a title + distinct from that of the Document, and from those of + previous versions (which should, if there were any, be listed + in the History section of the Document). You may use the + same title as a previous version if the original publisher of + that version gives permission. + + B. List on the Title Page, as authors, one or more persons or + entities responsible for authorship of the modifications in + the Modified Version, together with at least five of the + principal authors of the Document (all of its principal + authors, if it has fewer than five), unless they release you + from this requirement. + + C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. + + D. Preserve all the copyright notices of the Document. + + E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. + + F. Include, immediately after the copyright notices, a license + notice giving the public permission to use the Modified + Version under the terms of this License, in the form shown in + the Addendum below. + + G. Preserve in that license notice the full lists of Invariant + Sections and required Cover Texts given in the Document's + license notice. + + H. Include an unaltered copy of this License. + + I. Preserve the section Entitled "History", Preserve its Title, + and add to it an item stating at least the title, year, new + authors, and publisher of the Modified Version as given on + the Title Page. If there is no section Entitled "History" in + the Document, create one stating the title, year, authors, + and publisher of the Document as given on its Title Page, + then add an item describing the Modified Version as stated in + the previous sentence. + + J. Preserve the network location, if any, given in the Document + for public access to a Transparent copy of the Document, and + likewise the network locations given in the Document for + previous versions it was based on. These may be placed in + the "History" section. You may omit a network location for a + work that was published at least four years before the + Document itself, or if the original publisher of the version + it refers to gives permission. + + K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the + section all the substance and tone of each of the contributor + acknowledgements and/or dedications given therein. + + L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section + titles. + + M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. + + N. Do not retitle any existing section to be Entitled + "Endorsements" or to conflict in title with any Invariant + Section. + + O. Preserve any Warranty Disclaimers. + + If the Modified Version includes new front-matter sections or + appendices that qualify as Secondary Sections and contain no + material copied from the Document, you may at your option + designate some or all of these sections as invariant. To do this, + add their titles to the list of Invariant Sections in the Modified + Version's license notice. These titles must be distinct from any + other section titles. + + You may add a section Entitled "Endorsements", provided it contains + nothing but endorsements of your Modified Version by various + parties--for example, statements of peer review or that the text + has been approved by an organization as the authoritative + definition of a standard. + + You may add a passage of up to five words as a Front-Cover Text, + and a passage of up to 25 words as a Back-Cover Text, to the end + of the list of Cover Texts in the Modified Version. Only one + passage of Front-Cover Text and one of Back-Cover Text may be + added by (or through arrangements made by) any one entity. If the + Document already includes a cover text for the same cover, + previously added by you or by arrangement made by the same entity + you are acting on behalf of, you may not add another; but you may + replace the old one, on explicit permission from the previous + publisher that added the old one. + + The author(s) and publisher(s) of the Document do not by this + License give permission to use their names for publicity for or to + assert or imply endorsement of any Modified Version. + + 5. COMBINING DOCUMENTS + + You may combine the Document with other documents released under + this License, under the terms defined in section 4 above for + modified versions, provided that you include in the combination + all of the Invariant Sections of all of the original documents, + unmodified, and list them all as Invariant Sections of your + combined work in its license notice, and that you preserve all + their Warranty Disclaimers. + + The combined work need only contain one copy of this License, and + multiple identical Invariant Sections may be replaced with a single + copy. If there are multiple Invariant Sections with the same name + but different contents, make the title of each such section unique + by adding at the end of it, in parentheses, the name of the + original author or publisher of that section if known, or else a + unique number. Make the same adjustment to the section titles in + the list of Invariant Sections in the license notice of the + combined work. + + In the combination, you must combine any sections Entitled + "History" in the various original documents, forming one section + Entitled "History"; likewise combine any sections Entitled + "Acknowledgements", and any sections Entitled "Dedications". You + must delete all sections Entitled "Endorsements." + + 6. COLLECTIONS OF DOCUMENTS + + You may make a collection consisting of the Document and other + documents released under this License, and replace the individual + copies of this License in the various documents with a single copy + that is included in the collection, provided that you follow the + rules of this License for verbatim copying of each of the + documents in all other respects. + + You may extract a single document from such a collection, and + distribute it individually under this License, provided you insert + a copy of this License into the extracted document, and follow + this License in all other respects regarding verbatim copying of + that document. + + 7. AGGREGATION WITH INDEPENDENT WORKS + + A compilation of the Document or its derivatives with other + separate and independent documents or works, in or on a volume of + a storage or distribution medium, is called an "aggregate" if the + copyright resulting from the compilation is not used to limit the + legal rights of the compilation's users beyond what the individual + works permit. When the Document is included in an aggregate, this + License does not apply to the other works in the aggregate which + are not themselves derivative works of the Document. + + If the Cover Text requirement of section 3 is applicable to these + copies of the Document, then if the Document is less than one half + of the entire aggregate, the Document's Cover Texts may be placed + on covers that bracket the Document within the aggregate, or the + electronic equivalent of covers if the Document is in electronic + form. Otherwise they must appear on printed covers that bracket + the whole aggregate. + + 8. TRANSLATION + + Translation is considered a kind of modification, so you may + distribute translations of the Document under the terms of section + 4. Replacing Invariant Sections with translations requires special + permission from their copyright holders, but you may include + translations of some or all Invariant Sections in addition to the + original versions of these Invariant Sections. You may include a + translation of this License, and all the license notices in the + Document, and any Warranty Disclaimers, provided that you also + include the original English version of this License and the + original versions of those notices and disclaimers. In case of a + disagreement between the translation and the original version of + this License or a notice or disclaimer, the original version will + prevail. + + If a section in the Document is Entitled "Acknowledgements", + "Dedications", or "History", the requirement (section 4) to + Preserve its Title (section 1) will typically require changing the + actual title. + + 9. TERMINATION + + You may not copy, modify, sublicense, or distribute the Document + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense, or distribute it is void, + and will automatically terminate your rights under this License. + + However, if you cease all violation of this License, then your + license from a particular copyright holder is reinstated (a) + provisionally, unless and until the copyright holder explicitly + and finally terminates your license, and (b) permanently, if the + copyright holder fails to notify you of the violation by some + reasonable means prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is + reinstated permanently if the copyright holder notifies you of the + violation by some reasonable means, this is the first time you have + received notice of violation of this License (for any work) from + that copyright holder, and you cure the violation prior to 30 days + after your receipt of the notice. + + Termination of your rights under this section does not terminate + the licenses of parties who have received copies or rights from + you under this License. If your rights have been terminated and + not permanently reinstated, receipt of a copy of some or all of + the same material does not give you any rights to use it. + + 10. FUTURE REVISIONS OF THIS LICENSE + + The Free Software Foundation may publish new, revised versions of + the GNU Free Documentation License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. See + `http://www.gnu.org/copyleft/'. + + Each version of the License is given a distinguishing version + number. If the Document specifies that a particular numbered + version of this License "or any later version" applies to it, you + have the option of following the terms and conditions either of + that specified version or of any later version that has been + published (not as a draft) by the Free Software Foundation. If + the Document does not specify a version number of this License, + you may choose any version ever published (not as a draft) by the + Free Software Foundation. If the Document specifies that a proxy + can decide which future versions of this License can be used, that + proxy's public statement of acceptance of a version permanently + authorizes you to choose that version for the Document. + + 11. RELICENSING + + "Massive Multiauthor Collaboration Site" (or "MMC Site") means any + World Wide Web server that publishes copyrightable works and also + provides prominent facilities for anybody to edit those works. A + public wiki that anybody can edit is an example of such a server. + A "Massive Multiauthor Collaboration" (or "MMC") contained in the + site means any set of copyrightable works thus published on the MMC + site. + + "CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 + license published by Creative Commons Corporation, a not-for-profit + corporation with a principal place of business in San Francisco, + California, as well as future copyleft versions of that license + published by that same organization. + + "Incorporate" means to publish or republish a Document, in whole or + in part, as part of another Document. + + An MMC is "eligible for relicensing" if it is licensed under this + License, and if all works that were first published under this + License somewhere other than this MMC, and subsequently + incorporated in whole or in part into the MMC, (1) had no cover + texts or invariant sections, and (2) were thus incorporated prior + to November 1, 2008. + + The operator of an MMC Site may republish an MMC contained in the + site under CC-BY-SA on the same site at any time before August 1, + 2009, provided the MMC is eligible for relicensing. + + +ADDENDUM: How to use this License for your documents +==================================================== + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and license +notices just after the title page: + + Copyright (C) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. A copy of the license is included in the section entitled ``GNU + Free Documentation License''. + + If you have Invariant Sections, Front-Cover Texts and Back-Cover +Texts, replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with + the Front-Cover Texts being LIST, and with the Back-Cover Texts + being LIST. + + If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + + If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, to +permit their use in free software. + + +File: org, Node: Main Index, Next: Key Index, Prev: GNU Free Documentation License, Up: Top + +Concept index +************* + +[index] +* Menu: + +* #+ARCHIVE: Moving subtrees. (line 30) +* #+ASCII: ASCII/Latin-1/UTF-8 export. + (line 41) +* #+ATTR_ASCII: ASCII/Latin-1/UTF-8 export. + (line 52) +* #+ATTR_BEAMER: Beamer export. (line 124) +* #+ATTR_HTML <1>: Images in HTML export. + (line 24) +* #+ATTR_HTML <2>: Tables in HTML export. + (line 12) +* #+ATTR_HTML: Links in HTML export. + (line 21) +* #+ATTR_LATEX: LaTeX specific attributes. + (line 6) +* #+ATTR_ODT <1>: Customizing tables in ODT export. + (line 6) +* #+ATTR_ODT <2>: Images in ODT export. + (line 30) +* #+ATTR_ODT: Tables in ODT export. + (line 17) +* #+ATTR_TEXINFO: Texinfo specific attributes. + (line 6) +* #+BEAMER: Beamer export. (line 109) +* #+BEAMER_COLOR_THEME: Beamer export. (line 89) +* #+BEAMER_FONT_THEME: Beamer export. (line 89) +* #+BEAMER_INNER_THEME: Beamer export. (line 89) +* #+BEAMER_OUTER_THEME: Beamer export. (line 89) +* #+BEAMER_THEME: Beamer export. (line 89) +* #+BEGIN, clocktable: The clock table. (line 36) +* #+BEGIN, columnview: Capturing column view. + (line 11) +* #+BEGIN:dynamic block: Dynamic blocks. (line 15) +* #+BEGIN_ASCII: ASCII/Latin-1/UTF-8 export. + (line 41) +* #+BEGIN_BEAMER: Beamer export. (line 109) +* #+BEGIN_CENTER: Paragraphs. (line 31) +* #+BEGIN_COMMENT: Comment lines. (line 6) +* #+BEGIN_EXAMPLE: Literal examples. (line 8) +* #+BEGIN_HTML: Quoting HTML tags. (line 12) +* #+BEGIN_LATEX: Quoting LaTeX code. (line 11) +* #+BEGIN_QUOTE: Paragraphs. (line 26) +* #+BEGIN_SRC <1>: Structure of code blocks. + (line 6) +* #+BEGIN_SRC: Literal examples. (line 28) +* #+BEGIN_TEXINFO: Quoting Texinfo code. + (line 9) +* #+BEGIN_VERSE: Paragraphs. (line 13) +* #+BIND: Export settings. (line 187) +* #+CALL: Evaluating code blocks. + (line 22) +* #+CAPTION <1>: Images in HTML export. + (line 24) +* #+CAPTION <2>: Tables in HTML export. + (line 12) +* #+CAPTION: Images and tables. (line 6) +* #+CATEGORY: Categories. (line 6) +* #+CINDEX: Indices. (line 6) +* #+COLUMNS: Scope of column definitions. + (line 8) +* #+CONSTANTS: References. (line 102) +* #+DRAWERS: Drawers. (line 6) +* #+FILETAGS: Tag inheritance. (line 20) +* #+FINDEX: Indices. (line 6) +* #+HEADER:: Code block specific header arguments. + (line 30) +* #+HEADERS:: Code block specific header arguments. + (line 30) +* #+HTML: Quoting HTML tags. (line 12) +* #+HTML_HEAD: CSS support. (line 47) +* #+HTML_HEAD_EXTRA: CSS support. (line 47) +* #+HTML_INCLUDE_STYLE: CSS support. (line 41) +* #+INCLUDE: Include files. (line 7) +* #+INFOJS_OPT: JavaScript support. (line 23) +* #+KINDEX: Indices. (line 6) +* #+LATEX: Quoting LaTeX code. (line 11) +* #+LATEX_CLASS: Header and sectioning. + (line 22) +* #+LATEX_CLASS_OPTIONS: Header and sectioning. + (line 22) +* #+LATEX_HEADER: Header and sectioning. + (line 27) +* #+LATEX_HEADER_EXTRA: Header and sectioning. + (line 27) +* #+LINK: Link abbreviations. (line 49) +* #+MACRO: Macro replacement. (line 6) +* #+NAME <1>: Structure of code blocks. + (line 6) +* #+NAME <2>: Images and tables. (line 6) +* #+NAME: Internal links. (line 21) +* #+NAME, for table: References. (line 123) +* #+ODT_STYLES_FILE: Applying custom styles. + (line 28) +* #+OPTIONS: Headings and sections. + (line 14) +* #+ORGLST: Radio lists. (line 25) +* #+ORGTBL: Radio tables. (line 17) +* #+ORGTBL, SEND: A LaTeX example. (line 14) +* #+PINDEX: Indices. (line 6) +* #+PLOT: Org-Plot. (line 6) +* #+PRIORITIES: Priorities. (line 44) +* #+PROPERTY: Property syntax. (line 42) +* #+RESULTS: Evaluating code blocks. + (line 6) +* #+SEQ_TODO: Per-file keywords. (line 6) +* #+SETUPFILE <1>: In-buffer settings. (line 61) +* #+SETUPFILE: Export settings. (line 13) +* #+STARTUP: In-buffer settings. (line 74) +* #+SUBAUTHOR: Document preamble. (line 42) +* #+SUBTITLE: Document preamble. (line 35) +* #+TAGS: Setting tags. (line 29) +* #+TBLFM <1>: In-buffer settings. (line 184) +* #+TBLFM <2>: Editing and debugging formulas. + (line 99) +* #+TBLFM: Field and range formulas. + (line 12) +* #+TBLFM line, multiple: Editing and debugging formulas. + (line 99) +* #+TBLFM, switching: Editing and debugging formulas. + (line 99) +* #+TEXINFO: Quoting Texinfo code. + (line 9) +* #+TEXINFO_CLASS <1>: Headings and sectioning structure. + (line 6) +* #+TEXINFO_CLASS: Document preamble. (line 22) +* #+TEXINFO_DIR_CATEGORY: Document preamble. (line 69) +* #+TEXINFO_DIR_DESC: Document preamble. (line 69) +* #+TEXINFO_DIR_TITLE: Document preamble. (line 69) +* #+TEXINFO_FILENAME: Document preamble. (line 16) +* #+TEXINFO_HEADER: Document preamble. (line 22) +* #+TEXINFO_PRINTED_TITLE: Document preamble. (line 35) +* #+TINDEX: Indices. (line 6) +* #+TITLE: Document title. (line 8) +* #+TOC: Table of contents. (line 6) +* #+TODO: Per-file keywords. (line 6) +* #+TYP_TODO: Per-file keywords. (line 6) +* #+VINDEX: Indices. (line 6) +* abbreviation, links: Link abbreviations. (line 6) +* abstract, in LaTeX export: LaTeX specific attributes. + (line 180) +* acknowledgments: History and Acknowledgments. + (line 6) +* action, for publishing: Publishing action. (line 6) +* activation: Activation. (line 6) +* active region <1>: ODT export commands. (line 9) +* active region <2>: Built-in table editor. + (line 156) +* active region: Structure editing. (line 137) +* add-on packages: Add-on packages. (line 6) +* add-ons, context-sensitive commands: Context-sensitive commands. + (line 6) +* agenda: Weekly/daily agenda. (line 6) +* agenda dispatcher: Agenda dispatcher. (line 6) +* agenda files: Agenda files. (line 6) +* agenda files, removing buffers: Agenda commands. (line 521) +* agenda views: Agenda Views. (line 6) +* agenda views, custom: Custom agenda views. (line 6) +* agenda views, exporting <1>: Exporting Agenda Views. + (line 6) +* agenda views, exporting: Agenda commands. (line 507) +* agenda views, main example: Storing searches. (line 9) +* agenda views, optimization: Speeding up your agendas. + (line 6) +* agenda views, user-defined: Special agenda views. + (line 6) +* agenda*, as an agenda views: Storing searches. (line 9) +* agenda, as an agenda views: Storing searches. (line 9) +* agenda, column view: Agenda column view. (line 6) +* agenda, pipe: Extracting agenda information. + (line 6) +* agenda, with block views: Block agenda. (line 6) +* align, STARTUP keyword: In-buffer settings. (line 94) +* alignment in tables: Column width and alignment. + (line 6) +* anniversaries, from BBDB: Weekly/daily agenda. (line 73) +* API, for mapping: Using the mapping API. + (line 6) +* API, for properties <1>: Using the property API. + (line 6) +* API, for properties: Property API. (line 6) +* appointment <1>: Weekly/daily agenda. (line 107) +* appointment: Timestamps. (line 14) +* appointment reminders: Weekly/daily agenda. (line 107) +* appt.el: Weekly/daily agenda. (line 107) +* archive locations: Moving subtrees. (line 20) +* archiving: Archiving. (line 6) +* ASCII export: ASCII/Latin-1/UTF-8 export. + (line 6) +* Atom feeds: RSS Feeds. (line 6) +* attachments: Attachments. (line 6) +* author: Feedback. (line 6) +* autoload: Activation. (line 6) +* babel, languages: Languages. (line 6) +* babel, library of: Library of Babel. (line 6) +* backtrace of an error: Feedback. (line 65) +* Baur, Steven L.: Cooperation. (line 74) +* BBDB links: External links. (line 6) +* BBDB, anniversaries: Weekly/daily agenda. (line 73) +* Beamer export: Beamer export. (line 6) +* block agenda: Block agenda. (line 6) +* blocking, of checkboxes: Checkboxes. (line 46) +* blocks, folding: Blocks. (line 6) +* bold text, markup rules: Emphasis and monospace. + (line 6) +* Boolean logic, for tag/property searches: Matching tags and properties. + (line 34) +* bug reports: Feedback. (line 6) +* C-c C-c, overview: The very busy C-c C-c key. + (line 6) +* calc package: The spreadsheet. (line 6) +* calc.el: Cooperation. (line 6) +* calculations, in tables <1>: The spreadsheet. (line 6) +* calculations, in tables: Built-in table editor. + (line 156) +* calendar commands, from agenda: Agenda commands. (line 456) +* calendar integration: Weekly/daily agenda. (line 32) +* calendar, for selecting date: The date/time prompt. + (line 76) +* capture <1>: Capture. (line 6) +* capture: Capture - Refile - Archive. + (line 6) +* capturing, from agenda: Agenda commands. (line 349) +* category: Categories. (line 6) +* category filtering, in agenda: Filtering/limiting agenda items. + (line 17) +* category, require for tags/property match: Matching tags and properties. + (line 71) +* CDLaTeX: CDLaTeX mode. (line 6) +* cdlatex.el: Cooperation. (line 29) +* checkbox blocking: Checkboxes. (line 46) +* checkbox statistics: Checkboxes. (line 30) +* checkboxes: Checkboxes. (line 6) +* checkboxes and TODO dependencies: TODO dependencies. (line 44) +* children, subtree visibility state: Global and local cycling. + (line 10) +* clean outline view: Clean view. (line 6) +* clocking time: Clocking work time. (line 6) +* clocktable, dynamic block: The clock table. (line 6) +* code block, batch execution: Batch execution. (line 6) +* code block, editing: Editing source code. (line 6) +* code block, evaluating: Evaluating code blocks. + (line 6) +* code block, exporting: Exporting code blocks. + (line 6) +* code block, extracting source code: Extracting source code. + (line 6) +* code block, header arguments: Header arguments. (line 6) +* code block, key bindings: Key bindings and useful functions. + (line 6) +* code block, languages: Languages. (line 6) +* code block, library: Library of Babel. (line 6) +* code block, noweb reference: Noweb reference syntax. + (line 6) +* code block, results of evaluation: Results of evaluation. + (line 6) +* code block, structure: Structure of code blocks. + (line 6) +* code line references, markup rules: Literal examples. (line 6) +* code text, markup rules: Emphasis and monospace. + (line 6) +* column formula: Column formulas. (line 6) +* column view, for properties: Defining columns. (line 6) +* column view, in agenda: Agenda column view. (line 6) +* column, of field coordinates: References. (line 86) +* commands, in agenda buffer: Agenda commands. (line 6) +* comment lines: Comment lines. (line 6) +* completion, of dictionary words: Completion. (line 6) +* completion, of file names: Handling links. (line 89) +* completion, of link abbreviations: Completion. (line 6) +* completion, of links: Handling links. (line 66) +* completion, of option keywords <1>: Completion. (line 6) +* completion, of option keywords: Per-file keywords. (line 24) +* completion, of property keys: Completion. (line 6) +* completion, of tags <1>: Completion. (line 6) +* completion, of tags: Setting tags. (line 11) +* completion, of TeX symbols: Completion. (line 6) +* completion, of TODO keywords <1>: Completion. (line 6) +* completion, of TODO keywords: Workflow states. (line 15) +* constants, in calculations: References. (line 102) +* constants.el: Cooperation. (line 17) +* constcgs, STARTUP keyword: In-buffer settings. (line 154) +* constSI, STARTUP keyword: In-buffer settings. (line 154) +* content, STARTUP keyword <1>: In-buffer settings. (line 80) +* content, STARTUP keyword: Initial visibility. (line 6) +* contents, global visibility state: Global and local cycling. + (line 22) +* context-sensitive commands, hooks: Context-sensitive commands. + (line 6) +* continuous clocking: Resolving idle time. (line 78) +* convert: Configuring a document converter. + (line 6) +* converter: Configuring a document converter. + (line 6) +* coordinates, of field: References. (line 86) +* copying notes: Refile and copy. (line 6) +* copying, of subtrees: Structure editing. (line 6) +* Countdown timer: Countdown timer. (line 6) +* creating timestamps: Creating timestamps. (line 6) +* CSS, for HTML export: CSS support. (line 6) +* CUA.el: Conflicts. (line 19) +* custom agenda views: Custom agenda views. (line 6) +* custom date/time format: Custom time format. (line 6) +* custom search strings: Custom searches. (line 6) +* customization: Customization. (line 6) +* customtime, STARTUP keyword: In-buffer settings. (line 150) +* cutting, of subtrees: Structure editing. (line 6) +* cycling, in plain lists: Plain lists. (line 69) +* cycling, of agenda files: Agenda files. (line 22) +* cycling, of TODO states: TODO basics. (line 14) +* cycling, visibility: Visibility cycling. (line 6) +* daily agenda: Weekly/daily agenda. (line 6) +* date format, custom: Custom time format. (line 6) +* date range: Timestamps. (line 43) +* date stamp: Dates and Times. (line 6) +* date stamps: Timestamps. (line 6) +* date tree: Using capture. (line 9) +* date, reading in minibuffer: The date/time prompt. + (line 6) +* dates: Dates and Times. (line 6) +* Davison, Dan: Working With Source Code. + (line 6) +* DEADLINE keyword: Deadlines and scheduling. + (line 9) +* deadlines: Timestamps. (line 6) +* debugging, of table formulas: Editing and debugging formulas. + (line 132) +* demotion, of subtrees: Structure editing. (line 6) +* dependencies, of TODO states: TODO dependencies. (line 6) +* diary entries, creating from agenda: Agenda commands. (line 461) +* diary integration: Weekly/daily agenda. (line 32) +* dictionary word completion: Completion. (line 6) +* directories, for publishing: Sources and destinations. + (line 6) +* dispatching agenda commands: Agenda dispatcher. (line 6) +* display changing, in agenda: Agenda commands. (line 64) +* doc, docx, rtf: Configuring a document converter. + (line 6) +* document structure: Document Structure. (line 6) +* document title, markup rules: Document title. (line 6) +* Dominik, Carsten: Cooperation. (line 17) +* DONE, final TODO keyword: Per-file keywords. (line 27) +* dragging, agenda lines: Agenda commands. (line 354) +* drawer, for properties: Property syntax. (line 6) +* drawer, for state change recording: Tracking TODO state changes. + (line 6) +* drawers: Drawers. (line 6) +* Duration, computing: Durations and time values. + (line 6) +* dvipng <1>: Working with LaTeX math snippets. + (line 44) +* dvipng: Math formatting in HTML export. + (line 6) +* dynamic blocks: Dynamic blocks. (line 6) +* dynamic indentation: Clean view. (line 6) +* ecomplete.el: Conflicts. (line 39) +* editing tables: Tables. (line 6) +* editing, of table formulas: Editing and debugging formulas. + (line 6) +* edits, catching invisible: Catching invisible edits. + (line 6) +* effort estimates: Effort estimates. (line 6) +* effort filtering, in agenda: Filtering/limiting agenda items. + (line 17) +* Elisp links: External links. (line 6) +* ELPA: Activation. (line 6) +* emacsserver: Protocols. (line 6) +* embedding images in ODT: Images in ODT export. + (line 6) +* entitiesplain, STARTUP keyword: In-buffer settings. (line 177) +* entitiespretty, STARTUP keyword <1>: In-buffer settings. (line 177) +* entitiespretty, STARTUP keyword: Special symbols. (line 31) +* evaluate time range: Creating timestamps. (line 62) +* even, STARTUP keyword: In-buffer settings. (line 140) +* export back-ends, built-in: Other built-in back-ends. + (line 6) +* Export, back-ends: Export back-ends. (line 6) +* Export, dispatcher: The Export Dispatcher. + (line 6) +* export, OpenDocument: OpenDocument Text export. + (line 6) +* Export, settings: Export settings. (line 6) +* Export, writing back-ends: Adding export back-ends. + (line 6) +* exporting: Exporting. (line 6) +* exporting agenda views <1>: Exporting Agenda Views. + (line 13) +* exporting agenda views: Agenda commands. (line 507) +* exporting, not: Comment lines. (line 6) +* extended TODO keywords: TODO extensions. (line 6) +* external archiving: Moving subtrees. (line 6) +* external links: External links. (line 6) +* external links, in HTML export: Links in HTML export. + (line 6) +* faces, for TODO keywords: Faces for TODO keywords. + (line 6) +* FAQ: Summary. (line 53) +* feedback: Feedback. (line 6) +* field coordinates: References. (line 86) +* field formula: Field and range formulas. + (line 6) +* field references: References. (line 15) +* file links: External links. (line 6) +* file links, searching: Search options. (line 6) +* file name completion: Handling links. (line 89) +* files for agenda: Agenda files. (line 6) +* files, adding to agenda list: Agenda files. (line 15) +* files, selecting for publishing: Selecting files. (line 6) +* filladapt.el: Conflicts. (line 50) +* filtering, by tag, category, top headline and effort, in agenda: Filtering/limiting agenda items. + (line 17) +* Filters, exporting: Advanced configuration. + (line 32) +* fnadjust, STARTUP keyword: In-buffer settings. (line 160) +* fnauto, STARTUP keyword: In-buffer settings. (line 160) +* fnconfirm, STARTUP keyword: In-buffer settings. (line 160) +* fninline, STARTUP keyword: In-buffer settings. (line 160) +* fnlocal, STARTUP keyword: In-buffer settings. (line 160) +* fnplain, STARTUP keyword: In-buffer settings. (line 160) +* fnprompt, STARTUP keyword: In-buffer settings. (line 160) +* folded, subtree visibility state: Global and local cycling. + (line 10) +* folding, sparse trees: Sparse trees. (line 6) +* following links: Handling links. (line 101) +* footnote.el <1>: Cooperation. (line 74) +* footnote.el: Footnote markup. (line 6) +* footnotes: Footnotes. (line 6) +* footnotes, markup rules: Footnote markup. (line 6) +* format specifier: Formula syntax for Calc. + (line 14) +* format, of links: Link format. (line 6) +* formatting source code, markup rules: Literal examples. (line 23) +* formula debugging: Editing and debugging formulas. + (line 132) +* formula editing: Editing and debugging formulas. + (line 6) +* formula syntax, Calc: Formula syntax for Calc. + (line 6) +* formula, for individual table field: Field and range formulas. + (line 6) +* formula, for range of fields: Field and range formulas. + (line 6) +* formula, for table column: Column formulas. (line 6) +* formula, in tables: Built-in table editor. + (line 156) +* Gillespie, Dave: Cooperation. (line 6) +* global cycling: Global and local cycling. + (line 22) +* global key bindings: Activation. (line 6) +* global TODO list: Global TODO list. (line 6) +* global visibility states: Global and local cycling. + (line 22) +* Gnus links: External links. (line 6) +* graph, in tables: Org-Plot. (line 6) +* group tags: Tag groups. (line 6) +* group tags, as regular expressions: Matching tags and properties. + (line 65) +* grouping columns in tables: Column groups. (line 6) +* habits: Tracking your habits. + (line 6) +* hacking: Hacking. (line 6) +* header, for LaTeX files: Header and sectioning. + (line 6) +* headings and sections, markup rules: Headings and sections. + (line 6) +* headline navigation: Motion. (line 6) +* headline tagging: Tags. (line 6) +* headline, promotion and demotion: Structure editing. (line 6) +* headlines: Headlines. (line 6) +* hide text: Visibility cycling. (line 6) +* hideblocks, STARTUP keyword <1>: In-buffer settings. (line 172) +* hideblocks, STARTUP keyword: Blocks. (line 13) +* hidestars, STARTUP keyword: In-buffer settings. (line 140) +* hiding leading stars: Clean view. (line 6) +* history: History and Acknowledgments. + (line 6) +* hooks: Hooks. (line 6) +* horizontal rules, in ASCII export: ASCII/Latin-1/UTF-8 export. + (line 52) +* horizontal rules, in LaTeX export: LaTeX specific attributes. + (line 217) +* horizontal rules, markup rules: Horizontal rules. (line 6) +* HTML entities: Special symbols. (line 6) +* HTML export: HTML export. (line 6) +* HTML export, CSS: CSS support. (line 6) +* HTML, and Orgtbl mode: Translator functions. + (line 6) +* hyperlinks: Hyperlinks. (line 6) +* hyperlinks, adding new types: Adding hyperlink types. + (line 6) +* iCalendar export: iCalendar export. (line 6) +* identify, ImageMagick: Images in ODT export. + (line 33) +* idle, resolve, dangling: Resolving idle time. (line 9) +* imagemagick <1>: Working with LaTeX math snippets. + (line 44) +* imagemagick: Math formatting in HTML export. + (line 6) +* images, embedding in ODT: Images in ODT export. + (line 6) +* images, inline in HTML: Images in HTML export. + (line 6) +* images, inline in LaTeX: LaTeX specific attributes. + (line 100) +* images, inlining: Handling links. (line 136) +* imenu.el: Cooperation. (line 33) +* in-buffer settings: In-buffer settings. (line 6) +* inactive timestamp: Timestamps. (line 52) +* include files, markup rules: Include files. (line 6) +* indent, STARTUP keyword: In-buffer settings. (line 86) +* index entries, for publishing: Index entries. (line 6) +* index, in a publishing project: Generating an index. (line 6) +* Info links: External links. (line 6) +* inheritance, of properties: Property inheritance. + (line 6) +* inheritance, of tags: Tag inheritance. (line 6) +* inlined images, markup rules: Images and tables. (line 22) +* inlineimages, STARTUP keyword <1>: In-buffer settings. (line 101) +* inlineimages, STARTUP keyword: Handling links. (line 136) +* inlining images: Handling links. (line 136) +* inlining images in HTML: Images in HTML export. + (line 6) +* inlining images in LaTeX: LaTeX specific attributes. + (line 100) +* inserting links: Handling links. (line 66) +* insertion, of templates: Easy Templates. (line 6) +* installation: Installation. (line 6) +* internal links: Internal links. (line 6) +* internal links, in HTML export: Links in HTML export. + (line 6) +* introduction: Introduction. (line 6) +* iPhone: MobileOrg. (line 6) +* IRC links: External links. (line 6) +* italic text, markup rules: Emphasis and monospace. + (line 6) +* jumping, to headlines: Motion. (line 6) +* key bindings, global: Activation. (line 6) +* keyword options: Per-file keywords. (line 6) +* LaTeX class: Header and sectioning. + (line 6) +* LaTeX entities: Special symbols. (line 6) +* LaTeX export: LaTeX and PDF export. + (line 6) +* LaTeX fragments: LaTeX fragments. (line 6) +* LaTeX fragments, markup rules: Special symbols. (line 6) +* LaTeX fragments, preview: Previewing LaTeX fragments. + (line 6) +* LaTeX header: Header and sectioning. + (line 6) +* LaTeX interpretation: Embedded LaTeX. (line 6) +* LaTeX sectioning structure: Header and sectioning. + (line 6) +* LaTeX, and Orgtbl mode: A LaTeX example. (line 6) +* latexpreview, STARTUP keyword: In-buffer settings. (line 108) +* Latin-1 export: ASCII/Latin-1/UTF-8 export. + (line 6) +* level, require for tags/property match: Matching tags and properties. + (line 71) +* LibreOffice <1>: Extending ODT export. + (line 11) +* LibreOffice: OpenDocument Text export. + (line 6) +* limits, in agenda: Filtering/limiting agenda items. + (line 118) +* link abbreviations: Link abbreviations. (line 6) +* link abbreviations, completion of: Completion. (line 6) +* link completion: Handling links. (line 66) +* link format: Link format. (line 6) +* links, external: External links. (line 6) +* links, finding next/previous: Handling links. (line 156) +* links, handling: Handling links. (line 6) +* links, in HTML export: Links in HTML export. + (line 6) +* links, in ODT export: Links in ODT export. (line 6) +* links, internal: Internal links. (line 6) +* links, publishing: Publishing links. (line 6) +* links, radio targets: Radio targets. (line 6) +* links, returning to: Handling links. (line 149) +* Lisp forms, as table formulas: Formula syntax for Lisp. + (line 6) +* lists, in other modes: Tables in arbitrary syntax. + (line 6) +* lists, markup rules: Lists. (line 6) +* lists, ordered: Plain lists. (line 6) +* lists, plain: Plain lists. (line 6) +* literal examples, markup rules: Literal examples. (line 6) +* logdone, STARTUP keyword: In-buffer settings. (line 114) +* logdrawer, STARTUP keyword: In-buffer settings. (line 114) +* logging, of progress: Progress logging. (line 6) +* lognoteclock-out, STARTUP keyword: In-buffer settings. (line 114) +* lognotedone, STARTUP keyword: In-buffer settings. (line 114) +* lognoteredeadline, STARTUP keyword: In-buffer settings. (line 114) +* lognoterefile, STARTUP keyword: In-buffer settings. (line 114) +* lognoterepeat, STARTUP keyword: In-buffer settings. (line 114) +* lognotereschedule, STARTUP keyword: In-buffer settings. (line 114) +* logredeadline, STARTUP keyword: In-buffer settings. (line 114) +* logrefile, STARTUP keyword: In-buffer settings. (line 114) +* logrepeat, STARTUP keyword: In-buffer settings. (line 114) +* logreschedule, STARTUP keyword: In-buffer settings. (line 114) +* logstatesreversed, STARTUP keyword: In-buffer settings. (line 114) +* lookup functions in tables: Lookup functions. (line 6) +* Ludlam, Eric M.: Cooperation. (line 45) +* macro replacement, during export: Macro replacement. (line 6) +* maintainer: Feedback. (line 6) +* mapping entries, API: Using the mapping API. + (line 6) +* mark ring: Handling links. (line 145) +* Markdown export: Markdown export. (line 6) +* marking characters, tables: Advanced features. (line 39) +* match view: Matching tags and properties. + (line 6) +* matching, of properties: Matching tags and properties. + (line 6) +* matching, of tags: Matching tags and properties. + (line 6) +* matching, tags: Tags. (line 6) +* math symbols: Special symbols. (line 6) +* MathJax: Math formatting in HTML export. + (line 6) +* MathML: Working with LaTeX math snippets. + (line 9) +* MH-E links: External links. (line 6) +* minor mode for structure editing: Orgstruct mode. (line 6) +* minor mode for tables: Orgtbl mode. (line 6) +* MobileOrg: MobileOrg. (line 6) +* mode, for calc: Formula syntax for Calc. + (line 14) +* motion commands in agenda: Agenda commands. (line 19) +* motion, between headlines: Motion. (line 6) +* name, of column or field: References. (line 102) +* named references: References. (line 102) +* names as TODO keywords: TODO types. (line 6) +* narrow columns in tables: Column width and alignment. + (line 6) +* noalign, STARTUP keyword: In-buffer settings. (line 94) +* nofnadjust, STARTUP keyword: In-buffer settings. (line 160) +* nofninline, STARTUP keyword: In-buffer settings. (line 160) +* nohideblocks, STARTUP keyword <1>: In-buffer settings. (line 172) +* nohideblocks, STARTUP keyword: Blocks. (line 13) +* noindent, STARTUP keyword: In-buffer settings. (line 86) +* noinlineimages, STARTUP keyword <1>: In-buffer settings. (line 101) +* noinlineimages, STARTUP keyword: Handling links. (line 136) +* nolatexpreview, STARTUP keyword: In-buffer settings. (line 108) +* nologdone, STARTUP keyword: In-buffer settings. (line 114) +* nologdrawer, STARTUP keyword: In-buffer settings. (line 114) +* nolognoteclock-out, STARTUP keyword: In-buffer settings. (line 114) +* nologredeadline, STARTUP keyword: In-buffer settings. (line 114) +* nologrefile, STARTUP keyword: In-buffer settings. (line 114) +* nologrepeat, STARTUP keyword: In-buffer settings. (line 114) +* nologreschedule, STARTUP keyword: In-buffer settings. (line 114) +* nologstatesreversed, STARTUP keyword: In-buffer settings. (line 114) +* occur, command: Sparse trees. (line 6) +* occur-tree: Storing searches. (line 9) +* odd, STARTUP keyword: In-buffer settings. (line 140) +* odd-levels-only outlines: Clean view. (line 6) +* ODT: OpenDocument Text export. + (line 6) +* OpenDocument: OpenDocument Text export. + (line 6) +* option keyword completion: Completion. (line 6) +* options, for custom agenda views: Setting Options. (line 6) +* options, for customization: Customization. (line 6) +* options, for publishing: Publishing options. (line 6) +* ordered lists: Plain lists. (line 6) +* Org export: Org export. (line 6) +* Org mode, turning on: Activation. (line 27) +* Org syntax: Org syntax. (line 6) +* org-agenda, command: Weekly/daily agenda. (line 9) +* org-capture-last-stored: Using capture. (line 50) +* org-crypt.el: org-crypt. (line 6) +* org-decrypt-entry: org-crypt. (line 6) +* org-hide-block-startup: In-buffer settings. (line 171) +* org-insert-drawer <1>: Property syntax. (line 88) +* org-insert-drawer: Drawers. (line 6) +* org-list-insert-radio-list: Radio lists. (line 6) +* org-pretty-entities: In-buffer settings. (line 176) +* org-publish-project-alist: Project alist. (line 6) +* Orgstruct mode: Orgstruct mode. (line 6) +* Orgtbl mode <1>: Tables in arbitrary syntax. + (line 6) +* Orgtbl mode: Orgtbl mode. (line 6) +* Ota, Takaaki: Cooperation. (line 52) +* Outline mode: Outlines. (line 6) +* outline tree: Headlines. (line 6) +* outlines: Outlines. (line 6) +* overview, global visibility state: Global and local cycling. + (line 22) +* overview, STARTUP keyword <1>: In-buffer settings. (line 80) +* overview, STARTUP keyword: Initial visibility. (line 6) +* packages, interaction with other: Interaction. (line 6) +* paragraphs, markup rules: Paragraphs. (line 6) +* pasting, of subtrees: Structure editing. (line 6) +* PDF export: LaTeX and PDF export. + (line 6) +* per-file keywords: Per-file keywords. (line 6) +* plain lists: Plain lists. (line 6) +* plain lists, in LaTeX export: LaTeX specific attributes. + (line 148) +* plain text external links: External links. (line 70) +* plot tables using Gnuplot: Org-Plot. (line 6) +* presentation, of agenda items: Presentation and sorting. + (line 6) +* print edition: Summary. (line 58) +* printing sparse trees: Sparse trees. (line 53) +* priorities: Priorities. (line 6) +* priorities, of agenda items: Sorting agenda items. + (line 6) +* progress logging: Progress logging. (line 6) +* projects, for publishing: Project alist. (line 6) +* promotion, of subtrees: Structure editing. (line 6) +* proof, in LaTeX export: LaTeX specific attributes. + (line 180) +* properties: Properties and Columns. + (line 6) +* properties, API <1>: Using the property API. + (line 6) +* properties, API: Property API. (line 6) +* properties, column view: Defining columns. (line 6) +* properties, inheritance: Property inheritance. + (line 6) +* properties, searching: Property searches. (line 6) +* properties, special: Special properties. (line 6) +* property EXPORT_FILE_NAME: ODT export commands. (line 10) +* property syntax: Property syntax. (line 6) +* property, +: Property syntax. (line 50) +* property, _ALL: Property syntax. (line 42) +* property, ALT_TITLE: Table of contents. (line 31) +* property, APPENDIX: Headings and sectioning structure. + (line 19) +* property, ARCHIVE <1>: Moving subtrees. (line 32) +* property, ARCHIVE: Property inheritance. + (line 34) +* property, ATTACH_DIR: Attachments. (line 71) +* property, ATTACH_DIR_INHERIT: Attachments. (line 76) +* property, BEAMER_ACT: Beamer export. (line 63) +* property, BEAMER_COL: Beamer export. (line 70) +* property, BEAMER_ENV: Beamer export. (line 39) +* property, BEAMER_OPT: Beamer export. (line 63) +* property, BEAMER_REF: Beamer export. (line 50) +* property, CATEGORY <1>: Categories. (line 12) +* property, CATEGORY: Property inheritance. + (line 30) +* property, COLUMNS <1>: In-buffer settings. (line 30) +* property, COLUMNS: Property inheritance. + (line 22) +* property, COOKIE_DATA <1>: Checkboxes. (line 30) +* property, COOKIE_DATA: Breaking down tasks. (line 21) +* property, COPYING: Document preamble. (line 50) +* property, CUSTOM_ID <1>: Handling links. (line 21) +* property, CUSTOM_ID: Internal links. (line 6) +* property, DESCRIPTION <1>: iCalendar export. (line 46) +* property, DESCRIPTION: Headings and sectioning structure. + (line 22) +* property, Effort: Effort estimates. (line 6) +* property, EXPORT_FILE_NAME: Export settings. (line 192) +* property, EXPORT_LATEX_CLASS: Header and sectioning. + (line 22) +* property, EXPORT_LATEX_CLASS_OPTIONS: Header and sectioning. + (line 22) +* property, EXPORT_TITLE: Document title. (line 13) +* property, ID <1>: iCalendar export. (line 21) +* property, ID <2>: Capturing column view. + (line 22) +* property, ID: Handling links. (line 21) +* property, INDEX: Indices. (line 13) +* property, LOCATION: iCalendar export. (line 46) +* property, LOG_INTO_DRAWER <1>: Clocking commands. (line 7) +* property, LOG_INTO_DRAWER: Tracking TODO state changes. + (line 6) +* property, LOGGING <1>: Property inheritance. + (line 38) +* property, LOGGING: Tracking TODO state changes. + (line 45) +* property, ORDERED <1>: Checkboxes. (line 46) +* property, ORDERED: TODO dependencies. (line 6) +* property, special, ALLTAGS: Special properties. (line 13) +* property, special, BLOCKED: Special properties. (line 13) +* property, special, CATEGORY: Special properties. (line 13) +* property, special, CLOCKSUM <1>: Agenda column view. (line 28) +* property, special, CLOCKSUM: Special properties. (line 13) +* property, special, CLOCKSUM_T <1>: Agenda column view. (line 51) +* property, special, CLOCKSUM_T: Special properties. (line 13) +* property, special, CLOSED: Special properties. (line 13) +* property, special, DEADLINE: Special properties. (line 13) +* property, special, FILE: Special properties. (line 13) +* property, special, ID: Special properties. (line 13) +* property, special, ITEM: Special properties. (line 13) +* property, special, PRIORITY: Special properties. (line 13) +* property, special, SCHEDULED: Special properties. (line 13) +* property, special, TAGS: Special properties. (line 13) +* property, special, TIMESTAMP: Special properties. (line 13) +* property, special, TIMESTAMP_IA: Special properties. (line 13) +* property, special, TODO: Special properties. (line 13) +* property, SUMMARY: iCalendar export. (line 46) +* property, VISIBILITY: Initial visibility. (line 21) +* property: CLOCK_MODELINE_TOTAL: Clocking commands. (line 20) +* property: LAST_REPEAT: Clocking commands. (line 20) +* protocols, for external access: Protocols. (line 6) +* publishing: Publishing. (line 6) +* query editing, in agenda: Filtering/limiting agenda items. + (line 17) +* radio lists: Radio lists. (line 6) +* radio tables: Radio tables. (line 6) +* radio targets: Radio targets. (line 6) +* range formula: Field and range formulas. + (line 6) +* range references: References. (line 63) +* ranges, time: Timestamps. (line 6) +* recomputing table fields: Updating the table. (line 6) +* references: References. (line 6) +* references, named: References. (line 102) +* references, remote: References. (line 123) +* references, to a different table: References. (line 123) +* references, to fields: References. (line 15) +* references, to ranges: References. (line 63) +* refiling notes: Refile and copy. (line 6) +* region, active <1>: ODT export commands. (line 9) +* region, active <2>: Built-in table editor. + (line 156) +* region, active: Structure editing. (line 137) +* regular expressions, with tags search: Matching tags and properties. + (line 61) +* relative timer: Relative timer. (line 6) +* remember.el: Cooperation. (line 42) +* reminders: Weekly/daily agenda. (line 107) +* remote editing, bulk, from agenda: Agenda commands. (line 365) +* remote editing, from agenda: Agenda commands. (line 228) +* remote editing, undo: Agenda commands. (line 229) +* remote references: References. (line 123) +* repeated tasks: Repeated tasks. (line 6) +* report, of clocked time: The clock table. (line 6) +* resolve idle time: Resolving idle time. (line 9) +* revealing context: Global and local cycling. + (line 38) +* RMAIL links: External links. (line 6) +* Rose, Sebastian: JavaScript support. (line 6) +* row, of field coordinates: References. (line 86) +* RSS feeds: RSS Feeds. (line 6) +* rsync: Uploading files. (line 6) +* SCHEDULED keyword: Deadlines and scheduling. + (line 29) +* scheduling: Timestamps. (line 6) +* Schulte, Eric: Working With Source Code. + (line 6) +* Scripts, for agenda processing: Extracting agenda information. + (line 6) +* search option in file links: Search options. (line 6) +* search strings, custom: Custom searches. (line 6) +* search view: Search view. (line 6) +* searching for tags: Tag searches. (line 6) +* searching, for text: Search view. (line 6) +* searching, of properties: Property searches. (line 6) +* sectioning structure, for LaTeX export: Header and sectioning. + (line 6) +* set startup visibility, command: Global and local cycling. + (line 33) +* setting tags: Setting tags. (line 6) +* SHELL links: External links. (line 6) +* shift-selection-mode <1>: Conflicts. (line 6) +* shift-selection-mode: Plain lists. (line 94) +* show all, command: Global and local cycling. + (line 35) +* show all, global visibility state: Global and local cycling. + (line 22) +* show branches, command: Global and local cycling. + (line 47) +* show children, command: Global and local cycling. + (line 51) +* show hidden text: Visibility cycling. (line 6) +* showall, STARTUP keyword <1>: In-buffer settings. (line 80) +* showall, STARTUP keyword: Initial visibility. (line 6) +* showeverything, STARTUP keyword <1>: In-buffer settings. (line 80) +* showeverything, STARTUP keyword: Initial visibility. (line 6) +* showstars, STARTUP keyword: In-buffer settings. (line 140) +* sitemap, of published pages: Sitemap. (line 6) +* sorting, of agenda items: Sorting agenda items. + (line 6) +* sorting, of plain list: Plain lists. (line 154) +* sorting, of subtrees: Structure editing. (line 6) +* source blocks, in LaTeX export: LaTeX specific attributes. + (line 159) +* source code, batch execution: Batch execution. (line 6) +* source code, block header arguments: Header arguments. (line 6) +* source code, block structure: Structure of code blocks. + (line 6) +* source code, editing: Editing source code. (line 6) +* source code, evaluating: Evaluating code blocks. + (line 6) +* source code, exporting: Exporting code blocks. + (line 6) +* source code, extracting: Extracting source code. + (line 6) +* source code, inline: Structure of code blocks. + (line 16) +* source code, language: Structure of code blocks. + (line 37) +* source code, languages: Languages. (line 6) +* source code, library: Library of Babel. (line 6) +* source code, noweb reference: Noweb reference syntax. + (line 6) +* source code, results of evaluation: Results of evaluation. + (line 6) +* source code, switches: Structure of code blocks. + (line 41) +* source code, working with: Working With Source Code. + (line 6) +* sparse tree, for deadlines: Inserting deadline/schedule. + (line 32) +* sparse tree, for TODO: TODO basics. (line 42) +* sparse tree, tag based: Tags. (line 6) +* sparse trees: Sparse trees. (line 6) +* Special blocks: Special blocks. (line 6) +* special blocks, in LaTeX export: LaTeX specific attributes. + (line 180) +* special keywords: In-buffer settings. (line 6) +* special symbols: Special symbols. (line 6) +* speed keys: Speed keys. (line 6) +* speedbar.el: Cooperation. (line 45) +* spreadsheet capabilities: The spreadsheet. (line 6) +* square brackets, around links: External links. (line 70) +* statistics, for checkboxes: Checkboxes. (line 30) +* statistics, for TODO items: Breaking down tasks. (line 6) +* storing links: Handling links. (line 10) +* Storm, Kim. F.: Conflicts. (line 19) +* strike-through text, markup rules: Emphasis and monospace. + (line 6) +* structure editing: Structure editing. (line 6) +* structure of document: Document Structure. (line 6) +* styles, custom <1>: Working with OpenDocument style files. + (line 6) +* styles, custom: Applying custom styles. + (line 6) +* sublevels, inclusion into tags match: Tag inheritance. (line 6) +* sublevels, inclusion into TODO list: Global TODO list. (line 35) +* subscript: Subscripts and superscripts. + (line 6) +* subtree cycling: Global and local cycling. + (line 10) +* subtree visibility states: Global and local cycling. + (line 10) +* subtree, cut and paste: Structure editing. (line 6) +* subtree, subtree visibility state: Global and local cycling. + (line 10) +* subtrees, cut and paste: Structure editing. (line 6) +* summary: Summary. (line 6) +* superscript: Subscripts and superscripts. + (line 6) +* syntax, noweb: Noweb reference syntax. + (line 6) +* syntax, of formulas: Formula syntax for Calc. + (line 6) +* table editor, built-in: Built-in table editor. + (line 6) +* table editor, table.el: Cooperation. (line 52) +* table lookup functions: Lookup functions. (line 6) +* table of contents, markup rules: Table of contents. (line 6) +* table.el: Cooperation. (line 49) +* tables: Tables. (line 6) +* tables, in HTML: Tables in HTML export. + (line 6) +* tables, in LaTeX export: LaTeX specific attributes. + (line 12) +* tables, in ODT export <1>: Customizing tables in ODT export. + (line 6) +* tables, in ODT export: Tables in ODT export. + (line 6) +* tables, in other modes: Tables in arbitrary syntax. + (line 6) +* tables, markup rules: Images and tables. (line 6) +* tag completion: Completion. (line 6) +* tag filtering, in agenda: Filtering/limiting agenda items. + (line 17) +* tag inheritance: Tag inheritance. (line 6) +* tag searches: Tag searches. (line 6) +* tags: Tags. (line 6) +* tags view: Matching tags and properties. + (line 6) +* tags, as an agenda view: Storing searches. (line 9) +* tags, groups: Tag groups. (line 6) +* tags, setting: Setting tags. (line 6) +* tags-todo: Storing searches. (line 9) +* tags-tree: Storing searches. (line 9) +* tangling: Extracting source code. + (line 6) +* targets, for links: Internal links. (line 6) +* targets, radio: Radio targets. (line 6) +* tasks, breaking down: Breaking down tasks. (line 6) +* tasks, repeated: Repeated tasks. (line 6) +* template insertion: Easy Templates. (line 6) +* template, custom <1>: Working with OpenDocument style files. + (line 6) +* template, custom: Applying custom styles. + (line 6) +* templates, for Capture: Capture templates. (line 6) +* TeX interpretation: Embedded LaTeX. (line 6) +* TeX macros: Special symbols. (line 6) +* TeX symbol completion: Completion. (line 6) +* Texinfo export: Texinfo export. (line 6) +* text areas, in HTML: Text areas in HTML export. + (line 6) +* text search: Search view. (line 6) +* thanks: History and Acknowledgments. + (line 6) +* time clocking: Clocking work time. (line 6) +* time format, custom: Custom time format. (line 6) +* time grid: Time-of-day specifications. + (line 26) +* Time, computing: Durations and time values. + (line 6) +* time, reading in minibuffer: The date/time prompt. + (line 6) +* time-of-day specification: Time-of-day specifications. + (line 6) +* time-sorted view: Timeline. (line 6) +* timeline, single file: Timeline. (line 6) +* timerange: Timestamps. (line 43) +* times: Dates and Times. (line 6) +* timestamp <1>: Timestamps. (line 14) +* timestamp: Dates and Times. (line 6) +* timestamp, inactive: Timestamps. (line 52) +* timestamp, with repeater interval: Timestamps. (line 26) +* timestamps: Timestamps. (line 6) +* timestamps, creating: Creating timestamps. (line 6) +* TODO dependencies: TODO dependencies. (line 6) +* TODO items: TODO Items. (line 6) +* TODO keyword matching: Global TODO list. (line 18) +* TODO keyword matching, with tags search: Matching tags and properties. + (line 71) +* TODO keyword sets: Multiple sets in one file. + (line 6) +* TODO keywords completion: Completion. (line 6) +* TODO list, global: Global TODO list. (line 6) +* TODO types: TODO types. (line 6) +* TODO workflow: Workflow states. (line 6) +* todo, as an agenda view: Storing searches. (line 9) +* todo-tree: Storing searches. (line 9) +* top headline filtering, in agenda: Filtering/limiting agenda items. + (line 17) +* transient mark mode <1>: Built-in table editor. + (line 156) +* transient mark mode: Structure editing. (line 137) +* transient-mark-mode: ODT export commands. (line 9) +* translator function: Translator functions. + (line 6) +* trees, sparse: Sparse trees. (line 6) +* trees, visibility: Visibility cycling. (line 6) +* tty key bindings: TTY keys. (line 6) +* types as TODO keywords: TODO types. (line 6) +* underlined text, markup rules: Emphasis and monospace. + (line 6) +* undoing remote-editing events: Agenda commands. (line 229) +* unison: Uploading files. (line 6) +* unoconv: Extending ODT export. + (line 11) +* updating, table: Updating the table. (line 6) +* URL links: External links. (line 6) +* USENET links: External links. (line 6) +* UTF-8 export: ASCII/Latin-1/UTF-8 export. + (line 6) +* variables, for customization: Customization. (line 6) +* vectors, in table calculations: Formula syntax for Calc. + (line 11) +* verbatim text, markup rules: Emphasis and monospace. + (line 6) +* viper.el: Conflicts. (line 97) +* visibility cycling: Visibility cycling. (line 6) +* visibility cycling, drawers: Drawers. (line 6) +* visibility, initialize: Initial visibility. (line 6) +* visible text, printing: Sparse trees. (line 53) +* VM links: External links. (line 43) +* WANDERLUST links: External links. (line 43) +* weekly agenda: Weekly/daily agenda. (line 6) +* Wiegley, John: Cooperation. (line 42) +* windmove.el: Conflicts. (line 84) +* workflow states as TODO keywords: Workflow states. (line 6) +* XEmacs: Installation. (line 6) +* yasnippet.el: Conflicts. (line 58) +* zip: Pre-requisites for ODT export. + (line 6) + + +File: org, Node: Key Index, Next: Command and Function Index, Prev: Main Index, Up: Top + +Key index +********* + +[index] +* Menu: + +* $: Agenda commands. (line 263) +* %: Agenda commands. (line 382) +* ': CDLaTeX mode. (line 43) +* *: Agenda commands. (line 367) +* +: Agenda commands. (line 285) +* ,: Agenda commands. (line 277) +* -: Agenda commands. (line 290) +* .: Agenda commands. (line 97) +* / <1>: Agenda commands. (line 198) +* /: Filtering/limiting agenda items. + (line 17) +* :: Agenda commands. (line 273) +* ;: Countdown timer. (line 6) +* < <1>: Agenda commands. (line 205) +* < <2>: Filtering/limiting agenda items. + (line 93) +* < <3>: Agenda files. (line 57) +* < <4>: The date/time prompt. + (line 82) +* <: Using column view. (line 70) +* <1>: Agenda commands. (line 37) +* <2>: The date/time prompt. + (line 82) +* <3>: Setting tags. (line 116) +* <4>: Handling links. (line 122) +* : Built-in table editor. + (line 65) +* <1>: Agenda commands. (line 28) +* : Setting tags. (line 115) +* <1>: CDLaTeX mode. (line 23) +* <2>: Agenda commands. (line 34) +* <3>: Setting tags. (line 107) +* <4>: Editing and debugging formulas. + (line 57) +* <5>: Built-in table editor. + (line 58) +* <6>: Plain lists. (line 68) +* <7>: Structure editing. (line 33) +* : Global and local cycling. + (line 10) +* = <1>: Agenda commands. (line 213) +* =: Filtering/limiting agenda items. + (line 103) +* > <1>: Agenda commands. (line 326) +* > <2>: Agenda files. (line 61) +* > <3>: The date/time prompt. + (line 82) +* >: Using column view. (line 70) +* ?: Pulling from MobileOrg. + (line 34) +* [ <1>: Agenda commands. (line 121) +* [: Filtering/limiting agenda items. + (line 83) +* \ <1>: Agenda commands. (line 202) +* \: Filtering/limiting agenda items. + (line 76) +* ]: Filtering/limiting agenda items. + (line 83) +* ^ <1>: CDLaTeX mode. (line 33) +* ^ <2>: Agenda commands. (line 209) +* ^: Filtering/limiting agenda items. + (line 99) +* _: CDLaTeX mode. (line 33) +* `: CDLaTeX mode. (line 39) +* a: Agenda commands. (line 251) +* A: Agenda commands. (line 64) +* a: Using column view. (line 59) +* B: Agenda commands. (line 385) +* b: Agenda commands. (line 94) +* C: Agenda commands. (line 489) +* c: Agenda commands. (line 456) +* C-#: Advanced features. (line 10) +* C-': Agenda files. (line 22) +* C-,: Agenda files. (line 22) +* C-0 C-c C-w: Refile and copy. (line 47) +* C-: Structure editing. (line 19) +* C-_: Agenda commands. (line 229) +* C-c !: Creating timestamps. (line 15) +* C-c #: Checkboxes. (line 84) +* C-c $: Moving subtrees. (line 9) +* C-c %: Handling links. (line 142) +* C-c &: Handling links. (line 146) +* C-c ' <1>: Cooperation. (line 61) +* C-c ' <2>: Editing source code. (line 6) +* C-c ' <3>: Include files. (line 36) +* C-c ' <4>: Literal examples. (line 70) +* C-c ': Editing and debugging formulas. + (line 36) +* C-c * <1>: Updating the table. (line 13) +* C-c * <2>: Plain lists. (line 139) +* C-c *: Structure editing. (line 126) +* C-c +: Built-in table editor. + (line 156) +* C-c ,: Priorities. (line 24) +* C-c - <1>: Built-in table editor. + (line 101) +* C-c -: Plain lists. (line 127) +* C-c .: Creating timestamps. (line 10) +* C-c / <1>: Conflicts. (line 97) +* C-c /: Sparse trees. (line 15) +* C-c / a: Inserting deadline/schedule. + (line 39) +* C-c / b: Inserting deadline/schedule. + (line 36) +* C-c / d: Inserting deadline/schedule. + (line 29) +* C-c / m <1>: Property searches. (line 10) +* C-c / m: Tag searches. (line 9) +* C-c / p: Property searches. (line 29) +* C-c / r: Sparse trees. (line 17) +* C-c / t: TODO basics. (line 39) +* C-c ;: Comment lines. (line 12) +* C-c <: Creating timestamps. (line 29) +* C-c : Built-in table editor. + (line 105) +* C-c : Global and local cycling. + (line 51) +* C-c = <1>: Editing and debugging formulas. + (line 13) +* C-c =: Column formulas. (line 32) +* C-c >: Creating timestamps. (line 33) +* C-c ?: Editing and debugging formulas. + (line 22) +* C-c @: Structure editing. (line 63) +* C-c [: Agenda files. (line 15) +* C-c \ <1>: Property searches. (line 10) +* C-c \: Tag searches. (line 9) +* C-c ]: Agenda files. (line 19) +* C-c ^ <1>: Built-in table editor. + (line 109) +* C-c ^ <2>: Plain lists. (line 154) +* C-c ^: Structure editing. (line 105) +* C-c `: Built-in table editor. + (line 174) +* C-c a: Conventions. (line 35) +* C-c a !: Stuck projects. (line 14) +* C-c a #: Stuck projects. (line 13) +* C-c a ?: Pulling from MobileOrg. + (line 44) +* C-c a a: Weekly/daily agenda. (line 9) +* C-c a C: Storing searches. (line 9) +* C-c a e: Exporting Agenda Views. + (line 64) +* C-c a L: Timeline. (line 10) +* C-c a M: Matching tags and properties. + (line 17) +* C-c a m: Matching tags and properties. + (line 12) +* C-c a M: Property searches. (line 16) +* C-c a m: Property searches. (line 12) +* C-c a M: Tag searches. (line 17) +* C-c a m: Tag searches. (line 13) +* C-c a s: Search view. (line 9) +* C-c a T: Global TODO list. (line 15) +* C-c a t <1>: Global TODO list. (line 9) +* C-c a t: TODO basics. (line 50) +* C-c c <1>: Using capture. (line 6) +* C-c c: Conventions. (line 35) +* C-c c C: Capture templates. (line 10) +* C-c C-*: Plain lists. (line 144) +* C-c C-a <1>: Agenda commands. (line 298) +* C-c C-a: Attachments. (line 26) +* C-c C-a a: Attachments. (line 31) +* C-c C-a c: Attachments. (line 37) +* C-c C-a D: Attachments. (line 66) +* C-c C-a d: Attachments. (line 63) +* C-c C-a F: Attachments. (line 60) +* C-c C-a f: Attachments. (line 57) +* C-c C-a i: Attachments. (line 75) +* C-c C-a l: Attachments. (line 37) +* C-c C-a m: Attachments. (line 37) +* C-c C-a n: Attachments. (line 41) +* C-c C-a O: Attachments. (line 54) +* C-c C-a o: Attachments. (line 48) +* C-c C-a s: Attachments. (line 70) +* C-c C-a z: Attachments. (line 44) +* C-c C-b <1>: Beamer export. (line 142) +* C-c C-b: Motion. (line 15) +* C-c C-c <1>: Cooperation. (line 52) +* C-c C-c <2>: The very busy C-c C-c key. + (line 6) +* C-c C-c <3>: Key bindings and useful functions. + (line 11) +* C-c C-c <4>: Evaluating code blocks. + (line 19) +* C-c C-c <5>: Previewing LaTeX fragments. + (line 15) +* C-c C-c <6>: Using capture. (line 15) +* C-c C-c <7>: The clock table. (line 16) +* C-c C-c <8>: Clocking commands. (line 51) +* C-c C-c <9>: Creating timestamps. (line 26) +* C-c C-c <10>: Capturing column view. + (line 51) +* C-c C-c <11>: Using column view. (line 52) +* C-c C-c <12>: Property syntax. (line 90) +* C-c C-c <13>: Setting tags. (line 20) +* C-c C-c <14>: Checkboxes. (line 52) +* C-c C-c <15>: Editing and debugging formulas. + (line 47) +* C-c C-c <16>: Built-in table editor. + (line 57) +* C-c C-c <17>: Footnotes. (line 86) +* C-c C-c: Plain lists. (line 122) +* C-c C-c c: Property syntax. (line 108) +* C-c C-c D: Property syntax. (line 105) +* C-c C-c d: Property syntax. (line 102) +* C-c C-c s: Property syntax. (line 94) +* C-c C-d <1>: Agenda commands. (line 305) +* C-c C-d: Inserting deadline/schedule. + (line 9) +* C-c C-e: The Export Dispatcher. + (line 11) +* C-c C-e c a: iCalendar export. (line 34) +* C-c C-e c c: iCalendar export. (line 39) +* C-c C-e c f: iCalendar export. (line 32) +* C-c C-e C-v: Sparse trees. (line 53) +* C-c C-e h H: HTML Export commands. + (line 10) +* C-c C-e h h: HTML Export commands. + (line 6) +* C-c C-e i i: Texinfo export commands. + (line 9) +* C-c C-e i t: Texinfo export commands. + (line 6) +* C-c C-e l B: Beamer export. (line 16) +* C-c C-e l b: Beamer export. (line 13) +* C-c C-e l L: LaTeX export commands. + (line 9) +* C-c C-e l l: LaTeX export commands. + (line 6) +* C-c C-e l p: LaTeX export commands. + (line 12) +* C-c C-e l P: Beamer export. (line 19) +* C-c C-e m M: Markdown export. (line 19) +* C-c C-e m m: Markdown export. (line 16) +* C-c C-e O O: Org export. (line 16) +* C-c C-e O o: Org export. (line 13) +* C-c C-e o o: ODT export commands. (line 9) +* C-c C-e P a: Triggering publication. + (line 16) +* C-c C-e P f: Triggering publication. + (line 13) +* C-c C-e P p: Triggering publication. + (line 10) +* C-c C-e P x: Triggering publication. + (line 8) +* C-c C-e t A/L/U: ASCII/Latin-1/UTF-8 export. + (line 22) +* C-c C-e t a/l/u: ASCII/Latin-1/UTF-8 export. + (line 18) +* C-c C-f: Motion. (line 12) +* C-c C-j: Motion. (line 21) +* C-c C-k <1>: Using capture. (line 31) +* C-c C-k: Global and local cycling. + (line 47) +* C-c C-l: Handling links. (line 65) +* C-c C-n: Motion. (line 8) +* C-c C-o <1>: Key bindings and useful functions. + (line 11) +* C-c C-o <2>: Agenda commands. (line 56) +* C-c C-o <3>: Creating timestamps. (line 38) +* C-c C-o <4>: Handling links. (line 101) +* C-c C-o: Footnotes. (line 90) +* C-c C-p: Motion. (line 9) +* C-c C-q <1>: Setting tags. (line 10) +* C-c C-q: Editing and debugging formulas. + (line 50) +* C-c C-r <1>: Editing and debugging formulas. + (line 53) +* C-c C-r: Global and local cycling. + (line 38) +* C-c C-s <1>: Agenda commands. (line 301) +* C-c C-s: Inserting deadline/schedule. + (line 17) +* C-c C-t <1>: Clocking commands. (line 67) +* C-c C-t: TODO basics. (line 13) +* C-c C-u: Motion. (line 18) +* C-c C-v a: Key bindings and useful functions. + (line 54) +* C-c C-v b: Key bindings and useful functions. + (line 32) +* C-c C-v c: Key bindings and useful functions. + (line 42) +* C-c C-v C-a: Key bindings and useful functions. + (line 54) +* C-c C-v C-b: Key bindings and useful functions. + (line 32) +* C-c C-v C-c: Key bindings and useful functions. + (line 42) +* C-c C-v C-d: Key bindings and useful functions. + (line 36) +* C-c C-v C-e: Key bindings and useful functions. + (line 20) +* C-c C-v C-f: Key bindings and useful functions. + (line 40) +* C-c C-v C-g: Key bindings and useful functions. + (line 28) +* C-c C-v C-h: Key bindings and useful functions. + (line 56) +* C-c C-v C-I: Key bindings and useful functions. + (line 50) +* C-c C-v C-i: Key bindings and useful functions. + (line 48) +* C-c C-v C-j: Key bindings and useful functions. + (line 44) +* C-c C-v C-l: Key bindings and useful functions. + (line 46) +* C-c C-v C-n: Key bindings and useful functions. + (line 18) +* C-c C-v C-o: Key bindings and useful functions. + (line 22) +* C-c C-v C-p: Key bindings and useful functions. + (line 18) +* C-c C-v C-r: Key bindings and useful functions. + (line 30) +* C-c C-v C-s: Key bindings and useful functions. + (line 34) +* C-c C-v C-t: Key bindings and useful functions. + (line 38) +* C-c C-v C-u: Key bindings and useful functions. + (line 26) +* C-c C-v C-v: Key bindings and useful functions. + (line 24) +* C-c C-v C-x: Key bindings and useful functions. + (line 58) +* C-c C-v C-z: Key bindings and useful functions. + (line 52) +* C-c C-v d: Key bindings and useful functions. + (line 36) +* C-c C-v e: Key bindings and useful functions. + (line 20) +* C-c C-v f: Key bindings and useful functions. + (line 40) +* C-c C-v g: Key bindings and useful functions. + (line 28) +* C-c C-v h: Key bindings and useful functions. + (line 56) +* C-c C-v I: Key bindings and useful functions. + (line 50) +* C-c C-v i <1>: Key bindings and useful functions. + (line 48) +* C-c C-v i: Library of Babel. (line 20) +* C-c C-v j: Key bindings and useful functions. + (line 44) +* C-c C-v l: Key bindings and useful functions. + (line 46) +* C-c C-v n: Key bindings and useful functions. + (line 18) +* C-c C-v o: Key bindings and useful functions. + (line 22) +* C-c C-v p: Key bindings and useful functions. + (line 18) +* C-c C-v r: Key bindings and useful functions. + (line 30) +* C-c C-v s: Key bindings and useful functions. + (line 34) +* C-c C-v t <1>: Key bindings and useful functions. + (line 38) +* C-c C-v t: Extracting source code. + (line 26) +* C-c C-v u: Key bindings and useful functions. + (line 26) +* C-c C-v v: Key bindings and useful functions. + (line 24) +* C-c C-v x: Key bindings and useful functions. + (line 58) +* C-c C-v z: Key bindings and useful functions. + (line 52) +* C-c C-w <1>: Agenda commands. (line 248) +* C-c C-w <2>: Refile and copy. (line 14) +* C-c C-w <3>: Using capture. (line 22) +* C-c C-w: Structure editing. (line 101) +* C-c C-x ,: Relative timer. (line 21) +* C-c C-x -: Relative timer. (line 13) +* C-c C-x .: Relative timer. (line 10) +* C-c C-x 0: Relative timer. (line 30) +* C-c C-x ;: Countdown timer. (line 6) +* C-c C-x <: Agenda files. (line 42) +* C-c C-x > <1>: Agenda commands. (line 188) +* C-c C-x >: Agenda files. (line 49) +* C-c C-x \ <1>: Subscripts and superscripts. + (line 21) +* C-c C-x \: Special symbols. (line 31) +* C-c C-x A: Agenda commands. (line 259) +* C-c C-x a: Agenda commands. (line 256) +* C-c C-x A: Internal archiving. (line 49) +* C-c C-x a: Internal archiving. (line 36) +* C-c C-x b <1>: Agenda commands. (line 47) +* C-c C-x b: Global and local cycling. + (line 55) +* C-c C-x c: Structure editing. (line 93) +* C-c C-x C-a <1>: Agenda commands. (line 251) +* C-c C-x C-a: Archiving. (line 11) +* C-c C-x C-b: Checkboxes. (line 56) +* C-c C-x C-c <1>: Agenda column view. (line 11) +* C-c C-x C-c <2>: Agenda commands. (line 177) +* C-c C-x C-c: Using column view. (line 9) +* C-c C-x C-d: Clocking commands. (line 80) +* C-c C-x C-e <1>: Effort estimates. (line 17) +* C-c C-x C-e: Clocking commands. (line 48) +* C-c C-x C-i: Clocking commands. (line 6) +* C-c C-x C-j: Clocking commands. (line 75) +* C-c C-x C-k: Inserting deadline/schedule. + (line 23) +* C-c C-x C-l: Previewing LaTeX fragments. + (line 9) +* C-c C-x C-n: Handling links. (line 152) +* C-c C-x C-o: Clocking commands. (line 34) +* C-c C-x C-p: Handling links. (line 152) +* C-c C-x C-q: Clocking commands. (line 71) +* C-c C-x C-r: The clock table. (line 10) +* C-c C-x C-s <1>: Agenda commands. (line 263) +* C-c C-x C-s: Moving subtrees. (line 9) +* C-c C-x C-t: Custom time format. (line 12) +* C-c C-x C-u <1>: Dynamic blocks. (line 21) +* C-c C-x C-u <2>: The clock table. (line 16) +* C-c C-x C-u: Capturing column view. + (line 51) +* C-c C-x C-v: Handling links. (line 133) +* C-c C-x C-w <1>: Built-in table editor. + (line 130) +* C-c C-x C-w: Structure editing. (line 67) +* C-c C-x C-x: Clocking commands. (line 42) +* C-c C-x C-y <1>: Built-in table editor. + (line 134) +* C-c C-x C-y: Structure editing. (line 75) +* C-c C-x d: Drawers. (line 6) +* C-c C-x e: Effort estimates. (line 14) +* C-c C-x f: Footnotes. (line 51) +* C-c C-x G: RSS Feeds. (line 27) +* C-c C-x g: RSS Feeds. (line 23) +* C-c C-x i: Capturing column view. + (line 49) +* C-c C-x M-w <1>: Built-in table editor. + (line 126) +* C-c C-x M-w: Structure editing. (line 71) +* C-c C-x o <1>: Checkboxes. (line 76) +* C-c C-x o: TODO dependencies. (line 29) +* C-c C-x p <1>: Header arguments in Org mode properties. + (line 34) +* C-c C-x p: Property syntax. (line 81) +* C-c C-x q: Tag groups. (line 34) +* C-c C-x v: Global and local cycling. + (line 61) +* C-c C-y <1>: Clocking commands. (line 51) +* C-c C-y: Creating timestamps. (line 59) +* C-c C-z <1>: Agenda commands. (line 293) +* C-c C-z: Drawers. (line 35) +* C-c l <1>: Literal examples. (line 78) +* C-c l: Handling links. (line 9) +* C-c M-w: Refile and copy. (line 12) +* C-c { <1>: CDLaTeX mode. (line 21) +* C-c {: Editing and debugging formulas. + (line 32) +* C-c |: Built-in table editor. + (line 41) +* C-c }: Editing and debugging formulas. + (line 26) +* C-c ~: Cooperation. (line 63) +* C-k: Agenda commands. (line 242) +* C-S- <1>: Agenda commands. (line 240) +* C-S-: Multiple sets in one file. + (line 25) +* C-S-: Structure editing. (line 28) +* C-S- <1>: Agenda commands. (line 237) +* C-S-: Multiple sets in one file. + (line 25) +* C-S-: Clocking commands. (line 56) +* C-TAB: Internal archiving. (line 46) +* C-u C-c !: Creating timestamps. (line 19) +* C-u C-c *: Updating the table. (line 16) +* C-u C-c .: Creating timestamps. (line 19) +* C-u C-c = <1>: Editing and debugging formulas. + (line 13) +* C-u C-c =: Field and range formulas. + (line 28) +* C-u C-c c: Using capture. (line 43) +* C-u C-c C-c: Updating the table. (line 19) +* C-u C-c C-l: Handling links. (line 86) +* C-u C-c C-t: TODO basics. (line 28) +* C-u C-c C-w: Refile and copy. (line 33) +* C-u C-c C-x ,: Relative timer. (line 25) +* C-u C-c C-x a: Internal archiving. (line 39) +* C-u C-c C-x C-s: Moving subtrees. (line 11) +* C-u C-c C-x C-u <1>: Dynamic blocks. (line 22) +* C-u C-c C-x C-u <2>: The clock table. (line 20) +* C-u C-c C-x C-u: Capturing column view. + (line 55) +* C-u C-u <1>: Initial visibility. (line 25) +* C-u C-u : Global and local cycling. + (line 33) +* C-u C-u C-c *: Updating the table. (line 22) +* C-u C-u C-c =: Editing and debugging formulas. + (line 16) +* C-u C-u C-c c: Using capture. (line 45) +* C-u C-u C-c C-c: Updating the table. (line 22) +* C-u C-u C-c C-t: Multiple sets in one file. + (line 25) +* C-u C-u C-c C-w: Refile and copy. (line 36) +* C-u C-u C-u : Global and local cycling. + (line 35) +* C-u C-u C-u C-c C-t: TODO dependencies. (line 34) +* C-v: The date/time prompt. + (line 82) +* C-x C-s <1>: Agenda commands. (line 173) +* C-x C-s: Editing and debugging formulas. + (line 47) +* C-x C-w <1>: Exporting Agenda Views. + (line 12) +* C-x C-w: Agenda commands. (line 506) +* C-x n b: Structure editing. (line 120) +* C-x n s: Structure editing. (line 117) +* C-x n w: Structure editing. (line 123) +* C-y: Structure editing. (line 81) +* D: Agenda commands. (line 106) +* d: Agenda commands. (line 69) +* E: Agenda commands. (line 151) +* e: Using column view. (line 46) +* f: Agenda commands. (line 88) +* F: Agenda commands. (line 40) +* g: Agenda commands. (line 170) +* G: Agenda commands. (line 159) +* g: Using column view. (line 23) +* H: Agenda commands. (line 493) +* i: Agenda commands. (line 461) +* I: Agenda commands. (line 331) +* J: Agenda commands. (line 103) +* j: Agenda commands. (line 100) +* k: Agenda commands. (line 344) +* k a: Inserting deadline/schedule. + (line 26) +* k s: Inserting deadline/schedule. + (line 26) +* l: Agenda commands. (line 110) +* L: Agenda commands. (line 31) +* M: Agenda commands. (line 480) +* m: Agenda commands. (line 365) +* M-*: Agenda commands. (line 379) +* M- <1>: Agenda commands. (line 358) +* M- <2>: Editing and debugging formulas. + (line 77) +* M- <3>: Built-in table editor. + (line 90) +* M-: Plain lists. (line 97) +* M- <1>: Built-in table editor. + (line 82) +* M- <2>: Plain lists. (line 103) +* M-: Structure editing. (line 39) +* M- <1>: Relative timer. (line 17) +* M- <2>: Built-in table editor. + (line 141) +* M- <3>: Plain lists. (line 79) +* M-: Structure editing. (line 6) +* M- <1>: Built-in table editor. + (line 82) +* M- <2>: Plain lists. (line 103) +* M-: Structure editing. (line 42) +* M- <1>: Completion. (line 16) +* M- <2>: Property syntax. (line 78) +* M- <3>: Setting tags. (line 6) +* M- <4>: Per-file keywords. (line 24) +* M-: Editing and debugging formulas. + (line 64) +* M- <1>: Agenda commands. (line 354) +* M- <2>: Editing and debugging formulas. + (line 77) +* M- <3>: Built-in table editor. + (line 90) +* M-: Plain lists. (line 97) +* M-a: Built-in table editor. + (line 70) +* M-down: Key bindings and useful functions. + (line 13) +* M-e: Built-in table editor. + (line 74) +* M-g M-n: Sparse trees. (line 29) +* M-g M-p: Sparse trees. (line 32) +* M-g n: Sparse trees. (line 29) +* M-g p: Sparse trees. (line 32) +* M-h: Structure editing. (line 57) +* M-m: Agenda commands. (line 376) +* M-S- <1>: Editing and debugging formulas. + (line 72) +* M-S- <2>: Built-in table editor. + (line 97) +* M-S-: Structure editing. (line 54) +* M-S- <1>: The date/time prompt. + (line 82) +* M-S- <2>: Built-in table editor. + (line 84) +* M-S- <3>: Plain lists. (line 108) +* M-S-: Structure editing. (line 45) +* M-S- <1>: Checkboxes. (line 73) +* M-S- <2>: Plain lists. (line 89) +* M-S-: Structure editing. (line 24) +* M-S- <1>: The date/time prompt. + (line 82) +* M-S- <2>: Built-in table editor. + (line 87) +* M-S- <3>: Plain lists. (line 108) +* M-S-: Structure editing. (line 48) +* M-S- <1>: Editing and debugging formulas. + (line 72) +* M-S- <2>: Built-in table editor. + (line 94) +* M-S-: Structure editing. (line 51) +* M-up: Key bindings and useful functions. + (line 12) +* M-v: The date/time prompt. + (line 82) +* M-x org-iswitchb: Agenda files. (line 26) +* mouse-1 <1>: The date/time prompt. + (line 82) +* mouse-1 <2>: Handling links. (line 124) +* mouse-1: Footnotes. (line 90) +* mouse-2 <1>: Agenda commands. (line 34) +* mouse-2 <2>: Handling links. (line 124) +* mouse-2: Footnotes. (line 90) +* mouse-3 <1>: Agenda commands. (line 28) +* mouse-3: Handling links. (line 129) +* n <1>: Agenda commands. (line 19) +* n: Using column view. (line 42) +* O: Agenda commands. (line 335) +* o: Agenda commands. (line 66) +* P: Agenda commands. (line 282) +* p <1>: Agenda commands. (line 20) +* p: Using column view. (line 42) +* q <1>: Agenda commands. (line 520) +* q: Using column view. (line 26) +* r: Agenda commands. (line 163) +* R: Agenda commands. (line 132) +* r <1>: Global TODO list. (line 23) +* r: Using column view. (line 19) +* S: Agenda commands. (line 484) +* s: Agenda commands. (line 173) +* S- <1>: Agenda commands. (line 290) +* S- <2>: The date/time prompt. + (line 82) +* S- <3>: Creating timestamps. (line 47) +* S- <4>: Priorities. (line 29) +* S- <5>: Editing and debugging formulas. + (line 67) +* S-: Plain lists. (line 90) +* S- <1>: Agenda commands. (line 322) +* S- <2>: The clock table. (line 24) +* S- <3>: The date/time prompt. + (line 82) +* S- <4>: Creating timestamps. (line 42) +* S- <5>: Using column view. (line 35) +* S- <6>: Property syntax. (line 98) +* S- <7>: Multiple sets in one file. + (line 32) +* S- <8>: TODO basics. (line 34) +* S- <9>: Editing and debugging formulas. + (line 67) +* S-: Plain lists. (line 149) +* S-: Built-in table editor. + (line 159) +* S- <1>: Agenda commands. (line 308) +* S- <2>: The clock table. (line 24) +* S- <3>: The date/time prompt. + (line 82) +* S- <4>: Creating timestamps. (line 42) +* S- <5>: Using column view. (line 35) +* S- <6>: Property syntax. (line 98) +* S- <7>: Multiple sets in one file. + (line 32) +* S- <8>: TODO basics. (line 34) +* S- <9>: Editing and debugging formulas. + (line 67) +* S-: Plain lists. (line 149) +* S- <1>: Built-in table editor. + (line 62) +* S-: Global and local cycling. + (line 22) +* S- <1>: Agenda commands. (line 285) +* S- <2>: The date/time prompt. + (line 82) +* S- <3>: Creating timestamps. (line 47) +* S- <4>: Priorities. (line 29) +* S-: Editing and debugging formulas. + (line 67) +* S-M-: Using column view. (line 75) +* S-M-: TODO basics. (line 58) +* S-M-: Using column view. (line 72) +* S-M-: Clocking commands. (line 60) +* T: Agenda commands. (line 268) +* t: Agenda commands. (line 233) +* U: Agenda commands. (line 373) +* u: Agenda commands. (line 370) +* v: Using column view. (line 55) +* v [: Agenda commands. (line 121) +* v A: Agenda commands. (line 128) +* v a: Agenda commands. (line 125) +* v c: Agenda commands. (line 143) +* v d: Agenda commands. (line 69) +* v E: Agenda commands. (line 151) +* v L: Agenda commands. (line 113) +* v l: Agenda commands. (line 110) +* v m: Agenda commands. (line 74) +* v R: Agenda commands. (line 132) +* v SPC: Agenda commands. (line 76) +* v t: Agenda commands. (line 73) +* v w: Agenda commands. (line 72) +* v y: Agenda commands. (line 75) +* w: Agenda commands. (line 72) +* x: Agenda commands. (line 521) +* X: Agenda commands. (line 338) +* z: Agenda commands. (line 293) +* {: Filtering/limiting agenda items. + (line 83) +* | <1>: Agenda commands. (line 222) +* |: Filtering/limiting agenda items. + (line 112) +* }: Filtering/limiting agenda items. + (line 83) +* ~: Filtering/limiting agenda items. + (line 153) + + +File: org, Node: Command and Function Index, Next: Variable Index, Prev: Key Index, Up: Top + +Command and function index +************************** + +[index] +* Menu: + +* lisp-complete-symbol: Editing and debugging formulas. + (line 64) +* next-error: Sparse trees. (line 29) +* org-agenda <1>: Conventions. (line 35) +* org-agenda: Activation. (line 6) +* org-agenda-add-note: Agenda commands. (line 293) +* org-agenda-archive: Agenda commands. (line 263) +* org-agenda-archive-default-with-confirmation: Agenda commands. + (line 251) +* org-agenda-archive-to-archive-sibling: Agenda commands. (line 259) +* org-agenda-archives-mode: Agenda commands. (line 125) +* org-agenda-archives-mode 'files: Agenda commands. (line 128) +* org-agenda-bulk-action: Agenda commands. (line 385) +* org-agenda-bulk-mark: Agenda commands. (line 365) +* org-agenda-bulk-mark-all: Agenda commands. (line 367) +* org-agenda-bulk-mark-regexp: Agenda commands. (line 382) +* org-agenda-bulk-remove-all-marks: Agenda commands. (line 373) +* org-agenda-bulk-toggle: Agenda commands. (line 376) +* org-agenda-bulk-toggle-all: Agenda commands. (line 379) +* org-agenda-bulk-unmark: Agenda commands. (line 370) +* org-agenda-capture: Agenda commands. (line 344) +* org-agenda-clock-cancel: Agenda commands. (line 338) +* org-agenda-clock-goto: Agenda commands. (line 103) +* org-agenda-clock-in: Agenda commands. (line 331) +* org-agenda-clock-out: Agenda commands. (line 335) +* org-agenda-clockreport-mode: Agenda commands. (line 132) +* org-agenda-columns <1>: Agenda column view. (line 11) +* org-agenda-columns: Agenda commands. (line 177) +* org-agenda-convert-date: Agenda commands. (line 489) +* org-agenda-date-prompt: Agenda commands. (line 326) +* org-agenda-day-view: Agenda commands. (line 69) +* org-agenda-deadline: Agenda commands. (line 305) +* org-agenda-diary-entry: Agenda commands. (line 461) +* org-agenda-do-date-earlier: Agenda commands. (line 322) +* org-agenda-do-date-later: Agenda commands. (line 308) +* org-agenda-drag-line-backward: Agenda commands. (line 354) +* org-agenda-drag-line-forward: Agenda commands. (line 358) +* org-agenda-earlier: Agenda commands. (line 94) +* org-agenda-entry-text-mode: Agenda commands. (line 151) +* org-agenda-exit: Agenda commands. (line 521) +* org-agenda-file-to-front: Agenda files. (line 15) +* org-agenda-filter-by-category <1>: Agenda commands. (line 205) +* org-agenda-filter-by-category: Filtering/limiting agenda items. + (line 93) +* org-agenda-filter-by-regexp <1>: Agenda commands. (line 213) +* org-agenda-filter-by-regexp: Filtering/limiting agenda items. + (line 103) +* org-agenda-filter-by-tag <1>: Agenda commands. (line 198) +* org-agenda-filter-by-tag: Filtering/limiting agenda items. + (line 17) +* org-agenda-filter-by-tag-refine <1>: Agenda commands. (line 202) +* org-agenda-filter-by-tag-refine: Filtering/limiting agenda items. + (line 76) +* org-agenda-filter-by-top-headline <1>: Agenda commands. (line 209) +* org-agenda-filter-by-top-headline: Filtering/limiting agenda items. + (line 99) +* org-agenda-filter-remove-all <1>: Agenda commands. (line 222) +* org-agenda-filter-remove-all: Filtering/limiting agenda items. + (line 112) +* org-agenda-follow-mode: Agenda commands. (line 40) +* org-agenda-fortnight-view: Agenda commands. (line 73) +* org-agenda-goto: Agenda commands. (line 34) +* org-agenda-goto-calendar: Agenda commands. (line 456) +* org-agenda-goto-date: Agenda commands. (line 100) +* org-agenda-goto-today: Agenda commands. (line 97) +* org-agenda-holidays: Agenda commands. (line 493) +* org-agenda-kill: Agenda commands. (line 242) +* org-agenda-later: Agenda commands. (line 88) +* org-agenda-limit-interactively: Filtering/limiting agenda items. + (line 153) +* org-agenda-list: Weekly/daily agenda. (line 9) +* org-agenda-list-stuck-projects: Stuck projects. (line 13) +* org-agenda-log-mode: Agenda commands. (line 110) +* org-agenda-manipulate-query-add: Agenda commands. (line 121) +* org-agenda-month-view: Agenda commands. (line 74) +* org-agenda-next-line: Agenda commands. (line 19) +* org-agenda-open-link: Agenda commands. (line 56) +* org-agenda-phases-of-moon: Agenda commands. (line 480) +* org-agenda-previous-line: Agenda commands. (line 20) +* org-agenda-priority-down: Agenda commands. (line 290) +* org-agenda-priority-up: Agenda commands. (line 285) +* org-agenda-quit: Agenda commands. (line 520) +* org-agenda-recenter: Agenda commands. (line 31) +* org-agenda-redo: Agenda commands. (line 163) +* org-agenda-refile: Agenda commands. (line 248) +* org-agenda-remove-restriction-lock <1>: Agenda commands. (line 188) +* org-agenda-remove-restriction-lock: Agenda files. (line 49) +* org-agenda-reset-view: Agenda commands. (line 76) +* org-agenda-schedule: Agenda commands. (line 301) +* org-agenda-set-restriction-lock: Agenda files. (line 42) +* org-agenda-set-tags: Agenda commands. (line 273) +* org-agenda-show-and-scroll-up: Agenda commands. (line 28) +* org-agenda-show-priority: Agenda commands. (line 282) +* org-agenda-show-tags: Agenda commands. (line 268) +* org-agenda-sunrise-sunset: Agenda commands. (line 484) +* org-agenda-switch-to: Agenda commands. (line 37) +* org-agenda-todo: Agenda commands. (line 233) +* org-agenda-todo-nextset: Agenda commands. (line 237) +* org-agenda-todo-previousset: Agenda commands. (line 240) +* org-agenda-toggle-archive-tag: Agenda commands. (line 256) +* org-agenda-toggle-diary: Agenda commands. (line 106) +* org-agenda-toggle-time-grid: Agenda commands. (line 159) +* org-agenda-tree-to-indirect-buffer: Agenda commands. (line 47) +* org-agenda-undo: Agenda commands. (line 229) +* org-agenda-week-view: Agenda commands. (line 72) +* org-agenda-write <1>: Exporting Agenda Views. + (line 12) +* org-agenda-write: Agenda commands. (line 506) +* org-agenda-year-view: Agenda commands. (line 75) +* org-archive-subtree: Moving subtrees. (line 9) +* org-archive-subtree-default: Archiving. (line 11) +* org-archive-to-archive-sibling: Internal archiving. (line 49) +* org-ascii-export-as-ascii: ASCII/Latin-1/UTF-8 export. + (line 22) +* org-ascii-export-to-ascii: ASCII/Latin-1/UTF-8 export. + (line 18) +* org-attach <1>: Agenda commands. (line 298) +* org-attach: Attachments. (line 26) +* org-attach-attach: Attachments. (line 31) +* org-attach-delete-all: Attachments. (line 66) +* org-attach-delete-one: Attachments. (line 63) +* org-attach-new: Attachments. (line 41) +* org-attach-open: Attachments. (line 48) +* org-attach-open-in-emacs: Attachments. (line 54) +* org-attach-reveal: Attachments. (line 57) +* org-attach-reveal-in-emacs: Attachments. (line 60) +* org-attach-set-directory: Attachments. (line 70) +* org-attach-set-inherit: Attachments. (line 75) +* org-attach-sync: Attachments. (line 44) +* org-backward-same-level: Motion. (line 15) +* org-beamer-export-as-latex: Beamer export. (line 16) +* org-beamer-export-to-latex: Beamer export. (line 13) +* org-beamer-export-to-pdf: Beamer export. (line 19) +* org-beamer-select-environment: Beamer export. (line 142) +* org-buffer-property-keys: Using the property API. + (line 35) +* org-calendar-goto-agenda: Agenda commands. (line 457) +* org-capture <1>: Using capture. (line 6) +* org-capture <2>: Conventions. (line 35) +* org-capture: Activation. (line 6) +* org-capture-finalize: Using capture. (line 15) +* org-capture-kill: Using capture. (line 31) +* org-capture-refile: Using capture. (line 22) +* org-check-after-date: Inserting deadline/schedule. + (line 39) +* org-check-before-date: Inserting deadline/schedule. + (line 36) +* org-check-deadlines: Inserting deadline/schedule. + (line 29) +* org-clock-cancel: Clocking commands. (line 71) +* org-clock-display: Clocking commands. (line 80) +* org-clock-goto: Clocking commands. (line 75) +* org-clock-in: Clocking commands. (line 6) +* org-clock-in-last: Clocking commands. (line 42) +* org-clock-modify-effort-estimate <1>: Effort estimates. (line 17) +* org-clock-modify-effort-estimate: Clocking commands. (line 48) +* org-clock-out: Clocking commands. (line 34) +* org-clock-report: The clock table. (line 10) +* org-clock-timestamps-up/down: Clocking commands. (line 56) +* org-clocktable-try-shift: The clock table. (line 24) +* org-clone-subtree-with-time-shift: Structure editing. (line 93) +* org-columns: Using column view. (line 9) +* org-columns-delete: Using column view. (line 75) +* org-columns-edit-allowed: Using column view. (line 59) +* org-columns-edit-value: Using column view. (line 46) +* org-columns-narrow: Using column view. (line 70) +* org-columns-new: Using column view. (line 72) +* org-columns-next-allowed-value: Using column view. (line 42) +* org-columns-previous-allowed-value: Using column view. (line 42) +* org-columns-quit: Using column view. (line 26) +* org-columns-redo: Using column view. (line 19) +* org-columns-set-tags-or-toggle: Using column view. (line 52) +* org-columns-show-value: Using column view. (line 55) +* org-columns-widen: Using column view. (line 70) +* org-compute-property-at-point: Property syntax. (line 108) +* org-copy: Refile and copy. (line 12) +* org-copy-subtree: Structure editing. (line 71) +* org-copy-visible: Global and local cycling. + (line 61) +* org-cut-subtree: Structure editing. (line 67) +* org-cycle <1>: Plain lists. (line 68) +* org-cycle <2>: Structure editing. (line 33) +* org-cycle: Global and local cycling. + (line 10) +* org-cycle-agenda-files: Agenda files. (line 22) +* org-date-from-calendar: Creating timestamps. (line 29) +* org-dblock-update <1>: Dynamic blocks. (line 21) +* org-dblock-update <2>: The clock table. (line 16) +* org-dblock-update: Capturing column view. + (line 51) +* org-deadline: Inserting deadline/schedule. + (line 9) +* org-delete-property: Property syntax. (line 102) +* org-delete-property-globally: Property syntax. (line 105) +* org-demote: Using the mapping API. + (line 83) +* org-demote-subtree: Structure editing. (line 48) +* org-do-demote: Structure editing. (line 42) +* org-do-promote: Structure editing. (line 39) +* org-edit-special: Cooperation. (line 61) +* org-entry-add-to-multivalued-property: Using the property API. + (line 52) +* org-entry-delete: Using the property API. + (line 29) +* org-entry-get: Using the property API. + (line 20) +* org-entry-get-multivalued-property: Using the property API. + (line 47) +* org-entry-member-in-multivalued-property: Using the property API. + (line 64) +* org-entry-properties: Using the property API. + (line 10) +* org-entry-put: Using the property API. + (line 32) +* org-entry-put-multivalued-property: Using the property API. + (line 42) +* org-entry-remove-from-multivalued-property: Using the property API. + (line 58) +* org-evaluate-time-range <1>: Clocking commands. (line 51) +* org-evaluate-time-range: Creating timestamps. (line 59) +* org-export-dispatch: The Export Dispatcher. + (line 11) +* org-feed-goto-inbox: RSS Feeds. (line 27) +* org-feed-update-all: RSS Feeds. (line 23) +* org-force-cycle-archived: Internal archiving. (line 46) +* org-forward-same-level: Motion. (line 12) +* org-global-cycle: Global and local cycling. + (line 22) +* org-goto: Motion. (line 21) +* org-goto-calendar: Creating timestamps. (line 33) +* org-html-export-as-html: HTML Export commands. + (line 10) +* org-html-export-to-html: HTML Export commands. + (line 6) +* org-icalendar-combine-agenda-files: iCalendar export. (line 39) +* org-icalendar-export-agenda-files: iCalendar export. (line 34) +* org-icalendar-export-to-ics: iCalendar export. (line 32) +* org-insert-columns-dblock: Capturing column view. + (line 49) +* org-insert-heading <1>: Relative timer. (line 17) +* org-insert-heading <2>: Plain lists. (line 79) +* org-insert-heading: Structure editing. (line 6) +* org-insert-heading-respect-content: Structure editing. (line 19) +* org-insert-link: Handling links. (line 65) +* org-insert-property-drawer: Using the property API. + (line 18) +* org-insert-todo-heading <1>: Checkboxes. (line 73) +* org-insert-todo-heading <2>: TODO basics. (line 58) +* org-insert-todo-heading: Structure editing. (line 24) +* org-insert-todo-heading-respect-content: Structure editing. (line 28) +* org-iswitchb: Activation. (line 6) +* org-latex-export-as-latex: LaTeX export commands. + (line 9) +* org-latex-export-to-latex: LaTeX export commands. + (line 6) +* org-latex-export-to-pdf: LaTeX export commands. + (line 12) +* org-lookup-all: Lookup functions. (line 22) +* org-lookup-first: Lookup functions. (line 8) +* org-lookup-last: Lookup functions. (line 18) +* org-map-entries: Using the mapping API. + (line 13) +* org-mark-element: Structure editing. (line 57) +* org-mark-entry-for-agenda-action: Inserting deadline/schedule. + (line 23) +* org-mark-ring-goto: Handling links. (line 146) +* org-mark-ring-push: Handling links. (line 142) +* org-mark-subtree: Structure editing. (line 63) +* org-match-sparse-tree <1>: Property searches. (line 10) +* org-match-sparse-tree: Tag searches. (line 9) +* org-md-export-as-markdown: Markdown export. (line 19) +* org-md-export-to-markdown: Markdown export. (line 16) +* org-move-subtree-down: Structure editing. (line 54) +* org-move-subtree-up: Structure editing. (line 51) +* org-narrow-to-block: Structure editing. (line 120) +* org-narrow-to-subtree: Structure editing. (line 117) +* org-next-link: Handling links. (line 152) +* org-occur: Sparse trees. (line 17) +* org-odt-export-to-odt: ODT export commands. (line 9) +* org-open-at-point <1>: Creating timestamps. (line 38) +* org-open-at-point: Handling links. (line 101) +* org-org-export-as-org: Org export. (line 16) +* org-org-export-to-org: Org export. (line 13) +* org-paste-subtree: Structure editing. (line 75) +* org-previous-link: Handling links. (line 152) +* org-priority <1>: Using the mapping API. + (line 71) +* org-priority: Priorities. (line 24) +* org-priority-down: Priorities. (line 29) +* org-priority-up: Priorities. (line 29) +* org-promote: Using the mapping API. + (line 80) +* org-promote-subtree: Structure editing. (line 45) +* org-property-action: Property syntax. (line 90) +* org-property-next-allowed-value: Property syntax. (line 98) +* org-property-previous-allowed-value: Property syntax. (line 98) +* org-publish: Triggering publication. + (line 8) +* org-publish-all: Triggering publication. + (line 16) +* org-publish-current-file: Triggering publication. + (line 13) +* org-publish-current-project: Triggering publication. + (line 10) +* org-refile <1>: Refile and copy. (line 14) +* org-refile: Structure editing. (line 101) +* org-refile-cache-clear: Refile and copy. (line 47) +* org-refile-goto-last-stored: Refile and copy. (line 36) +* org-remove-file: Agenda files. (line 19) +* org-reveal: Global and local cycling. + (line 38) +* org-save-all-org-buffers: Agenda commands. (line 173) +* org-schedule: Inserting deadline/schedule. + (line 17) +* org-search-view: Search view. (line 9) +* org-set-effort: Effort estimates. (line 14) +* org-set-property: Property syntax. (line 81) +* org-set-startup-visibility <1>: Initial visibility. (line 25) +* org-set-startup-visibility: Global and local cycling. + (line 33) +* org-set-tags-command: Setting tags. (line 10) +* org-show-todo-tree: TODO basics. (line 39) +* org-sort: Structure editing. (line 105) +* org-sparse-tree: Sparse trees. (line 15) +* org-speedbar-set-agenda-restriction: Agenda files. (line 57) +* org-store-agenda-views: Exporting Agenda Views. + (line 64) +* org-store-link <1>: Handling links. (line 9) +* org-store-link: Activation. (line 6) +* org-table-align: Built-in table editor. + (line 57) +* org-table-beginning-of-field: Built-in table editor. + (line 70) +* org-table-copy-down: Built-in table editor. + (line 159) +* org-table-copy-region: Built-in table editor. + (line 126) +* org-table-create-or-convert-from-region: Built-in table editor. + (line 41) +* org-table-create-with-table.el: Cooperation. (line 63) +* org-table-cut-region: Built-in table editor. + (line 130) +* org-table-delete-column: Built-in table editor. + (line 84) +* org-table-edit-field: Built-in table editor. + (line 174) +* org-table-edit-formulas: Editing and debugging formulas. + (line 36) +* org-table-end-of-field: Built-in table editor. + (line 74) +* org-table-eval-formula <1>: Editing and debugging formulas. + (line 13) +* org-table-eval-formula <2>: Column formulas. (line 32) +* org-table-eval-formula: Field and range formulas. + (line 28) +* org-table-export: Built-in table editor. + (line 199) +* org-table-fedit-abort: Editing and debugging formulas. + (line 50) +* org-table-fedit-finish: Editing and debugging formulas. + (line 47) +* org-table-fedit-line-down: Editing and debugging formulas. + (line 72) +* org-table-fedit-line-up: Editing and debugging formulas. + (line 72) +* org-table-fedit-lisp-indent: Editing and debugging formulas. + (line 57) +* org-table-fedit-ref-down: Editing and debugging formulas. + (line 67) +* org-table-fedit-ref-left: Editing and debugging formulas. + (line 67) +* org-table-fedit-ref-right: Editing and debugging formulas. + (line 67) +* org-table-fedit-ref-up: Editing and debugging formulas. + (line 67) +* org-table-fedit-scroll-down: Editing and debugging formulas. + (line 77) +* org-table-fedit-scroll-up: Editing and debugging formulas. + (line 77) +* org-table-fedit-toggle-ref-type: Editing and debugging formulas. + (line 53) +* org-table-field-info: Editing and debugging formulas. + (line 22) +* org-table-hline-and-move: Built-in table editor. + (line 105) +* org-table-insert-column: Built-in table editor. + (line 87) +* org-table-insert-hline: Built-in table editor. + (line 101) +* org-table-insert-row: Built-in table editor. + (line 97) +* org-table-iterate: Updating the table. (line 22) +* org-table-iterate-buffer-tables: Updating the table. (line 33) +* org-table-kill-row: Built-in table editor. + (line 94) +* org-table-move-column-left: Built-in table editor. + (line 82) +* org-table-move-column-right: Built-in table editor. + (line 82) +* org-table-move-row-down: Built-in table editor. + (line 90) +* org-table-move-row-up: Built-in table editor. + (line 90) +* org-table-next-field: Built-in table editor. + (line 58) +* org-table-next-row: Built-in table editor. + (line 65) +* org-table-paste-rectangle: Built-in table editor. + (line 134) +* org-table-previous-field: Built-in table editor. + (line 62) +* org-table-recalculate: Updating the table. (line 13) +* org-table-recalculate-buffer-tables: Updating the table. (line 30) +* org-table-rotate-recalc-marks: Advanced features. (line 10) +* org-table-sort-lines: Built-in table editor. + (line 109) +* org-table-sum: Built-in table editor. + (line 156) +* org-table-toggle-coordinate-overlays: Editing and debugging formulas. + (line 26) +* org-table-toggle-formula-debugger: Editing and debugging formulas. + (line 32) +* org-table-wrap-region: Built-in table editor. + (line 141) +* org-tags-view <1>: Matching tags and properties. + (line 12) +* org-tags-view <2>: Property searches. (line 12) +* org-tags-view: Tag searches. (line 13) +* org-texinfo-export-to-info: Texinfo export commands. + (line 9) +* org-texinfo-export-to-texinfo: Texinfo export commands. + (line 6) +* org-time-stamp: Creating timestamps. (line 10) +* org-time-stamp-inactive: Creating timestamps. (line 15) +* org-timeline: Timeline. (line 10) +* org-timer: Relative timer. (line 10) +* org-timer-item: Relative timer. (line 13) +* org-timer-start: Relative timer. (line 30) +* org-timestamp-down-day: Creating timestamps. (line 42) +* org-timestamp-down-down: Creating timestamps. (line 47) +* org-timestamp-up: Creating timestamps. (line 47) +* org-timestamp-up-day: Creating timestamps. (line 42) +* org-timestamp-up/down: Clocking commands. (line 60) +* org-todo <1>: Using the mapping API. + (line 67) +* org-todo <2>: Clocking commands. (line 67) +* org-todo: TODO basics. (line 13) +* org-todo-list <1>: Global TODO list. (line 9) +* org-todo-list: TODO basics. (line 50) +* org-toggle-archive-tag: Internal archiving. (line 36) +* org-toggle-checkbox: Checkboxes. (line 52) +* org-toggle-heading: Structure editing. (line 126) +* org-toggle-inline-images: Handling links. (line 133) +* org-toggle-ordered-property <1>: Checkboxes. (line 76) +* org-toggle-ordered-property: TODO dependencies. (line 29) +* org-toggle-tag: Using the mapping API. + (line 75) +* org-toggle-time-stamp-overlays: Custom time format. (line 12) +* org-tree-to-indirect-buffer: Global and local cycling. + (line 55) +* org-update-all-dblocks: Capturing column view. + (line 55) +* org-update-statistics-cookies: Checkboxes. (line 84) +* org-yank: Structure editing. (line 81) +* outline-next-visible-heading: Motion. (line 8) +* outline-previous-visible-heading: Motion. (line 9) +* outline-up-heading: Motion. (line 18) +* pcomplete: Property syntax. (line 78) +* previous-error: Sparse trees. (line 32) +* show-all: Global and local cycling. + (line 35) +* show-branches: Global and local cycling. + (line 47) +* show-children: Global and local cycling. + (line 51) +* widen: Structure editing. (line 123) + + +File: org, Node: Variable Index, Prev: Command and Function Index, Up: Top + +Variable index +************** + +This is not a complete index of variables and faces, only the ones that +are mentioned in the manual. For a more complete list, use `M-x +org-customize ' and then click yourself through the tree. + +[index] +* Menu: + +* cdlatex-simplify-sub-super-scripts: CDLaTeX mode. (line 33) +* constants-unit-system <1>: In-buffer settings. (line 153) +* constants-unit-system: References. (line 109) +* htmlize-output-type: Exporting Agenda Views. + (line 20) +* LaTeX-verbatim-environments: A LaTeX example. (line 21) +* org-adapt-indentation: Clean view. (line 46) +* org-agenda-add-entry-text-maxlines: Exporting Agenda Views. + (line 20) +* org-agenda-bulk-custom-functions: Agenda commands. (line 365) +* org-agenda-category-filter-preset <1>: Agenda commands. (line 206) +* org-agenda-category-filter-preset: Filtering/limiting agenda items. + (line 94) +* org-agenda-clock-consistency-checks: Agenda commands. (line 146) +* org-agenda-columns-add-appointments-to-effort-sum: Effort estimates. + (line 41) +* org-agenda-confirm-kill: Agenda commands. (line 245) +* org-agenda-custom-commands <1>: Extracting agenda information. + (line 6) +* org-agenda-custom-commands <2>: Setting Options. (line 6) +* org-agenda-custom-commands <3>: Storing searches. (line 9) +* org-agenda-custom-commands: Sparse trees. (line 37) +* org-agenda-custom-commands-contexts: Setting Options. (line 62) +* org-agenda-diary-file: Agenda commands. (line 464) +* org-agenda-dim-blocked-tasks <1>: Speeding up your agendas. + (line 16) +* org-agenda-dim-blocked-tasks: TODO dependencies. (line 39) +* org-agenda-entry-text-maxlines: Agenda commands. (line 154) +* org-agenda-exporter-settings <1>: Exporting Agenda Views. + (line 13) +* org-agenda-exporter-settings: Agenda commands. (line 507) +* org-agenda-files <1>: iCalendar export. (line 37) +* org-agenda-files <2>: Sorting agenda items. + (line 8) +* org-agenda-files: Agenda files. (line 6) +* org-agenda-inhibit-startup <1>: Speeding up your agendas. + (line 19) +* org-agenda-inhibit-startup: Initial visibility. (line 6) +* org-agenda-log-mode-items: Agenda commands. (line 113) +* org-agenda-max-effort: Filtering/limiting agenda items. + (line 118) +* org-agenda-max-entries: Filtering/limiting agenda items. + (line 118) +* org-agenda-max-tags: Filtering/limiting agenda items. + (line 118) +* org-agenda-max-todos: Filtering/limiting agenda items. + (line 118) +* org-agenda-ndays: Weekly/daily agenda. (line 15) +* org-agenda-overriding-header: Special agenda views. + (line 45) +* org-agenda-prefix-format: Presentation and sorting. + (line 6) +* org-agenda-regexp-filter-preset <1>: Agenda commands. (line 214) +* org-agenda-regexp-filter-preset: Filtering/limiting agenda items. + (line 104) +* org-agenda-restore-windows-after-quit: Agenda Views. (line 40) +* org-agenda-show-inherited-tags <1>: Speeding up your agendas. + (line 22) +* org-agenda-show-inherited-tags: Agenda commands. (line 271) +* org-agenda-skip-archived-trees: Internal archiving. (line 21) +* org-agenda-skip-deadline-prewarning-if-scheduled: Deadlines and scheduling. + (line 12) +* org-agenda-skip-function <1>: Using the mapping API. + (line 52) +* org-agenda-skip-function: Special agenda views. + (line 6) +* org-agenda-skip-function-global: Special agenda views. + (line 6) +* org-agenda-skip-scheduled-delay-if-deadline: Deadlines and scheduling. + (line 40) +* org-agenda-skip-scheduled-if-deadline-is-shown: Repeated tasks. + (line 62) +* org-agenda-skip-scheduled-if-done: Deadlines and scheduling. + (line 32) +* org-agenda-sorting-strategy: Sorting agenda items. + (line 27) +* org-agenda-span <1>: Agenda commands. (line 77) +* org-agenda-span: Weekly/daily agenda. (line 15) +* org-agenda-start-day: Weekly/daily agenda. (line 15) +* org-agenda-start-on-weekday: Weekly/daily agenda. (line 15) +* org-agenda-start-with-clockreport-mode: Agenda commands. (line 135) +* org-agenda-start-with-entry-text-mode: Agenda commands. (line 154) +* org-agenda-start-with-follow-mode: Agenda commands. (line 43) +* org-agenda-sticky: Agenda dispatcher. (line 53) +* org-agenda-tag-filter-preset <1>: Agenda commands. (line 199) +* org-agenda-tag-filter-preset: Filtering/limiting agenda items. + (line 18) +* org-agenda-tags-column: Presentation and sorting. + (line 6) +* org-agenda-tags-todo-honor-ignore-options: Matching tags and properties. + (line 20) +* org-agenda-text-search-extra-files <1>: Search view. (line 24) +* org-agenda-text-search-extra-files: Agenda dispatcher. (line 32) +* org-agenda-time-grid <1>: Agenda commands. (line 162) +* org-agenda-time-grid: Time-of-day specifications. + (line 41) +* org-agenda-todo-ignore-deadlines: Global TODO list. (line 38) +* org-agenda-todo-ignore-scheduled: Global TODO list. (line 38) +* org-agenda-todo-ignore-timestamp: Global TODO list. (line 38) +* org-agenda-todo-ignore-with-date: Global TODO list. (line 38) +* org-agenda-todo-list-sublevels <1>: Global TODO list. (line 47) +* org-agenda-todo-list-sublevels: Breaking down tasks. (line 6) +* org-agenda-use-tag-inheritance <1>: Speeding up your agendas. + (line 22) +* org-agenda-use-tag-inheritance: Tag inheritance. (line 32) +* org-agenda-use-time-grid <1>: Agenda commands. (line 162) +* org-agenda-use-time-grid: Time-of-day specifications. + (line 41) +* org-agenda-window-setup: Agenda Views. (line 40) +* org-archive-default-command <1>: Agenda commands. (line 254) +* org-archive-default-command: Archiving. (line 12) +* org-archive-location <1>: In-buffer settings. (line 16) +* org-archive-location: Moving subtrees. (line 10) +* org-archive-save-context-info: Moving subtrees. (line 36) +* org-ascii-links-to-notes: ASCII/Latin-1/UTF-8 export. + (line 11) +* org-attach-directory: Attachments. (line 6) +* org-attach-method: Attachments. (line 32) +* org-babel-default-header-args <1>: Header arguments in Org mode properties. + (line 34) +* org-babel-default-header-args: System-wide header arguments. + (line 6) +* org-beamer-environments-default: Beamer export. (line 44) +* org-beamer-environments-extra: Beamer export. (line 44) +* org-beamer-frame-level: Beamer export. (line 35) +* org-calc-default-modes: Formula syntax for Calc. + (line 14) +* org-capture-bookmark: Using capture. (line 50) +* org-capture-templates-contexts: Templates in contexts. + (line 6) +* org-capture-use-agenda-date: Agenda commands. (line 349) +* org-catch-invisible-edits: Catching invisible edits. + (line 6) +* org-checkbox-hierarchical-statistics: Checkboxes. (line 30) +* org-clock-continuously <1>: Resolving idle time. (line 78) +* org-clock-continuously: Clocking commands. (line 7) +* org-clock-idle-time: Resolving idle time. (line 14) +* org-clock-into-drawer: Clocking commands. (line 7) +* org-clock-modeline-total: Clocking commands. (line 20) +* org-clock-report-include-clocking-task: Agenda commands. (line 135) +* org-clock-x11idle-program-name: Resolving idle time. (line 9) +* org-clocktable-defaults: The clock table. (line 38) +* org-closed-keep-when-no-todo: Closing items. (line 11) +* org-coderef-label-format: Literal examples. (line 58) +* org-columns-default-format <1>: Agenda column view. (line 18) +* org-columns-default-format <2>: Agenda commands. (line 180) +* org-columns-default-format <3>: Effort estimates. (line 31) +* org-columns-default-format: Using column view. (line 10) +* org-columns-skip-archived-trees: Internal archiving. (line 31) +* org-confirm-babel-evaluate: Code evaluation security. + (line 34) +* org-confirm-elisp-link-function: Code evaluation security. + (line 56) +* org-confirm-shell-link-function: Code evaluation security. + (line 53) +* org-create-file-search-functions: Custom searches. (line 12) +* org-ctrl-c-ctrl-c-hook: Context-sensitive commands. + (line 6) +* org-ctrl-k-protect-subtree: Headlines. (line 6) +* org-cycle-emulate-tab: Global and local cycling. + (line 16) +* org-cycle-global-at-bob: Global and local cycling. + (line 16) +* org-cycle-include-plain-lists: Plain lists. (line 69) +* org-cycle-open-archived-trees: Internal archiving. (line 11) +* org-cycle-separator-lines: Headlines. (line 22) +* org-deadline-warning-days <1>: Inserting deadline/schedule. + (line 32) +* org-deadline-warning-days: Deadlines and scheduling. + (line 12) +* org-default-notes-file <1>: Template elements. (line 49) +* org-default-notes-file: Setting up capture. (line 9) +* org-default-priority <1>: In-buffer settings. (line 54) +* org-default-priority: Priorities. (line 38) +* org-display-custom-times <1>: Publishing options. (line 12) +* org-display-custom-times: Custom time format. (line 6) +* org-display-internal-link-with-indirect-buffer: Handling links. + (line 132) +* org-disputed-keys: Conflicts. (line 34) +* org-done (face): Faces for TODO keywords. + (line 6) +* org-drawers <1>: In-buffer settings. (line 45) +* org-drawers: Drawers. (line 6) +* org-edit-src-auto-save-idle-delay: Editing source code. (line 6) +* org-edit-src-turn-on-auto-save: Editing source code. (line 6) +* org-emphasis-alist: Emphasis and monospace. + (line 6) +* org-emphasis-regexp-components: Emphasis and monospace. + (line 6) +* org-enable-table-editor: Built-in table editor. + (line 30) +* org-enforce-todo-dependencies: TODO dependencies. (line 6) +* org-entities: Special symbols. (line 15) +* org-execute-file-search-functions: Custom searches. (line 12) +* org-export-allow-bind-keywords: Export settings. (line 187) +* org-export-async-init-file: The Export Dispatcher. + (line 25) +* org-export-backends <1>: Other built-in back-ends. + (line 6) +* org-export-backends: Export back-ends. (line 10) +* org-export-before-parsing-hook: Advanced configuration. + (line 9) +* org-export-before-processing-hook: Advanced configuration. + (line 9) +* org-export-copy-to-kill-ring: The Export Dispatcher. + (line 54) +* org-export-creator-string <1>: HTML preamble and postamble. + (line 6) +* org-export-creator-string: Export settings. (line 28) +* org-export-date-timestamp-format: Export settings. (line 32) +* org-export-default-language <1>: Publishing options. (line 12) +* org-export-default-language: Export settings. (line 48) +* org-export-dispatch-use-expert-ui: The Export Dispatcher. + (line 6) +* org-export-exclude-tags: Publishing options. (line 12) +* org-export-headline-levels <1>: Publishing options. (line 12) +* org-export-headline-levels <2>: Export settings. (line 129) +* org-export-headline-levels: Headings and sections. + (line 6) +* org-export-in-background: The Export Dispatcher. + (line 34) +* org-export-initial-scope: The Export Dispatcher. + (line 44) +* org-export-preserve-breaks <1>: Publishing options. (line 12) +* org-export-preserve-breaks: Export settings. (line 91) +* org-export-publishing-directory: Publishing options. (line 12) +* org-export-select-tags <1>: Publishing options. (line 12) +* org-export-select-tags: Export settings. (line 54) +* org-export-time-stamp-file <1>: HTML preamble and postamble. + (line 6) +* org-export-time-stamp-file: Export settings. (line 167) +* org-export-with-archived-trees <1>: Publishing options. (line 12) +* org-export-with-archived-trees <2>: Export settings. (line 99) +* org-export-with-archived-trees: Internal archiving. (line 27) +* org-export-with-author <1>: Publishing options. (line 12) +* org-export-with-author: Export settings. (line 104) +* org-export-with-clocks: Export settings. (line 108) +* org-export-with-creator <1>: Publishing options. (line 12) +* org-export-with-creator: Export settings. (line 111) +* org-export-with-drawers <1>: Publishing options. (line 12) +* org-export-with-drawers <2>: Export settings. (line 115) +* org-export-with-drawers: Drawers. (line 38) +* org-export-with-email <1>: Publishing options. (line 12) +* org-export-with-email: Export settings. (line 122) +* org-export-with-emphasize: Publishing options. (line 12) +* org-export-with-entities: Export settings. (line 119) +* org-export-with-fixed-width <1>: Publishing options. (line 12) +* org-export-with-fixed-width: Export settings. (line 84) +* org-export-with-footnotes <1>: Publishing options. (line 12) +* org-export-with-footnotes: Export settings. (line 126) +* org-export-with-inlinetasks: Export settings. (line 134) +* org-export-with-latex <1>: Publishing options. (line 12) +* org-export-with-latex <2>: Export settings. (line 163) +* org-export-with-latex: LaTeX fragments. (line 39) +* org-export-with-planning <1>: Publishing options. (line 12) +* org-export-with-planning: Export settings. (line 142) +* org-export-with-priority <1>: Publishing options. (line 12) +* org-export-with-priority: Export settings. (line 147) +* org-export-with-section-numbers <1>: Publishing options. (line 12) +* org-export-with-section-numbers: Export settings. (line 137) +* org-export-with-smart-quotes: Export settings. (line 74) +* org-export-with-special-strings <1>: Publishing options. (line 12) +* org-export-with-special-strings: Export settings. (line 80) +* org-export-with-statistics-cookies: Export settings. (line 150) +* org-export-with-sub-superscripts <1>: Publishing options. (line 12) +* org-export-with-sub-superscripts: Export settings. (line 94) +* org-export-with-tables <1>: Publishing options. (line 12) +* org-export-with-tables: Export settings. (line 179) +* org-export-with-tags <1>: Publishing options. (line 12) +* org-export-with-tags: Export settings. (line 154) +* org-export-with-tasks <1>: Publishing options. (line 12) +* org-export-with-tasks: Export settings. (line 158) +* org-export-with-timestamps <1>: Publishing options. (line 12) +* org-export-with-timestamps: Export settings. (line 87) +* org-export-with-toc <1>: Publishing options. (line 12) +* org-export-with-toc <2>: Export settings. (line 171) +* org-export-with-toc: Table of contents. (line 6) +* org-export-with-todo-keywords <1>: Publishing options. (line 12) +* org-export-with-todo-keywords: Export settings. (line 175) +* org-fast-tag-selection-include-todo: Fast access to TODO states. + (line 16) +* org-fast-tag-selection-single-key: Setting tags. (line 144) +* org-file-apps <1>: Attachments. (line 49) +* org-file-apps: Handling links. (line 104) +* org-fontify-emphasized-text: Emphasis and monospace. + (line 6) +* org-footnote-auto-adjust <1>: In-buffer settings. (line 158) +* org-footnote-auto-adjust: Footnotes. (line 58) +* org-footnote-auto-label <1>: In-buffer settings. (line 158) +* org-footnote-auto-label: Footnotes. (line 44) +* org-footnote-define-inline <1>: In-buffer settings. (line 158) +* org-footnote-define-inline: Footnotes. (line 58) +* org-footnote-section: Footnotes. (line 58) +* org-format-latex-header: LaTeX fragments. (line 6) +* org-format-latex-options: Previewing LaTeX fragments. + (line 20) +* org-from-is-user-regexp: Template expansion. (line 49) +* org-global-properties <1>: Effort estimates. (line 31) +* org-global-properties: Property syntax. (line 73) +* org-goto-auto-isearch: Motion. (line 26) +* org-goto-interface: Motion. (line 37) +* org-group-tags: Tag groups. (line 34) +* org-hide (face): Clean view. (line 66) +* org-hide-block-startup: Blocks. (line 6) +* org-hide-leading-stars <1>: Clean view. (line 50) +* org-hide-leading-stars: In-buffer settings. (line 137) +* org-hierarchical-todo-statistics: Breaking down tasks. (line 25) +* org-highest-priority <1>: In-buffer settings. (line 54) +* org-highest-priority: Priorities. (line 38) +* org-html-container-element: Publishing options. (line 38) +* org-html-doctype <1>: Publishing options. (line 38) +* org-html-doctype: HTML doctypes. (line 6) +* org-html-doctype-alist: HTML doctypes. (line 6) +* org-html-extension: Publishing options. (line 38) +* org-html-head <1>: Publishing options. (line 38) +* org-html-head: CSS support. (line 41) +* org-html-head-extra <1>: Publishing options. (line 38) +* org-html-head-extra: CSS support. (line 41) +* org-html-head-include-default-style <1>: Publishing options. + (line 38) +* org-html-head-include-default-style: CSS support. (line 41) +* org-html-head-include-scripts: Publishing options. (line 38) +* org-html-html5-elements: HTML doctypes. (line 39) +* org-html-html5-fancy <1>: Publishing options. (line 38) +* org-html-html5-fancy: HTML doctypes. (line 39) +* org-html-infojs-options: JavaScript support. (line 54) +* org-html-inline-images <1>: Publishing options. (line 38) +* org-html-inline-images: Images in HTML export. + (line 6) +* org-html-link-home: Publishing options. (line 38) +* org-html-link-org-files-as-html: Publishing options. (line 38) +* org-html-link-up: Publishing options. (line 38) +* org-html-link-use-abs-url: Publishing options. (line 38) +* org-html-postamble <1>: Publishing options. (line 38) +* org-html-postamble: HTML preamble and postamble. + (line 6) +* org-html-postamble-format: HTML preamble and postamble. + (line 6) +* org-html-preamble <1>: Publishing options. (line 38) +* org-html-preamble: HTML preamble and postamble. + (line 6) +* org-html-preamble-format: HTML preamble and postamble. + (line 6) +* org-html-style-default: CSS support. (line 41) +* org-html-table-default-attributes <1>: Publishing options. (line 38) +* org-html-table-default-attributes: Tables in HTML export. + (line 6) +* org-html-table-row-tags <1>: Publishing options. (line 38) +* org-html-table-row-tags: Tables in HTML export. + (line 15) +* org-html-tag-class-prefix: CSS support. (line 6) +* org-html-todo-kwd-class-prefix: CSS support. (line 6) +* org-html-use-infojs: JavaScript support. (line 54) +* org-html-validation-link: HTML preamble and postamble. + (line 6) +* org-html-xml-declaration: Publishing options. (line 38) +* org-icalendar-alarm-time: iCalendar export. (line 6) +* org-icalendar-categories: iCalendar export. (line 6) +* org-icalendar-combined-agenda-file: iCalendar export. (line 42) +* org-icalendar-include-body: iCalendar export. (line 46) +* org-icalendar-include-todo: iCalendar export. (line 6) +* org-icalendar-store-UID: iCalendar export. (line 21) +* org-icalendar-use-deadline: iCalendar export. (line 6) +* org-icalendar-use-scheduled: iCalendar export. (line 6) +* org-id-link-to-org-use-id: Handling links. (line 21) +* org-imenu-depth: Cooperation. (line 38) +* org-insert-mode-line-in-empty-file: Activation. (line 33) +* org-irc-link-to-logs: Handling links. (line 45) +* org-keep-stored-link-after-insertion: Handling links. (line 66) +* org-latex-classes: Header and sectioning. + (line 13) +* org-latex-create-formula-image-program: Previewing LaTeX fragments. + (line 6) +* org-latex-default-class: Header and sectioning. + (line 13) +* org-latex-default-packages-alist: Header and sectioning. + (line 13) +* org-latex-default-table-environment: LaTeX specific attributes. + (line 26) +* org-latex-default-table-mode: LaTeX specific attributes. + (line 17) +* org-latex-packages-alist: Header and sectioning. + (line 13) +* org-latex-tables-booktabs: LaTeX specific attributes. + (line 60) +* org-latex-tables-centered: LaTeX specific attributes. + (line 60) +* org-latex-to-mathml-convert-command: Working with LaTeX math snippets. + (line 20) +* org-latex-to-mathml-jar-file: Working with LaTeX math snippets. + (line 20) +* org-link-abbrev-alist <1>: In-buffer settings. (line 49) +* org-link-abbrev-alist: Link abbreviations. (line 12) +* org-link-frame-setup: Handling links. (line 104) +* org-list-allow-alphabetical: Plain lists. (line 14) +* org-list-automatic-rules <1>: Checkboxes. (line 6) +* org-list-automatic-rules: Plain lists. (line 62) +* org-list-demote-modify-bullet: Plain lists. (line 56) +* org-list-empty-line-terminates-plain-lists: Plain lists. (line 30) +* org-list-indent-offset: Plain lists. (line 56) +* org-list-use-circular-motion: Plain lists. (line 94) +* org-log-done <1>: In-buffer settings. (line 112) +* org-log-done <2>: Agenda commands. (line 113) +* org-log-done: Tracking TODO state changes. + (line 29) +* org-log-into-drawer <1>: Agenda commands. (line 296) +* org-log-into-drawer: Tracking TODO state changes. + (line 6) +* org-log-note-clock-out <1>: In-buffer settings. (line 112) +* org-log-note-clock-out: Clocking commands. (line 37) +* org-log-refile: Refile and copy. (line 17) +* org-log-repeat <1>: In-buffer settings. (line 112) +* org-log-repeat: Repeated tasks. (line 34) +* org-log-states-order-reversed: Tracking TODO state changes. + (line 6) +* org-lowest-priority <1>: In-buffer settings. (line 54) +* org-lowest-priority: Priorities. (line 38) +* org-M-RET-may-split-line <1>: Plain lists. (line 82) +* org-M-RET-may-split-line: Structure editing. (line 7) +* org-md-headline-style: Markdown export. (line 30) +* org-odd-levels-only <1>: Special agenda views. + (line 48) +* org-odd-levels-only <2>: Clean view. (line 74) +* org-odd-levels-only <3>: In-buffer settings. (line 137) +* org-odd-levels-only: Matching tags and properties. + (line 71) +* org-odt-category-map-alist: Labels and captions in ODT export. + (line 25) +* org-odt-convert: Extending ODT export. + (line 39) +* org-odt-convert-capabilities: Configuring a document converter. + (line 20) +* org-odt-convert-process: Configuring a document converter. + (line 30) +* org-odt-convert-processes: Configuring a document converter. + (line 13) +* org-odt-create-custom-styles-for-srcblocks: Literal examples in ODT export. + (line 17) +* org-odt-fontify-srcblocks: Literal examples in ODT export. + (line 13) +* org-odt-pixels-per-inch: Images in ODT export. + (line 33) +* org-odt-preferred-output-format <1>: Extending ODT export. + (line 22) +* org-odt-preferred-output-format: ODT export commands. (line 12) +* org-odt-schema-dir: Validating OpenDocument XML. + (line 16) +* org-odt-styles-file: Applying custom styles. + (line 28) +* org-odt-table-styles: Customizing tables in ODT export. + (line 16) +* org-outline-path-complete-in-steps: Refile and copy. (line 17) +* org-overriding-columns-format: Agenda column view. (line 18) +* org-plain-list-ordered-item-terminator: Plain lists. (line 14) +* org-popup-calendar-for-date-prompt: The date/time prompt. + (line 76) +* org-priority-faces: Priorities. (line 13) +* org-priority-start-cycle-with-default: Priorities. (line 33) +* org-property-allowed-value-functions: Using the property API. + (line 69) +* org-publish-project-alist <1>: Publishing options. (line 60) +* org-publish-project-alist: Project alist. (line 6) +* org-publish-use-timestamps-flag: Triggering publication. + (line 21) +* org-put-time-stamp-overlays: In-buffer settings. (line 148) +* org-read-date-display-live: The date/time prompt. + (line 90) +* org-read-date-force-compatible-dates: The date/time prompt. + (line 61) +* org-read-date-prefer-future: The date/time prompt. + (line 6) +* org-refile-allow-creating-parent-nodes: Refile and copy. (line 17) +* org-refile-keep: Refile and copy. (line 17) +* org-refile-targets: Refile and copy. (line 17) +* org-refile-use-cache: Refile and copy. (line 17) +* org-refile-use-outline-path: Refile and copy. (line 17) +* org-remove-highlights-with-change <1>: Clocking commands. (line 83) +* org-remove-highlights-with-change: Sparse trees. (line 20) +* org-replace-disputed-keys: Conflicts. (line 19) +* org-return-follows-link: Handling links. (line 123) +* org-reverse-note-order: Refile and copy. (line 17) +* org-scheduled-delay-days: Deadlines and scheduling. + (line 40) +* org-show-entry-below: Sparse trees. (line 6) +* org-show-following-heading: Sparse trees. (line 6) +* org-show-hierarchy-above: Sparse trees. (line 6) +* org-show-siblings: Sparse trees. (line 6) +* org-sort-agenda-noeffort-is-high: Filtering/limiting agenda items. + (line 36) +* org-sparse-tree-open-archived-trees: Internal archiving. (line 17) +* org-special-ctrl-a/e: Headlines. (line 6) +* org-special-ctrl-k: Headlines. (line 6) +* org-speed-commands-user: Speed keys. (line 6) +* org-startup-align-all-tables <1>: In-buffer settings. (line 91) +* org-startup-align-all-tables: Column width and alignment. + (line 33) +* org-startup-folded <1>: Speeding up your agendas. + (line 19) +* org-startup-folded <2>: In-buffer settings. (line 80) +* org-startup-folded: Initial visibility. (line 6) +* org-startup-indented: In-buffer settings. (line 86) +* org-startup-with-inline-images <1>: In-buffer settings. (line 98) +* org-startup-with-inline-images: Handling links. (line 136) +* org-startup-with-latex-preview <1>: In-buffer settings. (line 105) +* org-startup-with-latex-preview: Previewing LaTeX fragments. + (line 25) +* org-store-link-functions: Adding hyperlink types. + (line 65) +* org-stuck-projects: Stuck projects. (line 17) +* org-support-shift-select <1>: Conflicts. (line 6) +* org-support-shift-select: Plain lists. (line 94) +* org-table-auto-blank-field: Built-in table editor. + (line 30) +* org-table-copy-increment: Built-in table editor. + (line 162) +* org-table-duration-custom-format: Durations and time values. + (line 6) +* org-table-export-default-format: Built-in table editor. + (line 199) +* org-table-formula: In-buffer settings. (line 35) +* org-table-formula-constants <1>: Cooperation. (line 17) +* org-table-formula-constants <2>: In-buffer settings. (line 35) +* org-table-formula-constants: References. (line 102) +* org-table-use-standard-references <1>: Editing and debugging formulas. + (line 6) +* org-table-use-standard-references: References. (line 17) +* org-tag-alist <1>: In-buffer settings. (line 182) +* org-tag-alist: Setting tags. (line 23) +* org-tag-faces: Tags. (line 10) +* org-tag-persistent-alist: Setting tags. (line 38) +* org-tags-column: Setting tags. (line 11) +* org-tags-exclude-from-inheritance: Tag inheritance. (line 22) +* org-tags-match-list-sublevels <1>: Matching tags and properties. + (line 20) +* org-tags-match-list-sublevels <2>: Property searches. (line 19) +* org-tags-match-list-sublevels <3>: Tag searches. (line 20) +* org-tags-match-list-sublevels: Tag inheritance. (line 26) +* org-texinfo-classes <1>: Headings and sectioning structure. + (line 6) +* org-texinfo-classes: Document preamble. (line 22) +* org-texinfo-coding-system: Document preamble. (line 22) +* org-texinfo-def-table-markup: Texinfo specific attributes. + (line 17) +* org-texinfo-default-class: Headings and sectioning structure. + (line 6) +* org-texinfo-info-process: Texinfo export commands. + (line 6) +* org-time-stamp-custom-formats: Custom time format. (line 6) +* org-time-stamp-overlay-formats: In-buffer settings. (line 148) +* org-time-stamp-rounding-minutes: Creating timestamps. (line 23) +* org-todo (face): Faces for TODO keywords. + (line 6) +* org-todo-keyword-faces: Faces for TODO keywords. + (line 6) +* org-todo-keywords <1>: In-buffer settings. (line 205) +* org-todo-keywords <2>: Global TODO list. (line 18) +* org-todo-keywords <3>: TODO extensions. (line 6) +* org-todo-keywords: TODO basics. (line 42) +* org-todo-repeat-to-state: Repeated tasks. (line 19) +* org-todo-state-tags-triggers: TODO basics. (line 63) +* org-track-ordered-property-with-tag <1>: Checkboxes. (line 79) +* org-track-ordered-property-with-tag: TODO dependencies. (line 30) +* org-treat-insert-todo-heading-as-state-change: Structure editing. + (line 27) +* org-treat-S-cursor-todo-selection-as-state-change: TODO basics. + (line 35) +* org-use-fast-todo-selection: TODO basics. (line 14) +* org-use-property-inheritance <1>: Using the property API. + (line 18) +* org-use-property-inheritance <2>: Header arguments in Org mode properties. + (line 19) +* org-use-property-inheritance <3>: iCalendar export. (line 46) +* org-use-property-inheritance: Property inheritance. + (line 6) +* org-use-speed-commands: Speed keys. (line 6) +* org-use-sub-superscripts: Subscripts and superscripts. + (line 15) +* org-use-tag-inheritance: Tag inheritance. (line 22) +* org-yank-adjusted-subtrees: Structure editing. (line 84) +* org-yank-folded-subtrees: Structure editing. (line 84) +* orgstruct-heading-prefix-regexp: Orgstruct mode. (line 26) +* parse-time-months: The date/time prompt. + (line 57) +* parse-time-weekdays: The date/time prompt. + (line 57) +* ps-landscape-mode: Exporting Agenda Views. + (line 20) +* ps-number-of-columns: Exporting Agenda Views. + (line 20) +* user-full-name: Export settings. (line 25) +* user-mail-address <1>: Publishing options. (line 12) +* user-mail-address: Export settings. (line 40) + + + +Tag Table: +Node: Top895 +Node: Introduction24003 +Node: Summary24444 +Node: Installation27498 +Node: Activation30179 +Ref: Activation-Footnote-132009 +Node: Feedback32131 +Ref: Feedback-Footnote-135734 +Node: Conventions35861 +Ref: Conventions-Footnote-137872 +Node: Document Structure37964 +Node: Outlines38955 +Node: Headlines39611 +Ref: Headlines-Footnote-140615 +Ref: Headlines-Footnote-240791 +Node: Visibility cycling40862 +Node: Global and local cycling41241 +Ref: Global and local cycling-Footnote-144088 +Ref: Global and local cycling-Footnote-244146 +Ref: Global and local cycling-Footnote-344196 +Node: Initial visibility44466 +Ref: Initial visibility-Footnote-145718 +Node: Catching invisible edits45899 +Node: Motion46364 +Node: Structure editing47699 +Ref: Structure editing-Footnote-154507 +Node: Sparse trees54607 +Ref: Sparse trees-Footnote-157102 +Ref: Sparse trees-Footnote-257308 +Ref: Sparse trees-Footnote-357379 +Node: Plain lists57494 +Ref: Plain lists-Footnote-164908 +Ref: Plain lists-Footnote-265262 +Ref: Plain lists-Footnote-365358 +Ref: Plain lists-Footnote-465605 +Ref: Plain lists-Footnote-565776 +Ref: Plain lists-Footnote-665839 +Ref: Plain lists-Footnote-766015 +Ref: Plain lists-Footnote-866115 +Ref: Plain lists-Footnote-966217 +Node: Drawers66283 +Ref: Drawers-Footnote-168118 +Node: Blocks68223 +Node: Footnotes68782 +Ref: Footnotes-Footnote-173164 +Ref: Footnotes-Footnote-273261 +Node: Orgstruct mode73338 +Node: Org syntax74968 +Node: Tables75872 +Node: Built-in table editor76513 +Ref: Built-in table editor-Footnote-186003 +Node: Column width and alignment86103 +Ref: Column width and alignment-Footnote-188663 +Ref: Column width and alignment-Footnote-288709 +Node: Column groups88806 +Node: Orgtbl mode90350 +Node: The spreadsheet91159 +Node: References92619 +Ref: References-Footnote-198727 +Ref: References-Footnote-298949 +Ref: References-Footnote-399218 +Ref: References-Footnote-499321 +Node: Formula syntax for Calc99611 +Ref: Formula syntax for Calc-Footnote-1104758 +Node: Formula syntax for Lisp105082 +Node: Durations and time values106818 +Node: Field and range formulas107897 +Node: Column formulas110308 +Node: Lookup functions112397 +Node: Editing and debugging formulas114320 +Ref: Using multiple #+TBLFM lines118579 +Node: Updating the table119792 +Node: Advanced features121148 +Ref: Advanced features-Footnote-1125629 +Node: Org-Plot125735 +Node: Hyperlinks128577 +Node: Link format129334 +Node: Internal links130612 +Ref: Internal links-Footnote-1132904 +Ref: Internal links-Footnote-2133144 +Node: Radio targets133282 +Node: External links133972 +Ref: External links-Footnote-1138038 +Node: Handling links138428 +Ref: Handling links-Footnote-1146333 +Ref: Handling links-Footnote-2146492 +Ref: Handling links-Footnote-3146667 +Ref: Handling links-Footnote-4146963 +Ref: Handling links-Footnote-5147209 +Ref: Handling links-Footnote-6147286 +Ref: Handling links-Footnote-7147358 +Node: Using links outside Org147442 +Node: Link abbreviations147927 +Node: Search options150607 +Ref: Search options-Footnote-1152489 +Node: Custom searches152570 +Node: TODO Items153580 +Ref: TODO Items-Footnote-1154688 +Node: TODO basics154802 +Node: TODO extensions157667 +Node: Workflow states158697 +Ref: Workflow states-Footnote-1160022 +Node: TODO types160115 +Ref: TODO types-Footnote-1161713 +Node: Multiple sets in one file161795 +Node: Fast access to TODO states163660 +Ref: Fast access to TODO states-Footnote-1164533 +Ref: Fast access to TODO states-Footnote-2164617 +Node: Per-file keywords164910 +Ref: Per-file keywords-Footnote-1166306 +Node: Faces for TODO keywords166507 +Node: TODO dependencies167548 +Node: Progress logging169711 +Node: Closing items170423 +Ref: Closing items-Footnote-1171653 +Ref: Closing items-Footnote-2171722 +Node: Tracking TODO state changes171796 +Ref: Tracking TODO state changes-Footnote-1174832 +Ref: Tracking TODO state changes-Footnote-2174887 +Ref: Tracking TODO state changes-Footnote-3175027 +Node: Tracking your habits175315 +Node: Priorities179549 +Ref: Priorities-Footnote-1181539 +Node: Breaking down tasks181608 +Ref: Breaking down tasks-Footnote-1183587 +Node: Checkboxes183683 +Ref: Checkboxes-Footnote-1188209 +Ref: Checkboxes-Footnote-2188333 +Ref: Checkboxes-Footnote-3188507 +Node: Tags188621 +Node: Tag inheritance189689 +Ref: Tag inheritance-Footnote-1191513 +Ref: Tag inheritance-Footnote-2191613 +Node: Setting tags191739 +Ref: Setting tags-Footnote-1198043 +Node: Tag groups198126 +Node: Tag searches199575 +Node: Properties and Columns200867 +Node: Property syntax202303 +Node: Special properties206527 +Node: Property searches208361 +Node: Property inheritance209796 +Node: Column view211612 +Node: Defining columns212847 +Node: Scope of column definitions213245 +Node: Column attributes214175 +Ref: Column attributes-Footnote-1218978 +Node: Using column view219111 +Node: Capturing column view221973 +Ref: Capturing column view-Footnote-1224969 +Node: Property API225105 +Node: Dates and Times225459 +Node: Timestamps226438 +Ref: Timestamps-Footnote-1228881 +Ref: Timestamps-Footnote-2229067 +Ref: Timestamps-Footnote-3229198 +Node: Creating timestamps229967 +Node: The date/time prompt232791 +Ref: The date/time prompt-Footnote-1237317 +Ref: The date/time prompt-Footnote-2237480 +Ref: The date/time prompt-Footnote-3237586 +Node: Custom time format237680 +Node: Deadlines and scheduling239402 +Ref: Deadlines and scheduling-Footnote-1242784 +Node: Inserting deadline/schedule242939 +Ref: Inserting deadline/schedule-Footnote-1245251 +Ref: Inserting deadline/schedule-Footnote-2245403 +Ref: Inserting deadline/schedule-Footnote-3245511 +Node: Repeated tasks245619 +Ref: Repeated tasks-Footnote-1249366 +Ref: Repeated tasks-Footnote-2249615 +Node: Clocking work time249814 +Ref: Clocking work time-Footnote-1250999 +Ref: Clocking work time-Footnote-2251143 +Node: Clocking commands251281 +Ref: Clocking commands-Footnote-1256254 +Ref: Clocking commands-Footnote-2256361 +Ref: Clocking commands-Footnote-3256411 +Ref: Clocking commands-Footnote-4256469 +Node: The clock table256547 +Ref: The clock table-Footnote-1263805 +Ref: The clock table-Footnote-2263899 +Node: Resolving idle time264024 +Ref: Resolving idle time-Footnote-1267871 +Node: Effort estimates268339 +Ref: Effort estimates-Footnote-1271100 +Node: Relative timer271207 +Node: Countdown timer273054 +Node: Capture - Refile - Archive273546 +Node: Capture274536 +Node: Setting up capture275639 +Ref: Setting up capture-Footnote-1276064 +Node: Using capture276130 +Node: Capture templates278537 +Node: Template elements280498 +Ref: Template elements-Footnote-1286162 +Node: Template expansion286337 +Ref: Template expansion-Footnote-1290327 +Ref: Template expansion-Footnote-2290414 +Ref: Template expansion-Footnote-3290596 +Node: Templates in contexts290694 +Node: Attachments291516 +Ref: Attachments-Footnote-1294898 +Node: RSS Feeds295048 +Node: Protocols296638 +Node: Refile and copy297353 +Ref: Refile and copy-Footnote-1299775 +Node: Archiving299871 +Node: Moving subtrees300571 +Ref: Moving subtrees-Footnote-1302428 +Node: Internal archiving302872 +Node: Agenda Views305502 +Node: Agenda files307693 +Ref: Agenda files-Footnote-1310517 +Ref: Agenda files-Footnote-2310666 +Node: Agenda dispatcher310859 +Ref: Agenda dispatcher-Footnote-1313674 +Ref: Agenda dispatcher-Footnote-2313768 +Node: Built-in agenda views313870 +Node: Weekly/daily agenda314519 +Ref: Weekly/daily agenda-Footnote-1319827 +Ref: Weekly/daily agenda-Footnote-2320054 +Node: Global TODO list320229 +Node: Matching tags and properties322757 +Ref: Matching tags and properties-Footnote-1330084 +Node: Timeline330164 +Node: Search view330856 +Node: Stuck projects332149 +Ref: Stuck projects-Footnote-1334209 +Node: Presentation and sorting334239 +Node: Categories335196 +Ref: Categories-Footnote-1335997 +Node: Time-of-day specifications336434 +Node: Sorting agenda items338403 +Node: Filtering/limiting agenda items339972 +Ref: Filtering/limiting agenda items-Footnote-1347243 +Ref: Filtering/limiting agenda items-Footnote-2347658 +Node: Agenda commands347726 +Ref: Agenda commands-Footnote-1369053 +Ref: Agenda commands-Footnote-2369134 +Ref: Agenda commands-Footnote-3369253 +Ref: Agenda commands-Footnote-4369353 +Node: Custom agenda views369436 +Node: Storing searches370077 +Ref: Storing searches-Footnote-1373046 +Ref: Storing searches-Footnote-2373163 +Node: Block agenda373411 +Node: Setting Options374649 +Node: Exporting Agenda Views378283 +Ref: Exporting Agenda Views-Footnote-1383184 +Ref: Exporting Agenda Views-Footnote-2383242 +Ref: Exporting Agenda Views-Footnote-3383398 +Ref: Exporting Agenda Views-Footnote-4383585 +Node: Agenda column view383667 +Node: Markup386741 +Node: Structural markup elements387770 +Node: Document title388440 +Node: Headings and sections389017 +Node: Table of contents389687 +Node: Lists391171 +Node: Paragraphs391462 +Node: Footnote markup392612 +Node: Emphasis and monospace392949 +Node: Horizontal rules393806 +Node: Comment lines394063 +Node: Images and tables394571 +Node: Literal examples396288 +Ref: Literal examples-Footnote-1400167 +Ref: Literal examples-Footnote-2400497 +Ref: Literal examples-Footnote-3400669 +Ref: Literal examples-Footnote-4400848 +Ref: Literal examples-Footnote-5401098 +Node: Include files401192 +Node: Index entries402859 +Node: Macro replacement403321 +Ref: Macro replacement-Footnote-1404145 +Node: Embedded LaTeX404375 +Ref: Embedded LaTeX-Footnote-1405339 +Node: Special symbols405529 +Ref: Special symbols-Footnote-1407151 +Node: Subscripts and superscripts407306 +Node: LaTeX fragments408411 +Ref: LaTeX fragments-Footnote-1410636 +Ref: LaTeX fragments-Footnote-2410809 +Ref: LaTeX fragments-Footnote-3411178 +Node: Previewing LaTeX fragments411386 +Ref: Previewing LaTeX fragments-Footnote-1412617 +Node: CDLaTeX mode412724 +Ref: CDLaTeX mode-Footnote-1415219 +Node: Special blocks415367 +Node: Exporting416270 +Node: The Export Dispatcher418225 +Ref: The Export Dispatcher-Footnote-1420563 +Node: Export back-ends420826 +Node: Export settings421736 +Ref: Export settings-Footnote-1428706 +Ref: Export settings-Footnote-2428808 +Ref: Export settings-Footnote-3428903 +Node: ASCII/Latin-1/UTF-8 export428946 +Node: Beamer export430977 +Ref: Beamer export-Footnote-1438379 +Ref: Beamer export-Footnote-2438542 +Node: HTML export438660 +Node: HTML Export commands439745 +Node: HTML doctypes440295 +Node: HTML preamble and postamble442533 +Node: Quoting HTML tags443581 +Node: Links in HTML export444211 +Node: Tables in HTML export445344 +Node: Images in HTML export446062 +Ref: Images in HTML export-Footnote-1447352 +Node: Math formatting in HTML export447407 +Ref: Math formatting in HTML export-Footnote-1448896 +Node: Text areas in HTML export449031 +Node: CSS support449811 +Ref: CSS support-Footnote-1452875 +Ref: CSS support-Footnote-2453047 +Node: JavaScript support453289 +Node: LaTeX and PDF export456670 +Ref: LaTeX and PDF export-Footnote-1457804 +Node: LaTeX export commands458127 +Node: Header and sectioning458822 +Ref: Header and sectioning-Footnote-1460434 +Ref: Header and sectioning-Footnote-2460546 +Node: Quoting LaTeX code460709 +Node: LaTeX specific attributes461304 +Ref: LaTeX specific attributes-Footnote-1469402 +Ref: LaTeX specific attributes-Footnote-2469480 +Ref: LaTeX specific attributes-Footnote-3469554 +Node: Markdown export469708 +Ref: Markdown export-Footnote-1471012 +Node: OpenDocument Text export471098 +Ref: OpenDocument Text export-Footnote-1472231 +Ref: OpenDocument Text export-Footnote-2472261 +Node: Pre-requisites for ODT export472405 +Node: ODT export commands472764 +Ref: x-export-to-odt472993 +Ref: ODT export commands-Footnote-1473992 +Ref: ODT export commands-Footnote-2474052 +Node: Extending ODT export474103 +Ref: x-export-to-other-formats475098 +Ref: x-convert-to-other-formats475626 +Node: Applying custom styles476083 +Node: Links in ODT export478241 +Node: Tables in ODT export478886 +Ref: Tables in ODT export-Footnote-1481020 +Node: Images in ODT export481113 +Ref: Images in ODT export-Footnote-1483838 +Node: Math formatting in ODT export484071 +Node: Working with LaTeX math snippets484533 +Ref: Working with LaTeX math snippets-Footnote-1486643 +Node: Working with MathML or OpenDocument formula files486718 +Node: Labels and captions in ODT export487290 +Node: Literal examples in ODT export488745 +Ref: Literal examples in ODT export-Footnote-1489646 +Node: Advanced topics in ODT export489757 +Node: Configuring a document converter490511 +Ref: x-odt-converter-capabilities491341 +Node: Working with OpenDocument style files491922 +Ref: x-factory-styles492418 +Ref: x-orgodtstyles-xml492650 +Ref: x-orgodtcontenttemplate-xml492977 +Ref: x-overriding-factory-styles493633 +Ref: x-org-odt-styles-file493907 +Ref: x-org-odt-content-template-file494788 +Node: Creating one-off styles494929 +Node: Customizing tables in ODT export497150 +Ref: Customizing tables in ODT export-Footnote-1502295 +Ref: Customizing tables in ODT export-Footnote-2502399 +Ref: Customizing tables in ODT export-Footnote-3502487 +Node: Validating OpenDocument XML502802 +Ref: Validating OpenDocument XML-Footnote-1503821 +Node: Org export503873 +Node: Texinfo export504637 +Node: Texinfo export commands505261 +Ref: Texinfo export commands-Footnote-1505804 +Node: Document preamble505912 +Ref: Document preamble-Footnote-1509186 +Node: Headings and sectioning structure509248 +Node: Indices510700 +Node: Quoting Texinfo code511493 +Node: Texinfo specific attributes511977 +Ref: Texinfo specific attributes-Footnote-1513183 +Node: An example513249 +Node: iCalendar export515221 +Ref: iCalendar export-Footnote-1517953 +Ref: iCalendar export-Footnote-2518043 +Ref: iCalendar export-Footnote-3518143 +Node: Other built-in back-ends518280 +Node: Export in foreign buffers518873 +Node: Advanced configuration519863 +Node: Publishing525964 +Node: Configuration526832 +Node: Project alist527614 +Node: Sources and destinations528777 +Node: Selecting files530295 +Node: Publishing action531296 +Ref: Publishing action-Footnote-1533125 +Node: Publishing options533282 +Node: Publishing links536335 +Node: Sitemap537302 +Node: Generating an index540521 +Node: Uploading files541108 +Node: Sample configuration542872 +Node: Simple example543361 +Node: Complex example544037 +Node: Triggering publication546088 +Node: Working With Source Code547084 +Node: Structure of code blocks548776 +Ref: Structure of code blocks-Footnote-1550642 +Node: Editing source code550736 +Node: Exporting code blocks552857 +Node: Extracting source code554963 +Node: Evaluating code blocks557199 +Ref: Evaluating code blocks-Footnote-1560553 +Ref: Evaluating code blocks-Footnote-2560850 +Node: Library of Babel560976 +Node: Languages561953 +Node: Header arguments564269 +Node: Using header arguments564754 +Node: System-wide header arguments565809 +Node: Language-specific header arguments566647 +Node: Header arguments in Org mode properties567156 +Ref: Header arguments in Org mode properties-Footnote-1568885 +Node: Language-specific header arguments in Org mode properties569157 +Node: Code block specific header arguments570173 +Node: Header arguments in function calls572019 +Node: Specific header arguments572768 +Node: var575397 +Node: results582222 +Node: file587075 +Node: file-desc587987 +Node: dir588452 +Node: exports591386 +Node: tangle592040 +Node: mkdirp592851 +Node: comments593182 +Node: padline594315 +Node: no-expand594847 +Node: session595339 +Node: noweb595786 +Node: noweb-ref597963 +Ref: noweb-ref-Footnote-1599429 +Node: noweb-sep599558 +Node: cache599852 +Node: sep601584 +Node: hlines602156 +Node: colnames603658 +Node: rownames604961 +Node: shebang606136 +Node: tangle-mode606539 +Node: eval607290 +Node: wrap608328 +Node: post608768 +Node: prologue609884 +Node: epilogue610456 +Node: Results of evaluation610711 +Node: Noweb reference syntax614479 +Node: Key bindings and useful functions616130 +Node: Batch execution618875 +Node: Miscellaneous619909 +Node: Completion620738 +Node: Easy Templates622714 +Node: Speed keys624123 +Node: Code evaluation security624950 +Node: Customization627664 +Node: In-buffer settings628259 +Ref: In-buffer settings-Footnote-1638407 +Node: The very busy C-c C-c key638455 +Node: Clean view640439 +Ref: Clean view-Footnote-1644424 +Ref: Clean view-Footnote-2644485 +Ref: Clean view-Footnote-3644669 +Ref: Clean view-Footnote-4644730 +Ref: Clean view-Footnote-5644842 +Ref: Clean view-Footnote-6644897 +Node: TTY keys645022 +Node: Interaction646788 +Node: Cooperation647182 +Node: Conflicts650980 +Node: org-crypt655949 +Node: Hacking657260 +Node: Hooks658248 +Node: Add-on packages658664 +Node: Adding hyperlink types659218 +Node: Adding export back-ends663138 +Node: Context-sensitive commands664583 +Ref: Context-sensitive commands-Footnote-1666160 +Node: Tables in arbitrary syntax666294 +Node: Radio tables667706 +Node: A LaTeX example670466 +Ref: A LaTeX example-Footnote-1674395 +Ref: A LaTeX example-Footnote-2674552 +Node: Translator functions674987 +Ref: Translator functions-Footnote-1678211 +Node: Radio lists678299 +Node: Dynamic blocks679428 +Node: Special agenda views681641 +Ref: x-agenda-skip-entry-regexp685104 +Ref: Special agenda views-Footnote-1685907 +Ref: Special agenda views-Footnote-2686104 +Node: Speeding up your agendas686239 +Node: Extracting agenda information687342 +Node: Using the property API691420 +Node: Using the mapping API694796 +Node: MobileOrg699218 +Node: Setting up the staging area700917 +Ref: Setting up the staging area-Footnote-1702016 +Ref: Setting up the staging area-Footnote-2702317 +Node: Pushing to MobileOrg702579 +Ref: Pushing to MobileOrg-Footnote-1703579 +Ref: Pushing to MobileOrg-Footnote-2703668 +Ref: Pushing to MobileOrg-Footnote-3704084 +Node: Pulling from MobileOrg704155 +Ref: Pulling from MobileOrg-Footnote-1706576 +Ref: Pulling from MobileOrg-Footnote-2706636 +Node: History and Acknowledgments707011 +Node: GNU Free Documentation License721967 +Node: Main Index747157 +Node: Key Index824688 +Node: Command and Function Index876736 +Node: Variable Index911060 + +End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/xemacs-packages/lisp/org-8.2.3c/org-agenda.el b/elpa/org-20150427/org-agenda.el similarity index 96% rename from xemacs-packages/lisp/org-8.2.3c/org-agenda.el rename to elpa/org-20150427/org-agenda.el index 8bf122db..403f6212 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-agenda.el +++ b/elpa/org-20150427/org-agenda.el @@ -1,6 +1,6 @@ ;;; org-agenda.el --- Dynamic task and appointment lists for Org -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -52,7 +52,7 @@ (declare-function diary-add-to-list "diary-lib" (date string specifier &optional marker globcolor literal)) -(declare-function calendar-absolute-from-iso "cal-iso" (date)) +(declare-function calendar-iso-to-absolute "cal-iso" (date)) (declare-function calendar-astro-date-string "cal-julian" (&optional date)) (declare-function calendar-bahai-date-string "cal-bahai" (&optional date)) (declare-function calendar-chinese-date-string "cal-china" (&optional date)) @@ -328,11 +328,11 @@ the daily/weekly agenda, see `org-agenda-skip-function'.") (string)) (list :tag "Number of days in agenda" (const org-agenda-span) - (choice (const :tag "Day" 'day) - (const :tag "Week" 'week) - (const :tag "Fortnight" 'fortnight) - (const :tag "Month" 'month) - (const :tag "Year" 'year) + (choice (const :tag "Day" day) + (const :tag "Week" week) + (const :tag "Fortnight" fortnight) + (const :tag "Month" month) + (const :tag "Year" year) (integer :tag "Custom"))) (list :tag "Fixed starting date" (const org-agenda-start-day) @@ -390,23 +390,27 @@ the daily/weekly agenda, see `org-agenda-skip-function'.") (repeat :inline t :tag "Conditions for skipping" (choice :tag "Condition type" - (list :tag "Regexp matches" :inline t (const :format "" 'regexp) (regexp)) - (list :tag "Regexp does not match" :inline t (const :format "" 'notregexp) (regexp)) + (list :tag "Regexp matches" :inline t + (const :format "" 'regexp) + (regexp)) + (list :tag "Regexp does not match" :inline t + (const :format "" 'notregexp) + (regexp)) (list :tag "TODO state is" :inline t (const 'todo) (choice - (const :tag "any not-done state" 'todo) - (const :tag "any done state" 'done) - (const :tag "any state" 'any) + (const :tag "Any not-done state" 'todo) + (const :tag "Any done state" 'done) + (const :tag "Any state" 'any) (list :tag "Keyword list" (const :format "" quote) (repeat (string :tag "Keyword"))))) (list :tag "TODO state is not" :inline t (const 'nottodo) (choice - (const :tag "any not-done state" 'todo) - (const :tag "any done state" 'done) - (const :tag "any state" 'any) + (const :tag "Any not-done state" 'todo) + (const :tag "Any done state" 'done) + (const :tag "Any state" 'any) (list :tag "Keyword list" (const :format "" quote) (repeat (string :tag "Keyword"))))) @@ -649,8 +653,8 @@ of custom agenda commands." :tag "Org Agenda Match View" :group 'org-agenda) (defgroup org-agenda-search-view nil - "Options concerning the general tags/property/todo match agenda view." - :tag "Org Agenda Match View" + "Options concerning the search agenda view." + :tag "Org Agenda Search View" :group 'org-agenda) (defvar org-agenda-archives-mode nil @@ -764,7 +768,7 @@ to make his option also apply to the tags-todo list." (integer :tag "Ignore if N or more days in past(-) or future(+)."))) (defcustom org-agenda-todo-ignore-deadlines nil - "Non-nil means ignore some deadlined TODO items when making TODO list. + "Non-nil means ignore some deadline TODO items when making TODO list. There are different motivations for using different values, please think carefully when configuring this variable. @@ -863,7 +867,7 @@ When set to the symbol `not-today', skip scheduled previously, but not scheduled today. When set to the symbol `repeated-after-deadline', skip scheduled -items if they are repeated beyond the current dealine." +items if they are repeated beyond the current deadline." :group 'org-agenda-skip :group 'org-agenda-daily/weekly :type '(choice @@ -1357,12 +1361,12 @@ explanations on the possible values." :group 'org-agenda-startup :group 'org-agenda-daily/weekly :type '(choice (const :tag "Don't show log items" nil) - (const :tag "Show only log items" 'only) - (const :tag "Show all possible log items" 'clockcheck) + (const :tag "Show only log items" only) + (const :tag "Show all possible log items" clockcheck) (repeat :tag "Choose among possible values for `org-agenda-log-mode-items'" - (choice (const :tag "Show closed log items" 'closed) - (const :tag "Show clocked log items" 'clock) - (const :tag "Show all logged state changes" 'state))))) + (choice (const :tag "Show closed log items" closed) + (const :tag "Show clocked log items" clock) + (const :tag "Show all logged state changes" state))))) (defcustom org-agenda-start-with-clockreport-mode nil "The initial value of clockreport-mode in a newly created agenda window." @@ -1468,6 +1472,7 @@ symbols specifying conditions when the grid should be displayed: weekly if the agenda shows an entire week today show grid on current date, independent of daily/weekly display require-timed show grid only if at least one item has a time specification + remove-match skip grid times already present in an entry The second item is a string which will be placed behind the grid time. @@ -1805,7 +1810,7 @@ When set to nil, never show inherited tags in agenda lines." :version "24.3" :type '(choice (const :tag "Show inherited tags when available" t) - (const :tag "Always show inherited tags" 'always) + (const :tag "Always show inherited tags" always) (repeat :tag "Show inherited tags only in selected agenda types" (symbol :tag "Agenda type")))) @@ -2092,11 +2097,9 @@ When nil, `q' will kill the single agenda buffer." org-agenda-info org-agenda-pre-window-conf org-agenda-columns-active - org-agenda-tag-filter-overlays org-agenda-tag-filter - org-agenda-cat-filter-overlays org-agenda-category-filter - org-agenda-re-filter-overlays + org-agenda-top-headline-filter org-agenda-regexp-filter org-agenda-markers org-agenda-last-search-view-search-was-boolean @@ -2144,6 +2147,7 @@ The following commands are available: ;; Keep global-font-lock-mode from turning on font-lock-mode (org-set-local 'font-lock-global-modes (list 'not major-mode)) (setq mode-name "Org-Agenda") + (setq indent-tabs-mode nil) (use-local-map org-agenda-mode-map) (easy-menu-add org-agenda-menu) (if org-startup-truncated (setq truncate-lines t)) @@ -2157,10 +2161,11 @@ The following commands are available: nil t) (unless org-agenda-keep-modes (setq org-agenda-follow-mode org-agenda-start-with-follow-mode - org-agenda-entry-text-mode org-agenda-start-with-entry-text-mode - org-agenda-clockreport-mode org-agenda-start-with-clockreport-mode - org-agenda-show-log org-agenda-start-with-log-mode)) - + org-agenda-entry-text-mode org-agenda-start-with-entry-text-mode)) + (setq org-agenda-show-log org-agenda-start-with-log-mode) + (setq org-agenda-clockreport-mode org-agenda-start-with-clockreport-mode) + (add-to-invisibility-spec '(org-filtered)) + (add-to-invisibility-spec '(org-link)) (easy-menu-change '("Agenda") "Agenda Files" (append @@ -2603,7 +2608,7 @@ type." :package-version '(Org . "8.0") :group 'org-agenda-custom-commands :type '(choice (symbol :tag "No limit" nil) - (integer :tag "Max number of entries") + (integer :tag "Max number of TODOs") (repeat (cons (choice :tag "Agenda type" (const agenda) @@ -2611,7 +2616,7 @@ type." (const tags) (const search) (const timeline)) - (integer :tag "Max number of entries"))))) + (integer :tag "Max number of TODOs"))))) (defcustom org-agenda-max-tags nil "Maximum number of tagged entries to display in an agenda. @@ -2622,7 +2627,7 @@ type." :package-version '(Org . "8.0") :group 'org-agenda-custom-commands :type '(choice (symbol :tag "No limit" nil) - (integer :tag "Max number of entries") + (integer :tag "Max number of tagged entries") (repeat (cons (choice :tag "Agenda type" (const agenda) @@ -2630,7 +2635,7 @@ type." (const tags) (const search) (const timeline)) - (integer :tag "Max number of entries"))))) + (integer :tag "Max number of tagged entries"))))) (defcustom org-agenda-max-effort nil "Maximum cumulated effort duration for the agenda. @@ -2641,7 +2646,7 @@ to limit entries to in this type." :package-version '(Org . "8.0") :group 'org-agenda-custom-commands :type '(choice (symbol :tag "No limit" nil) - (integer :tag "Max number of entries") + (integer :tag "Max number of minutes") (repeat (cons (choice :tag "Agenda type" (const agenda) @@ -2649,7 +2654,7 @@ to limit entries to in this type." (const tags) (const search) (const timeline)) - (integer :tag "Max number of entries"))))) + (integer :tag "Max number of minutes"))))) (defvar org-keys nil) (defvar org-match nil) @@ -3323,19 +3328,12 @@ If AGENDA-BUFFER-NAME, use this as the buffer name for the agenda to write." (org-let (if nosettings nil org-agenda-exporter-settings) '(save-excursion (save-window-excursion - (org-agenda-mark-filtered-text) (let ((bs (copy-sequence (buffer-string))) beg content) - (org-agenda-unmark-filtered-text) (with-temp-buffer (rename-buffer org-agenda-write-buffer-name t) (set-buffer-modified-p nil) (insert bs) (org-agenda-remove-marked-text 'org-filtered) - (while (setq beg (text-property-any (point-min) (point-max) - 'org-filtered t)) - (delete-region - beg (or (next-single-property-change beg 'org-filtered) - (point-max)))) (run-hooks 'org-agenda-before-write-hook) (cond ((org-bound-and-true-p org-mobile-creating-agendas) @@ -3355,7 +3353,7 @@ If AGENDA-BUFFER-NAME, use this as the buffer name for the agenda to write." content))) (find-file file) (erase-buffer) - (mapcar (lambda (s) (org-paste-subtree 1 s)) (reverse content)) + (dolist (s content) (org-paste-subtree 1 s)) (write-file file) (kill-buffer (current-buffer)) (message "Org file written to %s" file))) @@ -3401,28 +3399,6 @@ If AGENDA-BUFFER-NAME, use this as the buffer name for the agenda to write." org-agenda-buffer-name))) (when open (org-open-file file))) -(defvar org-agenda-tag-filter-overlays nil) -(defvar org-agenda-cat-filter-overlays nil) -(defvar org-agenda-re-filter-overlays nil) - -(defun org-agenda-mark-filtered-text () - "Mark all text hidden by filtering with a text property." - (let ((inhibit-read-only t)) - (mapc - (lambda (o) - (when (equal (overlay-buffer o) (current-buffer)) - (put-text-property - (overlay-start o) (overlay-end o) - 'org-filtered t))) - (append org-agenda-tag-filter-overlays - org-agenda-cat-filter-overlays - org-agenda-re-filter-overlays)))) - -(defun org-agenda-unmark-filtered-text () - "Remove the filtering text property." - (let ((inhibit-read-only t)) - (remove-text-properties (point-min) (point-max) '(org-filtered t)))) - (defun org-agenda-remove-marked-text (property &optional value) "Delete all text marked with VALUE of PROPERTY. VALUE defaults to t." @@ -3431,7 +3407,7 @@ VALUE defaults to t." (while (setq beg (text-property-any (point-min) (point-max) property value)) (delete-region - beg (or (next-single-property-change beg 'org-filtered) + beg (or (next-single-property-change beg property) (point-max)))))) (defun org-agenda-add-entry-text () @@ -3556,7 +3532,6 @@ removed from the entry content. Currently only `planning' is allowed here." (defvar org-agenda-category-filter nil) (defvar org-agenda-regexp-filter nil) (defvar org-agenda-top-headline-filter nil) -(defvar org-agenda-tag-filter-while-redo nil) (defvar org-agenda-tag-filter-preset nil "A preset of the tags filter used for secondary agenda filtering. This must be a list of strings, each string must be a single tag preceded @@ -3579,7 +3554,7 @@ the global options and expect it to be applied to the entire view.") (defvar org-agenda-regexp-filter-preset nil "A preset of the regexp filter used for secondary agenda filtering. -This must be a list of strings, each string must be a single category +This must be a list of strings, each string must be a single regexp preceded by \"+\" or \"-\". This variable should not be set directly, but agenda custom commands can bind it in the options section. The preset filter is a global property of @@ -3608,10 +3583,12 @@ generating a new one." ;; does not have org variables local org-agenda-this-buffer-is-sticky)))) -(defun org-agenda-prepare-window (abuf) - "Setup agenda buffer in the window." - (let* ((awin (get-buffer-window abuf)) - wconf) +(defun org-agenda-prepare-window (abuf filter-alist) + "Setup agenda buffer in the window. +ABUF is the buffer for the agenda window. +FILTER-ALIST is an alist of filters we need to apply when +`org-agenda-persistent-filter' is non-nil." + (let* ((awin (get-buffer-window abuf)) wconf) (cond ((equal (current-buffer) abuf) nil) (awin (select-window awin)) @@ -3625,68 +3602,76 @@ generating a new one." ((equal org-agenda-window-setup 'reorganize-frame) (delete-other-windows) (org-switch-to-buffer-other-window abuf))) - ;; additional test in case agenda is invoked from within agenda - ;; buffer via elisp link + (setq org-agenda-tag-filter (cdr (assoc 'tag filter-alist))) + (setq org-agenda-category-filter (cdr (assoc 'cat filter-alist))) + (setq org-agenda-regexp-filter (cdr (assoc 're filter-alist))) + ;; Additional test in case agenda is invoked from within agenda + ;; buffer via elisp link. (unless (equal (current-buffer) abuf) (org-pop-to-buffer-same-window abuf)) (setq org-agenda-pre-window-conf (or org-agenda-pre-window-conf wconf)))) (defun org-agenda-prepare (&optional name) - (if (org-agenda-use-sticky-p) - (progn - ;; Popup existing buffer - (org-agenda-prepare-window (get-buffer org-agenda-buffer-name)) - (message "Sticky Agenda buffer, use `r' to refresh") - (or org-agenda-multi (org-agenda-fit-window-to-buffer)) - (throw 'exit "Sticky Agenda buffer, use `r' to refresh")) - (setq org-todo-keywords-for-agenda nil) - (setq org-drawers-for-agenda nil) - (unless org-agenda-persistent-filter - (setq org-agenda-tag-filter nil - org-agenda-category-filter nil - org-agenda-regexp-filter nil)) - (put 'org-agenda-tag-filter :preset-filter - org-agenda-tag-filter-preset) - (put 'org-agenda-category-filter :preset-filter - org-agenda-category-filter-preset) - (put 'org-agenda-regexp-filter :preset-filter - org-agenda-regexp-filter-preset) - (if org-agenda-multi + (let ((filter-alist (if org-agenda-persistent-filter + (list `(tag . ,org-agenda-tag-filter) + `(re . ,org-agenda-regexp-filter) + `(car . ,org-agenda-category-filter))))) + (if (org-agenda-use-sticky-p) (progn - (setq buffer-read-only nil) - (goto-char (point-max)) - (unless (or (bobp) org-agenda-compact-blocks - (not org-agenda-block-separator)) - (insert "\n" - (if (stringp org-agenda-block-separator) - org-agenda-block-separator - (make-string (window-width) org-agenda-block-separator)) - "\n")) - (narrow-to-region (point) (point-max))) - (setq org-done-keywords-for-agenda nil) - - ;; Setting any org variables that are in org-agenda-local-vars - ;; list need to be done after the prepare call - (org-agenda-prepare-window (get-buffer-create org-agenda-buffer-name)) - (setq buffer-read-only nil) - (org-agenda-reset-markers) - (let ((inhibit-read-only t)) (erase-buffer)) - (org-agenda-mode) - (setq org-agenda-buffer (current-buffer)) - (setq org-agenda-contributing-files nil) - (setq org-agenda-columns-active nil) - (org-agenda-prepare-buffers (org-agenda-files nil 'ifmode)) - (setq org-todo-keywords-for-agenda - (org-uniquify org-todo-keywords-for-agenda)) - (setq org-done-keywords-for-agenda - (org-uniquify org-done-keywords-for-agenda)) - (setq org-drawers-for-agenda (org-uniquify org-drawers-for-agenda)) - (setq org-agenda-last-prefix-arg current-prefix-arg) - (setq org-agenda-this-buffer-name org-agenda-buffer-name) - (and name (not org-agenda-name) - (org-set-local 'org-agenda-name name))) - (setq buffer-read-only nil))) + (put 'org-agenda-tag-filter :preset-filter nil) + (put 'org-agenda-category-filter :preset-filter nil) + (put 'org-agenda-regexp-filter :preset-filter nil) + ;; Popup existing buffer + (org-agenda-prepare-window (get-buffer org-agenda-buffer-name) + filter-alist) + (message "Sticky Agenda buffer, use `r' to refresh") + (or org-agenda-multi (org-agenda-fit-window-to-buffer)) + (throw 'exit "Sticky Agenda buffer, use `r' to refresh")) + (setq org-todo-keywords-for-agenda nil) + (setq org-drawers-for-agenda nil) + (put 'org-agenda-tag-filter :preset-filter + org-agenda-tag-filter-preset) + (put 'org-agenda-category-filter :preset-filter + org-agenda-category-filter-preset) + (put 'org-agenda-regexp-filter :preset-filter + org-agenda-regexp-filter-preset) + (if org-agenda-multi + (progn + (setq buffer-read-only nil) + (goto-char (point-max)) + (unless (or (bobp) org-agenda-compact-blocks + (not org-agenda-block-separator)) + (insert "\n" + (if (stringp org-agenda-block-separator) + org-agenda-block-separator + (make-string (window-width) org-agenda-block-separator)) + "\n")) + (narrow-to-region (point) (point-max))) + (setq org-done-keywords-for-agenda nil) + + ;; Setting any org variables that are in org-agenda-local-vars + ;; list need to be done after the prepare call + (org-agenda-prepare-window + (get-buffer-create org-agenda-buffer-name) filter-alist) + (setq buffer-read-only nil) + (org-agenda-reset-markers) + (let ((inhibit-read-only t)) (erase-buffer)) + (org-agenda-mode) + (setq org-agenda-buffer (current-buffer)) + (setq org-agenda-contributing-files nil) + (setq org-agenda-columns-active nil) + (org-agenda-prepare-buffers (org-agenda-files nil 'ifmode)) + (setq org-todo-keywords-for-agenda + (org-uniquify org-todo-keywords-for-agenda)) + (setq org-done-keywords-for-agenda + (org-uniquify org-done-keywords-for-agenda)) + (setq org-drawers-for-agenda (org-uniquify org-drawers-for-agenda)) + (setq org-agenda-last-prefix-arg current-prefix-arg) + (setq org-agenda-this-buffer-name org-agenda-buffer-name) + (and name (not org-agenda-name) + (org-set-local 'org-agenda-name name))) + (setq buffer-read-only nil)))) (defvar org-agenda-overriding-columns-format) ; From org-colview.el (defun org-agenda-finalize () @@ -3718,12 +3703,7 @@ generating a new one." (org-agenda-fontify-priorities)) (when (and org-agenda-dim-blocked-tasks org-blocker-hook) (org-agenda-dim-blocked-tasks)) - ;; We need to widen when `org-agenda-finalize' is called from - ;; `org-agenda-change-all-lines' (e.g. in `org-agenda-clock-in') - (when org-clock-current-task - (save-restriction - (widen) - (org-agenda-mark-clocking-task))) + (org-agenda-mark-clocking-task) (when org-agenda-entry-text-mode (org-agenda-entry-text-hide) (org-agenda-entry-text-show)) @@ -3743,37 +3723,53 @@ generating a new one." (save-excursion (goto-char (point-min)) (while (equal (forward-line) 0) - (when (setq mrk (or (get-text-property (point) 'org-hd-marker) - (get-text-property (point) 'org-hd-marker))) + (when (setq mrk (get-text-property (point) 'org-hd-marker)) (put-text-property (point-at-bol) (point-at-eol) 'tags (org-with-point-at mrk (delete-dups (mapcar 'downcase (org-get-tags-at)))))))))) (run-hooks 'org-agenda-finalize-hook) - (when (or org-agenda-tag-filter (get 'org-agenda-tag-filter :preset-filter)) + (when org-agenda-top-headline-filter + (org-agenda-filter-top-headline-apply + org-agenda-top-headline-filter)) + (when org-agenda-tag-filter (org-agenda-filter-apply org-agenda-tag-filter 'tag)) - (when (or org-agenda-category-filter (get 'org-agenda-category-filter :preset-filter)) + (when (get 'org-agenda-tag-filter :preset-filter) + (org-agenda-filter-apply + (get 'org-agenda-tag-filter :preset-filter) 'tag)) + (when org-agenda-category-filter (org-agenda-filter-apply org-agenda-category-filter 'category)) - (when (or org-agenda-regexp-filter (get 'org-agenda-regexp-filter :preset-filter)) + (when (get 'org-agenda-category-filter :preset-filter) + (org-agenda-filter-apply + (get 'org-agenda-category-filter :preset-filter) 'category)) + (when org-agenda-regexp-filter (org-agenda-filter-apply org-agenda-regexp-filter 'regexp)) + (when (get 'org-agenda-regexp-filter :preset-filter) + (org-agenda-filter-apply + (get 'org-agenda-regexp-filter :preset-filter) 'regexp)) (org-add-hook 'kill-buffer-hook 'org-agenda-reset-markers 'append 'local))))) (defun org-agenda-mark-clocking-task () "Mark the current clock entry in the agenda if it is present." - (org-agenda-unmark-clocking-task) - (when (marker-buffer org-clock-hd-marker) - (save-excursion - (goto-char (point-min)) - (let (s ov) - (while (setq s (next-single-property-change (point) 'org-hd-marker)) - (goto-char s) - (when (equal (org-get-at-bol 'org-hd-marker) - org-clock-hd-marker) - (setq ov (make-overlay (point-at-bol) (1+ (point-at-eol)))) - (overlay-put ov 'type 'org-agenda-clocking) - (overlay-put ov 'face 'org-agenda-clocking) - (overlay-put ov 'help-echo - "The clock is running in this item"))))))) + ;; We need to widen when `org-agenda-finalize' is called from + ;; `org-agenda-change-all-lines' (e.g. in `org-agenda-clock-in') + (when org-clock-current-task + (save-restriction + (widen) + (org-agenda-unmark-clocking-task) + (when (marker-buffer org-clock-hd-marker) + (save-excursion + (goto-char (point-min)) + (let (s ov) + (while (setq s (next-single-property-change (point) 'org-hd-marker)) + (goto-char s) + (when (equal (org-get-at-bol 'org-hd-marker) + org-clock-hd-marker) + (setq ov (make-overlay (point-at-bol) (1+ (point-at-eol)))) + (overlay-put ov 'type 'org-agenda-clocking) + (overlay-put ov 'face 'org-agenda-clocking) + (overlay-put ov 'help-echo + "The clock is running in this item"))))))))) (defun org-agenda-unmark-clocking-task () "Unmark the current clocking task." @@ -3851,11 +3847,12 @@ dimming them." e (point-at-eol) ov (make-overlay b e)) (if invis1 - (overlay-put ov 'invisible t) + (progn (overlay-put ov 'invisible t) + (overlay-put ov 'intangible t)) (overlay-put ov 'face 'org-agenda-dimmed-todo-face)) (overlay-put ov 'org-type 'org-blocked-todo)))))) - (when (org-called-interactively-p 'interactive) - (message "Dim or hide blocked tasks...done"))) + (when (org-called-interactively-p 'interactive) + (message "Dim or hide blocked tasks...done"))) (defvar org-agenda-skip-function nil "Function to be called at each match during agenda construction. @@ -4315,14 +4312,6 @@ items if they have an hour specification like [h]h:mm." (setq p (plist-put p :tstart clocktable-start)) (setq p (plist-put p :tend clocktable-end)) (setq p (plist-put p :scope 'agenda)) - (when (and (eq org-agenda-clockreport-mode 'with-filter) - (setq filter (or org-agenda-tag-filter-while-redo - (get 'org-agenda-tag-filter :preset-filter)))) - (setq p (plist-put p :tags (mapconcat (lambda (x) - (if (string-match "[<>=]" x) - "" - x)) - filter "")))) (setq tbl (apply 'org-clock-get-clocktable p)) (insert tbl))) (goto-char (point-min)) @@ -4917,7 +4906,7 @@ See `org-agenda-skip-if' for details." (org-agenda-skip-if nil conditions)) (defun org-agenda-skip-subtree-if (&rest conditions) - "Skip entry if any of CONDITIONS is true. + "Skip subtree if any of CONDITIONS is true. See `org-agenda-skip-if' for details." (org-agenda-skip-if t conditions)) @@ -5086,6 +5075,7 @@ of what a project is and how to check if it stuck, customize the variable (mapconcat 'identity re-list "\\|") (error "No information how to identify unstuck projects"))) (org-tags-view nil matcher) + (setq org-agenda-buffer-name (buffer-name)) (with-current-buffer org-agenda-buffer-name (setq org-agenda-redo-command `(org-agenda-list-stuck-projects ,current-prefix-arg))))) @@ -5099,8 +5089,7 @@ of what a project is and how to check if it stuck, customize the variable "Get the (Emacs Calendar) diary entries for DATE." (require 'diary-lib) (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*") - (diary-display-hook '(fancy-diary-display)) - (diary-display-function 'fancy-diary-display) + (diary-display-function 'diary-fancy-display) (pop-up-frames nil) (diary-list-entries-hook (cons 'org-diary-default-entry diary-list-entries-hook)) @@ -5453,7 +5442,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines', ;;;###autoload (defun org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item - (&optional end) + (&optional end) "Do we have a reason to ignore this TODO entry because it has a time stamp?" (when (or org-agenda-todo-ignore-with-date org-agenda-todo-ignore-scheduled @@ -5690,10 +5679,10 @@ This function is invoked if `org-agenda-todo-ignore-deadlines', (setq txt "SEXP entry returned empty string")) (setq txt (org-agenda-format-item extra txt level category tags 'time)) (org-add-props txt props 'org-marker marker - 'org-category category 'date date 'todo-state todo-state - 'org-category-position category-pos 'tags tags - 'level level - 'type "sexp" 'warntime warntime) + 'org-category category 'date date 'todo-state todo-state + 'org-category-position category-pos + 'level level + 'type "sexp" 'warntime warntime) (push txt ee))))) (nreverse ee))) @@ -6244,6 +6233,7 @@ an hour specification like [h]h:mm." category-pos (get-text-property (point) 'org-category-position)) (if (and (eq org-agenda-skip-scheduled-if-deadline-is-shown 'repeated-after-deadline) + (org-get-deadline-time (point)) (<= 0 (- d2 (time-to-days (org-get-deadline-time (point)))))) (throw :skip nil)) (if (not (re-search-backward "^\\*+[ \t]+" nil t)) @@ -6768,8 +6758,10 @@ The optional STRING argument forces conversion into a 5 character wide string HH:MM." (save-match-data (when - (or (string-match "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)\\([AaPp][Mm]\\)?\\> *" s) - (string-match "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)?\\([AaPp][Mm]\\)\\> *" s)) + (and + (or (string-match "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)\\([AaPp][Mm]\\)?\\> *" s) + (string-match "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)?\\([AaPp][Mm]\\)\\> *" s)) + (not (eq (get-text-property 1 'face s) 'org-link))) (let* ((h (string-to-number (match-string 1 s))) (m (if (match-end 3) (string-to-number (match-string 3 s)) 0)) (ampm (if (match-end 4) (downcase (match-string 4 s)))) @@ -6997,17 +6989,19 @@ The optional argument TYPE tells the agenda type." (cond ((< ta tb) -1) ((< tb ta) +1)))) -(defsubst org-cmp-ts (a b &optional type) +(defsubst org-cmp-ts (a b type) "Compare the timestamps values of entries A and B. When TYPE is \"scheduled\", \"deadline\", \"timestamp\" or \"timestamp_ia\", compare within each of these type. When TYPE is the empty string, compare all timestamps without respect of their type." - (let* ((def (if org-sort-agenda-notime-is-late 9901 -1)) + (let* ((def (if org-sort-agenda-notime-is-late most-positive-fixnum -1)) (ta (or (and (string-match type (or (get-text-property 1 'type a) "")) - (get-text-property 1 'ts-date a)) def)) + (get-text-property 1 'ts-date a)) + def)) (tb (or (and (string-match type (or (get-text-property 1 'type b) "")) - (get-text-property 1 'ts-date b)) def))) + (get-text-property 1 'ts-date b)) + def))) (cond ((< ta tb) -1) ((< tb ta) +1)))) @@ -7033,7 +7027,7 @@ their type." (org-cmp-ts a b "deadline"))) (deadline-down (if deadline-up (- deadline-up) nil)) (tsia-up (and (org-em 'tsia-up 'tsia-down ss) - (org-cmp-ts a b "iatimestamp_ia"))) + (org-cmp-ts a b "timestamp_ia"))) (tsia-down (if tsia-up (- tsia-up) nil)) (ts-up (and (org-em 'ts-up 'ts-down ss) (org-cmp-ts a b "timestamp"))) @@ -7270,7 +7264,6 @@ in the agenda." (cat-preset (get 'org-agenda-category-filter :preset-filter)) (re-filter org-agenda-regexp-filter) (re-preset (get 'org-agenda-regexp-filter :preset-filter)) - (org-agenda-tag-filter-while-redo (or tag-filter tag-preset)) (cols org-agenda-columns-active) (line (org-current-line)) (window-line (- line (org-current-line (window-start)))) @@ -7303,9 +7296,12 @@ in the agenda." (put 'org-agenda-tag-filter :preset-filter tag-preset) (put 'org-agenda-category-filter :preset-filter cat-preset) (put 'org-agenda-regexp-filter :preset-filter re-preset) - (and (or tag-filter tag-preset) (org-agenda-filter-apply tag-filter 'tag)) - (and (or cat-filter cat-preset) (org-agenda-filter-apply cat-filter 'category)) - (and (or re-filter re-preset) (org-agenda-filter-apply re-filter 'regexp)) + (let ((tag (or tag-filter tag-preset)) + (cat (or cat-filter cat-preset)) + (re (or re-filter re-preset))) + (when tag (org-agenda-filter-apply tag 'tag)) + (when cat (org-agenda-filter-apply cat 'category)) + (when re (org-agenda-filter-apply re 'regexp))) (and top-hl-filter (org-agenda-filter-top-headline-apply top-hl-filter)) (and cols (org-called-interactively-p 'any) (org-agenda-columns)) (org-goto-line line) @@ -7331,7 +7327,7 @@ The category is that of the current line." (org-agenda-filter-apply (setq org-agenda-category-filter (list (concat "+" cat))) 'category)) - ((error "No category at point")))))) + (t (error "No category at point")))))) (defun org-find-top-headline (&optional pos) "Find the topmost parent headline and return it." @@ -7352,10 +7348,10 @@ The top headline is that of the current line." (progn (setq org-agenda-filtered-by-top-headline nil org-agenda-top-headline-filter nil) - (org-agenda-filter-show-all-cat)) - (let ((cat (org-find-top-headline (org-get-at-bol 'org-hd-marker)))) - (if cat (org-agenda-filter-top-headline-apply cat strip) - (error "No top-level category at point"))))) + (org-agenda-filter-show-all-top-filter)) + (let ((toph (org-find-top-headline (org-get-at-bol 'org-hd-marker)))) + (if toph (org-agenda-filter-top-headline-apply toph strip) + (error "No top-level headline at point"))))) (defvar org-agenda-regexp-filter nil) (defun org-agenda-filter-by-regexp (strip) @@ -7370,7 +7366,7 @@ With two prefix arguments, remove the regexp filters." (read-from-minibuffer (if (equal strip '(4)) "Filter out entries matching regexp: " - "Narrow to entries matching regexp: "))))) + "Narrow to entries matching regexp: "))))) (push flt org-agenda-regexp-filter) (org-agenda-filter-apply org-agenda-regexp-filter 'regexp)) (org-agenda-filter-show-all-re) @@ -7384,7 +7380,10 @@ With two prefix arguments, remove the regexp filters." (when org-agenda-category-filter (org-agenda-filter-show-all-cat)) (when org-agenda-regexp-filter - (org-agenda-filter-show-all-re))) + (org-agenda-filter-show-all-re)) + (when org-agenda-top-headline-filter + (org-agenda-filter-show-all-top-filter)) + (org-agenda-finalize)) (defun org-agenda-filter-by-tag (strip &optional char narrow) "Keep only those lines in the agenda buffer that have a specific tag. @@ -7487,8 +7486,7 @@ to switch to narrowing." (org-agenda-filter-apply org-agenda-tag-filter 'tag) (setq maybe-refresh t)) (t (error "Invalid tag selection character %c" char))) - (when (and maybe-refresh - (eq org-agenda-clockreport-mode 'with-filter)) + (when maybe-refresh (org-agenda-redo)))) (defun org-agenda-get-represented-tags () @@ -7609,13 +7607,12 @@ When NO-OPERATOR is non-nil, do not add the + operator to returned tags." ;; Deactivate `org-agenda-entry-text-mode' when filtering (if org-agenda-entry-text-mode (org-agenda-entry-text-mode)) (let (tags cat txt) - (setq org-agenda-filter-form - (org-agenda-filter-make-matcher filter type)) - (if (and (eq type 'category) - (not (equal (substring (car filter) 0 1) "-"))) - ;; Only set `org-agenda-filtered-by-category' to t - ;; when a unique category is used as the filter - (setq org-agenda-filtered-by-category t)) + (setq org-agenda-filter-form (org-agenda-filter-make-matcher filter type)) + ;; Only set `org-agenda-filtered-by-category' to t when a unique + ;; category is used as the filter: + (setq org-agenda-filtered-by-category + (and (eq type 'category) + (not (equal (substring (car filter) 0 1) "-")))) (org-agenda-set-mode-name) (save-excursion (goto-char (point-min)) @@ -7645,8 +7642,8 @@ When NO-OPERATOR is non-nil, do not add the + operator to returned tags." (let* ((pos (org-get-at-bol 'org-hd-marker)) (tophl (and pos (org-find-top-headline pos)))) (if (and tophl (funcall (if negative 'identity 'not) - (string= hl tophl))) - (org-agenda-filter-hide-line 'category))) + (string= hl tophl))) + (org-agenda-filter-hide-line 'top-headline))) (beginning-of-line 2))) (if (get-char-property (point) 'invisible) (org-agenda-previous-line)) @@ -7655,50 +7652,36 @@ When NO-OPERATOR is non-nil, do not add the + operator to returned tags." (defun org-agenda-filter-hide-line (type) "Hide lines with TYPE in the agenda buffer." - (let (ov) - (setq ov (make-overlay (max (point-min) (1- (point-at-bol))) - (point-at-eol))) - (overlay-put ov 'invisible t) - (overlay-put ov 'type type) - (cond ((eq type 'tag) (push ov org-agenda-tag-filter-overlays)) - ((eq type 'category) (push ov org-agenda-cat-filter-overlays)) - ((eq type 'regexp) (push ov org-agenda-re-filter-overlays))))) - -(defun org-agenda-fix-tags-filter-overlays-at (&optional pos) - (setq pos (or pos (point))) + (let* ((b (max (point-min) (1- (point-at-bol)))) + (e (point-at-eol))) + (let ((inhibit-read-only t)) + (add-text-properties + b e `(invisible org-filtered org-filter-type ,type))))) + +(defun org-agenda-remove-filter (type) + (interactive) + "Remove filter of type TYPE from the agenda buffer." (save-excursion - (dolist (ov (overlays-at pos)) - (when (and (overlay-get ov 'invisible) - (eq (overlay-get ov 'type) 'tag)) + (goto-char (point-min)) + (let ((inhibit-read-only t) pos) + (while (setq pos (text-property-any (point) (point-max) 'org-filter-type type)) (goto-char pos) - (if (< (overlay-start ov) (point-at-eol)) - (move-overlay ov (point-at-eol) - (overlay-end ov))))))) + (remove-text-properties + (point) (next-single-property-change (point) 'org-filter-type) + `(invisible org-filtered org-filter-type ,type)))) + (set (intern (format "org-agenda-%s-filter" (intern-soft type))) nil) + (setq org-agenda-filter-form nil) + (org-agenda-set-mode-name) + (org-agenda-finalize))) (defun org-agenda-filter-show-all-tag nil - "Remove tag filter overlays from the agenda buffer." - (mapc 'delete-overlay org-agenda-tag-filter-overlays) - (setq org-agenda-tag-filter-overlays nil - org-agenda-tag-filter nil - org-agenda-filter-form nil) - (org-agenda-set-mode-name)) - + (org-agenda-remove-filter 'tag)) (defun org-agenda-filter-show-all-re nil - "Remove regexp filter overlays from the agenda buffer." - (mapc 'delete-overlay org-agenda-re-filter-overlays) - (setq org-agenda-re-filter-overlays nil - org-agenda-regexp-filter nil - org-agenda-filter-form nil) - (org-agenda-set-mode-name)) - + (org-agenda-remove-filter 'regexp)) (defun org-agenda-filter-show-all-cat nil - "Remove category filter overlays from the agenda buffer." - (mapc 'delete-overlay org-agenda-cat-filter-overlays) - (setq org-agenda-cat-filter-overlays nil - org-agenda-filtered-by-category nil - org-agenda-category-filter nil - org-agenda-filter-form nil) - (org-agenda-set-mode-name)) + (org-agenda-remove-filter 'category)) +(defun org-agenda-filter-show-all-top-filter nil + (org-agenda-remove-filter 'top-headline)) (defun org-agenda-manipulate-query-add () "Manipulate the query by adding a search term with positive selection. @@ -8002,7 +7985,7 @@ so that the date SD will be in that range." (setq y1 (org-small-year-to-year (/ n 100)) n (mod n 100))) (setq sd - (calendar-absolute-from-iso + (calendar-iso-to-absolute (list n 1 (or y1 (nth 2 (calendar-iso-from-absolute sd))))))))) ((eq span 'month) @@ -8092,15 +8075,12 @@ so that the date SD will be in that range." (format " (maximum number of lines is %d)" (if (integerp arg) arg org-agenda-entry-text-maxlines)))))) -(defun org-agenda-clockreport-mode (&optional with-filter) - "Toggle clocktable mode in an agenda buffer. -With prefix arg WITH-FILTER, make the clocktable respect the current -agenda filter." - (interactive "P") +(defun org-agenda-clockreport-mode () + "Toggle clocktable mode in an agenda buffer." + (interactive) (org-agenda-check-type t 'agenda) - (if with-filter - (setq org-agenda-clockreport-mode 'with-filter) - (setq org-agenda-clockreport-mode (not org-agenda-clockreport-mode))) + (setq org-agenda-clockreport-mode (not org-agenda-clockreport-mode)) + (setq org-agenda-start-with-clockreport-mode org-agenda-clockreport-mode) (org-agenda-set-mode-name) (org-agenda-redo) (message "Clocktable mode is %s" @@ -8121,6 +8101,7 @@ With a double `C-u' prefix arg, show *only* log items, nothing else." nil 'clockcheck)) (special '(closed clock state)) (t (not org-agenda-show-log)))) + (setq org-agenda-start-with-log-mode org-agenda-show-log) (org-agenda-set-mode-name) (org-agenda-redo) (message "Log mode is %s" @@ -8238,10 +8219,7 @@ When called with a prefix argument, include all archive files as well." " Archives" (format " :%s:" org-archive-tag)) "") - (if org-agenda-clockreport-mode - (if (eq org-agenda-clockreport-mode 'with-filter) - " Clock{}" " Clock") - ""))) + (if org-agenda-clockreport-mode " Clock" ""))) (force-mode-line-update)) (define-obsolete-function-alias @@ -8482,7 +8460,8 @@ It also looks at the text of the entry itself." (org-get-at-bol 'org-marker))) (buffer (and marker (marker-buffer marker))) (prefix (buffer-substring (point-at-bol) (point-at-eol))) - (lkall (org-offer-links-in-entry buffer marker arg prefix)) + (lkall (and buffer (org-offer-links-in-entry + buffer marker arg prefix))) (lk0 (car lkall)) (lk (if (stringp lk0) (list lk0) lk0)) (lkend (cdr lkall)) @@ -8608,7 +8587,8 @@ if it was hidden in the outline." (interactive "p") (let ((win (selected-window))) (org-agenda-goto t) - (org-recenter-heading 1) + (org-back-to-heading) + (set-window-start (selected-window) (point-at-bol)) (cond ((= more 0) (hide-subtree) @@ -8647,11 +8627,6 @@ if it was hidden in the outline." (message "Remote: SUBTREE AND ALL DRAWERS"))) (select-window win))) -(defun org-recenter-heading (n) - (save-excursion - (org-back-to-heading) - (recenter n))) - (defvar org-agenda-cycle-counter nil) (defun org-agenda-cycle-show (&optional n) "Show the current entry in another window, with default settings. @@ -8789,8 +8764,12 @@ the same tree node, and the headline of the tree node in the Org-mode file." (org-back-to-heading) (move-marker org-last-heading-marker (point)))) (beginning-of-line 1) - (save-excursion + (save-window-excursion (org-agenda-change-all-lines newhead hdmarker 'fixface just-one)) + (when (org-bound-and-true-p org-clock-out-when-done) + (string-match (concat "^" (regexp-opt org-done-keywords-for-agenda)) + newhead) + (org-agenda-unmark-clocking-task)) (org-move-to-column col)))) (defun org-agenda-add-note (&optional arg) @@ -8927,7 +8906,8 @@ Called with a universal prefix arg, show the priority instead of setting it." (unless org-enable-priority-commands (error "Priority commands are disabled")) (org-agenda-check-no-diary) - (let* ((marker (or (org-get-at-bol 'org-marker) + (let* ((col (current-column)) + (marker (or (org-get-at-bol 'org-marker) (org-agenda-error))) (hdmarker (org-get-at-bol 'org-hd-marker)) (buffer (marker-buffer hdmarker)) @@ -8946,7 +8926,7 @@ Called with a universal prefix arg, show the priority instead of setting it." (end-of-line 1) (setq newhead (org-get-heading))) (org-agenda-change-all-lines newhead hdmarker) - (beginning-of-line 1))))) + (org-move-to-column col))))) ;; FIXME: should fix the tags property of the agenda line. (defun org-agenda-set-tags (&optional tag onoff) @@ -9155,8 +9135,8 @@ Called with a universal prefix arg, show the priority instead of setting it." (goto-char (point-max)) (while (not (bobp)) (when (equal marker (org-get-at-bol 'org-marker)) - (org-move-to-column (- (window-width) (length stamp)) t nil t) - (org-agenda-fix-tags-filter-overlays-at (point)) + (remove-text-properties (point-at-bol) (point-at-eol) '(display)) + (org-move-to-column (- (window-width) (length stamp)) t) (if (featurep 'xemacs) ;; Use `duplicable' property to trigger undo recording (let ((ex (make-extent nil nil)) @@ -9166,9 +9146,9 @@ Called with a universal prefix arg, show the priority instead of setting it." ex (list 'invisible t 'end-glyph gl 'duplicable t)) (insert-extent ex (1- (point)) (point-at-eol))) (add-text-properties - (1- (point)) (point-at-eol) + (1- (point)) (point-at-eol) (list 'display (org-add-props stamp nil - 'face 'secondary-selection)))) + 'face '(secondary-selection default))))) (beginning-of-line 1)) (beginning-of-line 0))))) @@ -9456,9 +9436,9 @@ a timestamp can be added there." (if org-adapt-indentation (org-indent-to-column 2))) (defun org-agenda-insert-diary-make-new-entry (text) - "Make new entry as last child of current entry. -Add TEXT as headline, and position the cursor in the second line so that -a timestamp can be added there." + "Make a new entry with TEXT as the first child of the current subtree. +Position the point in the line right after the new heading so +that a timestamp can be added there." (let ((org-show-following-heading t) (org-show-siblings t) (org-show-hierarchy-above t) @@ -9493,13 +9473,13 @@ entries in that Org-mode file." (message "Diary entry: [d]ay [w]eekly [m]onthly [y]early [a]nniversary [b]lock [c]yclic") (read-char-exclusive))) (cmd (cdr (assoc char - '((?d . insert-diary-entry) - (?w . insert-weekly-diary-entry) - (?m . insert-monthly-diary-entry) - (?y . insert-yearly-diary-entry) - (?a . insert-anniversary-diary-entry) - (?b . insert-block-diary-entry) - (?c . insert-cyclic-diary-entry))))) + '((?d . diary-insert-entry) + (?w . diary-insert-weekly-entry) + (?m . diary-insert-monthly-entry) + (?y . diary-insert-yearly-entry) + (?a . diary-insert-anniversary-entry) + (?b . diary-insert-block-entry) + (?c . diary-insert-cyclic-entry))))) (oldf (symbol-function 'calendar-cursor-to-date)) ;; (buf (get-file-buffer (substitute-in-file-name diary-file))) (point (point)) @@ -9550,12 +9530,12 @@ entries in that Org-mode file." (defun org-agenda-phases-of-moon () "Display the phases of the moon for the 3 months around the cursor date." (interactive) - (org-agenda-execute-calendar-command 'calendar-phases-of-moon)) + (org-agenda-execute-calendar-command 'calendar-lunar-phases)) (defun org-agenda-holidays () "Display the holidays for the 3 months around the cursor date." (interactive) - (org-agenda-execute-calendar-command 'list-calendar-holidays)) + (org-agenda-execute-calendar-command 'calendar-list-holidays)) (defvar calendar-longitude) ; defined in calendar.el (defvar calendar-latitude) ; defined in calendar.el @@ -9647,7 +9627,7 @@ This is a command that has to be installed in `calendar-mode-map'." (overlay-put ov 'type 'org-marked-entry-overlay)) (end-of-line 1) (or (ignore-errors - (goto-char (next-single-property-change (point) 'txt))) + (goto-char (next-single-property-change (point) 'org-hd-marker))) (beginning-of-line 2)) (while (and (get-char-property (point) 'invisible) (not (eobp))) (beginning-of-line 2)) @@ -9665,7 +9645,7 @@ This is a command that has to be installed in `calendar-mode-map'." (let ((entries-marked 0) txt-at-point) (save-excursion (goto-char (point-min)) - (goto-char (next-single-property-change (point) 'txt)) + (goto-char (next-single-property-change (point) 'org-hd-marker)) (while (and (re-search-forward regexp nil t) (setq txt-at-point (get-text-property (point) 'txt))) (when (string-match regexp txt-at-point) @@ -9701,7 +9681,7 @@ This is a command that has to be installed in `calendar-mode-map'." (save-excursion (goto-char (point-min)) (while (ignore-errors - (goto-char (next-single-property-change (point) 'txt))) + (goto-char (next-single-property-change (point) 'org-hd-marker))) (org-agenda-bulk-toggle)))) (defun org-agenda-bulk-toggle () @@ -9917,31 +9897,43 @@ current HH:MM time." ;;; Dragging agenda lines forward/backward -(defun org-agenda-drag-line-forward (arg) - "Drag an agenda line forward by ARG lines." +(defun org-agenda-reapply-filters () + "Re-apply all agenda filters." + (mapcar + (lambda(f) (when (car f) (org-agenda-filter-apply (car f) (cadr f)))) + `((,org-agenda-tag-filter tag) + (,org-agenda-category-filter category) + (,org-agenda-regexp-filter regexp) + (,(get 'org-agenda-tag-filter :preset-filter) tag) + (,(get 'org-agenda-category-filter :preset-filter) category) + (,(get 'org-agenda-regexp-filter :preset-filter) regexp)))) + +(defun org-agenda-drag-line-forward (arg &optional backward) + "Drag an agenda line forward by ARG lines. +When the optional argument `backward' is non-nil, move backward." (interactive "p") - (let ((inhibit-read-only t) lst) + (let ((inhibit-read-only t) lst line) (if (or (not (get-text-property (point) 'txt)) (save-excursion (dotimes (n arg) - (move-beginning-of-line 2) + (move-beginning-of-line (if backward 0 2)) (push (not (get-text-property (point) 'txt)) lst)) (delq nil lst))) (message "Cannot move line forward") - (org-drag-line-forward arg)))) + (let ((end (save-excursion (move-beginning-of-line 2) (point)))) + (move-beginning-of-line 1) + (setq line (buffer-substring (point) end)) + (delete-region (point) end) + (move-beginning-of-line (funcall (if backward '1- '1+) arg)) + (insert line) + (org-agenda-reapply-filters) + (org-agenda-mark-clocking-task) + (move-beginning-of-line 0))))) (defun org-agenda-drag-line-backward (arg) "Drag an agenda line backward by ARG lines." (interactive "p") - (let ((inhibit-read-only t) lst) - (if (or (not (get-text-property (point) 'txt)) - (save-excursion - (dotimes (n arg) - (move-beginning-of-line 0) - (push (not (get-text-property (point) 'txt)) lst)) - (delq nil lst))) - (message "Cannot move line backward") - (org-drag-line-backward arg)))) + (org-agenda-drag-line-forward arg t)) ;;; Flagging notes diff --git a/xemacs-packages/lisp/org-8.2.3c/org-archive.el b/elpa/org-20150427/org-archive.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-archive.el rename to elpa/org-20150427/org-archive.el index 3dc52c1c..6deac47b 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-archive.el +++ b/elpa/org-20150427/org-archive.el @@ -1,6 +1,6 @@ ;;; org-archive.el --- Archiving for Org-mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org-attach.el b/elpa/org-20150427/org-attach.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/org-attach.el rename to elpa/org-20150427/org-attach.el index 898d9116..bcf7ba73 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-attach.el +++ b/elpa/org-20150427/org-attach.el @@ -1,6 +1,6 @@ ;;; org-attach.el --- Manage file attachments to org-mode tasks -;; Copyright (C) 2008-2013 Free Software Foundation, Inc. +;; Copyright (C) 2008-2014 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: org data task @@ -41,8 +41,7 @@ (require 'cl)) (require 'org-id) (require 'org) - -(declare-function vc-git-root "vc-git" (file)) +(require 'vc-git) (defgroup org-attach nil "Options concerning entry attachments in Org-mode." @@ -209,7 +208,9 @@ the directory and (if necessary) the corresponding ID will be created." (save-excursion (save-restriction (widen) - (goto-char org-entry-property-inherited-from) + (if (marker-position org-entry-property-inherited-from) + (goto-char org-entry-property-inherited-from) + (org-back-to-heading t)) (let (org-attach-allow-inheritance) (org-attach-dir create-if-not-exists-p))))) (org-attach-check-absolute-path attach-dir) @@ -266,7 +267,7 @@ This checks for the existence of a \".git\" directory in that directory." (let* ((dir (expand-file-name org-attach-directory)) (git-dir (vc-git-root dir)) (changes 0)) - (when git-dir + (when (and git-dir (executable-find "git")) (with-temp-buffer (cd dir) (let ((have-annex diff --git a/elpa/org-20150427/org-autoloads.el b/elpa/org-20150427/org-autoloads.el new file mode 100644 index 00000000..741525f1 --- /dev/null +++ b/elpa/org-20150427/org-autoloads.el @@ -0,0 +1,682 @@ +;;; org-autoloads.el --- automatically extracted autoloads +;; +;;; Code: +(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) + +;;;### (autoloads nil "org" "org.el" (21822 1136 0 0)) +;;; Generated autoloads from org.el + +(autoload 'org-babel-do-load-languages "org" "\ +Load the languages defined in `org-babel-load-languages'. + +\(fn SYM VALUE)" nil nil) + +(autoload 'org-babel-load-file "org" "\ +Load Emacs Lisp source code blocks in the Org-mode FILE. +This function exports the source code using `org-babel-tangle' +and then loads the resulting file using `load-file'. With prefix +arg (noninteractively: 2nd arg) COMPILE the tangled Emacs Lisp +file to byte-code before it is loaded. + +\(fn FILE &optional COMPILE)" t nil) + +(autoload 'org-version "org" "\ +Show the org-mode version in the echo area. +With prefix argument HERE, insert it at point. +When FULL is non-nil, use a verbose version string. +When MESSAGE is non-nil, display a message with the version. + +\(fn &optional HERE FULL MESSAGE)" t nil) + +(autoload 'turn-on-orgtbl "org" "\ +Unconditionally turn on `orgtbl-mode'. + +\(fn)" nil nil) + +(autoload 'org-clock-persistence-insinuate "org" "\ +Set up hooks for clock persistence. + +\(fn)" nil nil) + +(autoload 'org-mode "org" "\ +Outline-based notes management and organizer, alias +\"Carsten's outline-mode for keeping track of everything.\" + +Org-mode develops organizational tasks around a NOTES file which +contains information about projects as plain text. Org-mode is +implemented on top of outline-mode, which is ideal to keep the content +of large files well structured. It supports ToDo items, deadlines and +time stamps, which magically appear in the diary listing of the Emacs +calendar. Tables are easily created with a built-in table editor. +Plain text URL-like links connect to websites, emails (VM), Usenet +messages (Gnus), BBDB entries, and any files related to the project. +For printing and sharing of notes, an Org-mode file (or a part of it) +can be exported as a structured ASCII or HTML file. + +The following commands are available: + +\\{org-mode-map} + +\(fn)" t nil) + +(autoload 'org-cycle "org" "\ +TAB-action and visibility cycling for Org-mode. + +This is the command invoked in Org-mode by the TAB key. Its main purpose +is outline visibility cycling, but it also invokes other actions +in special contexts. + +- When this function is called with a prefix argument, rotate the entire + buffer through 3 states (global cycling) + 1. OVERVIEW: Show only top-level headlines. + 2. CONTENTS: Show all headlines of all levels, but no body text. + 3. SHOW ALL: Show everything. + When called with two `C-u C-u' prefixes, switch to the startup visibility, + determined by the variable `org-startup-folded', and by any VISIBILITY + properties in the buffer. + When called with three `C-u C-u C-u' prefixed, show the entire buffer, + including any drawers. + +- When inside a table, re-align the table and move to the next field. + +- When point is at the beginning of a headline, rotate the subtree started + by this line through 3 different states (local cycling) + 1. FOLDED: Only the main headline is shown. + 2. CHILDREN: The main headline and the direct children are shown. + From this state, you can move to one of the children + and zoom in further. + 3. SUBTREE: Show the entire subtree, including body text. + If there is no subtree, switch directly from CHILDREN to FOLDED. + +- When point is at the beginning of an empty headline and the variable + `org-cycle-level-after-item/entry-creation' is set, cycle the level + of the headline by demoting and promoting it to likely levels. This + speeds up creation document structure by pressing TAB once or several + times right after creating a new headline. + +- When there is a numeric prefix, go up to a heading with level ARG, do + a `show-subtree' and return to the previous cursor position. If ARG + is negative, go up that many levels. + +- When point is not at the beginning of a headline, execute the global + binding for TAB, which is re-indenting the line. See the option + `org-cycle-emulate-tab' for details. + +- Special case: if point is at the beginning of the buffer and there is + no headline in line 1, this function will act as if called with prefix arg + (C-u TAB, same as S-TAB) also when called without prefix arg. + But only if also the variable `org-cycle-global-at-bob' is t. + +\(fn &optional ARG)" t nil) + +(autoload 'org-global-cycle "org" "\ +Cycle the global visibility. For details see `org-cycle'. +With \\[universal-argument] prefix arg, switch to startup visibility. +With a numeric prefix, show all headlines up to that level. + +\(fn &optional ARG)" t nil) +(put 'orgstruct-heading-prefix-regexp 'safe-local-variable 'stringp) + +(autoload 'orgstruct-mode "org" "\ +Toggle the minor mode `orgstruct-mode'. +This mode is for using Org-mode structure commands in other +modes. The following keys behave as if Org-mode were active, if +the cursor is on a headline, or on a plain list item (both as +defined by Org-mode). + +\(fn &optional ARG)" t nil) + +(autoload 'turn-on-orgstruct "org" "\ +Unconditionally turn on `orgstruct-mode'. + +\(fn)" nil nil) + +(autoload 'turn-on-orgstruct++ "org" "\ +Unconditionally turn on `orgstruct++-mode'. + +\(fn)" nil nil) + +(autoload 'org-run-like-in-org-mode "org" "\ +Run a command, pretending that the current buffer is in Org-mode. +This will temporarily bind local variables that are typically bound in +Org-mode to the values they have in Org-mode, and then interactively +call CMD. + +\(fn CMD)" nil nil) + +(autoload 'org-store-link "org" "\ +\\Store an org-link to the current location. +This link is added to `org-stored-links' and can later be inserted +into an org-buffer with \\[org-insert-link]. + +For some link types, a prefix arg is interpreted. +For links to Usenet articles, arg negates `org-gnus-prefer-web-links'. +For file links, arg negates `org-context-in-file-links'. + +A double prefix arg force skipping storing functions that are not +part of Org's core. + +A triple prefix arg force storing a link for each line in the +active region. + +\(fn ARG)" t nil) + +(autoload 'org-insert-link-global "org" "\ +Insert a link like Org-mode does. +This command can be called in any mode to insert a link in Org-mode syntax. + +\(fn)" t nil) + +(autoload 'org-open-at-point-global "org" "\ +Follow a link like Org-mode does. +This command can be called in any mode to follow a link that has +Org-mode syntax. + +\(fn)" t nil) + +(autoload 'org-open-link-from-string "org" "\ +Open a link in the string S, as if it was in Org-mode. + +\(fn S &optional ARG REFERENCE-BUFFER)" t nil) + +(autoload 'org-switchb "org" "\ +Switch between Org buffers. +With one prefix argument, restrict available buffers to files. +With two prefix arguments, restrict available buffers to agenda files. + +Defaults to `iswitchb' for buffer name completion. +Set `org-completion-use-ido' to make it use ido instead. + +\(fn &optional ARG)" t nil) + +(defalias 'org-ido-switchb 'org-switchb) + +(defalias 'org-iswitchb 'org-switchb) + +(autoload 'org-cycle-agenda-files "org" "\ +Cycle through the files in `org-agenda-files'. +If the current buffer visits an agenda file, find the next one in the list. +If the current buffer does not, find the first agenda file. + +\(fn)" t nil) + +(autoload 'org-submit-bug-report "org" "\ +Submit a bug report on Org-mode via mail. + +Don't hesitate to report any problems or inaccurate documentation. + +If you don't have setup sending mail from (X)Emacs, please copy the +output buffer into your mail program, as it gives us important +information about your Org-mode version and configuration. + +\(fn)" t nil) + +(autoload 'org-reload "org" "\ +Reload all org lisp files. +With prefix arg UNCOMPILED, load the uncompiled versions. + +\(fn &optional UNCOMPILED)" t nil) + +(autoload 'org-customize "org" "\ +Call the customize function with org as argument. + +\(fn)" t nil) + +;;;*** + +;;;### (autoloads nil "org-agenda" "org-agenda.el" (21822 1136 0 +;;;;;; 0)) +;;; Generated autoloads from org-agenda.el + +(autoload 'org-toggle-sticky-agenda "org-agenda" "\ +Toggle `org-agenda-sticky'. + +\(fn &optional ARG)" t nil) + +(autoload 'org-agenda "org-agenda" "\ +Dispatch agenda commands to collect entries to the agenda buffer. +Prompts for a command to execute. Any prefix arg will be passed +on to the selected command. The default selections are: + +a Call `org-agenda-list' to display the agenda for current day or week. +t Call `org-todo-list' to display the global todo list. +T Call `org-todo-list' to display the global todo list, select only + entries with a specific TODO keyword (the user gets a prompt). +m Call `org-tags-view' to display headlines with tags matching + a condition (the user is prompted for the condition). +M Like `m', but select only TODO entries, no ordinary headlines. +L Create a timeline for the current buffer. +e Export views to associated files. +s Search entries for keywords. +S Search entries for keywords, only with TODO keywords. +/ Multi occur across all agenda files and also files listed + in `org-agenda-text-search-extra-files'. +< Restrict agenda commands to buffer, subtree, or region. + Press several times to get the desired effect. +> Remove a previous restriction. +# List \"stuck\" projects. +! Configure what \"stuck\" means. +C Configure custom agenda commands. + +More commands can be added by configuring the variable +`org-agenda-custom-commands'. In particular, specific tags and TODO keyword +searches can be pre-defined in this way. + +If the current buffer is in Org-mode and visiting a file, you can also +first press `<' once to indicate that the agenda should be temporarily +\(until the next use of \\[org-agenda]) restricted to the current file. +Pressing `<' twice means to restrict to the current subtree or region +\(if active). + +\(fn &optional ARG ORG-KEYS RESTRICTION)" t nil) + +(autoload 'org-batch-agenda "org-agenda" "\ +Run an agenda command in batch mode and send the result to STDOUT. +If CMD-KEY is a string of length 1, it is used as a key in +`org-agenda-custom-commands' and triggers this command. If it is a +longer string it is used as a tags/todo match string. +Parameters are alternating variable names and values that will be bound +before running the agenda command. + +\(fn CMD-KEY &rest PARAMETERS)" nil t) + +(autoload 'org-batch-agenda-csv "org-agenda" "\ +Run an agenda command in batch mode and send the result to STDOUT. +If CMD-KEY is a string of length 1, it is used as a key in +`org-agenda-custom-commands' and triggers this command. If it is a +longer string it is used as a tags/todo match string. +Parameters are alternating variable names and values that will be bound +before running the agenda command. + +The output gives a line for each selected agenda item. Each +item is a list of comma-separated values, like this: + +category,head,type,todo,tags,date,time,extra,priority-l,priority-n + +category The category of the item +head The headline, without TODO kwd, TAGS and PRIORITY +type The type of the agenda entry, can be + todo selected in TODO match + tagsmatch selected in tags match + diary imported from diary + deadline a deadline on given date + scheduled scheduled on given date + timestamp entry has timestamp on given date + closed entry was closed on given date + upcoming-deadline warning about deadline + past-scheduled forwarded scheduled item + block entry has date block including g. date +todo The todo keyword, if any +tags All tags including inherited ones, separated by colons +date The relevant date, like 2007-2-14 +time The time, like 15:00-16:50 +extra Sting with extra planning info +priority-l The priority letter if any was given +priority-n The computed numerical priority +agenda-day The day in the agenda where this is listed + +\(fn CMD-KEY &rest PARAMETERS)" nil t) + +(autoload 'org-store-agenda-views "org-agenda" "\ +Store agenda views. + +\(fn &rest PARAMETERS)" t nil) + +(autoload 'org-batch-store-agenda-views "org-agenda" "\ +Run all custom agenda commands that have a file argument. + +\(fn &rest PARAMETERS)" nil t) + +(autoload 'org-agenda-list "org-agenda" "\ +Produce a daily/weekly view from all files in variable `org-agenda-files'. +The view will be for the current day or week, but from the overview buffer +you will be able to go to other days/weeks. + +With a numeric prefix argument in an interactive call, the agenda will +span ARG days. Lisp programs should instead specify SPAN to change +the number of days. SPAN defaults to `org-agenda-span'. + +START-DAY defaults to TODAY, or to the most recent match for the weekday +given in `org-agenda-start-on-weekday'. + +When WITH-HOUR is non-nil, only include scheduled and deadline +items if they have an hour specification like [h]h:mm. + +\(fn &optional ARG START-DAY SPAN WITH-HOUR)" t nil) + +(autoload 'org-search-view "org-agenda" "\ +Show all entries that contain a phrase or words or regular expressions. + +With optional prefix argument TODO-ONLY, only consider entries that are +TODO entries. The argument STRING can be used to pass a default search +string into this function. If EDIT-AT is non-nil, it means that the +user should get a chance to edit this string, with cursor at position +EDIT-AT. + +The search string can be viewed either as a phrase that should be found as +is, or it can be broken into a number of snippets, each of which must match +in a Boolean way to select an entry. The default depends on the variable +`org-agenda-search-view-always-boolean'. +Even if this is turned off (the default) you can always switch to +Boolean search dynamically by preceding the first word with \"+\" or \"-\". + +The default is a direct search of the whole phrase, where each space in +the search string can expand to an arbitrary amount of whitespace, +including newlines. + +If using a Boolean search, the search string is split on whitespace and +each snippet is searched separately, with logical AND to select an entry. +Words prefixed with a minus must *not* occur in the entry. Words without +a prefix or prefixed with a plus must occur in the entry. Matching is +case-insensitive. Words are enclosed by word delimiters (i.e. they must +match whole words, not parts of a word) if +`org-agenda-search-view-force-full-words' is set (default is nil). + +Boolean search snippets enclosed by curly braces are interpreted as +regular expressions that must or (when preceded with \"-\") must not +match in the entry. Snippets enclosed into double quotes will be taken +as a whole, to include whitespace. + +- If the search string starts with an asterisk, search only in headlines. +- If (possibly after the leading star) the search string starts with an + exclamation mark, this also means to look at TODO entries only, an effect + that can also be achieved with a prefix argument. +- If (possibly after star and exclamation mark) the search string starts + with a colon, this will mean that the (non-regexp) snippets of the + Boolean search must match as full words. + +This command searches the agenda files, and in addition the files listed +in `org-agenda-text-search-extra-files'. + +\(fn &optional TODO-ONLY STRING EDIT-AT)" t nil) + +(autoload 'org-todo-list "org-agenda" "\ +Show all (not done) TODO entries from all agenda file in a single list. +The prefix arg can be used to select a specific TODO keyword and limit +the list to these. When using \\[universal-argument], you will be prompted +for a keyword. A numeric prefix directly selects the Nth keyword in +`org-todo-keywords-1'. + +\(fn &optional ARG)" t nil) + +(autoload 'org-tags-view "org-agenda" "\ +Show all headlines for all `org-agenda-files' matching a TAGS criterion. +The prefix arg TODO-ONLY limits the search to TODO entries. + +\(fn &optional TODO-ONLY MATCH)" t nil) + +(autoload 'org-agenda-list-stuck-projects "org-agenda" "\ +Create agenda view for projects that are stuck. +Stuck projects are project that have no next actions. For the definitions +of what a project is and how to check if it stuck, customize the variable +`org-stuck-projects'. + +\(fn &rest IGNORE)" t nil) + +(autoload 'org-diary "org-agenda" "\ +Return diary information from org files. +This function can be used in a \"sexp\" diary entry in the Emacs calendar. +It accesses org files and extracts information from those files to be +listed in the diary. The function accepts arguments specifying what +items should be listed. For a list of arguments allowed here, see the +variable `org-agenda-entry-types'. + +The call in the diary file should look like this: + + &%%(org-diary) ~/path/to/some/orgfile.org + +Use a separate line for each org file to check. Or, if you omit the file name, +all files listed in `org-agenda-files' will be checked automatically: + + &%%(org-diary) + +If you don't give any arguments (as in the example above), the default value +of `org-agenda-entry-types' is used: (:deadline :scheduled :timestamp :sexp). +So the example above may also be written as + + &%%(org-diary :deadline :timestamp :sexp :scheduled) + +The function expects the lisp variables `entry' and `date' to be provided +by the caller, because this is how the calendar works. Don't use this +function from a program - use `org-agenda-get-day-entries' instead. + +\(fn &rest ARGS)" nil nil) + +(autoload 'org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item "org-agenda" "\ +Do we have a reason to ignore this TODO entry because it has a time stamp? + +\(fn &optional END)" nil nil) + +(autoload 'org-agenda-set-restriction-lock "org-agenda" "\ +Set restriction lock for agenda, to current subtree or file. +Restriction will be the file if TYPE is `file', or if type is the +universal prefix '(4), or if the cursor is before the first headline +in the file. Otherwise, restriction will be to the current subtree. + +\(fn &optional TYPE)" t nil) + +(autoload 'org-calendar-goto-agenda "org-agenda" "\ +Compute the Org-mode agenda for the calendar date displayed at the cursor. +This is a command that has to be installed in `calendar-mode-map'. + +\(fn)" t nil) + +(autoload 'org-agenda-to-appt "org-agenda" "\ +Activate appointments found in `org-agenda-files'. +With a \\[universal-argument] prefix, refresh the list of +appointments. + +If FILTER is t, interactively prompt the user for a regular +expression, and filter out entries that don't match it. + +If FILTER is a string, use this string as a regular expression +for filtering entries out. + +If FILTER is a function, filter out entries against which +calling the function returns nil. This function takes one +argument: an entry from `org-agenda-get-day-entries'. + +FILTER can also be an alist with the car of each cell being +either 'headline or 'category. For example: + + '((headline \"IMPORTANT\") + (category \"Work\")) + +will only add headlines containing IMPORTANT or headlines +belonging to the \"Work\" category. + +ARGS are symbols indicating what kind of entries to consider. +By default `org-agenda-to-appt' will use :deadline*, :scheduled* +\(i.e., deadlines and scheduled items with a hh:mm specification) +and :timestamp entries. See the docstring of `org-diary' for +details and examples. + +If an entry has a APPT_WARNTIME property, its value will be used +to override `appt-message-warning-time'. + +\(fn &optional REFRESH FILTER &rest ARGS)" t nil) + +;;;*** + +;;;### (autoloads nil "org-capture" "org-capture.el" (21822 1136 +;;;;;; 0 0)) +;;; Generated autoloads from org-capture.el + +(autoload 'org-capture-string "org-capture" "\ +Capture STRING with the template selected by KEYS. + +\(fn STRING &optional KEYS)" t nil) + +(autoload 'org-capture "org-capture" "\ +Capture something. +\\ +This will let you select a template from `org-capture-templates', and then +file the newly captured information. The text is immediately inserted +at the target location, and an indirect buffer is shown where you can +edit it. Pressing \\[org-capture-finalize] brings you back to the previous state +of Emacs, so that you can continue your work. + +When called interactively with a \\[universal-argument] prefix argument GOTO, don't capture +anything, just go to the file/headline where the selected template +stores its notes. With a double prefix argument \\[universal-argument] \\[universal-argument], go to the last note +stored. + +When called with a `C-0' (zero) prefix, insert a template at point. + +ELisp programs can set KEYS to a string associated with a template +in `org-capture-templates'. In this case, interactive selection +will be bypassed. + +If `org-capture-use-agenda-date' is non-nil, capturing from the +agenda will use the date at point as the default date. Then, a +`C-1' prefix will tell the capture process to use the HH:MM time +of the day at point (if any) or the current HH:MM time. + +\(fn &optional GOTO KEYS)" t nil) + +(autoload 'org-capture-import-remember-templates "org-capture" "\ +Set `org-capture-templates' to be similar to `org-remember-templates'. + +\(fn)" t nil) + +;;;*** + +;;;### (autoloads nil "org-colview" "org-colview.el" (21822 1136 +;;;;;; 0 0)) +;;; Generated autoloads from org-colview.el + +(autoload 'org-columns-remove-overlays "org-colview" "\ +Remove all currently active column overlays. + +\(fn)" t nil) + +(autoload 'org-columns-get-format-and-top-level "org-colview" "\ + + +\(fn)" nil nil) + +(autoload 'org-columns "org-colview" "\ +Turn on column view on an org-mode file. +When COLUMNS-FMT-STRING is non-nil, use it as the column format. + +\(fn &optional COLUMNS-FMT-STRING)" t nil) + +(autoload 'org-columns-compute "org-colview" "\ +Sum the values of property PROPERTY hierarchically, for the entire buffer. + +\(fn PROPERTY)" t nil) + +(autoload 'org-columns-number-to-string "org-colview" "\ +Convert a computed column number to a string value, according to FMT. + +\(fn N FMT &optional PRINTF)" nil nil) + +(autoload 'org-dblock-write:columnview "org-colview" "\ +Write the column view table. +PARAMS is a property list of parameters: + +:width enforce same column widths with specifiers. +:id the :ID: property of the entry where the columns view + should be built. When the symbol `local', call locally. + When `global' call column view with the cursor at the beginning + of the buffer (usually this means that the whole buffer switches + to column view). When \"file:path/to/file.org\", invoke column + view at the start of that file. Otherwise, the ID is located + using `org-id-find'. +:hlines When t, insert a hline before each item. When a number, insert + a hline before each level <= that number. +:vlines When t, make each column a colgroup to enforce vertical lines. +:maxlevel When set to a number, don't capture headlines below this level. +:skip-empty-rows + When t, skip rows where all specifiers other than ITEM are empty. +:format When non-nil, specify the column view format to use. + +\(fn PARAMS)" nil nil) + +(autoload 'org-insert-columns-dblock "org-colview" "\ +Create a dynamic block capturing a column view table. + +\(fn)" t nil) + +(autoload 'org-agenda-columns "org-colview" "\ +Turn on or update column view in the agenda. + +\(fn)" t nil) + +;;;*** + +;;;### (autoloads nil "org-compat" "org-compat.el" (21822 1135 0 +;;;;;; 0)) +;;; Generated autoloads from org-compat.el + +(autoload 'org-check-version "org-compat" "\ +Try very hard to provide sensible version strings. + +\(fn)" nil t) + +;;;*** + +;;;### (autoloads nil "org-macs" "org-macs.el" (21822 1136 0 0)) +;;; Generated autoloads from org-macs.el + +(autoload 'org-load-noerror-mustsuffix "org-macs" "\ +Load FILE with optional arguments NOERROR and MUSTSUFFIX. Drop the MUSTSUFFIX argument for XEmacs, which doesn't recognize it. + +\(fn FILE)" nil t) + +;;;*** + +;;;### (autoloads nil "org-version" "org-version.el" (21822 1136 +;;;;;; 0 0)) +;;; Generated autoloads from org-version.el + +(autoload 'org-release "org-version" "\ +The release version of org-mode. + Inserted by installing org-mode or when a release is made. + +\(fn)" nil nil) + +(autoload 'org-git-version "org-version" "\ +The Git version of org-mode. + Inserted by installing org-mode or when a release is made. + +\(fn)" nil nil) + +(defvar org-odt-data-dir "/usr/share/emacs/etc/org" "\ +The location of ODT styles.") + +;;;*** + +;;;### (autoloads nil nil ("ob-C.el" "ob-R.el" "ob-asymptote.el" +;;;;;; "ob-awk.el" "ob-calc.el" "ob-clojure.el" "ob-comint.el" "ob-core.el" +;;;;;; "ob-css.el" "ob-ditaa.el" "ob-dot.el" "ob-emacs-lisp.el" +;;;;;; "ob-eval.el" "ob-exp.el" "ob-fortran.el" "ob-gnuplot.el" +;;;;;; "ob-haskell.el" "ob-io.el" "ob-java.el" "ob-js.el" "ob-keys.el" +;;;;;; "ob-latex.el" "ob-ledger.el" "ob-lilypond.el" "ob-lisp.el" +;;;;;; "ob-lob.el" "ob-makefile.el" "ob-matlab.el" "ob-maxima.el" +;;;;;; "ob-mscgen.el" "ob-ocaml.el" "ob-octave.el" "ob-org.el" "ob-perl.el" +;;;;;; "ob-picolisp.el" "ob-plantuml.el" "ob-python.el" "ob-ref.el" +;;;;;; "ob-ruby.el" "ob-sass.el" "ob-scala.el" "ob-scheme.el" "ob-screen.el" +;;;;;; "ob-sh.el" "ob-shen.el" "ob-sql.el" "ob-sqlite.el" "ob-table.el" +;;;;;; "ob-tangle.el" "ob.el" "org-archive.el" "org-attach.el" "org-bbdb.el" +;;;;;; "org-bibtex.el" "org-clock.el" "org-crypt.el" "org-ctags.el" +;;;;;; "org-datetree.el" "org-docview.el" "org-element.el" "org-entities.el" +;;;;;; "org-eshell.el" "org-faces.el" "org-feed.el" "org-footnote.el" +;;;;;; "org-gnus.el" "org-habit.el" "org-id.el" "org-indent.el" +;;;;;; "org-info.el" "org-inlinetask.el" "org-install.el" "org-irc.el" +;;;;;; "org-list.el" "org-loaddefs.el" "org-macro.el" "org-mhe.el" +;;;;;; "org-mobile.el" "org-mouse.el" "org-pcomplete.el" "org-pkg.el" +;;;;;; "org-plot.el" "org-protocol.el" "org-rmail.el" "org-src.el" +;;;;;; "org-table.el" "org-timer.el" "org-w3m.el" "ox-ascii.el" +;;;;;; "ox-beamer.el" "ox-html.el" "ox-icalendar.el" "ox-latex.el" +;;;;;; "ox-man.el" "ox-md.el" "ox-odt.el" "ox-org.el" "ox-publish.el" +;;;;;; "ox-texinfo.el" "ox.el") (21822 1136 169682 0)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; End: +;;; org-autoloads.el ends here diff --git a/xemacs-packages/lisp/org-8.2.3c/org-bbdb.el b/elpa/org-20150427/org-bbdb.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/org-bbdb.el rename to elpa/org-20150427/org-bbdb.el index f122b67e..cfd5b3b6 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-bbdb.el +++ b/elpa/org-20150427/org-bbdb.el @@ -1,6 +1,6 @@ ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Authors: Carsten Dominik ;; Thomas Baumann @@ -400,8 +400,11 @@ This is used by Org to re-create the anniversary hash table." (defun org-bbdb-complete-link () "Read a bbdb link with name completion." (require 'bbdb-com) - (concat "bbdb:" - (bbdb-record-name (car (bbdb-completing-read-record "Name: "))))) + (let ((rec (bbdb-completing-read-record "Name: "))) + (concat "bbdb:" + (bbdb-record-name (if (listp rec) + (car rec) + rec))))) (defun org-bbdb-anniv-export-ical () "Extract anniversaries from BBDB and convert them to icalendar format." diff --git a/xemacs-packages/lisp/org-8.2.3c/org-bibtex.el b/elpa/org-20150427/org-bibtex.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/org-bibtex.el rename to elpa/org-20150427/org-bibtex.el index 52643994..75ac69ba 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-bibtex.el +++ b/elpa/org-20150427/org-bibtex.el @@ -1,6 +1,6 @@ ;;; org-bibtex.el --- Org links to BibTeX entries ;; -;; Copyright (C) 2007-2013 Free Software Foundation, Inc. +;; Copyright (C) 2007-2014 Free Software Foundation, Inc. ;; ;; Authors: Bastien Guerry ;; Carsten Dominik @@ -44,7 +44,7 @@ ;; Here is an example of a capture template that use some of this ;; information (:author :year :title :journal :pages): ;; -;; (setq org-capure-templates +;; (setq org-capture-templates ;; '((?b "* READ %?\n\n%a\n\n%:author (%:year): %:title\n \ ;; In %:journal, %:pages."))) ;; @@ -203,7 +203,7 @@ (:pages . "One or more page numbers or range of numbers, such as 42-111 or 7,41,73-97 or 43+ (the ‘+’ in this last example indicates pages following that don’t form simple range). BibTEX requires double dashes for page ranges (--).") (:publisher . "The publisher’s name.") (:school . "The name of the school where a thesis was written.") - (:series . "The name of a series or set of books. When citing an entire book, the the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") + (:series . "The name of a series or set of books. When citing an entire book, the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") (:title . "The work’s title, typed as explained in the LaTeX book.") (:type . "The type of a technical report for example, 'Research Note'.") (:volume . "The volume of a journal or multi-volume book.") @@ -279,7 +279,7 @@ not be exported." (defcustom org-bibtex-no-export-tags nil "List of tag(s) that should not be converted to keywords. -This variable is relevant only if `org-bibtex-export-tags-as-keywords' is t." +This variable is relevant only if `org-bibtex-tags-are-keywords' is t." :group 'org-bibtex :version "24.1" :type '(repeat :tag "Tag" (string))) @@ -371,7 +371,9 @@ This variable is relevant only if `org-bibtex-export-tags-as-keywords' is t." (bibtex-beginning-of-entry) (if (re-search-forward "keywords.*=.*{\\(.*\\)}" nil t) (progn (goto-char (match-end 1)) (insert ", ")) - (bibtex-make-field "keywords" t t)) + (search-forward ",\n" nil t) + (insert " keywords={},\n") + (search-backward "}," nil t)) (insert (mapconcat #'identity tags ", "))) (buffer-string)))))) @@ -534,7 +536,7 @@ With optional argument OPTIONAL, also prompt for optional fields." ;;; Bibtex <-> Org-mode headline translation functions (defun org-bibtex (&optional filename) "Export each headline in the current file to a bibtex entry. -Headlines are exported using `org-bibtex-export-headline'." +Headlines are exported using `org-bibtex-headline'." (interactive (list (read-file-name "Bibtex file: " nil nil nil @@ -613,7 +615,8 @@ This uses `bibtex-parse-entry'." (strip-delim (lambda (str) ; strip enclosing "..." and {...} (dolist (pair '((34 . 34) (123 . 125) (123 . 125))) - (when (and (= (aref str 0) (car pair)) + (when (and (> (length str) 1) + (= (aref str 0) (car pair)) (= (aref str (1- (length str))) (cdr pair))) (setf str (substring str 1 (1- (length str)))))) str))) (push (mapcar diff --git a/xemacs-packages/lisp/org-8.2.3c/org-capture.el b/elpa/org-20150427/org-capture.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-capture.el rename to elpa/org-20150427/org-capture.el index 39804ac3..88d7ee5a 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-capture.el +++ b/elpa/org-20150427/org-capture.el @@ -1,6 +1,6 @@ ;;; org-capture.el --- Fast note taking in Org-mode -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -741,7 +741,8 @@ captured item after finalizing." (pos (org-capture-get :initial-target-position)) (ipt (org-capture-get :insertion-point)) (size (org-capture-get :captured-entry-size))) - (when reg + (if (not reg) + (widen) (cond ((< ipt (car reg)) ;; insertion point is before the narrowed region (narrow-to-region (+ size (car reg)) (+ size (cdr reg)))) @@ -1528,8 +1529,8 @@ The template may still contain \"%?\" for cursor positioning." (v-x (or (org-get-x-clipboard 'PRIMARY) (org-get-x-clipboard 'CLIPBOARD) (org-get-x-clipboard 'SECONDARY))) - (v-t (format-time-string (car org-time-stamp-formats) ct)) - (v-T (format-time-string (cdr org-time-stamp-formats) ct)) + (v-t (format-time-string (car org-time-stamp-formats) ct1)) + (v-T (format-time-string (cdr org-time-stamp-formats) ct1)) (v-u (concat "[" (substring v-t 1 -1) "]")) (v-U (concat "[" (substring v-T 1 -1) "]")) ;; `initial' and `annotation' might habe been passed. @@ -1586,7 +1587,7 @@ The template may still contain \"%?\" for cursor positioning." (insert template) (goto-char (point-min)) (org-capture-steal-local-variables buffer) - (setq buffer-file-name nil) + (setq buffer-file-name nil mark-active nil) ;; %[] Insert contents of a file. (goto-char (point-min)) @@ -1601,8 +1602,6 @@ The template may still contain \"%?\" for cursor positioning." (insert-file-contents filename) (error (insert (format "%%![Couldn't insert %s: %s]" filename error))))))) - ;; %() embedded elisp - (org-capture-expand-embedded-elisp) ;; The current time (goto-char (point-min)) @@ -1632,6 +1631,10 @@ The template may still contain \"%?\" for cursor positioning." (intern (match-string 1))) "")) (replace-match x t t))))) + ;; %() embedded elisp + (goto-char (point-min)) + (org-capture-expand-embedded-elisp) + ;; Turn on org-mode in temp buffer, set local variables ;; This is to support completion in interactive prompts (let ((org-inhibit-startup t)) (org-mode)) @@ -1673,7 +1676,9 @@ The template may still contain \"%?\" for cursor positioning." (or (equal (char-before) ?:) (insert ":")) (insert ins) (or (equal (char-after) ?:) (insert ":")) - (and (org-at-heading-p) (org-set-tags nil 'align))))) + (and (org-at-heading-p) + (let ((org-ignore-region t)) + (org-set-tags nil 'align)))))) ((equal char "C") (cond ((= (length clipboards) 1) (insert (car clipboards))) ((> (length clipboards) 1) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-clock.el b/elpa/org-20150427/org-clock.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/org-clock.el rename to elpa/org-20150427/org-clock.el index 2340ffc7..319c1c47 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-clock.el +++ b/elpa/org-20150427/org-clock.el @@ -1,6 +1,6 @@ ;;; org-clock.el --- The time clocking code for Org-mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -32,7 +32,7 @@ (require 'cl)) (require 'org) -(declare-function calendar-absolute-from-iso "cal-iso" (&optional date)) +(declare-function calendar-iso-to-absolute "cal-iso" (&optional date)) (declare-function notifications-notify "notifications" (&rest params)) (declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) (declare-function org-refresh-properties "org" (dprop tprop)) @@ -424,7 +424,7 @@ to add an effort property.") "Hook run when stopping the current clock.") (defvar org-clock-cancel-hook nil - "Hook run when cancelling the current clock.") + "Hook run when canceling the current clock.") (defvar org-clock-goto-hook nil "Hook run when selecting the currently clocked-in entry.") (defvar org-clock-has-been-used nil @@ -441,7 +441,7 @@ to add an effort property.") (defvar org-clock-start-time "") (defvar org-clock-leftover-time nil - "If non-nil, user cancelled a clock; this is when leftover time started.") + "If non-nil, user canceled a clock; this is when leftover time started.") (defvar org-clock-effort "" "Effort estimate of the currently clocking task.") @@ -667,7 +667,7 @@ previous clocking intervals." VALUE can be a number of minutes, or a string with format hh:mm or mm. When the string starts with a + or a - sign, the current value of the effort property will be changed by that amount. If the effort value is expressed -as an `org-effort-durations' (e.g. \"3h\"), the modificied value will be +as an `org-effort-durations' (e.g. \"3h\"), the modified value will be converted to a hh:mm duration. This command will update the \"Effort\" property of the currently @@ -1838,9 +1838,9 @@ Use \\[org-clock-remove-overlays] to remove the subtree times." (when org-remove-highlights-with-change (org-add-hook 'before-change-functions 'org-clock-remove-overlays nil 'local)))) - (message (concat "Total file time: " - (org-minutes-to-clocksum-string org-clock-file-total-minutes) - " (%d hours and %d minutes)") h m))) + (message (concat "Total file time: " + (org-minutes-to-clocksum-string org-clock-file-total-minutes) + " (%d hours and %d minutes)") h m))) (defvar org-clock-overlays nil) (make-variable-buffer-local 'org-clock-overlays) @@ -1850,16 +1850,17 @@ Use \\[org-clock-remove-overlays] to remove the subtree times." If LEVEL is given, prefix time with a corresponding number of stars. This creates a new overlay and stores it in `org-clock-overlays', so that it will be easy to remove." - (let* ((c 60) (h (floor (/ time 60))) (m (- time (* 60 h))) - (l (if level (org-get-valid-level level 0) 0)) - (off 0) + (let* ((l (if level (org-get-valid-level level 0) 0)) ov tx) - (org-move-to-column c) - (unless (eolp) (skip-chars-backward "^ \t")) - (skip-chars-backward " \t") - (setq ov (make-overlay (point-at-bol) (point-at-eol)) - tx (concat (buffer-substring (point-at-bol) (point)) - (make-string (+ off (max 0 (- c (current-column)))) ?.) + (beginning-of-line) + (when (looking-at org-complex-heading-regexp) + (goto-char (match-beginning 4))) + (setq ov (make-overlay (point) (point-at-eol)) + tx (concat (buffer-substring-no-properties (point) (match-end 4)) + (make-string + (max 0 (- (- 60 (current-column)) + (- (match-end 4) (match-beginning 4)) + (length (org-get-at-bol 'line-prefix)))) ?.) (org-add-props (concat (make-string l ?*) " " (org-minutes-to-clocksum-string time) (make-string (- 16 l) ?\ )) @@ -2054,7 +2055,7 @@ If you can combine both, the month starting day will have priority." (setq y (string-to-number (match-string 1 skey)) w (string-to-number (match-string 2 skey))) (setq date (calendar-gregorian-from-absolute - (calendar-absolute-from-iso (list w 1 y)))) + (calendar-iso-to-absolute (list w 1 y)))) (setq d (nth 1 date) month (car date) y (nth 2 date) dow 1 key 'week)) @@ -2063,7 +2064,7 @@ If you can combine both, the month starting day will have priority." (setq y (string-to-number (match-string 1 skey))) (setq q (string-to-number (match-string 2 skey))) (setq date (calendar-gregorian-from-absolute - (calendar-absolute-from-iso (org-quarter-to-date q y)))) + (calendar-iso-to-absolute (org-quarter-to-date q y)))) (setq d (nth 1 date) month (car date) y (nth 2 date) dow 1 key 'quarter)) @@ -2191,7 +2192,7 @@ the currently selected interval size." ((and wp (string-match "w\\|W" wp) mw (> (length wp) 0)) (require 'cal-iso) (setq date (calendar-gregorian-from-absolute - (calendar-absolute-from-iso (list (+ mw n) 1 y)))) + (calendar-iso-to-absolute (list (+ mw n) 1 y)))) (setq ins (format-time-string "%G-W%V" (encode-time 0 0 0 (nth 1 date) (car date) (nth 2 date))))) @@ -2208,7 +2209,7 @@ the currently selected interval size." y (- y 1)) ()) (setq date (calendar-gregorian-from-absolute - (calendar-absolute-from-iso (org-quarter-to-date (+ mw n) y)))) + (calendar-iso-to-absolute (org-quarter-to-date (+ mw n) y)))) (setq ins (format-time-string (concat (number-to-string y) "-Q" (number-to-string (+ mw n))) (encode-time 0 0 0 (nth 1 date) (car date) (nth 2 date))))) @@ -2555,13 +2556,10 @@ from the dynamic block definition." total-time)) (defun org-clocktable-indent-string (level) - (if (= level 1) - "" - (let ((str "\\__")) - (while (> level 2) - (setq level (1- level) - str (concat str "___"))) - (concat str " ")))) + (if (= level 1) "" + (let ((str " ")) + (dotimes (k (1- level) str) + (setq str (concat "\\emsp" str)))))) (defun org-clocktable-steps (params) "Step through the range to make a number of clock tables." @@ -2705,9 +2703,13 @@ TIME: The sum of all time spend in this tree, in minutes. This time (format "file:%s::%s" (buffer-file-name) (save-match-data - (org-make-org-heading-search-string - (match-string 2)))) - (match-string 2))) + (match-string 2))) + (org-make-org-heading-search-string + (replace-regexp-in-string + org-bracket-link-regexp + (lambda (m) (or (match-string 3 m) + (match-string 1 m))) + (match-string 2))))) tsp (when timestamp (setq props (org-entry-properties (point))) (or (cdr (assoc "SCHEDULED" props)) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-colview.el b/elpa/org-20150427/org-colview.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-colview.el rename to elpa/org-20150427/org-colview.el index 361560dc..07ee69f1 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-colview.el +++ b/elpa/org-20150427/org-colview.el @@ -1,6 +1,6 @@ ;;; org-colview.el --- Column View in Org-mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -174,7 +174,7 @@ This is the compiled version of the format.") (face (list color font 'org-column ref-face)) (face1 (list color font 'org-agenda-column-dateline ref-face)) (cphr (get-text-property (point-at-bol) 'org-complex-heading-regexp)) - pom property ass width f string ov column val modval s2 title calc) + pom property ass width f fc string fm ov column val modval s2 title calc) ;; Check if the entry is in another buffer. (unless props (if (eq major-mode 'org-agenda-mode) @@ -204,6 +204,8 @@ This is the compiled version of the format.") (nth 2 column) (length property)) f (format "%%-%d.%ds | " width width) + fm (nth 4 column) + fc (nth 5 column) calc (nth 7 column) val (or (cdr ass) "") modval (cond ((and org-columns-modify-value-for-display-function @@ -215,13 +217,14 @@ This is the compiled version of the format.") (org-columns-cleanup-item val org-columns-current-fmt-compiled (or org-complex-heading-regexp cphr))) + (fc (org-columns-number-to-string + (org-columns-string-to-number val fm) fm fc)) ((and calc (functionp calc) (not (string= val "")) (not (get-text-property 0 'org-computed val))) (org-columns-number-to-string (funcall calc (org-columns-string-to-number - val (nth 4 column))) - (nth 4 column))))) + val fm)) fm)))) (setq s2 (org-columns-add-ellipses (or modval val) width)) (setq string (format f s2)) ;; Create the overlay diff --git a/xemacs-packages/lisp/org-8.2.3c/org-compat.el b/elpa/org-20150427/org-compat.el similarity index 95% rename from xemacs-packages/lisp/org-8.2.3c/org-compat.el rename to elpa/org-20150427/org-compat.el index b714f13a..90380a88 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-compat.el +++ b/elpa/org-20150427/org-compat.el @@ -1,6 +1,6 @@ ;;; org-compat.el --- Compatibility code for Org-mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -190,10 +190,12 @@ If DELETE is non-nil, delete all those overlays." found)) (defun org-get-x-clipboard (value) - "Get the value of the x clipboard, compatible with XEmacs, and GNU Emacs 21." - (if (eq window-system 'x) - (let ((x (org-get-x-clipboard-compat value))) - (if x (org-no-properties x))))) + "Get the value of the x or Windows clipboard, compatible with XEmacs, and GNU Emacs 21." + (cond ((eq window-system 'x) + (let ((x (org-get-x-clipboard-compat value))) + (if x (org-no-properties x)))) + ((and (eq window-system 'w32) (fboundp 'w32-get-clipboard-data)) + (w32-get-clipboard-data)))) (defsubst org-decompose-region (beg end) "Decompose from BEG to END." @@ -258,6 +260,12 @@ ignored in this case." next (+ from (* n inc))))) (nreverse seq))))) +;; `set-transient-map' is only in Emacs >= 24.4 +(defalias 'org-set-transient-map + (if (fboundp 'set-transient-map) + 'set-transient-map + 'set-temporary-overlay-map)) + ;; Region compatibility (defvar org-ignore-region nil @@ -304,8 +312,7 @@ Works on both Emacs and XEmacs." (defun org-in-invisibility-spec-p (arg) "Is ARG a member of `buffer-invisibility-spec'?" (if (consp buffer-invisibility-spec) - (member arg buffer-invisibility-spec) - nil)) + (member arg buffer-invisibility-spec))) (defmacro org-xemacs-without-invisibility (&rest body) "Turn off extents with invisibility while executing BODY." @@ -335,10 +342,15 @@ Works on both Emacs and XEmacs." (org-xemacs-without-invisibility (indent-line-to column)) (indent-line-to column))) -(defun org-move-to-column (column &optional force buffer ignore-invisible) - (let ((buffer-invisibility-spec ignore-invisible)) +(defun org-move-to-column (column &optional force buffer) + "Move to column COLUMN. +Pass COLUMN and FORCE to `move-to-column'. +Pass BUFFER to the XEmacs version of `move-to-column'." + (let ((buffer-invisibility-spec + (remove '(org-filtered) buffer-invisibility-spec))) (if (featurep 'xemacs) - (org-xemacs-without-invisibility (move-to-column column force buffer)) + (org-xemacs-without-invisibility + (move-to-column column force buffer)) (move-to-column column force)))) (defun org-get-x-clipboard-compat (value) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-crypt.el b/elpa/org-20150427/org-crypt.el similarity index 96% rename from xemacs-packages/lisp/org-8.2.3c/org-crypt.el rename to elpa/org-20150427/org-crypt.el index b02a7cef..46fd3e66 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-crypt.el +++ b/elpa/org-20150427/org-crypt.el @@ -1,6 +1,6 @@ ;;; org-crypt.el --- Public key encryption for org-mode entries -;; Copyright (C) 2007-2013 Free Software Foundation, Inc. +;; Copyright (C) 2007-2014 Free Software Foundation, Inc. ;; Emacs Lisp Archive Entry ;; Filename: org-crypt.el @@ -73,6 +73,8 @@ compress-algorithm)) (declare-function epg-encrypt-string "epg" (context plain recipients &optional sign always-trust)) +(defvar epg-context) + (defgroup org-crypt nil "Org Crypt." @@ -161,8 +163,8 @@ See `org-crypt-disable-auto-save'." (if (and (string= crypt-key (get-text-property 0 'org-crypt-key str)) (string= (sha1 str) (get-text-property 0 'org-crypt-checksum str))) (get-text-property 0 'org-crypt-text str) - (let ((epg-context (epg-make-context nil t t))) - (epg-encrypt-string epg-context str (epg-list-keys epg-context crypt-key))))) + (set (make-local-variable 'epg-context) (epg-make-context nil t t)) + (epg-encrypt-string epg-context str (epg-list-keys epg-context crypt-key)))) (defun org-encrypt-entry () "Encrypt the content of the current headline." @@ -170,11 +172,11 @@ See `org-crypt-disable-auto-save'." (require 'epg) (save-excursion (org-back-to-heading t) + (set (make-local-variable 'epg-context) (epg-make-context nil t t)) (let ((start-heading (point))) (forward-line) (when (not (looking-at "-----BEGIN PGP MESSAGE-----")) (let ((folded (outline-invisible-p)) - (epg-context (epg-make-context nil t t)) (crypt-key (org-crypt-key-for-heading)) (beg (point)) end encrypted-text) @@ -206,11 +208,11 @@ See `org-crypt-disable-auto-save'." (forward-line) (when (looking-at "-----BEGIN PGP MESSAGE-----") (org-crypt-check-auto-save) + (set (make-local-variable 'epg-context) (epg-make-context nil t t)) (let* ((end (save-excursion (search-forward "-----END PGP MESSAGE-----") (forward-line) (point))) - (epg-context (epg-make-context nil t t)) (encrypted-text (buffer-substring-no-properties (point) end)) (decrypted-text (decode-coding-string diff --git a/xemacs-packages/lisp/org-8.2.3c/org-ctags.el b/elpa/org-20150427/org-ctags.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-ctags.el rename to elpa/org-20150427/org-ctags.el index 9d8ed6c6..41775bda 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-ctags.el +++ b/elpa/org-20150427/org-ctags.el @@ -1,6 +1,6 @@ ;;; org-ctags.el - Integrate Emacs "tags" facility with org mode. ;; -;; Copyright (C) 2007-2013 Free Software Foundation, Inc. +;; Copyright (C) 2007-2014 Free Software Foundation, Inc. ;; Author: Paul Sexton diff --git a/xemacs-packages/lisp/org-8.2.3c/org-datetree.el b/elpa/org-20150427/org-datetree.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-datetree.el rename to elpa/org-20150427/org-datetree.el index dd4b1b0e..0646c3b5 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-datetree.el +++ b/elpa/org-20150427/org-datetree.el @@ -1,6 +1,6 @@ ;;; org-datetree.el --- Create date entries in a tree -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org-docview.el b/elpa/org-20150427/org-docview.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/org-docview.el rename to elpa/org-20150427/org-docview.el index 8e61c8ab..d2db6855 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-docview.el +++ b/elpa/org-20150427/org-docview.el @@ -1,6 +1,6 @@ ;;; org-docview.el --- support for links to doc-view-mode buffers -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: Jan Böcker ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org-element.el b/elpa/org-20150427/org-element.el similarity index 94% rename from xemacs-packages/lisp/org-8.2.3c/org-element.el rename to elpa/org-20150427/org-element.el index 55efb500..0ec86cfa 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-element.el +++ b/elpa/org-20150427/org-element.el @@ -1,6 +1,6 @@ ;;; org-element.el --- Parser And Applications for Org syntax -;; Copyright (C) 2012-2013 Free Software Foundation, Inc. +;; Copyright (C) 2012-2014 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp @@ -62,7 +62,7 @@ ;; `table-cell', `target', `timestamp', `underline' and `verbatim'. ;; ;; Some elements also have special properties whose value can hold -;; objects themselves (i.e. an item tag or a headline name). Such +;; objects themselves (e.g. an item tag or a headline name). Such ;; values are called "secondary strings". Any object belongs to ;; either an element or a secondary string. ;; @@ -143,10 +143,12 @@ "$" "\\|" ;; Tables (any type). "\\(?:|\\|\\+-[-+]\\)" "\\|" - ;; Blocks (any type), Babel calls, drawers (any type), - ;; fixed-width areas and keywords. Note: this is only an - ;; indication and need some thorough check. - "[#:]" "\\|" + ;; Blocks (any type), Babel calls and keywords. Note: this + ;; is only an indication and need some thorough check. + "#\\(?:[+ ]\\|$\\)" "\\|" + ;; Drawers (any type) and fixed-width areas. This is also + ;; only an indication. + ":" "\\|" ;; Horizontal rules. "-\\{5,\\}[ \t]*$" "\\|" ;; LaTeX environments. @@ -185,10 +187,10 @@ is not sufficient to know if point is at a paragraph ending. See "List of recursive element types aka Greater Elements.") (defconst org-element-all-successors - '(export-snippet footnote-reference inline-babel-call inline-src-block - latex-or-entity line-break link macro plain-link radio-target - statistics-cookie sub/superscript table-cell target - text-markup timestamp) + '(link export-snippet footnote-reference inline-babel-call + inline-src-block latex-or-entity line-break macro plain-link + radio-target statistics-cookie sub/superscript table-cell target + text-markup timestamp) "Complete list of successors.") (defconst org-element-object-successor-alist @@ -234,22 +236,9 @@ application to open them.") '("CAPTION" "DATA" "HEADER" "HEADERS" "LABEL" "NAME" "PLOT" "RESNAME" "RESULT" "RESULTS" "SOURCE" "SRCNAME" "TBLNAME") "List of affiliated keywords as strings. -By default, all keywords setting attributes (i.e. \"ATTR_LATEX\") +By default, all keywords setting attributes (e.g., \"ATTR_LATEX\") are affiliated keywords and need not to be in this list.") -(defconst org-element--affiliated-re - (format "[ \t]*#\\+%s:" - ;; Regular affiliated keywords. - (format "\\(%s\\|ATTR_[-_A-Za-z0-9]+\\)\\(?:\\[\\(.*\\)\\]\\)?" - (regexp-opt org-element-affiliated-keywords))) - "Regexp matching any affiliated keyword. - -Keyword name is put in match group 1. Moreover, if keyword -belongs to `org-element-dual-keywords', put the dual value in -match group 2. - -Don't modify it, set `org-element-affiliated-keywords' instead.") - (defconst org-element-keyword-translation-alist '(("DATA" . "NAME") ("LABEL" . "NAME") ("RESNAME" . "NAME") ("SOURCE" . "NAME") ("SRCNAME" . "NAME") ("TBLNAME" . "NAME") @@ -267,7 +256,7 @@ returned as the value of the property. This list is checked after translations have been applied. See `org-element-keyword-translation-alist'. -By default, all keywords setting attributes (i.e. \"ATTR_LATEX\") +By default, all keywords setting attributes (e.g., \"ATTR_LATEX\") allow multiple occurrences and need not to be in this list.") (defconst org-element-parsed-keywords '("CAPTION") @@ -296,6 +285,31 @@ This list is checked after translations have been applied. See Any keyword in this list will have its value parsed and stored as a secondary string.") +(defconst org-element--affiliated-re + (format "[ \t]*#\\+\\(?:%s\\):\\(?: \\|$\\)" + (concat + ;; Dual affiliated keywords. + (format "\\(?1:%s\\)\\(?:\\[\\(.*\\)\\]\\)?" + (regexp-opt org-element-dual-keywords)) + "\\|" + ;; Regular affiliated keywords. + (format "\\(?1:%s\\)" + (regexp-opt + (org-remove-if + #'(lambda (keyword) + (member keyword org-element-dual-keywords)) + org-element-affiliated-keywords))) + "\\|" + ;; Export attributes. + "\\(?1:ATTR_[-_A-Za-z0-9]+\\)")) + "Regexp matching any affiliated keyword. + +Keyword name is put in match group 1. Moreover, if keyword +belongs to `org-element-dual-keywords', put the dual value in +match group 2. + +Don't modify it, set `org-element-affiliated-keywords' instead.") + (defconst org-element-object-restrictions (let* ((standard-set (remq 'plain-link (remq 'table-cell org-element-all-successors))) @@ -314,13 +328,13 @@ a secondary string.") (paragraph ,@standard-set) ;; Remove any variable object from radio target as it would ;; prevent it from being properly recognized. - (radio-target latex-or-entity sub/superscript) + (radio-target latex-or-entity sub/superscript text-markup) (strike-through ,@standard-set) (subscript ,@standard-set) (superscript ,@standard-set) ;; Ignore inline babel call and inline src block as formulas are ;; possible. Also ignore line breaks and statistics cookies. - (table-cell export-snippet footnote-reference latex-or-entity link macro + (table-cell link export-snippet footnote-reference latex-or-entity macro radio-target sub/superscript target text-markup timestamp) (table-row table-cell) (underline ,@standard-set) @@ -332,7 +346,8 @@ a list of successors that will be called within an element or object of such type. For example, in a `radio-target' object, one can only find -entities, latex-fragments, subscript and superscript. +entities, latex-fragments, subscript, superscript and text +markup. This alist also applies to secondary string. For example, an `headline' type element doesn't directly contain objects, but @@ -345,11 +360,6 @@ still has an entry since one of its properties (`:title') does.") (footnote-reference . :inline-definition)) "Alist between element types and location of secondary value.") -(defconst org-element-object-variables '(org-link-abbrev-alist-local) - "List of buffer-local variables used when parsing objects. -These variables are copied to the temporary buffer created by -`org-export-secondary-string'.") - ;;; Accessors and Setters @@ -717,15 +727,17 @@ CONTENTS is the contents of the footnote-definition." Return a list whose CAR is `headline' and CDR is a plist containing `:raw-value', `:title', `:alt-title', `:begin', -`:end', `:pre-blank', `:hiddenp', `:contents-begin' and +`:end', `:pre-blank', `:hiddenp', `:contents-begin', `:contents-end', `:level', `:priority', `:tags', `:todo-keyword',`:todo-type', `:scheduled', `:deadline', -`:closed', `:quotedp', `:archivedp', `:commentedp' and -`:footnote-section-p' keywords. +`:closed', `:quotedp', `:archivedp', `:commentedp', +`:footnote-section-p' and `:post-blank' keywords. The plist also contains any property set in the property drawer, with its name in upper cases and colons added at the -beginning (i.e. `:CUSTOM_ID'). +beginning (e.g., `:CUSTOM_ID'). + +LIMIT is a buffer position bounding the search. When RAW-SECONDARY-P is non-nil, headline's title will not be parsed as a secondary string, but as a plain string instead. @@ -783,7 +795,7 @@ Assume point is at beginning of the headline." (t (setq plist (plist-put plist :closed time)))))) plist)))) (begin (point)) - (end (save-excursion (goto-char (org-end-of-subtree t t)))) + (end (min (save-excursion (org-end-of-subtree t t)) limit)) (pos-after-head (progn (forward-line) (point))) (contents-begin (save-excursion (skip-chars-forward " \r\t\n" end) @@ -824,10 +836,7 @@ Assume point is at beginning of the headline." :todo-keyword todo :todo-type todo-type :post-blank (count-lines - (if (not contents-end) pos-after-head - (goto-char contents-end) - (forward-line) - (point)) + (or contents-end pos-after-head) end) :footnote-section-p footnote-section-p :archivedp archivedp @@ -861,38 +870,40 @@ CONTENTS is the contents of the element." (org-element-property :tags headline)) (org-element-property :tags headline)))) (and tag-list - (format ":%s:" (mapconcat 'identity tag-list ":"))))) + (format ":%s:" (mapconcat #'identity tag-list ":"))))) (commentedp (org-element-property :commentedp headline)) (quotedp (org-element-property :quotedp headline)) (pre-blank (or (org-element-property :pre-blank headline) 0)) - (heading (concat (make-string (org-reduced-level level) ?*) - (and todo (concat " " todo)) - (and quotedp (concat " " org-quote-string)) - (and commentedp (concat " " org-comment-string)) - (and priority - (format " [#%s]" (char-to-string priority))) - (cond ((and org-footnote-section - (org-element-property - :footnote-section-p headline)) - (concat " " org-footnote-section)) - (title (concat " " title)))))) - (concat heading - ;; Align tags. - (when tags - (cond - ((zerop org-tags-column) (format " %s" tags)) - ((< org-tags-column 0) - (concat - (make-string - (max (- (+ org-tags-column (length heading) (length tags))) 1) - ? ) - tags)) - (t - (concat - (make-string (max (- org-tags-column (length heading)) 1) ? ) - tags)))) - (make-string (1+ pre-blank) 10) - contents))) + (heading + (concat (make-string (if org-odd-levels-only (1- (* level 2)) level) + ?*) + (and todo (concat " " todo)) + (and quotedp (concat " " org-quote-string)) + (and commentedp (concat " " org-comment-string)) + (and priority (format " [#%s]" (char-to-string priority))) + " " + (if (and org-footnote-section + (org-element-property :footnote-section-p headline)) + org-footnote-section + title)))) + (concat + heading + ;; Align tags. + (when tags + (cond + ((zerop org-tags-column) (format " %s" tags)) + ((< org-tags-column 0) + (concat + (make-string + (max (- (+ org-tags-column (length heading) (length tags))) 1) + ?\s) + tags)) + (t + (concat + (make-string (max (- org-tags-column (length heading)) 1) ?\s) + tags)))) + (make-string (1+ pre-blank) ?\n) + contents))) ;;;; Inlinetask @@ -908,7 +919,7 @@ containing `:title', `:begin', `:end', `:hiddenp', The plist also contains any property set in the property drawer, with its name in upper cases and colons added at the -beginning (i.e. `:CUSTOM_ID'). +beginning (e.g., `:CUSTOM_ID'). When optional argument RAW-SECONDARY-P is non-nil, inline-task's title will not be parsed as a secondary string, but as a plain @@ -958,8 +969,9 @@ Assume point is at beginning of the inline task." plist)))) (task-end (save-excursion (end-of-line) - (and (re-search-forward "^\\*+ END" limit t) - (match-beginning 0)))) + (and (re-search-forward org-outline-regexp-bol limit t) + (org-looking-at-p "END[ \t]*$") + (line-beginning-position)))) (contents-begin (progn (forward-line) (and task-end (< (point) task-end) (point)))) (hidden (and contents-begin (org-invisible-p2))) @@ -1210,7 +1222,7 @@ CONTENTS is the contents of the element." (forward-line) (let ((origin (point))) (when (re-search-forward inlinetask-re limit t) - (if (looking-at "^\\*+ END[ \t]*$") (forward-line) + (if (org-looking-at-p "END[ \t]*$") (forward-line) (goto-char origin))))) ;; At some text line. Check if it ends any previous item. (t @@ -1300,36 +1312,36 @@ containing `:begin', `:end', `:hiddenp', `:contents-begin', `:contents-end', `:post-blank' and `:post-affiliated' keywords. Assume point is at the beginning of the property drawer." - (save-excursion - (let ((case-fold-search t)) - (if (not (save-excursion - (re-search-forward "^[ \t]*:END:[ \t]*$" limit t))) - ;; Incomplete drawer: parse it as a paragraph. - (org-element-paragraph-parser limit affiliated) - (save-excursion - (let* ((drawer-end-line (match-beginning 0)) - (begin (car affiliated)) - (post-affiliated (point)) - (contents-begin (progn (forward-line) - (and (< (point) drawer-end-line) - (point)))) - (contents-end (and contents-begin drawer-end-line)) - (hidden (org-invisible-p2)) - (pos-before-blank (progn (goto-char drawer-end-line) - (forward-line) - (point))) - (end (progn (skip-chars-forward " \r\t\n" limit) - (if (eobp) (point) (line-beginning-position))))) - (list 'property-drawer - (nconc - (list :begin begin - :end end - :hiddenp hidden - :contents-begin contents-begin - :contents-end contents-end - :post-blank (count-lines pos-before-blank end) - :post-affiliated post-affiliated) - (cdr affiliated))))))))) + (let ((case-fold-search t)) + (if (not (save-excursion (re-search-forward "^[ \t]*:END:[ \t]*$" limit t))) + ;; Incomplete drawer: parse it as a paragraph. + (org-element-paragraph-parser limit affiliated) + (save-excursion + (let* ((drawer-end-line (match-beginning 0)) + (begin (car affiliated)) + (post-affiliated (point)) + (contents-begin + (progn + (forward-line) + (and (re-search-forward org-property-re drawer-end-line t) + (line-beginning-position)))) + (contents-end (and contents-begin drawer-end-line)) + (hidden (org-invisible-p2)) + (pos-before-blank (progn (goto-char drawer-end-line) + (forward-line) + (point))) + (end (progn (skip-chars-forward " \r\t\n" limit) + (if (eobp) (point) (line-beginning-position))))) + (list 'property-drawer + (nconc + (list :begin begin + :end end + :hiddenp hidden + :contents-begin contents-begin + :contents-end contents-end + :post-blank (count-lines pos-before-blank end) + :post-affiliated post-affiliated) + (cdr affiliated)))))))) (defun org-element-property-drawer-interpreter (property-drawer contents) "Interpret PROPERTY-DRAWER element as Org syntax. @@ -2084,28 +2096,28 @@ LIMIT bounds the search. Return a list whose CAR is `node-property' and CDR is a plist containing `:key', `:value', `:begin', `:end' and `:post-blank' keywords." - (save-excursion - (looking-at org-property-re) - (let ((case-fold-search t) - (begin (point)) - (key (org-match-string-no-properties 2)) - (value (org-match-string-no-properties 3)) - (pos-before-blank (progn (forward-line) (point))) - (end (progn (skip-chars-forward " \r\t\n" limit) - (if (eobp) (point) (point-at-bol))))) - (list 'node-property - (list :key key - :value value - :begin begin - :end end - :post-blank (count-lines pos-before-blank end)))))) + (looking-at org-property-re) + (let ((begin (point)) + (key (org-match-string-no-properties 2)) + (value (org-match-string-no-properties 3)) + (end (save-excursion + (end-of-line) + (if (re-search-forward org-property-re limit t) + (line-beginning-position) + limit)))) + (list 'node-property + (list :key key + :value value + :begin begin + :end end + :post-blank 0)))) (defun org-element-node-property-interpreter (node-property contents) "Interpret NODE-PROPERTY element as Org syntax. CONTENTS is nil." (format org-property-format (format ":%s:" (org-element-property :key node-property)) - (org-element-property :value node-property))) + (or (org-element-property :value node-property) ""))) ;;;; Paragraph @@ -2135,8 +2147,8 @@ Assume point is at the beginning of the paragraph." ;; A matching `org-element-paragraph-separate' is not ;; necessarily the end of the paragraph. In ;; particular, lines starting with # or : as a first - ;; non-space character are ambiguous. We have check - ;; if they are valid Org syntax (i.e. not an + ;; non-space character are ambiguous. We have to + ;; check if they are valid Org syntax (e.g., not an ;; incomplete keyword). (beginning-of-line) (while (not @@ -2471,7 +2483,7 @@ Assume point is at the beginning of the table." (defun org-element-table-interpreter (table contents) "Interpret TABLE element as Org syntax. -CONTENTS is nil." +CONTENTS is a string, if table's type is `org', or nil." (if (eq (org-element-property :type table) 'table.el) (org-remove-indentation (org-element-property :value table)) (concat (with-temp-buffer (insert contents) @@ -2574,8 +2586,8 @@ CONTENTS is verse block contents." ;; ;; Unlike to elements, interstices can be found between objects. ;; That's why, along with the parser, successor functions are provided -;; for each object. Some objects share the same successor (i.e. `code' -;; and `verbatim' objects). +;; for each object. Some objects share the same successor (e.g., +;; `code' and `verbatim' objects). ;; ;; A successor must accept a single argument bounding the search. It ;; will return either a cons cell whose CAR is the object's type, as @@ -2585,7 +2597,7 @@ CONTENTS is verse block contents." ;; org-element-NAME-successor, where NAME is the name of the ;; successor, as defined in `org-element-all-successors'. ;; -;; Some object types (i.e. `italic') are recursive. Restrictions on +;; Some object types (e.g., `italic') are recursive. Restrictions on ;; object types they can contain will be specified in ;; `org-element-object-restrictions'. ;; @@ -2904,12 +2916,8 @@ CONTENTS is nil." Return value is a cons cell whose CAR is `inline-babel-call' and CDR is beginning position." (save-excursion - ;; Use a simplified version of - ;; `org-babel-inline-lob-one-liner-regexp'. - (when (re-search-forward - "call_\\([^()\n]+?\\)\\(?:\\[.*?\\]\\)?([^\n]*?)\\(\\[.*?\\]\\)?" - nil t) - (cons 'inline-babel-call (match-beginning 0))))) + (when (re-search-forward org-babel-inline-lob-one-liner-regexp nil t) + (cons 'inline-babel-call (match-end 1))))) ;;;; Inline Src Block @@ -3084,7 +3092,9 @@ Assume point is at the beginning of the link." ((and org-target-link-regexp (looking-at org-target-link-regexp)) (setq type "radio" link-end (match-end 0) - path (org-match-string-no-properties 0))) + path (org-match-string-no-properties 0) + contents-begin (match-beginning 0) + contents-end (match-end 0))) ;; Type 2: Standard link, i.e. [[http://orgmode.org][homepage]] ((looking-at org-bracket-link-regexp) (setq contents-begin (match-beginning 3) @@ -3099,16 +3109,20 @@ Assume point is at the beginning of the link." (cond ;; File type. ((or (file-name-absolute-p raw-link) - (string-match "^\\.\\.?/" raw-link)) + (string-match "\\`\\.\\.?/" raw-link)) (setq type "file" path raw-link)) ;; Explicit type (http, irc, bbdb...). See `org-link-types'. - ((string-match org-link-re-with-space3 raw-link) - (setq type (match-string 1 raw-link) path (match-string 2 raw-link))) + ((string-match org-link-types-re raw-link) + (setq type (match-string 1 raw-link) + ;; According to RFC 3986, extra whitespace should be + ;; ignored when a URI is extracted. + path (replace-regexp-in-string + "[ \t]*\n[ \t]*" "" (substring raw-link (match-end 0))))) ;; Id type: PATH is the id. - ((string-match "^id:\\([-a-f0-9]+\\)" raw-link) + ((string-match "\\`id:\\([-a-f0-9]+\\)" raw-link) (setq type "id" path (match-string 1 raw-link))) ;; Code-ref type: PATH is the name of the reference. - ((string-match "^(\\(.*\\))$" raw-link) + ((string-match "\\`(\\(.*\\))\\'" raw-link) (setq type "coderef" path (match-string 1 raw-link))) ;; Custom-id type: PATH is the name of the custom id. ((= (aref raw-link 0) ?#) @@ -3117,13 +3131,13 @@ Assume point is at the beginning of the link." ;; headline name or nothing. PATH is the target or ;; headline's name. (t (setq type "fuzzy" path raw-link)))) - ;; Type 3: Plain link, i.e. http://orgmode.org + ;; Type 3: Plain link, e.g., http://orgmode.org ((looking-at org-plain-link-re) (setq raw-link (org-match-string-no-properties 0) type (org-match-string-no-properties 1) link-end (match-end 0) path (org-match-string-no-properties 2))) - ;; Type 4: Angular link, i.e. + ;; Type 4: Angular link, e.g., ((looking-at org-angle-link-re) (setq raw-link (buffer-substring-no-properties (match-beginning 1) (match-end 2)) @@ -3134,18 +3148,20 @@ Assume point is at the beginning of the link." ;; LINK-END variable. (setq post-blank (progn (goto-char link-end) (skip-chars-forward " \t")) end (point)) - ;; Extract search option and opening application out of - ;; "file"-type links. + ;; Special "file" type link processing. (when (member type org-element-link-type-is-file) - ;; Application. + ;; Extract opening application and search option. (cond ((string-match "^file\\+\\(.*\\)$" type) (setq application (match-string 1 type))) ((not (string-match "^file" type)) (setq application type))) - ;; Extract search option from PATH. - (when (string-match "::\\(.*\\)$" path) + (when (string-match "::\\(.*\\)\\'" path) (setq search-option (match-string 1 path) path (replace-match "" nil nil path))) + ;; Normalize URI. + (when (and (not (org-string-match-p "\\`//" path)) + (file-name-absolute-p path)) + (setq path (concat "//" (expand-file-name path)))) ;; Make sure TYPE always reports "file". (setq type "file")) (list 'link @@ -3453,7 +3469,7 @@ CONTENTS is the contents of the object." Return a list whose CAR is `table-cell' and CDR is a plist containing `:begin', `:end', `:contents-begin', `:contents-end' and `:post-blank' keywords." - (looking-at "[ \t]*\\(.*?\\)[ \t]*|") + (looking-at "[ \t]*\\(.*?\\)[ \t]*\\(?:|\\|$\\)") (let* ((begin (match-beginning 0)) (end (match-end 0)) (contents-begin (match-beginning 1)) @@ -3475,7 +3491,7 @@ CONTENTS is the contents of the cell, or nil." Return value is a cons cell whose CAR is `table-cell' and CDR is beginning position." - (when (looking-at "[ \t]*.*?[ \t]*|") (cons 'table-cell (point)))) + (when (looking-at "[ \t]*.*?[ \t]*\\(|\\|$\\)") (cons 'table-cell (point)))) ;;;; Target @@ -3526,7 +3542,7 @@ Return a list whose CAR is `timestamp', and CDR a plist with `:month-end', `:day-end', `:hour-end', `:minute-end', `:repeater-type', `:repeater-value', `:repeater-unit', `:warning-type', `:warning-value', `:warning-unit', `:begin', -`:end', `:value' and `:post-blank' keywords. +`:end' and `:post-blank' keywords. Assume point is at the beginning of the timestamp." (save-excursion @@ -3799,8 +3815,8 @@ CONTENTS is nil." ;; point. ;; ;; `org-element--current-element' makes use of special modes. They -;; are activated for fixed element chaining (i.e. `plain-list' > -;; `item') or fixed conditional element chaining (i.e. `headline' > +;; are activated for fixed element chaining (e.g., `plain-list' > +;; `item') or fixed conditional element chaining (e.g., `headline' > ;; `section'). Special modes are: `first-section', `item', ;; `node-property', `quote-section', `section' and `table-row'. @@ -3875,8 +3891,7 @@ element it has to parse." (goto-char (car affiliated)) (org-element-keyword-parser limit nil)) ;; LaTeX Environment. - ((looking-at - "[ \t]*\\\\begin{[A-Za-z0-9*]+}\\(\\[.*?\\]\\|{.*?}\\)*[ \t]*$") + ((looking-at "[ \t]*\\\\begin{\\([A-Za-z0-9]+\\*?\\)}\\(\\[.*?\\]\\|{.*?}\\)*[ \t]*$") (org-element-latex-environment-parser limit affiliated)) ;; Drawer and Property Drawer. ((looking-at org-drawer-regexp) @@ -3944,7 +3959,7 @@ CDR a plist of keywords and values and move point to the beginning of the first line after them. As a special case, if element doesn't start at the beginning of -the line (i.e. a paragraph starting an item), CAR is current +the line (e.g., a paragraph starting an item), CAR is current position of point and CDR is nil." (if (not (bolp)) (list (point)) (let ((case-fold-search t) @@ -4075,21 +4090,18 @@ looked after. Optional argument PARENT, when non-nil, is the element or object containing the secondary string. It is used to set correctly `:parent' property within the string." - ;; Copy buffer-local variables listed in - ;; `org-element-object-variables' into temporary buffer. This is - ;; required since object parsing is dependent on these variables. - (let ((pairs (delq nil (mapcar (lambda (var) - (when (boundp var) - (cons var (symbol-value var)))) - org-element-object-variables)))) + (let ((local-variables (buffer-local-variables))) (with-temp-buffer - (mapc (lambda (pair) (org-set-local (car pair) (cdr pair))) pairs) + (dolist (v local-variables) + (ignore-errors + (if (symbolp v) (makunbound v) + (org-set-local (car v) (cdr v))))) (insert string) + (restore-buffer-modified-p nil) (let ((secondary (org-element--parse-objects (point-min) (point-max) nil restriction))) (when parent - (mapc (lambda (obj) (org-element-put-property obj :parent parent)) - secondary)) + (dolist (o secondary) (org-element-put-property o :parent parent))) secondary)))) (defun org-element-map @@ -4479,8 +4491,8 @@ Return Org syntax as a string." (mapconcat (lambda (obj) (org-element-interpret-data obj parent)) (org-element-contents data) "")) - ;; Plain text: remove `:parent' text property from output. - ((stringp data) (org-no-properties data)) + ;; Plain text: return it. + ((stringp data) data) ;; Element/Object without contents. ((not (org-element-contents data)) (funcall (intern (format "org-element-%s-interpreter" type)) @@ -4599,71 +4611,65 @@ indentation to compute maximal common indentation. Return the normalized element that is element with global indentation removed from its contents. The function assumes that indentation is not done with TAB characters." - (let* (ind-list ; for byte-compiler - collect-inds ; for byte-compiler - (collect-inds - (function - ;; Return list of indentations within BLOB. This is done by - ;; walking recursively BLOB and updating IND-LIST along the - ;; way. FIRST-FLAG is non-nil when the first string hasn't - ;; been seen yet. It is required as this string is the only - ;; one whose indentation doesn't happen after a newline - ;; character. - (lambda (blob first-flag) - (mapc - (lambda (object) - (when (and first-flag (stringp object)) - (setq first-flag nil) - (string-match "\\`\\( *\\)" object) - (let ((len (length (match-string 1 object)))) - ;; An indentation of zero means no string will be - ;; modified. Quit the process. - (if (zerop len) (throw 'zero (setq ind-list nil)) - (push len ind-list)))) - (cond - ((stringp object) - (let ((start 0)) - ;; Avoid matching blank or empty lines. - (while (and (string-match "\n\\( *\\)\\(.\\)" object start) - (not (equal (match-string 2 object) " "))) - (setq start (match-end 0)) - (push (length (match-string 1 object)) ind-list)))) - ((memq (org-element-type object) org-element-recursive-objects) - (funcall collect-inds object first-flag)))) - (org-element-contents blob)))))) - ;; Collect indentation list in ELEMENT. Possibly remove first - ;; value if IGNORE-FIRST is non-nil. - (catch 'zero (funcall collect-inds element (not ignore-first))) - (if (not ind-list) element + (let* ((min-ind most-positive-fixnum) + find-min-ind ; For byte-compiler. + (find-min-ind + ;; Return minimal common indentation within BLOB. This is + ;; done by walking recursively BLOB and updating MIN-IND + ;; along the way. FIRST-FLAG is non-nil when the first + ;; string hasn't been seen yet. It is required as this + ;; string is the only one whose indentation doesn't happen + ;; after a newline character. + (lambda (blob first-flag) + (dolist (object (org-element-contents blob)) + (when (and first-flag (stringp object)) + (setq first-flag nil) + (string-match "\\` *" object) + (let ((len (match-end 0))) + ;; An indentation of zero means no string will be + ;; modified. Quit the process. + (if (zerop len) (throw 'zero (setq min-ind 0)) + (setq min-ind (min len min-ind))))) + (cond + ((stringp object) + (dolist (line (cdr (org-split-string object " *\n"))) + (unless (string= line "") + (setq min-ind (min (org-get-indentation line) min-ind))))) + ((memq (org-element-type object) org-element-recursive-objects) + (funcall find-min-ind object first-flag))))))) + ;; Find minimal indentation in ELEMENT. + (catch 'zero (funcall find-min-ind element (not ignore-first))) + (if (or (zerop min-ind) (= min-ind most-positive-fixnum)) element ;; Build ELEMENT back, replacing each string with the same ;; string minus common indentation. (let* (build ; For byte compiler. (build (function - (lambda (blob mci first-flag) + (lambda (blob first-flag) ;; Return BLOB with all its strings indentation - ;; shortened from MCI white spaces. FIRST-FLAG is - ;; non-nil when the first string hasn't been seen + ;; shortened from MIN-IND white spaces. FIRST-FLAG + ;; is non-nil when the first string hasn't been seen ;; yet. (setcdr (cdr blob) (mapcar - (lambda (object) - (when (and first-flag (stringp object)) - (setq first-flag nil) - (setq object - (replace-regexp-in-string - (format "\\` \\{%d\\}" mci) "" object))) - (cond - ((stringp object) - (replace-regexp-in-string - (format "\n \\{%d\\}" mci) "\n" object)) - ((memq (org-element-type object) - org-element-recursive-objects) - (funcall build object mci first-flag)) - (t object))) + #'(lambda (object) + (when (and first-flag (stringp object)) + (setq first-flag nil) + (setq object + (replace-regexp-in-string + (format "\\` \\{%d\\}" min-ind) + "" object))) + (cond + ((stringp object) + (replace-regexp-in-string + (format "\n \\{%d\\}" min-ind) "\n" object)) + ((memq (org-element-type object) + org-element-recursive-objects) + (funcall build object first-flag)) + (t object))) (org-element-contents blob))) blob)))) - (funcall build element (apply 'min ind-list) (not ignore-first)))))) + (funcall build element (not ignore-first)))))) @@ -4863,8 +4869,8 @@ Providing it allows for quicker computation." ;; their title. ((memq type '(headline inlinetask)) (goto-char (org-element-property :begin element)) - (skip-chars-forward "* ") - (if (and (>= origin (point)) (< origin (line-end-position))) + (skip-chars-forward "*") + (if (and (> origin (point)) (< origin (line-end-position))) (narrow-to-region (point) (line-end-position)) (throw 'objects-forbidden element))) ;; At a paragraph, a table-row or a verse block, objects are @@ -4881,11 +4887,21 @@ Providing it allows for quicker computation." (if (not (member (org-element-property :key element) org-element-document-properties)) (throw 'objects-forbidden element) - (beginning-of-line) + (goto-char (org-element-property :begin element)) (search-forward ":") (if (and (>= origin (point)) (< origin (line-end-position))) (narrow-to-region (point) (line-end-position)) (throw 'objects-forbidden element)))) + ;; At a planning line, if point is at a timestamp, return it, + ;; otherwise, return element. + ((eq type 'planning) + (dolist (p '(:closed :deadline :scheduled)) + (let ((timestamp (org-element-property p element))) + (when (and timestamp + (<= (org-element-property :begin timestamp) origin) + (> (org-element-property :end timestamp) origin)) + (throw 'objects-forbidden timestamp)))) + (throw 'objects-forbidden element)) (t (throw 'objects-forbidden element))) (goto-char (point-min)) (let ((restriction (org-element-restriction type)) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-entities.el b/elpa/org-20150427/org-entities.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/org-entities.el rename to elpa/org-20150427/org-entities.el index 638da786..6324a625 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-entities.el +++ b/elpa/org-20150427/org-entities.el @@ -1,6 +1,6 @@ ;;; org-entities.el --- Support for special entities in Org-mode -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik , ;; Ulf Stegemann @@ -27,9 +27,8 @@ ;;; Code: -(require 'org-macs) - -(declare-function org-table-align "org-table" ()) +(declare-function org-toggle-pretty-entities "org" ()) +(declare-function org-table-align "org-table" ()) (eval-when-compile (require 'cl)) @@ -330,7 +329,7 @@ packages to be loaded, add these packages to `org-latex-packages-alist'." ("infin" "\\propto" t "∞" "[infinity]" "[infinity]" "∞") ("infty" "\\infty" t "∞" "[infinity]" "[infinity]" "∞") ("prop" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝") - ("proptp" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝") + ("propto" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝") ("not" "\\textlnot{}" nil "¬" "[angled dash]" "¬" "¬") ("neg" "\\neg{}" t "¬" "[angled dash]" "¬" "¬") ("land" "\\land" t "∧" "[logical and]" "[logical and]" "∧") @@ -568,6 +567,7 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'." (goto-char pos) (org-table-align))) +(defvar org-pretty-entities) ;; declare defcustom from org (defun org-entities-help () "Create a Help buffer with all available entities." (interactive) @@ -598,7 +598,9 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'." (princ (format " %-8s \\%-16s %-22s %-13s\n" utf8 name latex html)))))) (with-current-buffer "*Org Entity Help*" - (org-mode)) + (org-mode) + (when org-pretty-entities + (org-toggle-pretty-entities))) (select-window (get-buffer-window "*Org Entity Help*"))) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-eshell.el b/elpa/org-20150427/org-eshell.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/org-eshell.el rename to elpa/org-20150427/org-eshell.el index 5c264000..1256bc37 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-eshell.el +++ b/elpa/org-20150427/org-eshell.el @@ -1,6 +1,6 @@ ;;; org-eshell.el - Support for links to working directories in eshell -;; Copyright (C) 2011-2013 Free Software Foundation, Inc. +;; Copyright (C) 2011-2014 Free Software Foundation, Inc. ;; Author: Konrad Hinsen diff --git a/xemacs-packages/lisp/org-8.2.3c/org-faces.el b/elpa/org-20150427/org-faces.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-faces.el rename to elpa/org-20150427/org-faces.el index d64fd0e1..f8625f12 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-faces.el +++ b/elpa/org-20150427/org-faces.el @@ -1,6 +1,6 @@ ;;; org-faces.el --- Face definitions for Org-mode. -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org-feed.el b/elpa/org-20150427/org-feed.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-feed.el rename to elpa/org-20150427/org-feed.el index 05ead8f0..6e680718 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-feed.el +++ b/elpa/org-20150427/org-feed.el @@ -1,6 +1,6 @@ ;;; org-feed.el --- Add RSS feed items to Org files ;; -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org-footnote.el b/elpa/org-20150427/org-footnote.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-footnote.el rename to elpa/org-20150427/org-footnote.el index 3c0d97c3..c8b8c2ea 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-footnote.el +++ b/elpa/org-20150427/org-footnote.el @@ -1,6 +1,6 @@ ;;; org-footnote.el --- Footnote support in Org and elsewhere ;; -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org-gnus.el b/elpa/org-20150427/org-gnus.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-gnus.el rename to elpa/org-20150427/org-gnus.el index e368a14e..785b577f 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-gnus.el +++ b/elpa/org-20150427/org-gnus.el @@ -1,6 +1,6 @@ ;;; org-gnus.el --- Support for links to Gnus groups and messages from within Org-mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Tassilo Horn diff --git a/xemacs-packages/lisp/org-8.2.3c/org-habit.el b/elpa/org-20150427/org-habit.el similarity index 95% rename from xemacs-packages/lisp/org-8.2.3c/org-habit.el rename to elpa/org-20150427/org-habit.el index eba90376..60137568 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-habit.el +++ b/elpa/org-20150427/org-habit.el @@ -1,6 +1,6 @@ ;;; org-habit.el --- The habit tracking code for Org-mode -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: outlines, hypermedia, calendar, wp @@ -200,7 +200,9 @@ This list represents a \"habit\" for the rest of this module." (count 0)) (unless reversed (goto-char end)) (while (and (< count maxdays) - (funcall search "- State \"DONE\".*\\[\\([^]]+\\)\\]" limit t)) + (funcall search (format "- State \"%s\".*\\[\\([^]]+\\)\\]" + (regexp-opt org-done-keywords)) + limit t)) (push (time-to-days (org-time-string-to-time (match-string-no-properties 1))) closed-dates) @@ -349,14 +351,7 @@ current time." (let ((inhibit-read-only t) l c (buffer-invisibility-spec '(org-link)) (moment (time-subtract (current-time) - (list 0 (* 3600 org-extend-today-until) 0))) - disabled-overlays) - ;; Disable filters; this helps with alignment if there are links. - (mapc (lambda (ol) - (when (overlay-get ol 'invisible) - (overlay-put ol 'invisible nil) - (setq disabled-overlays (cons ol disabled-overlays)))) - (overlays-in (point-min) (point-max))) + (list 0 (* 3600 org-extend-today-until) 0)))) (save-excursion (goto-char (if line (point-at-bol) (point-min))) (while (not (eobp)) @@ -372,9 +367,7 @@ current time." (time-subtract moment (days-to-time org-habit-preceding-days)) moment (time-add moment (days-to-time org-habit-following-days)))))) - (forward-line))) - (mapc (lambda (ol) (overlay-put ol 'invisible t)) - disabled-overlays))) + (forward-line))))) (defun org-habit-toggle-habits () "Toggle display of habits in an agenda buffer." diff --git a/xemacs-packages/lisp/org-8.2.3c/org-id.el b/elpa/org-20150427/org-id.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-id.el rename to elpa/org-20150427/org-id.el index 37f6e70e..fdd0ff00 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-id.el +++ b/elpa/org-20150427/org-id.el @@ -1,6 +1,6 @@ ;;; org-id.el --- Global identifiers for Org-mode entries ;; -;; Copyright (C) 2008-2013 Free Software Foundation, Inc. +;; Copyright (C) 2008-2014 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org-indent.el b/elpa/org-20150427/org-indent.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-indent.el rename to elpa/org-20150427/org-indent.el index 44311e38..fa5f0608 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-indent.el +++ b/elpa/org-20150427/org-indent.el @@ -1,5 +1,5 @@ ;;; org-indent.el --- Dynamic indentation for Org-mode -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org-info.el b/elpa/org-20150427/org-info.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/org-info.el rename to elpa/org-20150427/org-info.el index 421dde8e..8a2d7176 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-info.el +++ b/elpa/org-20150427/org-info.el @@ -1,6 +1,6 @@ ;;; org-info.el --- Support for links to Info nodes from within Org-Mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org-inlinetask.el b/elpa/org-20150427/org-inlinetask.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-inlinetask.el rename to elpa/org-20150427/org-inlinetask.el index ca7572bc..de4267c8 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-inlinetask.el +++ b/elpa/org-20150427/org-inlinetask.el @@ -1,6 +1,6 @@ ;;; org-inlinetask.el --- Tasks independent of outline hierarchy -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -103,7 +103,8 @@ the value of this variable." "Non-nil means display the first star of an inline task as additional marker. When nil, the first star is not shown." :tag "Org Inline Tasks" - :group 'org-structure) + :group 'org-structure + :type 'boolean) (defvar org-odd-levels-only) (defvar org-keyword-time-regexp) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-install.el b/elpa/org-20150427/org-install.el similarity index 100% rename from xemacs-packages/lisp/org-8.2.3c/org-install.el rename to elpa/org-20150427/org-install.el diff --git a/xemacs-packages/lisp/org-8.2.3c/org-irc.el b/elpa/org-20150427/org-irc.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/org-irc.el rename to elpa/org-20150427/org-irc.el index afacae3e..8f9761b3 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-irc.el +++ b/elpa/org-20150427/org-irc.el @@ -1,6 +1,6 @@ ;;; org-irc.el --- Store links to IRC sessions ;; -;; Copyright (C) 2008-2013 Free Software Foundation, Inc. +;; Copyright (C) 2008-2014 Free Software Foundation, Inc. ;; ;; Author: Philip Jackson ;; Keywords: erc, irc, link, org @@ -105,7 +105,7 @@ attributes that are found." ((eq major-mode 'erc-mode) (org-irc-erc-store-link)))) -(defun org-irc-elipsify-description (string &optional after) +(defun org-irc-ellipsify-description (string &optional after) "Remove unnecessary white space from STRING and add ellipses if necessary. Strip starting and ending white space from STRING and replace any chars that the value AFTER with '...'" @@ -158,7 +158,7 @@ the session itself." (progn (org-store-link-props :type "file" - :description (concat "'" (org-irc-elipsify-description + :description (concat "'" (org-irc-ellipsify-description (cadr parsed-line) 20) "' from an IRC conversation") :link (concat "file:" (car parsed-line) "::" diff --git a/xemacs-packages/lisp/org-8.2.3c/org-list.el b/elpa/org-20150427/org-list.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-list.el rename to elpa/org-20150427/org-list.el index 4a3d471f..a00e5573 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-list.el +++ b/elpa/org-20150427/org-list.el @@ -1,6 +1,6 @@ ;;; org-list.el --- Plain lists for Org-mode ;; -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Bastien Guerry @@ -1223,7 +1223,7 @@ some heuristics to guess the result." ;; When `org-blank-before-new-entry' says so, it is 1. ((eq insert-blank-p t) 1) ;; `plain-list-item' is 'auto. Count blank lines separating - ;; neighbours items in list. + ;; neighbors' items in list. (t (let ((next-p (org-list-get-next-item item struct prevs))) (cond ;; Is there a next item? @@ -1254,7 +1254,7 @@ some heuristics to guess the result." If POS is before first character after bullet of the item, the new item will be created before the current one. -STRUCT is the list structure. PREVS is the the alist of previous +STRUCT is the list structure. PREVS is the alist of previous items, as returned by `org-list-prevs-alist'. Insert a checkbox if CHECKBOX is non-nil, and string AFTER-BULLET @@ -2237,7 +2237,7 @@ item is invisible." t))))) (defun org-list-repair () - "Fix indentation, bullets and checkboxes is the list at point." + "Fix indentation, bullets and checkboxes in the list at point." (interactive) (unless (org-at-item-p) (error "This is not a list")) (let* ((struct (org-list-struct)) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-loaddefs.el b/elpa/org-20150427/org-loaddefs.el similarity index 92% rename from xemacs-packages/lisp/org-8.2.3c/org-loaddefs.el rename to elpa/org-20150427/org-loaddefs.el index 393fee77..a2719df7 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-loaddefs.el +++ b/elpa/org-20150427/org-loaddefs.el @@ -14,7 +14,7 @@ ;;;;;; org-babel-pop-to-session-maybe org-babel-load-in-session-maybe ;;;;;; org-babel-expand-src-block-maybe org-babel-view-src-block-info ;;;;;; org-babel-execute-maybe org-babel-execute-safely-maybe) "ob-core" -;;;;;; "ob-core.el" "a4f6521b05dcb8c040c0e5aeef52cc32") +;;;;;; "ob-core.el" "09a8853df17caadea177348cda6471b9") ;;; Generated autoloads from ob-core.el (autoload 'org-babel-execute-safely-maybe "ob-core" "\ @@ -229,7 +229,7 @@ Mark current src block. ;;;*** ;;;### (autoloads (org-babel-describe-bindings) "ob-keys" "ob-keys.el" -;;;;;; "f41a561a02eb66238c2824e76e3f8cc8") +;;;;;; "25a1e7a65f088c34d9576789abaaebc6") ;;; Generated autoloads from ob-keys.el (autoload 'org-babel-describe-bindings "ob-keys" "\ @@ -240,7 +240,7 @@ Describe all keybindings behind `org-babel-key-prefix'. ;;;*** ;;;### (autoloads (org-babel-lob-get-info org-babel-lob-execute-maybe) -;;;;;; "ob-lob" "ob-lob.el" "d94d0930566ed1471ffe0d04603ac1bc") +;;;;;; "ob-lob" "ob-lob.el" "6452edf7fff14c5ebb5c1cece08ba833") ;;; Generated autoloads from ob-lob.el (autoload 'org-babel-lob-execute-maybe "ob-lob" "\ @@ -258,7 +258,7 @@ Return a Library of Babel function call as a string. ;;;*** ;;;### (autoloads (org-babel-tangle org-babel-tangle-file) "ob-tangle" -;;;;;; "ob-tangle.el" "a8b8d21349eceb9147ddab7f6e5f1696") +;;;;;; "ob-tangle.el" "1fc39a5a416a66ab63a506ccc0a122ff") ;;; Generated autoloads from ob-tangle.el (autoload 'org-babel-tangle-file "ob-tangle" "\ @@ -292,7 +292,7 @@ used to limit the exported source code blocks by language. ;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views ;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda ;;;;;; org-agenda org-toggle-sticky-agenda) "org-agenda" "org-agenda.el" -;;;;;; (21125 47146)) +;;;;;; (21820 29495)) ;;; Generated autoloads from org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -568,7 +568,7 @@ to override `appt-message-warning-time'. ;;;### (autoloads (org-archive-subtree-default-with-confirmation ;;;;;; org-archive-subtree-default org-toggle-archive-tag org-archive-to-archive-sibling ;;;;;; org-archive-subtree org-add-archive-files) "org-archive" -;;;;;; "org-archive.el" "459396977488bc201173789dc42a9c37") +;;;;;; "org-archive.el" "9a54b246691497eb10c911c2c12f9742") ;;; Generated autoloads from org-archive.el (autoload 'org-add-archive-files "org-archive" "\ @@ -621,7 +621,7 @@ This command is set with the variable `org-archive-default-command'. ;;;*** -;;;### (autoloads (org-attach) "org-attach" "org-attach.el" "2acf3dc22dcf986b2dbf07e1c0f4bba4") +;;;### (autoloads (org-attach) "org-attach" "org-attach.el" "5ca6eaa6ba7fa7c7eddc8d339f2a2170") ;;; Generated autoloads from org-attach.el (autoload 'org-attach "org-attach" "\ @@ -633,7 +633,7 @@ Shows a list of commands and prompts for another key to execute a command. ;;;*** ;;;### (autoloads (org-bbdb-anniversaries) "org-bbdb" "org-bbdb.el" -;;;;;; "867e99974c8aab087ba115fc8f89e956") +;;;;;; "5fed335fd36cec704d37da4b5f5d54a7") ;;; Generated autoloads from org-bbdb.el (autoload 'org-bbdb-anniversaries "org-bbdb" "\ @@ -644,8 +644,8 @@ Extract anniversaries from BBDB for display in the agenda. ;;;*** ;;;### (autoloads (org-capture-import-remember-templates org-capture -;;;;;; org-capture-string) "org-capture" "org-capture.el" (21115 -;;;;;; 11994)) +;;;;;; org-capture-string) "org-capture" "org-capture.el" (21820 +;;;;;; 29495)) ;;; Generated autoloads from org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -692,7 +692,7 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;;;; org-clock-remove-overlays org-clock-display org-clock-sum ;;;;;; org-clock-goto org-clock-cancel org-clock-out org-clock-in-last ;;;;;; org-clock-in org-resolve-clocks) "org-clock" "org-clock.el" -;;;;;; "183405e8569b9377eaf55b3eea915a06") +;;;;;; "dd849ac89f30ddd981c37863a1b35e00") ;;; Generated autoloads from org-clock.el (autoload 'org-resolve-clocks "org-clock" "\ @@ -821,7 +821,7 @@ Otherwise, return nil. ;;;### (autoloads (org-agenda-columns org-insert-columns-dblock org-dblock-write:columnview ;;;;;; org-columns-number-to-string org-columns-compute org-columns ;;;;;; org-columns-get-format-and-top-level org-columns-remove-overlays) -;;;;;; "org-colview" "org-colview.el" (21125 47146)) +;;;;;; "org-colview" "org-colview.el" (21820 29495)) ;;; Generated autoloads from org-colview.el (autoload 'org-columns-remove-overlays "org-colview" "\ @@ -885,7 +885,7 @@ Turn on or update column view in the agenda. ;;;*** ;;;### (autoloads (org-check-version) "org-compat" "org-compat.el" -;;;;;; (21115 11994)) +;;;;;; (21820 29495)) ;;; Generated autoloads from org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -896,7 +896,7 @@ Try very hard to provide sensible version strings. ;;;*** ;;;### (autoloads (org-datetree-find-date-create) "org-datetree" -;;;;;; "org-datetree.el" "954f9d30ea6ea9b72b310bba030ca9a4") +;;;;;; "org-datetree.el" "448ccbc2749a60a5e276fc3c9a9c5605") ;;; Generated autoloads from org-datetree.el (autoload 'org-datetree-find-date-create "org-datetree" "\ @@ -910,7 +910,7 @@ tree can be found. ;;;*** ;;;### (autoloads (org-element-context org-element-at-point org-element-interpret-data) -;;;;;; "org-element" "org-element.el" "42a311969f9a6740f0212bc9d06ff408") +;;;;;; "org-element" "org-element.el" "e30bb4fe00f0e82056941112ae076340") ;;; Generated autoloads from org-element.el (autoload 'org-element-interpret-data "org-element" "\ @@ -972,7 +972,7 @@ Providing it allows for quicker computation. ;;;*** ;;;### (autoloads (org-feed-show-raw-feed org-feed-goto-inbox org-feed-update -;;;;;; org-feed-update-all) "org-feed" "org-feed.el" "f5f190118c0e7321f88972d9a4749f5f") +;;;;;; org-feed-update-all) "org-feed" "org-feed.el" "d29a33e181e81cddc70543c0ba8fdbe4") ;;; Generated autoloads from org-feed.el (autoload 'org-feed-update-all "org-feed" "\ @@ -1000,7 +1000,7 @@ Show the raw feed buffer of a feed. ;;;*** ;;;### (autoloads (org-footnote-normalize org-footnote-action) "org-footnote" -;;;;;; "org-footnote.el" "498ce4bcc019503ef9657f915606b130") +;;;;;; "org-footnote.el" "9906c2a4ea425a7c96d7c1371b2e35f9") ;;; Generated autoloads from org-footnote.el (autoload 'org-footnote-action "org-footnote" "\ @@ -1034,7 +1034,7 @@ referenced sequence. ;;;### (autoloads (org-id-store-link org-id-find-id-file org-id-update-id-locations ;;;;;; org-id-new org-id-find org-id-goto org-id-get-with-outline-drilling ;;;;;; org-id-get-with-outline-path-completion org-id-get org-id-copy -;;;;;; org-id-get-create) "org-id" "org-id.el" "62f25628049e4355bfa47d9ce6068de6") +;;;;;; org-id-get-create) "org-id" "org-id.el" "82e762bd5cca2e3d24252745fca306d7") ;;; Generated autoloads from org-id.el (autoload 'org-id-get-create "org-id" "\ @@ -1128,7 +1128,7 @@ Store a link to the current entry, using its ID. ;;;*** ;;;### (autoloads (org-indent-mode) "org-indent" "org-indent.el" -;;;;;; "5257f4635c377537f302a83dc69419dd") +;;;;;; "3d658901e4f096f04688498e4a709eb5") ;;; Generated autoloads from org-indent.el (autoload 'org-indent-mode "org-indent" "\ @@ -1145,7 +1145,7 @@ during idle time. ;;;*** -;;;### (autoloads (org-irc-store-link) "org-irc" "org-irc.el" "f5d45d21f475b63408f333384ce1cc61") +;;;### (autoloads (org-irc-store-link) "org-irc" "org-irc.el" "2432d5cd8271c05b0e8778cd26bf11ab") ;;; Generated autoloads from org-irc.el (autoload 'org-irc-store-link "org-irc" "\ @@ -1156,7 +1156,7 @@ Dispatch to the appropriate function to store a link to an IRC session. ;;;*** ;;;### (autoloads (org-load-noerror-mustsuffix) "org-macs" "org-macs.el" -;;;;;; (21125 47146)) +;;;;;; (21820 29495)) ;;; Generated autoloads from org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -1167,7 +1167,7 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. Drop the MUSTSUFFIX a ;;;*** ;;;### (autoloads (org-mobile-pull org-mobile-push) "org-mobile" -;;;;;; "org-mobile.el" "c69640ad752b53de4ac6874cbf252ec2") +;;;;;; "org-mobile.el" "13cb59aeb0c907454cbd127597d96ea2") ;;; Generated autoloads from org-mobile.el (autoload 'org-mobile-push "org-mobile" "\ @@ -1186,7 +1186,7 @@ agenda view showing the flagged items. ;;;*** -;;;### (autoloads (org-plot/gnuplot) "org-plot" "org-plot.el" "99a279b8b25fe56779d7c49fc617f1bf") +;;;### (autoloads (org-plot/gnuplot) "org-plot" "org-plot.el" "5fae0ed29ffaee8526d31b4634c56692") ;;; Generated autoloads from org-plot.el (autoload 'org-plot/gnuplot "org-plot" "\ @@ -1219,7 +1219,7 @@ line directly before or after the table. ;;;;;; org-table-begin org-table-align org-table-export org-table-import ;;;;;; org-table-convert-region org-table-create org-table-create-or-convert-from-region ;;;;;; org-table-create-with-table\.el) "org-table" "org-table.el" -;;;;;; "f0f693017b9d0664b74f5f59a58195e5") +;;;;;; "9b6e8818ec6951cc97eba4e5d0822cef") ;;; Generated autoloads from org-table.el (autoload 'org-table-create-with-table\.el "org-table" "\ @@ -1830,7 +1830,7 @@ provide ORGTBL directives for the generated table. ;;;*** ;;;### (autoloads (org-timer-set-timer org-timer-item org-timer-change-times-in-region -;;;;;; org-timer org-timer-start) "org-timer" "org-timer.el" "c0a04a9b6c18954e7eadb2f39ca2e805") +;;;;;; org-timer org-timer-start) "org-timer" "org-timer.el" "54b0453041fa05a477a9da6054ed8b31") ;;; Generated autoloads from org-timer.el (autoload 'org-timer-start "org-timer" "\ @@ -1891,7 +1891,7 @@ replace any running timer. ;;;*** ;;;### (autoloads (org-git-version org-release) "org-version" "org-version.el" -;;;;;; (21139 43013)) +;;;;;; (21821 49750)) ;;; Generated autoloads from org-version.el (autoload 'org-release "org-version" "\ @@ -1917,7 +1917,7 @@ The location of ODT styles.") ;;;;;; org-run-like-in-org-mode turn-on-orgstruct++ turn-on-orgstruct ;;;;;; orgstruct-mode org-global-cycle org-cycle org-mode org-clock-persistence-insinuate ;;;;;; turn-on-orgtbl org-version org-babel-load-file org-babel-do-load-languages) -;;;;;; "org" "org.el" (21125 47146)) +;;;;;; "org" "org.el" (21820 29495)) ;;; Generated autoloads from org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -2136,11 +2136,179 @@ Call the customize function with org as argument. \(fn)" t nil) +;;;*** + +;;;### (autoloads nil "ox" "ox.el" "a3f90141f011b5f549828135c723de85") +;;; Generated autoloads from ox.el + +(autoload 'org-export-as "ox" "\ +Transcode current Org buffer into BACKEND code. + +BACKEND is either an export back-end, as returned by, e.g., +`org-export-create-backend', or a symbol referring to +a registered back-end. + +If narrowing is active in the current buffer, only transcode its +narrowed part. + +If a region is active, transcode that region. + +When optional argument SUBTREEP is non-nil, transcode the +sub-tree at point, extracting information from the headline +properties first. + +When optional argument VISIBLE-ONLY is non-nil, don't export +contents of hidden elements. + +When optional argument BODY-ONLY is non-nil, only return body +code, without surrounding template. + +Optional argument EXT-PLIST, when provided, is a property list +with external parameters overriding Org default settings, but +still inferior to file-local settings. + +Return code as a string. + +\(fn BACKEND &optional SUBTREEP VISIBLE-ONLY BODY-ONLY EXT-PLIST)" nil nil) + +(autoload 'org-export-string-as "ox" "\ +Transcode STRING into BACKEND code. + +BACKEND is either an export back-end, as returned by, e.g., +`org-export-create-backend', or a symbol referring to +a registered back-end. + +When optional argument BODY-ONLY is non-nil, only return body +code, without preamble nor postamble. + +Optional argument EXT-PLIST, when provided, is a property list +with external parameters overriding Org default settings, but +still inferior to file-local settings. + +Return code as a string. + +\(fn STRING BACKEND &optional BODY-ONLY EXT-PLIST)" nil nil) + +(autoload 'org-export-replace-region-by "ox" "\ +Replace the active region by its export to BACKEND. +BACKEND is either an export back-end, as returned by, e.g., +`org-export-create-backend', or a symbol referring to +a registered back-end. + +\(fn BACKEND)" nil nil) + +(autoload 'org-export-insert-default-template "ox" "\ +Insert all export keywords with default values at beginning of line. + +BACKEND is a symbol referring to the name of a registered export +back-end, for which specific export options should be added to +the template, or `default' for default template. When it is nil, +the user will be prompted for a category. + +If SUBTREEP is non-nil, export configuration will be set up +locally for the subtree through node properties. + +\(fn &optional BACKEND SUBTREEP)" t nil) + +(autoload 'org-export-to-buffer "ox" "\ +Call `org-export-as' with output to a specified buffer. + +BACKEND is either an export back-end, as returned by, e.g., +`org-export-create-backend', or a symbol referring to +a registered back-end. + +BUFFER is the name of the output buffer. If it already exists, +it will be erased first, otherwise, it will be created. + +A non-nil optional argument ASYNC means the process should happen +asynchronously. The resulting buffer should then be accessible +through the `org-export-stack' interface. When ASYNC is nil, the +buffer is displayed if `org-export-show-temporary-export-buffer' +is non-nil. + +Optional arguments SUBTREEP, VISIBLE-ONLY, BODY-ONLY and +EXT-PLIST are similar to those used in `org-export-as', which +see. + +Optional argument POST-PROCESS is a function which should accept +no argument. It is always called within the current process, +from BUFFER, with point at its beginning. Export back-ends can +use it to set a major mode there, e.g, + + (defun org-latex-export-as-latex + (&optional async subtreep visible-only body-only ext-plist) + (interactive) + (org-export-to-buffer 'latex \"*Org LATEX Export*\" + async subtreep visible-only body-only ext-plist (lambda () (LaTeX-mode)))) + +This function returns BUFFER. + +\(fn BACKEND BUFFER &optional ASYNC SUBTREEP VISIBLE-ONLY BODY-ONLY EXT-PLIST POST-PROCESS)" nil nil) + +(put 'org-export-to-buffer 'lisp-indent-function '2) + +(autoload 'org-export-to-file "ox" "\ +Call `org-export-as' with output to a specified file. + +BACKEND is either an export back-end, as returned by, e.g., +`org-export-create-backend', or a symbol referring to +a registered back-end. FILE is the name of the output file, as +a string. + +A non-nil optional argument ASYNC means the process should happen +asynchronously. The resulting buffer will then be accessible +through the `org-export-stack' interface. + +Optional arguments SUBTREEP, VISIBLE-ONLY, BODY-ONLY and +EXT-PLIST are similar to those used in `org-export-as', which +see. + +Optional argument POST-PROCESS is called with FILE as its +argument and happens asynchronously when ASYNC is non-nil. It +has to return a file name, or nil. Export back-ends can use this +to send the output file through additional processing, e.g, + + (defun org-latex-export-to-latex + (&optional async subtreep visible-only body-only ext-plist) + (interactive) + (let ((outfile (org-export-output-file-name \".tex\" subtreep))) + (org-export-to-file 'latex outfile + async subtreep visible-only body-only ext-plist + (lambda (file) (org-latex-compile file))) + +The function returns either a file name returned by POST-PROCESS, +or FILE. + +\(fn BACKEND FILE &optional ASYNC SUBTREEP VISIBLE-ONLY BODY-ONLY EXT-PLIST POST-PROCESS)" nil nil) + +(put 'org-export-to-file 'lisp-indent-function '2) + +(autoload 'org-export-dispatch "ox" "\ +Export dispatcher for Org mode. + +It provides an access to common export related tasks in a buffer. +Its interface comes in two flavors: standard and expert. + +While both share the same set of bindings, only the former +displays the valid keys associations in a dedicated buffer. +Scrolling (resp. line-wise motion) in this buffer is done with +SPC and DEL (resp. C-n and C-p) keys. + +Set variable `org-export-dispatch-use-expert-ui' to switch to one +flavor or the other. + +When ARG is \\[universal-argument], repeat the last export action, with the same set +of options used back then, on the current buffer. + +When ARG is \\[universal-argument] \\[universal-argument], display the asynchronous export stack. + +\(fn &optional ARG)" t nil) + ;;;*** ;;;### (autoloads (org-ascii-publish-to-utf8 org-ascii-publish-to-latin1 ;;;;;; org-ascii-publish-to-ascii org-ascii-export-to-ascii org-ascii-export-as-ascii) -;;;;;; "ox-ascii" "ox-ascii.el" "447720ba2ecf9c62dd16363ae7b3e4f2") +;;;;;; "ox-ascii" "ox-ascii.el" "8bba507846964285c7ecb40e66b6afe3") ;;; Generated autoloads from ox-ascii.el (autoload 'org-ascii-export-as-ascii "ox-ascii" "\ @@ -2243,7 +2411,7 @@ Return output file name. ;;;### (autoloads (org-beamer-publish-to-pdf org-beamer-publish-to-latex ;;;;;; org-beamer-insert-options-template org-beamer-select-environment ;;;;;; org-beamer-export-to-pdf org-beamer-export-to-latex org-beamer-export-as-latex -;;;;;; org-beamer-mode) "ox-beamer" "ox-beamer.el" "0cc5c809a9e8a88b4f9157d4e1ab8799") +;;;;;; org-beamer-mode) "ox-beamer" "ox-beamer.el" "bb0ba558b851a54fc6394a24106c4bb4") ;;; Generated autoloads from ox-beamer.el (autoload 'org-beamer-mode "ox-beamer" "\ @@ -2385,7 +2553,7 @@ Return output file name. ;;;### (autoloads (org-html-publish-to-html org-html-export-to-html ;;;;;; org-html-convert-region-to-html org-html-export-as-html org-html-htmlize-generate-css) -;;;;;; "ox-html" "ox-html.el" "85c845b7c8a04a7193754f359ac6f000") +;;;;;; "ox-html" "ox-html.el" "65604b7a2a80c70979b37eb44119d6f9") ;;; Generated autoloads from ox-html.el (put 'org-html-head-include-default-style 'safe-local-variable 'booleanp) @@ -2493,7 +2661,7 @@ Return output file name. ;;;### (autoloads (org-icalendar-combine-agenda-files org-icalendar-export-agenda-files ;;;;;; org-icalendar-export-to-ics) "ox-icalendar" "ox-icalendar.el" -;;;;;; "6a6f72bc83138debb70bccf3be2f4e5f") +;;;;;; "74a493ca40404cb8fd648526fd898b6f") ;;; Generated autoloads from ox-icalendar.el (autoload 'org-icalendar-export-to-ics "ox-icalendar" "\ @@ -2545,7 +2713,7 @@ The file is stored under the name chosen in ;;;### (autoloads (org-latex-publish-to-pdf org-latex-publish-to-latex ;;;;;; org-latex-export-to-pdf org-latex-export-to-latex org-latex-convert-region-to-latex -;;;;;; org-latex-export-as-latex) "ox-latex" "ox-latex.el" "0e49f54b683fd1727a3a29c21156a48d") +;;;;;; org-latex-export-as-latex) "ox-latex" "ox-latex.el" "6277aa86c5275b5aae6c2c2d578a04fb") ;;; Generated autoloads from ox-latex.el (autoload 'org-latex-export-as-latex "ox-latex" "\ @@ -2671,7 +2839,7 @@ Return output file name. ;;;*** ;;;### (autoloads (org-md-export-to-markdown org-md-convert-region-to-md -;;;;;; org-md-export-as-markdown) "ox-md" "ox-md.el" "1c4ede28f75ffb336a5abe02ab748bd6") +;;;;;; org-md-export-as-markdown) "ox-md" "ox-md.el" "33f62cc6c4fd2d0ee63030f60bc3c5d3") ;;; Generated autoloads from ox-md.el (autoload 'org-md-export-as-markdown "ox-md" "\ @@ -2733,7 +2901,7 @@ Return output file's name. ;;;*** ;;;### (autoloads (org-odt-convert org-odt-export-to-odt org-odt-export-as-odf-and-open -;;;;;; org-odt-export-as-odf) "ox-odt" "ox-odt.el" "8c434e65153b17f1200119d1f3dfa2c6") +;;;;;; org-odt-export-as-odf) "ox-odt" "ox-odt.el" "74b69feba31202aef277a075e012a392") ;;; Generated autoloads from ox-odt.el (put 'org-odt-preferred-output-format 'safe-local-variable 'stringp) @@ -2796,7 +2964,7 @@ using `org-open-file'. ;;;*** ;;;### (autoloads (org-org-publish-to-org org-org-export-to-org org-org-export-as-org) -;;;;;; "ox-org" "ox-org.el" "6e1a106b8efe79c352cc72ac77ad8d91") +;;;;;; "ox-org" "ox-org.el" "952b4282cdf7bddd86e2e7660934888f") ;;; Generated autoloads from ox-org.el (autoload 'org-org-export-as-org "ox-org" "\ @@ -2870,7 +3038,7 @@ Return output file name. ;;;### (autoloads (org-publish-current-project org-publish-current-file ;;;;;; org-publish-all org-publish) "ox-publish" "ox-publish.el" -;;;;;; "5cc5fa1fa56e97dcb858997fd9cbaced") +;;;;;; "20cfd65a07e6275687d28df1d264b407") ;;; Generated autoloads from ox-publish.el (defalias 'org-publish-project 'org-publish) @@ -2914,7 +3082,7 @@ the project. ;;;*** ;;;### (autoloads (org-texinfo-convert-region-to-texinfo org-texinfo-publish-to-texinfo) -;;;;;; "ox-texinfo" "ox-texinfo.el" "90b063b241343b3d9e9f2481425b2d9d") +;;;;;; "ox-texinfo" "ox-texinfo.el" "ae3f8dd17715c8093138512ae3c347cc") ;;; Generated autoloads from ox-texinfo.el (autoload 'org-texinfo-publish-to-texinfo "ox-texinfo" "\ @@ -2940,7 +3108,7 @@ this command to convert it. ;;;### (autoloads (org-export-dispatch org-export-to-file org-export-to-buffer ;;;;;; org-export-insert-default-template org-export-replace-region-by -;;;;;; org-export-string-as org-export-as) "ox" "ox.el" "683956bcfd9a00f67855e18db64893c1") +;;;;;; org-export-string-as org-export-as) "ox" "ox.el" "a3f90141f011b5f549828135c723de85") ;;; Generated autoloads from ox.el (autoload 'org-export-as "ox" "\ @@ -3056,7 +3224,7 @@ a registered back-end. FILE is the name of the output file, as a string. A non-nil optional argument ASYNC means the process should happen -asynchronously. The resulting buffer file then be accessible +asynchronously. The resulting buffer will then be accessible through the `org-export-stack' interface. Optional arguments SUBTREEP, VISIBLE-ONLY, BODY-ONLY and @@ -3085,7 +3253,7 @@ or FILE. Export dispatcher for Org mode. It provides an access to common export related tasks in a buffer. -Its interface comes in two flavours: standard and expert. +Its interface comes in two flavors: standard and expert. While both share the same set of bindings, only the former displays the valid keys associations in a dedicated buffer. @@ -3093,7 +3261,7 @@ Scrolling (resp. line-wise motion) in this buffer is done with SPC and DEL (resp. C-n and C-p) keys. Set variable `org-export-dispatch-use-expert-ui' to switch to one -flavour or the other. +flavor or the other. When ARG is \\[universal-argument], repeat the last export action, with the same set of options used back then, on the current buffer. diff --git a/xemacs-packages/lisp/org-8.2.3c/org-macro.el b/elpa/org-20150427/org-macro.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-macro.el rename to elpa/org-20150427/org-macro.el index 61e9243b..5b890346 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-macro.el +++ b/elpa/org-20150427/org-macro.el @@ -1,6 +1,6 @@ ;;; org-macro.el --- Macro Replacement Code for Org Mode -;; Copyright (C) 2013 Free Software Foundation, Inc. +;; Copyright (C) 2013-2014 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org-macs.el b/elpa/org-20150427/org-macs.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-macs.el rename to elpa/org-20150427/org-macs.el index 4afbace5..96265ec0 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-macs.el +++ b/elpa/org-20150427/org-macs.el @@ -1,6 +1,6 @@ ;;; org-macs.el --- Top-level definitions for Org-mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -154,9 +154,9 @@ We use a macro so that the test can happen at compilation time." `(let ((,mpom ,pom)) (save-excursion (if (markerp ,mpom) (set-buffer (marker-buffer ,mpom))) - (save-excursion - (goto-char (or ,mpom (point))) - ,@body))))) + (org-with-wide-buffer + (goto-char (or ,mpom (point))) + ,@body))))) (def-edebug-spec org-with-point-at (form body)) (put 'org-with-point-at 'lisp-indent-function 1) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-mhe.el b/elpa/org-20150427/org-mhe.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-mhe.el rename to elpa/org-20150427/org-mhe.el index 7d6e4ec9..bdd6e150 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-mhe.el +++ b/elpa/org-20150427/org-mhe.el @@ -1,6 +1,6 @@ ;;; org-mhe.el --- Support for links to MH-E messages from within Org-mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Thomas Baumann ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org-mobile.el b/elpa/org-20150427/org-mobile.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-mobile.el rename to elpa/org-20150427/org-mobile.el index a43896bd..9c87791a 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-mobile.el +++ b/elpa/org-20150427/org-mobile.el @@ -1,5 +1,5 @@ ;;; org-mobile.el --- Code for asymmetric sync with a mobile device -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -460,6 +460,7 @@ agenda view showing the flagged items." ((stringp x) x) ((eq (car x) :startgroup) "{") ((eq (car x) :endgroup) "}") + ((eq (car x) :grouptags) nil) ((eq (car x) :newline) nil) ((listp x) (car x)))) def-tags)) @@ -500,7 +501,8 @@ agenda view showing the flagged items." (org-mobile-encrypt-and-move file target-path) (copy-file file target-path 'ok-if-exists)) (setq check (shell-command-to-string - (concat org-mobile-checksum-binary " " + (concat (shell-quote-argument org-mobile-checksum-binary) + " " (shell-quote-argument (expand-file-name file))))) (when (string-match "[a-fA-F0-9]\\{30,40\\}" check) (push (cons link-name (match-string 0 check)) @@ -1073,7 +1075,7 @@ be returned that indicates what went wrong." ;; which prevents correct insertion when point is invisible (org-show-subtree) (end-of-line 1) - (org-insert-heading-respect-content '(16) t) + (org-insert-heading-respect-content t) (org-demote)) (beginning-of-line) (insert "* ")) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-mouse.el b/elpa/org-20150427/org-mouse.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-mouse.el rename to elpa/org-20150427/org-mouse.el index c8a6c86c..74046c73 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-mouse.el +++ b/elpa/org-20150427/org-mouse.el @@ -1,6 +1,6 @@ ;;; org-mouse.el --- Better mouse support for org-mode -;; Copyright (C) 2006-2013 Free Software Foundation, Inc. +;; Copyright (C) 2006-2014 Free Software Foundation, Inc. ;; Author: Piotr Zielinski ;; Maintainer: Carsten Dominik @@ -953,20 +953,23 @@ This means, between the beginning of line and the point." (point) (save-excursion (goto-char start) (org-back-to-heading) (point)))) - (outline-end-of-subtree) + (progn (org-end-of-subtree nil t) + (unless (eobp) (backward-char))) (end-of-line) (if (eobp) (newline) (forward-char))) (when (looking-at org-outline-regexp) (let ((level (- (match-end 0) (match-beginning 0)))) (when (> end (match-end 0)) - (outline-end-of-subtree) + (progn (org-end-of-subtree nil t) + (unless (eobp) (backward-char))) (end-of-line) (if (eobp) (newline) (forward-char)) (setq level (1+ level))) (org-paste-subtree level) (save-excursion - (outline-end-of-subtree) + (progn (org-end-of-subtree nil t) + (unless (eobp) (backward-char))) (when (bolp) (delete-char -1)))))))))) @@ -1003,8 +1006,8 @@ This means, between the beginning of line and the point." (org-mouse-main-buffer (current-buffer))) (when (eq (with-current-buffer buffer major-mode) 'org-mode) (let ((endmarker (with-current-buffer buffer - (outline-end-of-subtree) - (forward-char 1) + (org-end-of-subtree nil t) + (unless (eobp) (forward-char 1)) (copy-marker (point))))) (org-with-remote-undo buffer (with-current-buffer buffer diff --git a/xemacs-packages/lisp/org-8.2.3c/org-pcomplete.el b/elpa/org-20150427/org-pcomplete.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-pcomplete.el rename to elpa/org-20150427/org-pcomplete.el index 77f68f4d..32dcaa68 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-pcomplete.el +++ b/elpa/org-20150427/org-pcomplete.el @@ -1,6 +1,6 @@ ;;; org-pcomplete.el --- In-buffer completion code -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; John Wiegley diff --git a/elpa/org-20150427/org-pkg.el b/elpa/org-20150427/org-pkg.el new file mode 100644 index 00000000..6150f3cf --- /dev/null +++ b/elpa/org-20150427/org-pkg.el @@ -0,0 +1,3 @@ +(define-package "org" + "20150427" "Outline-based notes management and organizer" ( )) +;; no-byte-compile: t diff --git a/xemacs-packages/lisp/org-8.2.3c/org-plot.el b/elpa/org-20150427/org-plot.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/org-plot.el rename to elpa/org-20150427/org-plot.el index 384a6f68..faa34fc3 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-plot.el +++ b/elpa/org-20150427/org-plot.el @@ -1,6 +1,6 @@ ;;; org-plot.el --- Support for plotting from Org-mode -;; Copyright (C) 2008-2013 Free Software Foundation, Inc. +;; Copyright (C) 2008-2014 Free Software Foundation, Inc. ;; ;; Author: Eric Schulte ;; Keywords: tables, plotting @@ -281,8 +281,7 @@ line directly before or after the table." (delete-other-windows) (when (get-buffer "*gnuplot*") ;; reset *gnuplot* if it already running (with-current-buffer "*gnuplot*" - (goto-char (point-max)) - (gnuplot-delchar-or-maybe-eof nil))) + (goto-char (point-max)))) (org-plot/goto-nearest-table) ;; set default options (mapc @@ -295,6 +294,7 @@ line directly before or after the table." (table (org-table-to-lisp)) (num-cols (length (if (eq (first table) 'hline) (second table) (first table))))) + (run-with-idle-timer 0.1 nil #'delete-file data-file) (while (equal 'hline (first table)) (setf table (cdr table))) (when (equal (second table) 'hline) (setf params (plist-put params :labels (first table))) ;; headers to labels @@ -345,8 +345,7 @@ line directly before or after the table." (gnuplot-mode) (gnuplot-send-buffer-to-gnuplot)) ;; cleanup - (bury-buffer (get-buffer "*gnuplot*")) - (run-with-idle-timer 0.1 nil (lambda () (delete-file data-file)))))) + (bury-buffer (get-buffer "*gnuplot*"))))) (provide 'org-plot) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-protocol.el b/elpa/org-20150427/org-protocol.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-protocol.el rename to elpa/org-20150427/org-protocol.el index 84b1176a..0c6f2de3 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-protocol.el +++ b/elpa/org-20150427/org-protocol.el @@ -1,6 +1,6 @@ ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions. ;; -;; Copyright (C) 2008-2013 Free Software Foundation, Inc. +;; Copyright (C) 2008-2014 Free Software Foundation, Inc. ;; ;; Authors: Bastien Guerry ;; Daniel M German diff --git a/xemacs-packages/lisp/org-8.2.3c/org-rmail.el b/elpa/org-20150427/org-rmail.el similarity index 93% rename from xemacs-packages/lisp/org-8.2.3c/org-rmail.el rename to elpa/org-20150427/org-rmail.el index e2f9fbee..6859b659 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-rmail.el +++ b/elpa/org-20150427/org-rmail.el @@ -1,6 +1,6 @@ ;;; org-rmail.el --- Support for links to Rmail messages from within Org-mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -95,7 +95,10 @@ (defun org-rmail-follow-link (folder article) "Follow an Rmail link to FOLDER and ARTICLE." (require 'rmail) - (setq article (org-add-angle-brackets article)) + (cond ((null article) (setq article "")) + ((stringp article) + (setq article (org-add-angle-brackets article))) + (t (user-error "Wrong RMAIL link format"))) (let (message-number) (save-excursion (save-window-excursion @@ -105,8 +108,7 @@ (rmail-widen) (goto-char (point-max)) (if (re-search-backward - (concat "^Message-ID:\\s-+" (regexp-quote - (or article ""))) + (concat "^Message-ID:\\s-+" (regexp-quote article)) nil t) (rmail-what-message)))))) (if message-number diff --git a/xemacs-packages/lisp/org-8.2.3c/org-src.el b/elpa/org-20150427/org-src.el similarity index 96% rename from xemacs-packages/lisp/org-8.2.3c/org-src.el rename to elpa/org-20150427/org-src.el index 99038576..618ed9fb 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-src.el +++ b/elpa/org-20150427/org-src.el @@ -1,6 +1,6 @@ ;;; org-src.el --- Source code examples in Org ;; -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Bastien Guerry @@ -69,7 +69,7 @@ there are kept outside the narrowed region." This will save the content of the source code editing buffer into a newly created file, not the base buffer for this source block. -If you want to regularily save the base buffer instead of the source +If you want to regularly save the base buffer instead of the source code editing buffer, see `org-edit-src-auto-save-idle-delay' instead." :group 'org-edit-structure :version "24.4" @@ -348,7 +348,7 @@ the display of windows containing the Org buffer and the code buffer." (condition-case e (funcall lang-f) (error - (error "Language mode `%s' fails with: %S" lang-f (nth 1 e))))) + (message "Language mode `%s' fails with: %S" lang-f (nth 1 e))))) (dolist (pair transmitted-variables) (org-set-local (car pair) (cadr pair))) ;; Remove protecting commas from visible part of buffer. @@ -376,23 +376,21 @@ the display of windows containing the Org buffer and the code buffer." (when (fboundp edit-prep-func) (funcall edit-prep-func full-info))) (or org-edit-src-code-timer + (zerop org-edit-src-auto-save-idle-delay) (setq org-edit-src-code-timer - (unless (zerop org-edit-src-auto-save-idle-delay) - (run-with-idle-timer - org-edit-src-auto-save-idle-delay t - (lambda () - (cond - ((and (string-match "\*Org Src" (buffer-name)) - (buffer-modified-p)) - (org-edit-src-save)) - ((not - (delq nil (mapcar - (lambda (b) - (string-match "\*Org Src" (buffer-name b))) - (buffer-list)))) - (cancel-timer org-edit-src-code-timer) - (setq org-edit-src-code-timer))))))))) - t))) + (run-with-idle-timer + org-edit-src-auto-save-idle-delay t + (lambda () + (cond + ((org-string-match-p "\\`\\*Org Src" (buffer-name)) + (when (buffer-modified-p) (org-edit-src-save))) + ((not (org-some (lambda (b) + (org-string-match-p "\\`\\*Org Src" + (buffer-name b))) + (buffer-list))) + (cancel-timer org-edit-src-code-timer) + (setq org-edit-src-code-timer nil)))))))) + t))) (defun org-edit-src-continue (e) "Continue editing source blocks." ;; Fixme: be more accurate @@ -577,14 +575,6 @@ the language, a switch telling if the content should be in a single line." (pos (point)) re1 re2 single beg end lang lfmt match-re1 ind entry) (catch 'exit - (when (org-at-table.el-p) - (re-search-backward "^[\t]*[^ \t|\\+]" nil t) - (setq beg (1+ (point-at-eol))) - (goto-char beg) - (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t) - (progn (goto-char (point-max)) (newline))) - (setq end (1- (point-at-bol))) - (throw 'exit (list beg end 'table.el nil nil 0))) (while (setq entry (pop re-list)) (setq re1 (car entry) re2 (nth 1 entry) lang (nth 2 entry) single (nth 3 entry)) @@ -615,7 +605,15 @@ the language, a switch telling if the content should be in a single line." (throw 'exit (list (match-end 0) end (org-edit-src-get-lang lang) - single lfmt ind)))))))))))) + single lfmt ind))))))))) + (when (org-at-table.el-p) + (re-search-backward "^[\t]*[^ \t|\\+]" nil t) + (setq beg (1+ (point-at-eol))) + (goto-char beg) + (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t) + (progn (goto-char (point-max)) (newline))) + (setq end (1- (point-at-bol))) + (throw 'exit (list beg end 'table.el nil nil 0)))))) (defun org-edit-src-get-lang (lang) "Extract the src language." @@ -737,8 +735,8 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"." (unless (or single preserve-indentation (= total-nindent 0)) (setq indent (make-string total-nindent ?\ )) (goto-char (point-min)) - (while (re-search-forward "^" nil t) - (replace-match indent))) + (while (re-search-forward "\\(^\\).+" nil t) + (replace-match indent nil nil nil 1))) (if (org-bound-and-true-p org-edit-src-picture) (setq total-nindent (+ total-nindent 2))) (setq code (buffer-string)) @@ -753,14 +751,14 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"." (kill-buffer buffer)) (goto-char beg) (when allow-write-back-p - (let ((buffer-undo-list t)) - (delete-region beg (max beg end)) - (unless (string-match "\\`[ \t]*\\'" code) - (insert code)) - ;; Make sure the overlay stays in place - (when (eq context 'save) (move-overlay ovl beg (point))) - (goto-char beg) - (if single (just-one-space)))) + (undo-boundary) + (delete-region beg (max beg end)) + (unless (string-match "\\`[ \t]*\\'" code) + (insert code)) + ;; Make sure the overlay stays in place + (when (eq context 'save) (move-overlay ovl beg (point))) + (goto-char beg) + (if single (just-one-space))) (if (memq t (mapcar (lambda (overlay) (eq (overlay-get overlay 'invisible) 'org-hide-block)) @@ -774,9 +772,6 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"." (unless (eq context 'save) (move-marker beg nil) (move-marker end nil))) - (when org-edit-src-code-timer - (cancel-timer org-edit-src-code-timer) - (setq org-edit-src-code-timer nil)) (unless (eq context 'save) (when org-edit-src-saved-temp-window-config (set-window-configuration org-edit-src-saved-temp-window-config) @@ -821,7 +816,10 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"." (defun org-src-mode-configure-edit-buffer () (when (org-bound-and-true-p org-edit-src-from-org-mode) (org-add-hook 'kill-buffer-hook - #'(lambda () (delete-overlay org-edit-src-overlay)) nil 'local) + (lambda () + (when (overlayp org-edit-src-overlay) + (delete-overlay org-edit-src-overlay))) + nil 'local) (if (org-bound-and-true-p org-edit-src-allow-write-back-p) (progn (setq buffer-offer-save t) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-table.el b/elpa/org-20150427/org-table.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-table.el rename to elpa/org-20150427/org-table.el index c191345e..30a66c9c 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-table.el +++ b/elpa/org-20150427/org-table.el @@ -1,6 +1,6 @@ ;;; org-table.el --- The table editor for Org-mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -97,11 +97,11 @@ this variable requires a restart of Emacs to become effective." Each template must define lines that will be treated as a comment and that must contain the \"BEGIN RECEIVE ORGTBL %n\" and \"END RECEIVE ORGTBL\" lines where \"%n\" will be replaced with the name of the table during -insertion of the tempate. The transformed table will later be inserted +insertion of the template. The transformed table will later be inserted between these lines. The template should also contain a minimal table in a multiline comment. -If multiline comments are not possible in the buffer language, +If multiline comments are not possible in the buffer language, you can pack it into a string that will not be used when the code is compiled or executed. Above the table will you need a line with the fixed string \"#+ORGTBL: SEND\", followed by instruction on how to @@ -1241,6 +1241,7 @@ is always the old value." (defun org-table-field-info (arg) "Show info about the current field, and highlight any reference at point." (interactive "P") + (unless (org-at-table-p) (user-error "Not at a table")) (org-table-get-specials) (save-excursion (let* ((pos (point)) @@ -2274,7 +2275,7 @@ KEY is \"@\" or \"$\". REPLACE is an alist of numbers to replace. For all numbers larger than LIMIT, shift them by DELTA." (save-excursion (goto-char (org-table-end)) - (when (let ((case-fold-search t)) (looking-at "[ \t]*#\\+tblfm:")) + (while (let ((case-fold-search t)) (looking-at "[ \t]*#\\+tblfm:")) (let ((msg "The formulas in #+TBLFM have been updated") (re (concat key "\\([0-9]+\\)")) (re2 @@ -2288,8 +2289,9 @@ For all numbers larger than LIMIT, shift them by DELTA." (while (re-search-forward re2 (point-at-eol) t) (unless (save-match-data (org-in-regexp "remote([^)]+?)")) (if (equal (char-before (match-beginning 0)) ?.) - (user-error "Change makes TBLFM term %s invalid, use undo to recover" - (match-string 0)) + (user-error + "Change makes TBLFM term %s invalid, use undo to recover" + (match-string 0)) (replace-match ""))))) (while (re-search-forward re (point-at-eol) t) (unless (save-match-data (org-in-regexp "remote([^)]+?)")) @@ -2300,7 +2302,8 @@ For all numbers larger than LIMIT, shift them by DELTA." (message msg)) ((and limit (> n limit)) (replace-match (concat key (int-to-string (+ n delta))) t t) - (message msg))))))))) + (message msg)))))) + (forward-line)))) (defun org-table-get-specials () "Get the column names and local parameters for this table." @@ -2709,7 +2712,8 @@ not overwrite the stored one." (or (fboundp 'calc-eval) (user-error "Calc does not seem to be installed, and is needed to evaluate the formula")) ;; Use <...> time-stamps so that Calc can handle them - (setq form (replace-regexp-in-string org-ts-regexp3 "<\\1>" form)) + (while (string-match (concat "\\[" org-ts-regexp1 "\\]") form) + (setq form (replace-match "<\\1>" nil nil form))) ;; I18n-ize local time-stamps by setting (system-time-locale "C") (when (string-match org-ts-regexp2 form) (let* ((ts (match-string 0 form)) @@ -3859,9 +3863,10 @@ With prefix ARG, apply the new formulas to the table." (push org-table-current-begin-pos org-show-positions) (let ((min (apply 'min org-show-positions)) (max (apply 'max org-show-positions))) - (goto-char min) (recenter 0) + (set-window-start (selected-window) min) (goto-char max) - (or (pos-visible-in-window-p max) (recenter -1)))) + (or (pos-visible-in-window-p max) + (set-window-start (selected-window) max)))) (select-window win)))) (defun org-table-force-dataline () @@ -4124,7 +4129,7 @@ to execute outside of tables." '(arg) (concat "In tables, run `" (symbol-name fun) "'.\n" "Outside of tables, run the binding of `" - (mapconcat (lambda (x) (format "%s" x)) keys "' or `") + (mapconcat #'key-description keys "' or `") "'.") '(interactive "p") (list 'if diff --git a/xemacs-packages/lisp/org-8.2.3c/org-timer.el b/elpa/org-20150427/org-timer.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/org-timer.el rename to elpa/org-20150427/org-timer.el index db7760dc..8161699f 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-timer.el +++ b/elpa/org-20150427/org-timer.el @@ -1,6 +1,6 @@ ;;; org-timer.el --- The relative timer code for Org-mode -;; Copyright (C) 2008-2013 Free Software Foundation, Inc. +;; Copyright (C) 2008-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -156,12 +156,14 @@ With prefix arg STOP, stop it entirely." (org-timer-set-mode-line 'pause) (message "Timer paused at %s" (org-timer-value-string))))) +(defvar org-timer-current-timer nil) (defun org-timer-stop () "Stop the relative timer." (interactive) (run-hooks 'org-timer-stop-hook) (setq org-timer-start-time nil - org-timer-pause-time nil) + org-timer-pause-time nil + org-timer-current-timer nil) (org-timer-set-mode-line 'off) (message "Timer stopped")) @@ -184,7 +186,10 @@ it in the buffer." (insert (org-timer-value-string)))) (defun org-timer-value-string () - (format org-timer-format (org-timer-secs-to-hms (floor (org-timer-seconds))))) + "Set the timer string." + (format org-timer-format + (org-timer-secs-to-hms + (abs (floor (org-timer-seconds)))))) (defvar org-timer-timer-is-countdown nil) (defun org-timer-seconds () @@ -344,7 +349,6 @@ VALUE can be `on', `off', or `pause'." (concat " <" (substring (org-timer-value-string) 0 -1) ">")) (force-mode-line-update))) -(defvar org-timer-current-timer nil) (defun org-timer-cancel-timer () "Cancel the current timer." (interactive) diff --git a/xemacs-packages/lisp/org-8.2.3c/org-version.el b/elpa/org-20150427/org-version.el similarity index 87% rename from xemacs-packages/lisp/org-8.2.3c/org-version.el rename to elpa/org-20150427/org-version.el index abe8bd3d..b2cb29f0 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-version.el +++ b/elpa/org-20150427/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of org-mode. Inserted by installing org-mode or when a release is made." - (let ((org-release "8.2.3c")) + (let ((org-release "8.2.10")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of org-mode. Inserted by installing org-mode or when a release is made." - (let ((org-git-version "8.2.3c-dist")) + (let ((org-git-version "8.2.10-37-gc000e8-elpa")) org-git-version)) ;;;###autoload (defvar org-odt-data-dir "/usr/share/emacs/etc/org" diff --git a/xemacs-packages/lisp/org-8.2.3c/org-w3m.el b/elpa/org-20150427/org-w3m.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/org-w3m.el rename to elpa/org-20150427/org-w3m.el index a2f29165..c8ddc82d 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org-w3m.el +++ b/elpa/org-20150427/org-w3m.el @@ -1,6 +1,6 @@ ;;; org-w3m.el --- Support from copy and paste from w3m to Org-mode -;; Copyright (C) 2008-2013 Free Software Foundation, Inc. +;; Copyright (C) 2008-2014 Free Software Foundation, Inc. ;; Author: Andy Stewart ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/xemacs-packages/lisp/org-8.2.3c/org.el b/elpa/org-20150427/org.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/org.el rename to elpa/org-20150427/org.el index 8c0fe354..4636830d 100644 --- a/xemacs-packages/lisp/org-8.2.3c/org.el +++ b/elpa/org-20150427/org.el @@ -1,7 +1,7 @@ ;;; org.el --- Outline-based notes management and organizer ;; Carstens outline-mode for keeping track of everything. -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Maintainer: Carsten Dominik @@ -111,6 +111,8 @@ Stars are put in group 1 and the trimmed body in group 2.") (unless (boundp 'diary-fancy-buffer) (org-defvaralias 'diary-fancy-buffer 'fancy-diary-buffer)) +(declare-function org-add-archive-files "org-archive" (files)) + (declare-function org-inlinetask-at-task-p "org-inlinetask" ()) (declare-function org-inlinetask-outline-regexp "org-inlinetask" ()) (declare-function org-inlinetask-toggle-visibility "org-inlinetask" ()) @@ -118,7 +120,10 @@ Stars are put in group 1 and the trimmed body in group 2.") (declare-function org-clock-get-last-clock-out-time "org-clock" ()) (declare-function org-clock-timestamps-up "org-clock" (&optional n)) (declare-function org-clock-timestamps-down "org-clock" (&optional n)) +(declare-function org-clock-remove-overlays "org-clock" (&optional beg end noremove)) (declare-function org-clock-sum-current-item "org-clock" (&optional tstart)) +(declare-function org-clock-update-time-maybe "org-clock" ()) +(declare-function org-clocktable-shift "org-clock" (dir n)) (declare-function orgtbl-mode "org-table" (&optional arg)) (declare-function org-clock-out "org-clock" (&optional switch-to-state fail-quietly at-time)) @@ -133,6 +138,10 @@ Stars are put in group 1 and the trimmed body in group 2.") (declare-function org-agenda-list "org-agenda" (&optional arg start-day span)) (declare-function org-agenda-redo "org-agenda" (&optional all)) (declare-function org-table-align "org-table" ()) +(declare-function org-table-begin "org-table" (&optional table-type)) +(declare-function org-table-blank-field "org-table" ()) +(declare-function org-table-end "org-table" (&optional table-type)) +(declare-function org-table-insert-row "org-table" (&optional arg)) (declare-function org-table-paste-rectangle "org-table" ()) (declare-function org-table-maybe-eval-formula "org-table" ()) (declare-function org-table-maybe-recalculate-line "org-table" ()) @@ -179,6 +188,7 @@ Stars are put in group 1 and the trimmed body in group 2.") (intern (concat "org-babel-expand-body:" lang))))))) org-babel-load-languages)) +(declare-function org-babel-tangle-file "ob-tangle" (file &optional target-file lang)) ;;;###autoload (defun org-babel-load-file (file &optional compile) "Load Emacs Lisp source code blocks in the Org-mode FILE. @@ -602,7 +612,7 @@ The list of commands is: `org-schedule', `org-deadline', already archived entries." :type '(choice (const :tag "Don't loop" nil) (const :tag "All headlines in active region" t) - (const :tag "In active region, headlines at the same level than the first one" 'start-level) + (const :tag "In active region, headlines at the same level than the first one" start-level) (string :tag "Tags/Property/Todo matcher")) :version "24.1" :group 'org-todo @@ -654,11 +664,17 @@ the following lines anywhere in the buffer: (defcustom org-use-sub-superscripts t "Non-nil means interpret \"_\" and \"^\" for display. -When this option is turned on, you can use TeX-like syntax for sub- and -superscripts. Several characters after \"_\" or \"^\" will be -considered as a single item - so grouping with {} is normally not -needed. For example, the following things will be parsed as single -sub- or superscripts. + +If you want to control how Org exports those characters, see +`org-export-with-sub-superscripts'. `org-use-sub-superscripts' +used to be an alias for `org-export-with-sub-superscripts' in +Org <8.0, it is not anymore. + +When this option is turned on, you can use TeX-like syntax for +sub- and superscripts within the buffer. Several characters after +\"_\" or \"^\" will be considered as a single item - so grouping +with {} is normally not needed. For example, the following things +will be parsed as single sub- or superscripts: 10^24 or 10^tau several digits will be considered 1 item. 10^-12 or 10^-tau a leading sign with digits or a word @@ -666,13 +682,14 @@ sub- or superscripts. terminated by almost any nonword/nondigit char. x_{i^2} or x^(2-i) braces or parenthesis do grouping. -Still, ambiguity is possible - so when in doubt use {} to enclose -the sub/superscript. If you set this variable to the symbol -`{}', the braces are *required* in order to trigger -interpretations as sub/superscript. This can be helpful in -documents that need \"_\" frequently in plain text." +Still, ambiguity is possible. So when in doubt, use {} to enclose +the sub/superscript. If you set this variable to the symbol `{}', +the braces are *required* in order to trigger interpretations as +sub/superscript. This can be helpful in documents that need \"_\" +frequently in plain text." :group 'org-startup - :version "24.1" + :version "24.4" + :package-version '(Org . "8.0") :type '(choice (const :tag "Always interpret" t) (const :tag "Only with braces" {}) @@ -713,7 +730,7 @@ the following lines anywhere in the buffer: "Non-nil means preview LaTeX fragments when loading a new Org file. This can also be configured on a per-file basis by adding one of -the followinglines anywhere in the buffer: +the following lines anywhere in the buffer: #+STARTUP: latexpreview #+STARTUP: nolatexpreview" :group 'org-startup @@ -806,10 +823,11 @@ Also apply the translations defined in `org-xemacs-key-equivalents'." (defcustom org-ellipsis nil "The ellipsis to use in the Org-mode outline. -When nil, just use the standard three dots. When a string, use that instead, +When nil, just use the standard three dots. +When a string, use that string instead. When a face, use the standard 3 dots, but with the specified face. The change affects only Org-mode (which will then use its own display table). -Changing this requires executing `M-x org-mode' in a buffer to become +Changing this requires executing `M-x org-mode RET' in a buffer to become effective." :group 'org-startup :type '(choice (const :tag "Default" nil) @@ -1037,7 +1055,7 @@ commands in the Help buffer using the `?' speed command." :last-refile "org-refile-last-stored" :last-capture-marker "org-capture-last-stored-marker") "Names for bookmarks automatically set by some Org commands. -This can provide strings as names for a number of bookmakrs Org sets +This can provide strings as names for a number of bookmarks Org sets automatically. The following keys are currently implemented: :last-capture :last-capture-marker @@ -1217,7 +1235,7 @@ The following issues are influenced by this variable: body starts with text at column 0, indentation is not changed at all. - Property drawers and planning information is inserted indented when - this variable s set. When nil, they will not be indented. + this variable is set. When nil, they will not be indented. - TAB indents a line relative to context. The lines below a headline will be indented when this variable is set. @@ -1734,7 +1752,7 @@ Needs to be set before org.el is loaded." :version "24.4" :package-version '(Org . "8.3") :type '(choice - (const :tag "A double click follows the link" 'double) + (const :tag "A double click follows the link" double) (const :tag "Unconditionally follow the link with mouse-1" t) (integer :tag "mouse-1 click does not follow the link if longer than N ms" 450))) @@ -2239,7 +2257,7 @@ fast, while still showing the whole path to the entry." "Non-nil means allow to create new nodes as refile targets. New nodes are then created by adding \"/new node name\" to the completion of an existing node. When the value of this variable is `confirm', -new node creation must be confirmed by the user (recommended) +new node creation must be confirmed by the user (recommended). When nil, the completion must match an existing entry. Note that, if the new heading is not seen by the criteria @@ -2421,7 +2439,7 @@ current entry each time a todo state is changed." :group 'org-todo :type '(choice (const :tag "Yes, only for TODO entries" t) - (const :tag "Yes, including all entries" 'all-headlines) + (const :tag "Yes, including all entries" all-headlines) (repeat :tag "Yes, for TODOs in this list" (string :tag "TODO keyword")) (other :tag "No TODO statistics" nil))) @@ -3700,12 +3718,12 @@ This is a property list with the following properties: the same numbers for HTML export. :matchers a list indicating which matchers should be used to find LaTeX fragments. Valid members of this list are: - \"begin\" find environments - \"$1\" find single characters surrounded by $.$ - \"$\" find math expressions surrounded by $...$ - \"$$\" find math expressions surrounded by $$....$$ - \"\\(\" find math expressions surrounded by \\(...\\) - \"\\ [\" find math expressions surrounded by \\ [...\\]" + \"begin\" find environments + \"$1\" find single characters surrounded by $.$ + \"$\" find math expressions surrounded by $...$ + \"$$\" find math expressions surrounded by $$....$$ + \"\\(\" find math expressions surrounded by \\(...\\) + \"\\=\\[\" find math expressions surrounded by \\=\\[...\\]" :group 'org-latex :type 'plist) @@ -3866,10 +3884,18 @@ Org mode to function properly: Therefore you should not modify this variable unless you know what you are doing. The one reason to change it anyway is that you might be loading some other package that conflicts with one -of the default packages. Each cell is of the format -\( \"options\" \"package\" snippet-flag). If SNIPPET-FLAG is t, -the package also needs to be included when compiling LaTeX -snippets into images for inclusion into non-LaTeX output." +of the default packages. Each element is either a cell or +a string. + +A cell is of the format: + + \( \"options\" \"package\" SNIPPET-FLAG). + +If SNIPPET-FLAG is non-nil, the package also needs to be included +when compiling LaTeX snippets into images for inclusion into +non-LaTeX output. + +A string will be inserted as-is in the header of the document." :group 'org-latex :group 'org-export-latex :set 'org-set-packages-alist @@ -3887,18 +3913,22 @@ snippets into images for inclusion into non-LaTeX output." "Alist of packages to be inserted in every LaTeX header. These will be inserted after `org-latex-default-packages-alist'. -Each cell is of the format: +Each element is either a cell or a string. + +A cell is of the format: - \(\"options\" \"package\" snippet-flag) + \(\"options\" \"package\" SNIPPET-FLAG) -SNIPPET-FLAG, when t, indicates that this package is also needed -when turning LaTeX snippets into images for inclusion into +SNIPPET-FLAG, when non-nil, indicates that this package is also +needed when turning LaTeX snippets into images for inclusion into non-LaTeX output. +A string will be inserted as-is in the header of the document. + Make sure that you only list packages here which: - - you want in every file - - do not conflict with the setup in `org-format-latex-header'. + - you want in every file; + - do not conflict with the setup in `org-format-latex-header'; - do not conflict with the default packages in `org-latex-default-packages-alist'." :group 'org-latex @@ -4112,8 +4142,8 @@ You need to reload Org or to restart Emacs after customizing this.") `(("*" bold) ("/" italic) ("_" underline) - ("=" org-code verbatim) - ("~" org-verbatim verbatim) + ("=" org-verbatim verbatim) + ("~" org-code verbatim) ("+" ,(if (featurep 'xemacs) 'org-table '(:strike-through t)))) "Alist of characters and faces to emphasize text. Text starting and ending with a special character will be emphasized, @@ -4183,7 +4213,7 @@ Normal means, no org-mode-specific context." (defvar mark-active) ;; Various packages -(declare-function calendar-absolute-from-iso "cal-iso" (date)) +(declare-function calendar-iso-to-absolute "cal-iso" (date)) (declare-function calendar-forward-day "cal-move" (arg)) (declare-function calendar-goto-date "cal-move" (date)) (declare-function calendar-goto-today "cal-move" ()) @@ -4374,14 +4404,6 @@ If yes, offer to stop it and to save the buffer with the changes." (add-hook 'org-mode-hook 'org-clock-load) (add-hook 'kill-emacs-hook 'org-clock-save)) -;; Define the variable already here, to make sure we have it. -(defvar org-indent-mode nil - "Non-nil if Org-Indent mode is enabled. -Use the command `org-indent-mode' to change this variable.") - -;; Autoload archiving code -;; The stuff that is needed for cycling and tags has to be defined here. - (defgroup org-archive nil "Options concerning archiving in Org-mode." :tag "Org Archive" @@ -5097,9 +5119,9 @@ Support for group tags is controlled by the option "\\(?: +\\(\\[#.\\]\\)\\)?" "\\(?: +" ;; Stats cookies can be stuck to body. - "\\(?:\\[[0-9%%/]+\\] *\\)?" + "\\(?:\\[[0-9%%/]+\\] *\\)*" "\\(%s\\)" - "\\(?: *\\[[0-9%%/]+\\]\\)?" + "\\(?: *\\[[0-9%%/]+\\]\\)*" "\\)" (org-re "\\(?:[ \t]+\\(:[[:alnum:]_@#%%:]+:\\)\\)?") "[ \t]*$") @@ -5153,11 +5175,11 @@ Support for group tags is controlled by the option (defun org-file-contents (file &optional noerror) "Return the contents of FILE, as a string." - (if (or (not file) - (not (file-readable-p file))) - (if noerror - (message "Cannot read file \"%s\"" file) - (error "Cannot read file \"%s\"" file)) + (if (or (not file) (not (file-readable-p file))) + (if (not noerror) + (error "Cannot read file \"%s\"" file) + (message "Cannot read file \"%s\"" file) + "") (with-temp-buffer (insert-file-contents file) (buffer-string)))) @@ -5341,6 +5363,8 @@ The following commands are available: ;; Modify a few syntax entries (modify-syntax-entry ?@ "w") (modify-syntax-entry ?\" "\"") + (modify-syntax-entry ?\\ "_") + (modify-syntax-entry ?~ "_") (if org-startup-truncated (setq truncate-lines t)) (when org-startup-indented (require 'org-indent) (org-indent-mode 1)) (org-set-local 'font-lock-unfontify-region-function @@ -5364,7 +5388,12 @@ The following commands are available: (org-setup-comments-handling) ;; Beginning/end of defun (org-set-local 'beginning-of-defun-function 'org-backward-element) - (org-set-local 'end-of-defun-function 'org-forward-element) + (org-set-local 'end-of-defun-function + (lambda () + (if (not (org-at-heading-p)) + (org-forward-element) + (org-forward-element) + (forward-char -1)))) ;; Next error for sparse trees (org-set-local 'next-error-function 'org-occur-next-match) ;; Make sure dependence stuff works reliably, even for users who set it @@ -5398,8 +5427,7 @@ The following commands are available: (org-add-hook 'isearch-mode-end-hook 'org-isearch-end 'append 'local) ;; Emacs 22 deals with this through a special variable (org-set-local 'outline-isearch-open-invisible-function - (lambda (&rest ignore) (org-show-context 'isearch))) - (org-add-hook 'isearch-mode-end-hook 'org-fix-ellipsis-at-bol 'append 'local)) + (lambda (&rest ignore) (org-show-context 'isearch)))) ;; Setup the pcomplete hooks (set (make-local-variable 'pcomplete-command-completion-function) @@ -5431,13 +5459,15 @@ The following commands are available: (unless org-inhibit-startup-visibility-stuff (org-set-startup-visibility)))) ;; Try to set org-hide correctly - (set-face-foreground 'org-hide (org-find-invisible-foreground))) + (let ((foreground (org-find-invisible-foreground))) + (if foreground + (set-face-foreground 'org-hide foreground)))) ;; Update `customize-package-emacs-version-alist' (add-to-list 'customize-package-emacs-version-alist '(Org ("6.21b" . "23.1") ("6.33x" . "23.2") ("7.8.11" . "24.1") ("7.9.4" . "24.3") - ("8.0" . "24.4"))) + ("8.2.6" . "24.4"))) (defvar org-mode-transpose-word-syntax-table (let ((st (make-syntax-table))) @@ -5452,9 +5482,6 @@ The following commands are available: (put 'org-mode 'flyspell-mode-predicate 'org-mode-flyspell-verify) -(defsubst org-fix-ellipsis-at-bol () - (save-excursion (goto-char (window-start)) (recenter 0))) - (defun org-find-invisible-foreground () (let ((candidates (remove "unspecified-bg" @@ -5577,59 +5604,55 @@ stacked delimiters is N. Escaping delimiters is not possible." (defun org-make-link-regexps () "Update the link regular expressions. This should be called after the variable `org-link-types' has changed." - (setq org-link-types-re - (concat - "\\`\\(" (mapconcat 'regexp-quote org-link-types "\\|") "\\):") - org-link-re-with-space - (concat - "?") - org-link-re-with-space2 - (concat - "?") - org-link-re-with-space3 - (concat - "") - org-plain-link-re - (concat - "\\<\\(" (mapconcat 'regexp-quote org-link-types "\\|") "\\):" - (org-re "\\([^ \t\n()<>]+\\(?:([[:word:]0-9_]+)\\|\\([^[:punct:] \t\n]\\|/\\)\\)\\)")) - ;; "\\([^]\t\n\r<>() ]+[^]\t\n\r<>,.;() ]\\)") - org-bracket-link-regexp - "\\[\\[\\([^][]+\\)\\]\\(\\[\\([^][]+\\)\\]\\)?\\]" - org-bracket-link-analytic-regexp - (concat - "\\[\\[" - "\\(\\(" (mapconcat 'regexp-quote org-link-types "\\|") "\\):\\)?" - "\\([^]]+\\)" - "\\]" - "\\(\\[" "\\([^]]+\\)" "\\]\\)?" - "\\]") - org-bracket-link-analytic-regexp++ - (concat - "\\[\\[" - "\\(\\(" (mapconcat 'regexp-quote (cons "coderef" org-link-types) "\\|") "\\):\\)?" - "\\([^]]+\\)" - "\\]" - "\\(\\[" "\\([^]]+\\)" "\\]\\)?" - "\\]") - org-any-link-re - (concat "\\(" org-bracket-link-regexp "\\)\\|\\(" - org-angle-link-re "\\)\\|\\(" - org-plain-link-re "\\)"))) + (let ((types-re (regexp-opt org-link-types t))) + (setq org-link-types-re + (concat "\\`" types-re ":") + org-link-re-with-space + (concat "?") + org-link-re-with-space2 + (concat "?") + org-link-re-with-space3 + (concat "") + org-plain-link-re + (concat + "\\<" types-re ":" + (org-re "\\([^ \t\n()<>]+\\(?:([[:word:]0-9_]+)\\|\\([^[:punct:] \t\n]\\|/\\)\\)\\)")) + ;; "\\([^]\t\n\r<>() ]+[^]\t\n\r<>,.;() ]\\)") + org-bracket-link-regexp + "\\[\\[\\([^][]+\\)\\]\\(\\[\\([^][]+\\)\\]\\)?\\]" + org-bracket-link-analytic-regexp + (concat + "\\[\\[" + "\\(" types-re ":\\)?" + "\\([^]]+\\)" + "\\]" + "\\(\\[" "\\([^]]+\\)" "\\]\\)?" + "\\]") + org-bracket-link-analytic-regexp++ + (concat + "\\[\\[" + "\\(" (regexp-opt (cons "coderef" org-link-types) t) ":\\)?" + "\\([^]]+\\)" + "\\]" + "\\(\\[" "\\([^]]+\\)" "\\]\\)?" + "\\]") + org-any-link-re + (concat "\\(" org-bracket-link-regexp "\\)\\|\\(" + org-angle-link-re "\\)\\|\\(" + org-plain-link-re "\\)")))) (org-make-link-regexps) @@ -5668,25 +5691,31 @@ The time stamps may be either active or inactive.") "Run through the buffer and add overlays to emphasized strings." (let (rtn a) (while (and (not rtn) (re-search-forward org-emph-re limit t)) - (if (not (= (char-after (match-beginning 3)) - (char-after (match-beginning 4)))) - (progn - (setq rtn t) - (setq a (assoc (match-string 3) org-emphasis-alist)) - (font-lock-prepend-text-property (match-beginning 2) (match-end 2) - 'face - (nth 1 a)) - (and (nth 2 a) - (org-remove-flyspell-overlays-in - (match-beginning 0) (match-end 0))) - (add-text-properties (match-beginning 2) (match-end 2) - '(font-lock-multiline t org-emphasis t)) - (when org-hide-emphasis-markers - (add-text-properties (match-end 4) (match-beginning 5) - '(invisible org-link)) - (add-text-properties (match-beginning 3) (match-end 3) - '(invisible org-link))))) - (backward-char 1)) + (let* ((border (char-after (match-beginning 3))) + (bre (regexp-quote (char-to-string border)))) + (if (and (not (= border (char-after (match-beginning 4)))) + (not (save-match-data + (string-match (concat bre ".*" bre) + (replace-regexp-in-string + "\n" " " + (substring (match-string 2) 1 -1)))))) + (progn + (setq rtn t) + (setq a (assoc (match-string 3) org-emphasis-alist)) + (font-lock-prepend-text-property (match-beginning 2) (match-end 2) + 'face + (nth 1 a)) + (and (nth 2 a) + (org-remove-flyspell-overlays-in + (match-beginning 0) (match-end 0))) + (add-text-properties (match-beginning 2) (match-end 2) + '(font-lock-multiline t org-emphasis t)) + (when org-hide-emphasis-markers + (add-text-properties (match-end 4) (match-beginning 5) + '(invisible org-link)) + (add-text-properties (match-beginning 3) (match-end 3) + '(invisible org-link)))))) + (goto-char (1+ (match-beginning 0)))) rtn)) (defun org-emphasize (&optional char) @@ -5858,7 +5887,7 @@ by a #." ((member dc1 '("+title:" "+author:" "+email:" "+date:")) (add-text-properties beg (match-end 3) - (if (member (intern (substring dc1 0 -1)) org-hidden-keywords) + (if (member (intern (substring dc1 1 -1)) org-hidden-keywords) '(font-lock-fontified t invisible t) '(font-lock-fontified t face org-document-info-keyword))) (add-text-properties @@ -6087,7 +6116,7 @@ The regular expression finds the targets also if there is a line break between words." (and targets (concat - "\\<\\(" + "\\_<\\(" (mapconcat (lambda (x) (setq x (regexp-quote x)) @@ -6096,7 +6125,7 @@ between words." x) targets "\\|") - "\\)\\>"))) + "\\)\\_>"))) (defun org-activate-tags (limit) (if (re-search-forward (org-re "^\\*+.*[ \t]\\(:[[:alnum:]_@#%:]+:\\)[ \r\n]") limit t) @@ -6122,15 +6151,25 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'." (defvar org-font-lock-keywords nil) -(defsubst org-re-property (property &optional literal) +(defsubst org-re-property (property &optional literal allow-null) "Return a regexp matching a PROPERTY line. -Match group 3 will be set to the value if it exists." - (concat "^\\(?4:[ \t]*\\)\\(?1::\\(?2:" - (if literal property (regexp-quote property)) - "\\):\\)[ \t]+\\(?3:[^ \t\r\n].*?\\)\\(?5:[ \t]*\\)$")) + +When optional argument LITERAL is non-nil, do not quote PROPERTY. +This is useful when PROPERTY is a regexp. When ALLOW-NULL is +non-nil, match properties even without a value. + +Match group 3 is set to the value when it exists. If there is no +value and ALLOW-NULL is non-nil, it is set to the empty string." + (concat + "^\\(?4:[ \t]*\\)" + (format "\\(?1::\\(?2:%s\\):\\)" + (if literal property (regexp-quote property))) + (if allow-null + "\\(?:\\(?3:$\\)\\|[ \t]+\\(?3:.*?\\)\\)\\(?5:[ \t]*\\)$" + "[ \t]+\\(?3:[^ \r\t\n]+.*?\\)\\(?5:[ \t]*\\)$"))) (defconst org-property-re - (org-re-property ".*?" 'literal) + (org-re-property ".*?" 'literal t) "Regular expression matching a property line. There are four matching groups: 1: :PROPKEY: including the leading and trailing colon, @@ -6580,6 +6619,9 @@ in special contexts. (show-all) (org-unlogged-message "Entire buffer visible, including drawers")) + ;; Try cdlatex TAB completion + ((org-try-cdlatex-tab)) + ;; Table: enter it or move to the next field. ((org-at-table-p 'any) (if (org-at-table.el-p) @@ -6616,8 +6658,6 @@ in special contexts. (or (bolp) (not (eq org-cycle-emulate-tab 'exc-hl-bol)))) (org-inlinetask-toggle-visibility)) - ((org-try-cdlatex-tab)) - ;; At an item/headline: delegate to `org-cycle-internal-local'. ((and (or (and org-cycle-include-plain-lists (org-at-item-p)) (save-excursion (beginning-of-line 1) @@ -6688,7 +6728,8 @@ in special contexts. (setq org-cycle-global-status 'overview) (run-hook-with-args 'org-cycle-hook 'overview))))) -(defvar org-called-with-limited-levels);Dyn-bound in ̀org-with-limited-levels'. +(defvar org-called-with-limited-levels nil + "Non-nil when `org-with-limited-levels' is currently active.") (defun org-cycle-internal-local () "Do the local cycling action." @@ -6705,7 +6746,8 @@ in special contexts. (setq has-children (org-list-has-child-p (point) struct))) (org-back-to-heading) (setq eoh (save-excursion (outline-end-of-heading) (point))) - (setq eos (save-excursion (1- (org-end-of-subtree t t)))) + (setq eos (save-excursion (org-end-of-subtree t t) + (when (bolp) (backward-char)) (point))) (setq has-children (or (save-excursion (let ((level (funcall outline-level))) @@ -6820,10 +6862,12 @@ With a numeric prefix, show all headlines up to that level." "Set the visibility required by startup options and properties." (cond ((eq org-startup-folded t) - (org-cycle '(4))) + (org-overview)) ((eq org-startup-folded 'content) - (let ((this-command 'org-cycle) (last-command 'org-cycle)) - (org-cycle '(4)) (org-cycle '(4))))) + (org-content)) + ((or (eq org-startup-folded 'showeverything) + (eq org-startup-folded nil)) + (show-all))) (unless (eq org-startup-folded 'showeverything) (if org-hide-block-startup (org-hide-block-all)) (org-set-visibility-according-to-property 'no-cleanup) @@ -6868,26 +6912,26 @@ With a numeric prefix, show all headlines up to that level." ;; buffers, where outline-regexp is needed. (defun org-overview () "Switch to overview mode, showing only top-level headlines. -Really, this shows all headlines with level equal or greater than the level +This shows all headlines with a level equal or greater than the level of the first headline in the buffer. This is important, because if the first headline is not level one, then (hide-sublevels 1) gives confusing results." (interactive) - (let ((pos (point)) - (level (save-excursion - (goto-char (point-min)) - (if (re-search-forward (concat "^" outline-regexp) nil t) - (progn - (goto-char (match-beginning 0)) - (funcall outline-level)))))) - (and level (hide-sublevels level)) - (recenter '(4)) - (goto-char pos))) + (save-excursion + (let ((level + (save-excursion + (goto-char (point-min)) + (if (re-search-forward (concat "^" outline-regexp) nil t) + (progn + (goto-char (match-beginning 0)) + (funcall outline-level)))))) + (and level (hide-sublevels level))))) (defun org-content (&optional arg) "Show all headlines in the buffer, like a table of contents. With numerical argument N, show content up to level N." (interactive "P") + (org-overview) (save-excursion ;; Visit all headings and show their offspring (and (integerp arg) (org-overview)) @@ -6903,7 +6947,6 @@ With numerical argument N, show content up to level N." (show-branches)) (if (bobp) (throw 'exit nil)))))) - (defun org-optimize-window-after-visibility-change (state) "Adjust the window after a change in outline visibility. This function is the default value of the hook `org-cycle-hook'." @@ -7079,13 +7122,11 @@ Otherwise make it visible." (pos-visible-in-window-p (save-excursion (org-end-of-subtree t) (point)))) -(defun org-first-headline-recenter (&optional N) - "Move cursor to the first headline and recenter the headline. -Optional argument N means put the headline into the Nth line of the window." +(defun org-first-headline-recenter () + "Move cursor to the first headline and recenter the headline." (goto-char (point-min)) (when (re-search-forward (concat "^\\(" org-outline-regexp "\\)") nil t) - (beginning-of-line) - (recenter (prefix-numeric-value N)))) + (set-window-start (selected-window) (point-at-bol)))) ;;; Saving and restoring visibility @@ -7358,8 +7399,14 @@ or nil." (defvar org-goto-local-auto-isearch-map (make-sparse-keymap)) (set-keymap-parent org-goto-local-auto-isearch-map isearch-mode-map) -(define-key org-goto-local-auto-isearch-map "\C-i" 'isearch-other-control-char) -(define-key org-goto-local-auto-isearch-map "\C-m" 'isearch-other-control-char) +;; `isearch-other-control-char' was removed in Emacs 24.4. +(if (fboundp 'isearch-other-control-char) + (progn + (define-key org-goto-local-auto-isearch-map "\C-i" 'isearch-other-control-char) + (define-key org-goto-local-auto-isearch-map "\C-m" 'isearch-other-control-char)) + (define-key org-goto-local-auto-isearch-map "\C-i" nil) + (define-key org-goto-local-auto-isearch-map "\C-m" nil) + (define-key org-goto-local-auto-isearch-map [return] nil)) (defun org-goto-local-search-headings (string bound noerror) "Search and make sure that any matches are in headlines." @@ -7519,28 +7566,37 @@ When NEXT is non-nil, check the next line instead." (looking-at "[ \t]*$"))))) (defun org-insert-heading (&optional arg invisible-ok) - "Insert a new heading or item with same depth at point. -If point is in a plain list and ARG is nil, create a new list item. -With one universal prefix argument, insert a heading even in lists. -With two universal prefix arguments, insert the heading at the end -of the parent subtree. - -If point is at the beginning of a headline, insert a sibling before -the current headline. If point is not at the beginning, split the line -and create a new headline with the text in the current line after point -\(see `org-M-RET-may-split-line' on how to modify this behavior). - -If point is at the beginning of a normal line, turn this line into -a heading. - -When INVISIBLE-OK is set, stop at invisible headlines when going back. -This is important for non-interactive uses of the command." + "Insert a new heading or an item with the same depth at point. + +If point is at the beginning of a heading or a list item, insert +a new heading or a new item above the current one. If point is +at the beginning of a normal line, turn the line into a heading. + +If point is in the middle of a headline or a list item, split the +headline or the item and create a new headline/item with the text +in the current line after point \(see `org-M-RET-may-split-line' +on how to modify this behavior). + +With one universal prefirx argument, set the user option +`org-insert-heading-respect-content' to t for the duration of +the command. This modifies the behavior described above in this +ways: on list items and at the beginning of normal lines, force +the insertion of a heading after the current subtree. + +With two universal prefix arguments, insert the heading at the +end of the grandparent subtree. For example, if point is within +a 2nd-level heading, then it will insert a 2nd-level heading at +the end of the 1st-level parent heading. + +When INVISIBLE-OK is set, stop at invisible headlines when going +back. This is important for non-interactive uses of the +command." (interactive "P") (if (org-called-interactively-p 'any) (org-reveal)) (let ((itemp (org-in-item-p)) (may-split (org-get-alist-option org-M-RET-may-split-line 'headline)) (respect-content (or org-insert-heading-respect-content - (equal arg '(16)))) + (equal arg '(4)))) (initial-content "") (adjust-empty-lines t)) @@ -7553,16 +7609,25 @@ This is important for non-interactive uses of the command." (or arg (not itemp)))) ;; At beginning of buffer or so high up that only a heading ;; makes sense. - (insert - (if (or (bobp) (org-previous-line-empty-p)) "" "\n") - (if (org-in-src-block-p) ",* " "* ")) + (cond ((and (bolp) (not respect-content)) (insert "* ")) + ((not respect-content) + (unless may-split (end-of-line)) + (insert "\n* ")) + ((re-search-forward org-outline-regexp-bol nil t) + (beginning-of-line) + (insert "* \n") + (backward-char)) + (t (goto-char (point-max)) + (insert "\n* "))) (run-hooks 'org-insert-heading-hook)) - ((and itemp (not (equal arg '(4)))) - ;; Insert an item - (org-insert-item)) + ((and itemp (not (member arg '((4) (16)))) (org-insert-item))) (t + ;; Maybe move at the end of the subtree + (when (equal arg '(16)) + (org-up-heading-safe) + (org-end-of-subtree t)) ;; Insert a heading (save-restriction (widen) @@ -7574,11 +7639,12 @@ This is important for non-interactive uses of the command." nil)) ;; Get a level string to fall back on (fix-level - (save-excursion - (org-back-to-heading t) - (if (org-previous-line-empty-p) (setq empty-line-p t)) - (looking-at org-outline-regexp) - (make-string (1- (length (match-string 0))) ?*))) + (if (org-before-first-heading-p) "*" + (save-excursion + (org-back-to-heading t) + (if (org-previous-line-empty-p) (setq empty-line-p t)) + (looking-at org-outline-regexp) + (make-string (1- (length (match-string 0))) ?*)))) (stars (save-excursion (condition-case nil @@ -7610,10 +7676,15 @@ This is important for non-interactive uses of the command." pos hide-previous previous-pos) ;; If we insert after content, move there and clean up whitespace - (when respect-content - (org-end-of-subtree nil t) + (when (and respect-content + (not (org-looking-at-p org-outline-regexp-bol))) + (if (not (org-before-first-heading-p)) + (org-end-of-subtree nil t) + (re-search-forward org-outline-regexp-bol) + (beginning-of-line 0)) (skip-chars-backward " \r\n") - (and (looking-at "[ \t]+") (replace-match "")) + (and (not (looking-back "^\*+")) + (looking-at "[ \t]+") (replace-match "")) (unless (eobp) (forward-char 1)) (when (looking-at "^\\*") (unless (bobp) (backward-char 1)) @@ -7639,10 +7710,9 @@ This is important for non-interactive uses of the command." (setq initial-content (org-trim initial-content))) (goto-char pos)) ;; a normal line - (unless (bolp) - (setq initial-content (buffer-substring (point) (point-at-eol))) - (delete-region (point) (point-at-eol)) - (setq initial-content (org-trim initial-content))))) + (setq initial-content + (org-trim (buffer-substring (point) (point-at-eol)))) + (delete-region (point) (point-at-eol)))) ;; If we are at the beginning of the line, insert before it. Else after (cond @@ -7667,13 +7737,12 @@ This is important for non-interactive uses of the command." "Make the number of empty lines before current exactly N. So this will delete or add empty lines." (save-excursion - (goto-char (point-at-bol)) - (if (looking-back "\\s-+" nil 'greedy) - (replace-match "")) - (or (bobp) (insert "\n")) - (while (> N 0) - (insert "\n") - (setq N (1- N))))) + (beginning-of-line) + (let ((p (point))) + (skip-chars-backward " \r\t\n") + (unless (bolp) (forward-line)) + (delete-region (point) p)) + (when (> N 0) (insert (make-string N ?\n))))) (defun org-get-heading (&optional no-tags no-todo) "Return the heading of the current entry, without the stars. @@ -7742,23 +7811,21 @@ This is a list with the following elements: (org-move-subtree-down) (end-of-line 1)) -(defun org-insert-heading-respect-content (&optional arg invisible-ok) +(defun org-insert-heading-respect-content (&optional invisible-ok) "Insert heading with `org-insert-heading-respect-content' set to t." - (interactive "P") - (let ((org-insert-heading-respect-content t)) - (org-insert-heading '(4) invisible-ok))) + (interactive) + (org-insert-heading '(4) invisible-ok)) (defun org-insert-todo-heading-respect-content (&optional force-state) "Insert TODO heading with `org-insert-heading-respect-content' set to t." - (interactive "P") - (let ((org-insert-heading-respect-content t)) - (org-insert-todo-heading force-state '(4)))) + (interactive) + (org-insert-todo-heading force-state '(4))) (defun org-insert-todo-heading (arg &optional force-heading) "Insert a new heading with the same level and TODO state as current heading. If the heading has no TODO state, or if the state is DONE, use the first -state (TODO by default). Also one prefix arg, force first state. With two -prefix args, force inserting at the end of the parent subtree." +state (TODO by default). Also with one prefix arg, force first state. With +two prefix args, force inserting at the end of the parent subtree." (interactive "P") (when (or force-heading (not (org-insert-item 'checkbox))) (org-insert-heading (or (and (equal arg '(16)) '(16)) @@ -7769,7 +7836,7 @@ prefix args, force inserting at the end of the parent subtree." (looking-at org-todo-line-regexp)) (let* ((new-mark-x - (if (or arg + (if (or (equal arg '(4)) (not (match-beginning 2)) (member (match-string 2) org-done-keywords)) (car org-todo-keywords-1) @@ -7879,14 +7946,10 @@ The level is the number of stars at the beginning of the headline." "Return the outline depth of the last headline before the current line. Returns 0 for the first headline in the buffer, and nil if before the first headline." - (let ((current-level (org-current-level)) - (prev-level (when (> (line-number-at-pos) 1) - (save-excursion - (beginning-of-line 0) - (org-current-level))))) - (cond ((null current-level) nil) ; Before first headline - ((null prev-level) 0) ; At first headline - (prev-level)))) + (and (org-current-level) + (or (and (/= (line-beginning-position) (point-min)) + (save-excursion (beginning-of-line 0) (org-current-level))) + 0))) (defun org-reduced-level (l) "Compute the effective level of a heading. @@ -7938,7 +8001,7 @@ in the region." (t (replace-match up-head nil t))) ;; Fixup tag positioning (unless (= level 1) - (and org-auto-align-tags (org-set-tags nil t)) + (and org-auto-align-tags (org-set-tags nil 'ignore-column)) (if org-adapt-indentation (org-fixup-indentation (- diff)))) (run-hooks 'org-after-promote-entry-hook))) @@ -7954,7 +8017,7 @@ in the region." (diff (abs (- level (length down-head) -1)))) (replace-match down-head nil t) ;; Fixup tag positioning - (and org-auto-align-tags (org-set-tags nil t)) + (and org-auto-align-tags (org-set-tags nil 'ignore-column)) (if org-adapt-indentation (org-fixup-indentation diff)) (run-hooks 'org-after-demote-entry-hook))) @@ -8113,7 +8176,8 @@ case." (save-match-data (save-excursion (outline-end-of-heading) (setq folded (outline-invisible-p))) - (outline-end-of-subtree)) + (progn (org-end-of-subtree nil t) + (unless (eobp) (backward-char)))) (outline-next-heading) (setq ne-end (org-back-over-empty-lines)) (setq end (point)) @@ -8266,7 +8330,7 @@ the inserted text when done." (string-match "^\\*+$" (buffer-substring (point-at-bol) (point)))) - (- (match-end 1) (match-beginning 1))) + (- (match-end 0) (match-beginning 0))) ((and (bolp) (looking-at org-outline-regexp)) (- (match-end 0) (point) 1)))) @@ -8617,7 +8681,8 @@ links." (setq start (point) end (progn (org-end-of-subtree t t) (or (bolp) (insert "\n")) - (org-back-over-empty-lines) + (when (>= (org-back-over-empty-lines) 1) + (forward-line 1)) (point)) what "children") (goto-char start) @@ -8640,7 +8705,7 @@ links." (show-all))) (setq beg (point)) - (if (>= beg end) (user-error "Nothing to sort")) + (when (>= beg end) (goto-char start) (user-error "Nothing to sort")) (looking-at "\\(\\*+\\)") (setq stars (match-string 1) @@ -9038,14 +9103,16 @@ if `orgstruct-heading-prefix-regexp' is not empty." (if fallback (let* ((orgstruct-mode) (binding - (loop with key = ,key - for rep in - '(nil - ("<\\([^>]*\\)tab>" . "\\1TAB") - ("<\\([^>]*\\)return>" . "\\1RET") - ("<\\([^>]*\\)escape>" . "\\1ESC") - ("<\\([^>]*\\)delete>" . "\\1DEL")) - do + (let ((key ,key)) + (catch 'exit + (dolist + (rep + '(nil + ("<\\([^>]*\\)tab>" . "\\1TAB") + ("<\\([^>]*\\)return>" . "\\1RET") + ("<\\([^>]*\\)escape>" . "\\1ESC") + ("<\\([^>]*\\)delete>" . "\\1DEL")) + nil) (when rep (setq key (read-kbd-macro (let ((case-fold-search)) @@ -9053,9 +9120,10 @@ if `orgstruct-heading-prefix-regexp' is not empty." (car rep) (cdr rep) (key-description key)))))) - thereis (key-binding key)))) + (when (key-binding key) + (throw 'exit (key-binding key)))))))) (if (keymapp binding) - (set-temporary-overlay-map binding) + (org-set-transient-map binding) (let ((func (or binding (unless disable 'orgstruct-error)))) @@ -9269,7 +9337,7 @@ property to set." (save-excursion (org-back-to-heading t) (put-text-property - (point-at-bol) (org-end-of-subtree t t) tprop p)))))))) + (point-at-bol) (or (outline-next-heading) (point-max)) tprop p)))))))) ;;;; Link Stuff @@ -9414,7 +9482,7 @@ active region." (funcall (intern (completing-read "Which function for creating the link? " - sfunsn t (car sfunsn))))) + sfunsn nil t (car sfunsn))))) (funcall (caar sfuns))) (setq link (plist-get org-store-link-plist :link) desc (or (plist-get org-store-link-plist @@ -9521,8 +9589,9 @@ active region." ;; Store a link using the ID at point (setq link (condition-case nil (prog1 (org-id-store-link) - (setq desc (plist-get org-store-link-plist - :description))) + (setq desc (or (plist-get org-store-link-plist + :description) + ""))) (error ;; Probably before first headline, link only to file (concat "file:" @@ -9585,7 +9654,7 @@ active region." (setq link (or link cpltxt) desc (or desc cpltxt)) (cond ((equal desc "NONE") (setq desc nil)) - ((string-match org-bracket-link-analytic-regexp desc) + ((and desc (string-match org-bracket-link-analytic-regexp desc)) (let ((d0 (match-string 3 desc)) (p0 (match-string 5 desc))) (setq desc @@ -9604,7 +9673,8 @@ active region." (when custom-id (setq link (concat "file:" (abbreviate-file-name (buffer-file-name)) "::#" custom-id)) - (push (list link desc) org-stored-links))))))) + (push (list link desc) org-stored-links)) + (car org-stored-links)))))) (defun org-store-link-props (&rest plist) "Store link properties, extract names and addresses." @@ -10261,7 +10331,7 @@ See the docstring of `org-open-file' for details." This is saved in case the need arises to restore it.") (defvar org-open-link-marker (make-marker) - "Marker pointing to the location where `org-open-at-point; was called.") + "Marker pointing to the location where `org-open-at-point' was called.") ;;;###autoload (defun org-open-at-point-global () @@ -10341,7 +10411,8 @@ application the system uses for this file type." (let (type path link line search (pos (point))) (catch 'match (save-excursion - (skip-chars-forward "^]\n\r") + (or (org-in-regexp org-plain-link-re) + (skip-chars-forward "^]\n\r")) (when (org-in-regexp org-bracket-link-regexp 1) (setq link (org-extract-attributes (org-link-unescape (org-match-string-no-properties 1)))) @@ -10379,9 +10450,10 @@ application the system uses for this file type." ;; Check a plain link is not within a bracket link (and match (save-excursion - (progn - (goto-char (car match)) - (not (org-in-regexp org-bracket-link-regexp)))))) + (save-match-data + (progn + (goto-char (car match)) + (not (org-in-regexp org-bracket-link-regexp))))))) (let ((line_ending (save-excursion (end-of-line) (point)))) ;; We are in a line before a plain or bracket link (or (re-search-forward org-plain-link-re line_ending t) @@ -10550,6 +10622,10 @@ application the system uses for this file type." (move-marker org-open-link-marker nil) (run-hook-with-args 'org-follow-link-hook))) +(defsubst org-uniquify (list) + "Non-destructively remove duplicate elements from LIST." + (let ((res (copy-sequence list))) (delete-dups res))) + (defun org-offer-links-in-entry (buffer marker &optional nth zero) "Offer links in the current entry and return the selected link. If there is only one link, return it. @@ -11504,7 +11580,9 @@ prefix argument (`C-u C-u C-u C-c C-w')." (interactive "P") (if (member goto '(0 (64))) (org-refile-cache-clear) - (let* ((actionmsg (or msg "Refile")) + (let* ((actionmsg (cond (msg msg) + ((equal goto 3) "Refile (and keep)") + (t "Refile"))) (cbuf (current-buffer)) (regionp (org-region-active-p)) (region-start (and regionp (region-beginning))) @@ -11539,13 +11617,13 @@ prefix argument (`C-u C-u C-u C-c C-w')." (setq it (or rfloc (let (heading-text) (save-excursion - (unless goto + (unless (and goto (listp goto)) (org-back-to-heading t) (setq heading-text (nth 4 (org-heading-components)))) (org-refile-get-location - (cond (goto "Goto") + (cond ((and goto (listp goto)) "Goto") (regionp (concat actionmsg " region to")) (t (concat actionmsg " subtree \"" heading-text "\" to"))) @@ -11631,7 +11709,7 @@ prefix argument (`C-u C-u C-u C-c C-w')." (delete-region (point) (+ (point) (- region-end region-start))) (delete-region (and (org-back-to-heading t) (point)) - (min (buffer-size) (org-end-of-subtree t t) (point))))) + (min (1+ (buffer-size)) (org-end-of-subtree t t) (point))))) (when (featurep 'org-inlinetask) (org-inlinetask-remove-END-maybe)) (setq org-markers-to-move nil) @@ -11643,6 +11721,17 @@ prefix argument (`C-u C-u C-u C-c C-w')." (bookmark-jump "org-refile-last-stored") (message "This is the location of the last refile")) +(defun org-refile--get-location (refloc tbl) + "When user refile to REFLOC, find the associated target in TBL. +Also check `org-refile-target-table'." + (car (delq + nil + (mapcar + (lambda (r) (or (assoc r tbl) + (assoc r org-refile-target-table))) + (list (replace-regexp-in-string "/$" "" refloc) + (replace-regexp-in-string "\\([^/]\\)$" "\\1/" refloc)))))) + (defun org-refile-get-location (&optional prompt default-buffer new-nodes no-exclude) "Prompt the user for a refile location, using PROMPT. @@ -11696,10 +11785,9 @@ this is used for the GOTO interface." (setq old-hist org-refile-history) (setq answ (funcall cfunc prompt tbl nil (not new-nodes) nil 'org-refile-history (or cdef (car org-refile-history)))) - (setq pa (or (assoc answ tbl) (assoc (concat answ "/") tbl))) - (org-refile-check-position pa) - (if pa + (if (setq pa (org-refile--get-location answ tbl)) (progn + (org-refile-check-position pa) (when (or (not org-refile-history) (not (eq old-hist org-refile-history)) (not (equal (car pa) (car org-refile-history)))) @@ -11714,8 +11802,7 @@ this is used for the GOTO interface." (progn (setq parent (match-string 1 answ) child (match-string 2 answ)) - (setq parent-target (or (assoc parent tbl) - (assoc (concat parent "/") tbl))) + (setq parent-target (org-refile--get-location parent tbl)) (when (and parent-target (or (eq new-nodes t) (and (eq new-nodes 'confirm) @@ -11897,8 +11984,9 @@ blocks in the buffer." This means to empty the block, parse for parameters and then call the correct writing function." (interactive) - (save-window-excursion - (let* ((pos (point)) + (save-excursion + (let* ((win (selected-window)) + (pos (point)) (line (org-current-line)) (params (org-prepare-dblock)) (name (plist-get params :name)) @@ -11911,6 +11999,7 @@ the correct writing function." (when (and indent (> indent 0)) (setq indent (make-string indent ?\ )) (save-excursion + (select-window win) (org-beginning-of-dblock) (forward-line 1) (while (not (looking-at org-dblock-end-re)) @@ -13436,49 +13525,44 @@ a Show deadlines and scheduled items after a date. d Show deadlines due within `org-deadline-warning-days'. D Show deadlines and scheduled items between a date range." (interactive "P") - (let (ans kwd value ts-type) - (setq type (or type org-sparse-tree-default-date-type)) - (setq org-ts-type type) - (message "Sparse tree: [/]regexp [t]odo [T]odo-kwd [m]atch [p]roperty\n [d]eadlines [b]efore-date [a]fter-date [D]ates range\n [c]ycle through date types: %s" - (cond ((eq type 'all) "all timestamps") - ((eq type 'scheduled) "only scheduled") - ((eq type 'deadline) "only deadline") - ((eq type 'active) "only active timestamps") - ((eq type 'inactive) "only inactive timestamps") - ((eq type 'scheduled-or-deadline) "scheduled/deadline") - ((eq type 'closed) "with a closed time-stamp") - (t "scheduled/deadline"))) - (setq ans (read-char-exclusive)) - (cond - ((equal ans ?c) - (org-sparse-tree - arg (cadr (member type '(scheduled-or-deadline - all scheduled deadline active inactive closed))))) - ((equal ans ?d) - (call-interactively 'org-check-deadlines)) - ((equal ans ?b) - (call-interactively 'org-check-before-date)) - ((equal ans ?a) - (call-interactively 'org-check-after-date)) - ((equal ans ?D) - (call-interactively 'org-check-dates-range)) - ((equal ans ?t) - (call-interactively 'org-show-todo-tree)) - ((equal ans ?T) - (org-show-todo-tree '(4))) - ((member ans '(?T ?m)) - (call-interactively 'org-match-sparse-tree)) - ((member ans '(?p ?P)) - (setq kwd (org-icompleting-read "Property: " - (mapcar 'list (org-buffer-property-keys)))) - (setq value (org-icompleting-read "Value: " - (mapcar 'list (org-property-values kwd)))) - (unless (string-match "\\`{.*}\\'" value) - (setq value (concat "\"" value "\""))) - (org-match-sparse-tree arg (concat kwd "=" value))) - ((member ans '(?r ?R ?/)) - (call-interactively 'org-occur)) - (t (user-error "No such sparse tree command \"%c\"" ans))))) + (setq type (or type org-sparse-tree-default-date-type)) + (setq org-ts-type type) + (message "Sparse tree: [/]regexp [t]odo [T]odo-kwd [m]atch [p]roperty + [d]eadlines [b]efore-date [a]fter-date [D]ates range + [c]ycle through date types: %s" + (case type + (all "all timestamps") + (scheduled "only scheduled") + (deadline "only deadline") + (active "only active timestamps") + (inactive "only inactive timestamps") + (scheduled-or-deadline "scheduled/deadline") + (closed "with a closed time-stamp") + (otherwise "scheduled/deadline"))) + (let ((answer (read-char-exclusive))) + (case answer + (?c + (org-sparse-tree + arg + (cadr (memq type '(scheduled-or-deadline all scheduled deadline active + inactive closed))))) + (?d (call-interactively #'org-check-deadlines)) + (?b (call-interactively #'org-check-before-date)) + (?a (call-interactively #'org-check-after-date)) + (?D (call-interactively #'org-check-dates-range)) + (?t (call-interactively #'org-show-todo-tree)) + (?T (org-show-todo-tree '(4))) + (?m (call-interactively #'org-match-sparse-tree)) + ((?p ?P) + (let* ((kwd (org-icompleting-read + "Property: " (mapcar #'list (org-buffer-property-keys)))) + (value (org-icompleting-read + "Value: " (mapcar #'list (org-property-values kwd))))) + (unless (string-match "\\`{.*}\\'" value) + (setq value (concat "\"" value "\""))) + (org-match-sparse-tree arg (concat kwd "=" value)))) + ((?r ?R ?/) (call-interactively #'org-occur)) + (otherwise (user-error "No such sparse tree command \"%c\"" answer))))) (defvar org-occur-highlights nil "List of overlays used for occur matches.") @@ -13590,8 +13674,7 @@ How much context is shown depends upon the variables (error nil)) (not (bobp))) (org-flag-heading nil) - (when siblings-p (org-show-siblings))))) - (unless (eq key 'agenda) (org-fix-ellipsis-at-bol)))) + (when siblings-p (org-show-siblings))))))) (defvar org-reveal-start-hook nil "Hook run before revealing a location.") @@ -13786,7 +13869,7 @@ a file becomes an N^2 operation - but with this variable set, it scales as N.") (defun org-scan-tags (action matcher todo-only &optional start-level) - "Sca headline tags with inheritance and produce output ACTION. + "Scan headline tags with inheritance and produce output ACTION. ACTION can be `sparse-tree' to produce a sparse tree in the current buffer, or `agenda' to produce an entry list for an agenda view. It can also be @@ -14376,6 +14459,7 @@ If ONOFF is `on' or `off', don't toggle but set to this state." (defun org-align-tags-here (to-col) ;; Assumes that this is a headline + "Align tags on the current headline to TO-COL." (let ((pos (point)) (col (current-column)) ncol tags-l p) (beginning-of-line 1) (if (and (looking-at (org-re ".*?\\([ \t]+\\)\\(:[[:alnum:]_@#%:]+:\\)[ \t]*$")) @@ -14394,7 +14478,7 @@ If ONOFF is `on' or `off', don't toggle but set to this state." (insert (make-string (- ncol (current-column)) ?\ )) (setq ncol (current-column)) (when indent-tabs-mode (tabify p (point-at-eol))) - (org-move-to-column (min ncol col) t nil t)) + (org-move-to-column (min ncol col))) (goto-char pos)))) (defun org-set-tags-command (&optional arg just-align) @@ -14452,15 +14536,16 @@ If DATA is nil or the empty string, any tags will be removed." (defvar org-indent-indentation-per-level) (defun org-set-tags (&optional arg just-align) "Set the tags for the current headline. -With prefix ARG, realign all tags in headings in the current buffer." +With prefix ARG, realign all tags in headings in the current buffer. +When JUST-ALIGN is non-nil, only align tags." (interactive "P") (if (and (org-region-active-p) org-loop-over-headlines-in-active-region) (let ((cl (if (eq org-loop-over-headlines-in-active-region 'start-level) 'region-start-level 'region)) org-loop-over-headlines-in-active-region) (org-map-entries - ;; We don't use ARG and JUST-ALIGN here these args are not - ;; useful when looping over headlines + ;; We don't use ARG and JUST-ALIGN here because these args + ;; are not useful when looping over headlines. `(org-set-tags) org-loop-over-headlines-in-active-region cl (if (outline-invisible-p) (org-end-of-subtree nil t)))) @@ -14538,7 +14623,7 @@ With prefix ARG, realign all tags in headings in the current buffer." (goto-char (match-beginning 0)) (setq c0 (current-column) ;; compute offset for the case of org-indent-mode active - di (if org-indent-mode + di (if (org-bound-and-true-p org-indent-mode) (* (1- org-indent-indentation-per-level) (1- level)) 0) p0 (if (equal (char-before) ?*) (1+ (point)) (point)) @@ -14692,8 +14777,8 @@ Returns the new tags string, or nil to not change the current settings." (if expert (set-buffer (get-buffer-create " *Org tags*")) (delete-other-windows) - (split-window-vertically) - (org-switch-to-buffer-other-window (get-buffer-create " *Org tags*"))) + (set-window-buffer (split-window-vertically) (get-buffer-create " *Org tags*")) + (org-switch-to-buffer-other-window " *Org tags*")) (erase-buffer) (org-set-local 'org-done-keywords done-keywords) (org-fast-tag-insert "Inherited" inherited i-face "\n") @@ -14952,7 +15037,7 @@ a *different* entry, you cannot use these techniques." ((eq match nil) (setq matcher t)) (t (setq matcher (if match (cdr (org-make-tags-matcher match)) t)))) - (save-window-excursion + (save-excursion (save-restriction (cond ((eq scope 'tree) (org-back-to-heading t) @@ -15176,103 +15261,105 @@ is a string only get exactly this property. SPECIFIC can be a string, the specific property we are interested in. Specifying it can speed things up because then unnecessary parsing is avoided." (setq which (or which 'all)) - (org-with-point-at pom - (let ((clockstr (substring org-clock-string 0 -1)) - (excluded '("TODO" "TAGS" "ALLTAGS" "PRIORITY" "BLOCKED")) - (case-fold-search nil) - beg end range props sum-props key key1 value string clocksum clocksumt) - (save-excursion - (when (condition-case nil - (and (derived-mode-p 'org-mode) (org-back-to-heading t)) - (error nil)) - (setq beg (point)) - (setq sum-props (get-text-property (point) 'org-summaries)) - (setq clocksum (get-text-property (point) :org-clock-minutes) - clocksumt (get-text-property (point) :org-clock-minutes-today)) - (outline-next-heading) - (setq end (point)) - (when (memq which '(all special)) - ;; Get the special properties, like TODO and tags - (goto-char beg) - (when (and (or (not specific) (string= specific "TODO")) - (looking-at org-todo-line-regexp) (match-end 2)) - (push (cons "TODO" (org-match-string-no-properties 2)) props)) - (when (and (or (not specific) (string= specific "PRIORITY")) - (looking-at org-priority-regexp)) - (push (cons "PRIORITY" (org-match-string-no-properties 2)) props)) - (when (or (not specific) (string= specific "FILE")) - (push (cons "FILE" buffer-file-name) props)) - (when (and (or (not specific) (string= specific "TAGS")) - (setq value (org-get-tags-string)) - (string-match "\\S-" value)) - (push (cons "TAGS" value) props)) - (when (and (or (not specific) (string= specific "ALLTAGS")) - (setq value (org-get-tags-at))) - (push (cons "ALLTAGS" (concat ":" (mapconcat 'identity value ":") - ":")) - props)) - (when (or (not specific) (string= specific "BLOCKED")) - (push (cons "BLOCKED" (if (org-entry-blocked-p) "t" "")) props)) - (when (or (not specific) - (member specific - '("SCHEDULED" "DEADLINE" "CLOCK" "CLOSED" - "TIMESTAMP" "TIMESTAMP_IA"))) - (catch 'match - (while (re-search-forward org-maybe-keyword-time-regexp end t) - (setq key (if (match-end 1) - (substring (org-match-string-no-properties 1) - 0 -1)) - string (if (equal key clockstr) - (org-trim - (buffer-substring-no-properties - (match-beginning 3) (goto-char - (point-at-eol)))) - (substring (org-match-string-no-properties 3) - 1 -1))) - ;; Get the correct property name from the key. This is - ;; necessary if the user has configured time keywords. - (setq key1 (concat key ":")) - (cond - ((not key) - (setq key - (if (= (char-after (match-beginning 3)) ?\[) - "TIMESTAMP_IA" "TIMESTAMP"))) - ((equal key1 org-scheduled-string) (setq key "SCHEDULED")) - ((equal key1 org-deadline-string) (setq key "DEADLINE")) - ((equal key1 org-closed-string) (setq key "CLOSED")) - ((equal key1 org-clock-string) (setq key "CLOCK"))) - (if (and specific (equal key specific) (not (equal key "CLOCK"))) - (progn - (push (cons key string) props) - ;; no need to search further if match is found - (throw 'match t)) - (when (or (equal key "CLOCK") (not (assoc key props))) - (push (cons key string) props))))))) - - (when (memq which '(all standard)) - ;; Get the standard properties, like :PROP: ... - (setq range (org-get-property-block beg end)) - (when range - (goto-char (car range)) - (while (re-search-forward org-property-re - (cdr range) t) - (setq key (org-match-string-no-properties 2) - value (org-trim (or (org-match-string-no-properties 3) ""))) - (unless (member key excluded) - (push (cons key (or value "")) props))))) - (if clocksum - (push (cons "CLOCKSUM" - (org-columns-number-to-string (/ (float clocksum) 60.) - 'add_times)) - props)) - (if clocksumt - (push (cons "CLOCKSUM_T" - (org-columns-number-to-string (/ (float clocksumt) 60.) - 'add_times)) - props)) - (unless (assoc "CATEGORY" props) - (push (cons "CATEGORY" (org-get-category)) props)) - (append sum-props (nreverse props))))))) + (org-with-wide-buffer + (org-with-point-at pom + (let ((clockstr (substring org-clock-string 0 -1)) + (excluded '("TODO" "TAGS" "ALLTAGS" "PRIORITY" "BLOCKED")) + (case-fold-search nil) + beg end range props sum-props key key1 value string clocksum clocksumt) + (when (and (derived-mode-p 'org-mode) + (ignore-errors (org-back-to-heading t))) + (setq beg (point)) + (setq sum-props (get-text-property (point) 'org-summaries)) + (setq clocksum (get-text-property (point) :org-clock-minutes) + clocksumt (get-text-property (point) :org-clock-minutes-today)) + (outline-next-heading) + (setq end (point)) + (when (memq which '(all special)) + ;; Get the special properties, like TODO and tags + (goto-char beg) + (when (and (or (not specific) (string= specific "TODO")) + (looking-at org-todo-line-regexp) (match-end 2)) + (push (cons "TODO" (org-match-string-no-properties 2)) props)) + (when (and (or (not specific) (string= specific "PRIORITY")) + (looking-at org-priority-regexp)) + (push (cons "PRIORITY" (org-match-string-no-properties 2)) props)) + (when (or (not specific) (string= specific "FILE")) + (push (cons "FILE" buffer-file-name) props)) + (when (and (or (not specific) (string= specific "TAGS")) + (setq value (org-get-tags-string)) + (string-match "\\S-" value)) + (push (cons "TAGS" value) props)) + (when (and (or (not specific) (string= specific "ALLTAGS")) + (setq value (org-get-tags-at))) + (push (cons "ALLTAGS" (concat ":" (mapconcat 'identity value ":") + ":")) + props)) + (when (or (not specific) (string= specific "BLOCKED")) + (push (cons "BLOCKED" (if (org-entry-blocked-p) "t" "")) props)) + (when (or (not specific) + (member specific + '("SCHEDULED" "DEADLINE" "CLOCK" "CLOSED" + "TIMESTAMP" "TIMESTAMP_IA"))) + (catch 'match + (while (and (re-search-forward org-maybe-keyword-time-regexp end t) + (not (text-property-any 0 (length (match-string 0)) + 'face 'font-lock-comment-face + (match-string 0)))) + (setq key (if (match-end 1) + (substring (org-match-string-no-properties 1) + 0 -1)) + string (if (equal key clockstr) + (org-trim + (buffer-substring-no-properties + (match-beginning 3) (goto-char + (point-at-eol)))) + (substring (org-match-string-no-properties 3) + 1 -1))) + ;; Get the correct property name from the key. This is + ;; necessary if the user has configured time keywords. + (setq key1 (concat key ":")) + (cond + ((not key) + (setq key + (if (= (char-after (match-beginning 3)) ?\[) + "TIMESTAMP_IA" "TIMESTAMP"))) + ((equal key1 org-scheduled-string) (setq key "SCHEDULED")) + ((equal key1 org-deadline-string) (setq key "DEADLINE")) + ((equal key1 org-closed-string) (setq key "CLOSED")) + ((equal key1 org-clock-string) (setq key "CLOCK"))) + (if (and specific (equal key specific) (not (equal key "CLOCK"))) + (progn + (push (cons key string) props) + ;; no need to search further if match is found + (throw 'match t)) + (when (or (equal key "CLOCK") (not (assoc key props))) + (push (cons key string) props))))))) + + (when (memq which '(all standard)) + ;; Get the standard properties, like :PROP: ... + (setq range (org-get-property-block beg end)) + (when range + (goto-char (car range)) + (while (re-search-forward org-property-re + (cdr range) t) + (setq key (org-match-string-no-properties 2) + value (org-trim (or (org-match-string-no-properties 3) ""))) + (unless (member key excluded) + (push (cons key (or value "")) props))))) + (if clocksum + (push (cons "CLOCKSUM" + (org-columns-number-to-string (/ (float clocksum) 60.) + 'add_times)) + props)) + (if clocksumt + (push (cons "CLOCKSUM_T" + (org-columns-number-to-string (/ (float clocksumt) 60.) + 'add_times)) + props)) + (unless (assoc "CATEGORY" props) + (push (cons "CATEGORY" (org-get-category)) props)) + (append sum-props (nreverse props))))))) (defun org-entry-get (pom property &optional inherit literal-nil) "Get value of PROPERTY for entry or content at point-or-marker POM. @@ -15283,6 +15370,8 @@ in `org-use-property-inheritance' selects PROPERTY for inheritance. If the property is present but empty, the return value is the empty string. If the property is not present at all, nil is returned. +Return the value as a string. + If LITERAL-NIL is set, return the string value \"nil\" as a string, do not interpret it as the list atom nil. This is used for inheritance when a \"nil\" value can supersede a non-nil value higher up the hierarchy." @@ -15292,30 +15381,38 @@ when a \"nil\" value can supersede a non-nil value higher up the hierarchy." t)) (org-entry-get-with-inheritance property literal-nil) (if (member property org-special-properties) - ;; We need a special property. Use `org-entry-properties' to - ;; retrieve it, but specify the wanted property + ;; We need a special property. Use `org-entry-properties' + ;; to retrieve it, but specify the wanted property (cdr (assoc property (org-entry-properties nil 'special property))) - (let ((range (org-get-property-block))) - (when (and range (not (eq (car range) (cdr range)))) - (let* ((props (list (or (assoc property org-file-properties) - (assoc property org-global-properties) - (assoc property org-global-properties-fixed)))) - (ap (lambda (key) - (when (re-search-forward - (org-re-property key) (cdr range) t) - (setq props - (org-update-property-plist - key - (if (match-end 3) - (org-match-string-no-properties 3) "") - props))))) - val) - (goto-char (car range)) - (funcall ap property) - (goto-char (car range)) - (while (funcall ap (concat property "+"))) - (setq val (cdr (assoc property props))) - (when val (if literal-nil val (org-not-nil val)))))))))) + (org-with-wide-buffer + (let ((range (org-get-property-block))) + (when (and range (not (eq (car range) (cdr range))) + (save-excursion + (goto-char (car range)) + (re-search-forward + (concat (org-re-property property) "\\|" + (org-re-property (concat property "+"))) + (cdr range) t))) + (let* ((props + (list (or (assoc property org-file-properties) + (assoc property org-global-properties) + (assoc property org-global-properties-fixed)))) + (ap (lambda (key) + (when (re-search-forward + (org-re-property key) (cdr range) t) + (setq props + (org-update-property-plist + key + (if (match-end 3) + (org-match-string-no-properties 3) "") + props))))) + val) + (goto-char (car range)) + (funcall ap property) + (goto-char (car range)) + (while (funcall ap (concat property "+"))) + (setq val (cdr (assoc property props))) + (when val (if literal-nil val (org-not-nil val))))))))))) (defun org-property-or-variable-value (var &optional inherit) "Check if there is a property fixing the value of VAR. @@ -15336,7 +15433,7 @@ an empty drawer to delete." (if (and range (goto-char (car range)) (re-search-forward - (org-re-property property) + (org-re-property property nil t) (cdr range) t)) (progn (delete-region (match-beginning 0) (1+ (point-at-eol))) @@ -15427,7 +15524,7 @@ However, if LITERAL-NIL is set, return the string value \"nil\" instead." (widen) (catch 'ex (while t - (when (setq tmp (org-entry-get nil property nil 'literal-nil)) + (when (setq tmp (org-entry-get nil property nil literal-nil)) (or (ignore-errors (org-back-to-heading t)) (goto-char (point-min))) (move-marker org-entry-property-inherited-from (point)) @@ -15446,14 +15543,19 @@ Each hook function should accept two arguments, the name of the property and the new value.") (defun org-entry-put (pom property value) - "Set PROPERTY to VALUE for entry at point-or-marker POM." + "Set PROPERTY to VALUE for entry at point-or-marker POM. +If the value is `nil', it is converted to the empty string. +If it is not a string, an error is raised." + (cond ((null value) (setq value "")) + ((not (stringp value)) + (error "Properties values should be strings."))) (org-with-point-at pom (org-back-to-heading t) (let ((beg (point)) (end (save-excursion (outline-next-heading) (point))) range) (cond ((equal property "TODO") - (when (and (stringp value) (string-match "\\S-" value) + (when (and (string-match "\\S-" value) (not (member value org-todo-keywords-1))) (user-error "\"%s\" is not a valid TODO state" value)) (if (or (not value) @@ -15462,7 +15564,7 @@ and the new value.") (org-todo value) (org-set-tags nil 'align)) ((equal property "PRIORITY") - (org-priority (if (and value (stringp value) (string-match "\\S-" value)) + (org-priority (if (and value (string-match "\\S-" value)) (string-to-char value) ?\ )) (org-set-tags nil 'align)) ((equal property "CLOCKSUM") @@ -15496,7 +15598,7 @@ and the new value.") (setq range (org-get-property-block beg end 'force)) (goto-char (car range)) (if (re-search-forward - (org-re-property property) (cdr range) t) + (org-re-property property nil t) (cdr range) t) (progn (delete-region (match-beginning 0) (match-end 0)) (goto-char (match-beginning 0))) @@ -15707,9 +15809,7 @@ This is computed according to `org-property-set-functions-alist'." (funcall set-function prompt (mapcar 'list (org-property-values property)) nil nil "" nil cur))))) - (if (equal val "") - cur - val))) + (org-trim val))) (defvar org-last-set-property nil) (defvar org-last-set-property-value nil) @@ -15779,13 +15879,18 @@ When optional argument DELETE-EMPTY-DRAWER is a string, it defines an empty drawer to delete." (interactive (let* ((completion-ignore-case t) - (prop (org-icompleting-read "Property: " - (org-entry-properties nil 'standard)))) + (cat (org-entry-get (point) "CATEGORY")) + (props0 (org-entry-properties nil 'standard)) + (props (if cat props0 + (delete `("CATEGORY" . ,(org-get-category)) props0))) + (prop (if (< 1 (length props)) + (org-icompleting-read "Property: " props nil t) + (caar props)))) (list prop))) - (message "Property %s %s" property - (if (org-entry-delete nil property delete-empty-drawer) - "deleted" - "was not present in the entry"))) + (if (not property) + (message "No property to delete in this entry") + (org-entry-delete nil property delete-empty-drawer) + (message "Property \"%s\" deleted" property))) (defun org-delete-property-globally (property) "Remove PROPERTY globally, from all entries." @@ -16184,10 +16289,10 @@ So these are more for recording a certain time/date." (message ""))) (org-defkey map ">" (lambda () (interactive) - (org-eval-in-calendar '(scroll-calendar-left 1)))) + (org-eval-in-calendar '(calendar-scroll-left 1)))) (org-defkey map "<" (lambda () (interactive) - (org-eval-in-calendar '(scroll-calendar-right 1)))) + (org-eval-in-calendar '(calendar-scroll-right 1)))) (org-defkey map "\C-v" (lambda () (interactive) (org-eval-in-calendar @@ -16530,7 +16635,7 @@ user." day (or iso-weekday wday 1) wday nil ; to make sure that the trigger below does not match iso-date (calendar-gregorian-from-absolute - (calendar-absolute-from-iso + (calendar-iso-to-absolute (list iso-week day year)))) ; FIXME: Should we also push ISO weeks into the future? ; (when (and org-read-date-prefer-future @@ -16539,7 +16644,7 @@ user." ; (time-to-days (current-time)))) ; (setq year (1+ year) ; iso-date (calendar-gregorian-from-absolute - ; (calendar-absolute-from-iso + ; (calendar-iso-to-absolute ; (list iso-week day year))))) (setq month (car iso-date) year (nth 2 iso-date) @@ -17674,9 +17779,9 @@ This requires Emacs >= 24.1, build with imagemagick support." (defcustom org-agenda-inhibit-startup nil "Inhibit startup when preparing agenda buffers. -When this variable is `t' (the default), the initialization of -the Org agenda buffers is inhibited: e.g. the visibility state -is not set, the tables are not re-aligned, etc." +When this variable is `t', the initialization of the Org agenda +buffers is inhibited: e.g. the visibility state is not set, the +tables are not re-aligned, etc." :type 'boolean :version "24.3" :group 'org-agenda) @@ -17986,7 +18091,7 @@ Optional argument FILE means use this file instead of the current." (progn (org-store-new-agenda-file-list files) (org-install-agenda-files-menu) - (message "Removed file: %s" afile)) + (message "Removed from Org Agenda list: %s" afile)) (message "File was not in list: %s (not removed)" afile)))) (defun org-file-menu-entry (file) @@ -18040,7 +18145,7 @@ When a buffer is unmodified, it is just killed. When modified, it is saved file re pos) (setq org-tag-alist-for-agenda nil org-tag-groups-alist-for-agenda nil) - (save-window-excursion + (save-excursion (save-restriction (while (setq file (pop files)) (catch 'nextfile @@ -19406,7 +19511,7 @@ The detailed reaction depends on the user option `org-catch-invisible-edits'." (if invisible-before-point (goto-char (previous-single-char-property-change (point) 'invisible))) - (org-cycle)) + (show-subtree)) (cond ((eq org-catch-invisible-edits 'show) ;; That's it, we do the edit after showing @@ -19481,8 +19586,14 @@ because, in this case the deletion might narrow the column." (org-fix-tags-on-the-fly)))) ;; Make `delete-selection-mode' work with org-mode and orgtbl-mode -(put 'org-self-insert-command 'delete-selection t) -(put 'orgtbl-self-insert-command 'delete-selection t) +(put 'org-self-insert-command 'delete-selection + (lambda () + (not (run-hook-with-args-until-success + 'self-insert-uses-region-functions)))) +(put 'orgtbl-self-insert-command 'delete-selection + (lambda () + (not (run-hook-with-args-until-success + 'self-insert-uses-region-functions)))) (put 'org-delete-char 'delete-selection 'supersede) (put 'org-delete-backward-char 'delete-selection 'supersede) (put 'org-yank 'delete-selection 'yank) @@ -19497,9 +19608,6 @@ because, in this case the deletion might narrow the column." (put 'org-self-insert-command 'pabbrev-expand-after-command t) (put 'orgtbl-self-insert-command 'pabbrev-expand-after-command t) -;; How to do this: Measure non-white length of current string -;; If equal to column width, we should realign. - (defun org-remap (map &rest commands) "In MAP, remap the functions given in COMMANDS. COMMANDS is a list of alternating OLDDEF NEWDEF command names." @@ -19514,7 +19622,7 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names." "Transpose words for Org. This uses the `org-mode-transpose-word-syntax-table' syntax table, which interprets characters in `org-emphasis-alist' as -word constituants." +word constituents." (interactive) (with-syntax-table org-mode-transpose-word-syntax-table (call-interactively 'transpose-words))) @@ -20020,21 +20128,19 @@ Depending on context, this does one of the following: "Change timestamps synchronously up in CLOCK log lines. Optional argument N tells to change by that many units." (interactive "P") - (cond ((and (not org-support-shift-select) - (org-at-clock-log-p) - (org-at-timestamp-p t)) - (org-clock-timestamps-up n)) - (t (org-shiftselect-error)))) + (if (and (org-at-clock-log-p) (org-at-timestamp-p t)) + (let (org-support-shift-select) + (org-clock-timestamps-up n)) + (user-error "Not at a clock log"))) (defun org-shiftcontroldown (&optional n) "Change timestamps synchronously down in CLOCK log lines. Optional argument N tells to change by that many units." (interactive "P") - (cond ((and (not org-support-shift-select) - (org-at-clock-log-p) - (org-at-timestamp-p t)) - (org-clock-timestamps-down n)) - (t (org-shiftselect-error)))) + (if (and (org-at-clock-log-p) (org-at-timestamp-p t)) + (let (org-support-shift-select) + (org-clock-timestamps-down n)) + (user-error "Not at a clock log"))) (defun org-ctrl-c-ret () "Call `org-table-hline-and-move' or `org-insert-heading' dep. on context." @@ -20209,10 +20315,19 @@ This command does many different things, depending on context: (if (save-excursion (beginning-of-line) (looking-at "[ \t]*$")) (or (run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-final-hook) (user-error "C-c C-c can do nothing useful at this location")) - ;; When at a link, act according to the parent instead. - (when (eq type 'link) - (setq context (org-element-property :parent context)) - (setq type (org-element-type context))) + (case type + ;; When at a link, act according to the parent instead. + (link (setq context (org-element-property :parent context)) + (setq type (org-element-type context))) + ;; Unsupported object types: refer to the first supported + ;; element or object containing it. + ((bold code entity export-snippet inline-babel-call inline-src-block + italic latex-fragment line-break macro strike-through subscript + superscript underline verbatim) + (while (and (setq context (org-element-property :parent context)) + (not (memq (setq type (org-element-type context)) + '(radio-target paragraph verse-block + table-cell))))))) ;; For convenience: at the first line of a paragraph on the ;; same line as an item, apply function on that item instead. (when (eq type 'paragraph) @@ -20348,11 +20463,13 @@ This command does many different things, depending on context: "C-c C-c can do nothing useful at this location"))))))))) (defun org-mode-restart () - "Restart Org-mode, to scan again for special lines. -Also updates the keyword regular expressions." (interactive) - (org-mode) - (message "Org-mode restarted")) + (let ((indent-status (org-bound-and-true-p org-indent-mode))) + (funcall major-mode) + (hack-local-variables) + (when (and indent-status (not (org-bound-and-true-p org-indent-mode))) + (org-indent-mode -1))) + (message "%s restarted" major-mode)) (defun org-kill-note-or-show-branches () "If this is a Note buffer, abort storing the note. Else call `show-branches'." @@ -21120,7 +21237,7 @@ With prefix arg UNCOMPILED, load the uncompiled versions." (message "The following feature%s found in load-path, please check if that's correct:\n%s" (if (> (length load-uncore) 1) "s were" " was") load-uncore)) (if load-misses - (message "Some error occured while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s" + (message "Some error occurred while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s" (if (> (length load-misses) 1) "s" "") load-misses (org-version nil 'full)) (message "Successfully reloaded Org\n%s" (org-version nil 'full))))) @@ -21738,9 +21855,7 @@ for the search purpose." "Return the reverse of STRING." (apply 'string (reverse (string-to-list string)))) -(defsubst org-uniquify (list) - "Non-destructively remove duplicate elements from LIST." - (let ((res (copy-sequence list))) (delete-dups res))) +;; defsubst org-uniquify must be defined before first use (defun org-uniquify-alist (alist) "Merge elements of ALIST with the same key. @@ -23192,14 +23307,6 @@ If there is no such heading, return nil." (forward-char -1)))))) (point)) -(defadvice outline-end-of-subtree (around prefer-org-version activate compile) - "Use Org version in org-mode, for dramatic speed-up." - (if (derived-mode-p 'org-mode) - (progn - (org-end-of-subtree nil t) - (unless (eobp) (backward-char 1))) - ad-do-it)) - (defun org-end-of-meta-data-and-drawers () "Jump to the first text after meta data and drawers in the current entry. This will move over empty lines, lines with planning time stamps, @@ -23696,8 +23803,7 @@ Show the heading too, if it is currently invisible." isearch-mode-end-hook-quit) ;; Only when the isearch was not quitted. (org-add-hook 'post-command-hook 'org-isearch-post-command - 'append 'local))) - (org-fix-ellipsis-at-bol))) + 'append 'local))))) (defun org-isearch-post-command () "Remove self from hook, and show context." diff --git a/elpa/org-20150427/orgcard.pdf b/elpa/org-20150427/orgcard.pdf new file mode 100644 index 0000000000000000000000000000000000000000..aedf8e5933183f290c4a20a9d5efd17d6472dbf2 GIT binary patch literal 124864 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 literal 0 HcmV?d00001 diff --git a/xemacs-packages/lisp/org-8.2.3c/ox-ascii.el b/elpa/org-20150427/ox-ascii.el similarity index 94% rename from xemacs-packages/lisp/org-8.2.3c/ox-ascii.el rename to elpa/org-20150427/ox-ascii.el index b2a38d55..cd2a9af1 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox-ascii.el +++ b/elpa/org-20150427/ox-ascii.el @@ -1,6 +1,6 @@ ;;; ox-ascii.el --- ASCII Back-End for Org Export Engine -;; Copyright (C) 2012-2013 Free Software Foundation, Inc. +;; Copyright (C) 2012-2014 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp @@ -192,8 +192,10 @@ original Org buffer at the same place." (defcustom org-ascii-indented-line-width 'auto "Additional indentation width for the first line in a paragraph. If the value is an integer, indent the first line of each -paragraph by this number. If it is the symbol `auto' preserve -indentation from original document." +paragraph by this width, unless it is located at the beginning of +a section, in which case indentation is removed from that line. +If it is the symbol `auto' preserve indentation from original +document." :group 'org-export-ascii :version "24.4" :package-version '(Org . "8.0") @@ -421,17 +423,17 @@ equivalent to `left'. For a justification that doesn't also fill string, see `org-ascii--justify-string'. Return nil if S isn't a string." - ;; Don't fill paragraph when break should be preserved. - (cond ((not (stringp s)) nil) - ((plist-get info :preserve-breaks) s) - (t (let ((double-space-p sentence-end-double-space)) - (with-temp-buffer - (let ((fill-column text-width) - (use-hard-newlines t) - (sentence-end-double-space double-space-p)) - (insert s) - (fill-region (point-min) (point-max) justify)) - (buffer-string)))))) + (when (stringp s) + (let ((double-space-p sentence-end-double-space)) + (with-temp-buffer + (let ((fill-column text-width) + (use-hard-newlines t) + (sentence-end-double-space double-space-p)) + (insert (if (plist-get info :preserve-breaks) + (replace-regexp-in-string "\n" hard-newline s) + s)) + (fill-region (point-min) (point-max) justify)) + (buffer-string))))) (defun org-ascii--justify-string (s text-width how) "Justify string S. @@ -455,13 +457,13 @@ HOW determines the type of justification: it can be `left', Empty lines are not indented." (when (stringp s) (replace-regexp-in-string - "\\(^\\)\\(?:.*\\S-\\)" (make-string width ? ) s nil nil 1))) + "\\(^\\)[ \t]*\\S-" (make-string width ?\s) s nil nil 1))) (defun org-ascii--box-string (s info) "Return string S with a partial box to its left. -INFO is a plist used as a communicaton channel." +INFO is a plist used as a communication channel." (let ((utf8p (eq (plist-get info :ascii-charset) 'utf-8))) - (format (if utf8p "╭────\n%s\n╰────" ",----\n%s\n`----") + (format (if utf8p "┌────\n%s\n└────" ",----\n%s\n`----") (replace-regexp-in-string "^" (if utf8p "│ " "| ") ;; Remove last newline character. @@ -473,7 +475,7 @@ INFO is a plist used as a communication channel." (case (org-element-type element) ;; Elements with an absolute width: `headline' and `inlinetask'. (inlinetask org-ascii-inlinetask-width) - ('headline + (headline (- org-ascii-text-width (let ((low-level-rank (org-export-low-level-p element info))) (if low-level-rank (* low-level-rank 2) org-ascii-global-margin)))) @@ -530,8 +532,9 @@ INFO is a plist used as a communication channel." (+ (- (org-list-get-ind beg-item struct) (org-list-get-ind (org-list-get-top-point struct) struct)) - (length (org-ascii--checkbox parent-item info)) - (length + (string-width (or (org-ascii--checkbox parent-item info) + "")) + (string-width (or (org-list-get-tag beg-item struct) (org-list-get-bullet beg-item struct))))))))))))) @@ -589,7 +592,8 @@ possible. It doesn't apply to `inlinetask' elements." (when tags (format (format " %%%ds" - (max (- text-width (1+ (length first-part))) (length tags))) + (max (- text-width (1+ (string-width first-part))) + (string-width tags))) tags)) ;; Maybe underline text, if ELEMENT type is `headline' and an ;; underline character has been defined. @@ -600,7 +604,9 @@ possible. It doesn't apply to `inlinetask' elements." org-ascii-underline))))) (and under-char (concat "\n" - (make-string (length first-part) under-char)))))))) + (make-string (/ (string-width first-part) + (char-width under-char)) + under-char)))))))) (defun org-ascii--has-caption-p (element info) "Non-nil when ELEMENT has a caption affiliated keyword. @@ -647,7 +653,7 @@ which the table of contents generation has been initiated." (let ((title (org-ascii--translate "Table of Contents" info))) (concat title "\n" - (make-string (length title) + (make-string (string-width title) (if (eq (plist-get info :ascii-charset) 'utf-8) ?─ ?_)) "\n\n" (let ((text-width @@ -674,13 +680,13 @@ generation. INFO is a plist used as a communication channel." (let ((title (org-ascii--translate "List of Listings" info))) (concat title "\n" - (make-string (length title) + (make-string (string-width title) (if (eq (plist-get info :ascii-charset) 'utf-8) ?─ ?_)) "\n\n" (let ((text-width (if keyword (org-ascii--current-text-width keyword info) (- org-ascii-text-width org-ascii-global-margin))) - ;; Use a counter instead of retreiving ordinal of each + ;; Use a counter instead of retrieving ordinal of each ;; src-block. (count 0)) (mapconcat @@ -688,9 +694,10 @@ generation. INFO is a plist used as a communication channel." ;; Store initial text so its length can be computed. This is ;; used to properly align caption right to it in case of ;; filling (like contents of a description list item). - (let ((initial-text - (format (org-ascii--translate "Listing %d:" info) - (incf count)))) + (let* ((initial-text + (format (org-ascii--translate "Listing %d:" info) + (incf count))) + (initial-width (string-width initial-text))) (concat initial-text " " (org-trim @@ -700,8 +707,8 @@ generation. INFO is a plist used as a communication channel." (let ((caption (or (org-export-get-caption src-block t) (org-export-get-caption src-block)))) (org-export-data caption info)) - (- text-width (length initial-text)) info) - (length initial-text)))))) + (- text-width initial-width) info) + initial-width))))) (org-export-collect-listings info) "\n"))))) (defun org-ascii--list-tables (keyword info) @@ -712,13 +719,13 @@ generation. INFO is a plist used as a communication channel." (let ((title (org-ascii--translate "List of Tables" info))) (concat title "\n" - (make-string (length title) + (make-string (string-width title) (if (eq (plist-get info :ascii-charset) 'utf-8) ?─ ?_)) "\n\n" (let ((text-width (if keyword (org-ascii--current-text-width keyword info) (- org-ascii-text-width org-ascii-global-margin))) - ;; Use a counter instead of retreiving ordinal of each + ;; Use a counter instead of retrieving ordinal of each ;; src-block. (count 0)) (mapconcat @@ -726,9 +733,10 @@ generation. INFO is a plist used as a communication channel." ;; Store initial text so its length can be computed. This is ;; used to properly align caption right to it in case of ;; filling (like contents of a description list item). - (let ((initial-text - (format (org-ascii--translate "Table %d:" info) - (incf count)))) + (let* ((initial-text + (format (org-ascii--translate "Table %d:" info) + (incf count))) + (initial-width (string-width initial-text))) (concat initial-text " " (org-trim @@ -738,13 +746,12 @@ generation. INFO is a plist used as a communication channel." (let ((caption (or (org-export-get-caption table t) (org-export-get-caption table)))) (org-export-data caption info)) - (- text-width (length initial-text)) info) - (length initial-text)))))) + (- text-width initial-width) info) + initial-width))))) (org-export-collect-tables info) "\n"))))) (defun org-ascii--unique-links (element info) "Return a list of unique link references in ELEMENT. - ELEMENT is either a headline element or a section element. INFO is a plist used as a communication channel." (let* (seen @@ -754,8 +761,14 @@ is a plist used as a communication channel." ;; Update SEEN links along the way. (lambda (link) (let ((footprint + ;; Normalize description in footprints. (cons (org-element-property :raw-link link) - (org-element-contents link)))) + (let ((contents (org-element-contents link))) + (and contents + (replace-regexp-in-string + "[ \r\t\n]+" " " + (org-trim + (org-element-interpret-data contents)))))))) ;; Ignore LINK if it hasn't been translated already. ;; It can happen if it is located in an affiliated ;; keyword that was ignored. @@ -852,14 +865,16 @@ INFO is a plist used as a communication channel." ((and (org-string-nw-p date) (org-string-nw-p author)) (concat author - (make-string (- text-width (length date) (length author)) ? ) + (make-string (- text-width (string-width date) (string-width author)) + ?\s) date (when (org-string-nw-p email) (concat "\n" email)) "\n\n\n")) ((and (org-string-nw-p date) (org-string-nw-p email)) (concat email - (make-string (- text-width (length date) (length email)) ? ) + (make-string (- text-width (string-width date) (string-width email)) + ?\s) date "\n\n\n")) ((org-string-nw-p date) (concat @@ -879,7 +894,10 @@ INFO is a plist used as a communication channel." (formatted-title (org-ascii--fill-string title title-len info)) (line (make-string - (min (+ (max title-len (length author) (length email)) 2) + (min (+ (max title-len + (string-width (or author "")) + (string-width (or email ""))) + 2) text-width) (if utf8p ?━ ?_)))) (org-ascii--justify-string (concat line "\n" @@ -918,7 +936,7 @@ holding export options." (concat title "\n" (make-string - (length title) + (string-width title) (if (eq (plist-get info :ascii-charset) 'utf-8) ?─ ?_)))) "\n\n" (let ((text-width (- org-ascii-text-width org-ascii-global-margin))) @@ -1195,10 +1213,10 @@ contextual information." ;;;; Inlinetask (defun org-ascii-format-inlinetask-default - (todo type priority name tags contents width inlinetask info) + (todo type priority name tags contents width inlinetask info) "Format an inline task element for ASCII export. See `org-ascii-format-inlinetask-function' for a description -of the paramaters." +of the parameters." (let* ((utf8p (eq (plist-get info :ascii-charset) 'utf-8)) (width (or width org-ascii-inlinetask-width))) (org-ascii--indent-string @@ -1208,7 +1226,7 @@ of the paramaters." (unless utf8p (concat (make-string width ? ) "\n")) ;; Add title. Fill it if wider than inlinetask. (let ((title (org-ascii--build-title inlinetask info width))) - (if (<= (length title) width) title + (if (<= (string-width title) width) title (org-ascii--fill-string title width info))) "\n" ;; If CONTENTS is not empty, insert it along with @@ -1301,7 +1319,7 @@ contextual information." ;; Contents: Pay attention to indentation. Note: check-boxes are ;; already taken care of at the paragraph level so they don't ;; interfere with indentation. - (let ((contents (org-ascii--indent-string contents (length bullet)))) + (let ((contents (org-ascii--indent-string contents (string-width bullet)))) (if (eq (org-element-type (car (org-element-contents item))) 'paragraph) (org-trim contents) (concat "\n" contents)))))) @@ -1376,10 +1394,7 @@ INFO is a plist holding contextual information." (org-export-resolve-coderef ref info)))) ;; Do not apply a special syntax on radio links. Though, use ;; transcoded target's contents as output. - ((string= type "radio") - (let ((destination (org-export-resolve-radio-link link info))) - (when destination - (org-export-data (org-element-contents destination) info)))) + ((string= type "radio") desc) ;; Do not apply a special syntax on fuzzy links pointing to ;; targets. ((string= type "fuzzy") @@ -1405,12 +1420,16 @@ INFO is a plist holding contextual information." "Transcode a PARAGRAPH element from Org to ASCII. CONTENTS is the contents of the paragraph, as a string. INFO is the plist used as a communication channel." - (let ((contents (if (not (wholenump org-ascii-indented-line-width)) contents - (concat - (make-string org-ascii-indented-line-width ? ) - (replace-regexp-in-string "\\`[ \t]+" "" contents))))) - (org-ascii--fill-string - contents (org-ascii--current-text-width paragraph info) info))) + (org-ascii--fill-string + (if (not (wholenump org-ascii-indented-line-width)) contents + (concat + ;; Do not indent first paragraph in a section. + (unless (and (not (org-export-get-previous-element paragraph info)) + (eq (org-element-type (org-export-get-parent paragraph)) + 'section)) + (make-string org-ascii-indented-line-width ?\s)) + (replace-regexp-in-string "\\`[ \t]+" "" contents))) + (org-ascii--current-text-width paragraph info) info)) ;;;; Plain List @@ -1578,8 +1597,8 @@ contextual information." CONTENTS is the contents of the object. INFO is a plist holding contextual information." (if (org-element-property :use-brackets-p superscript) - (format "_{%s}" contents) - (format "_%s" contents))) + (format "^{%s}" contents) + (format "^%s" contents))) ;;;; Strike-through @@ -1646,20 +1665,25 @@ are ignored." (or (gethash key cache) (puthash key - (or (and (not org-ascii-table-widen-columns) - (org-export-table-cell-width table-cell info)) - (let* ((max-width 0)) - (org-element-map table 'table-row - (lambda (row) - (setq max-width - (max (length - (org-export-data - (org-element-contents - (elt (org-element-contents row) col)) - info)) - max-width))) - info) - max-width)) + (let ((cookie-width (org-export-table-cell-width table-cell info))) + (or (and (not org-ascii-table-widen-columns) cookie-width) + (let ((contents-width + (let ((max-width 0)) + (org-element-map table 'table-row + (lambda (row) + (setq max-width + (max (string-width + (org-export-data + (org-element-contents + (elt (org-element-contents row) col)) + info)) + max-width))) + info) + max-width))) + (cond ((not cookie-width) contents-width) + (org-ascii-table-widen-columns + (max cookie-width contents-width)) + (t cookie-width))))) cache)))) (defun org-ascii-table-cell (table-cell contents info) @@ -1672,7 +1696,8 @@ a communication channel." ;; each cell in the column. (let ((width (org-ascii--table-cell-width table-cell info))) ;; When contents are too large, truncate them. - (unless (or org-ascii-table-widen-columns (<= (length contents) width)) + (unless (or org-ascii-table-widen-columns + (<= (string-width (or contents "")) width)) (setq contents (concat (substring contents 0 (- width 2)) "=>"))) ;; Align contents correctly within the cell. (let* ((indent-tabs-mode nil) @@ -1681,7 +1706,9 @@ a communication channel." (org-ascii--justify-string contents width (org-export-table-cell-alignment table-cell info))))) - (setq contents (concat data (make-string (- width (length data)) ? )))) + (setq contents + (concat data + (make-string (- width (string-width (or data ""))) ?\s)))) ;; Return cell. (concat (format " %s " contents) (when (memq 'right (org-export-table-cell-borders table-cell info)) diff --git a/xemacs-packages/lisp/org-8.2.3c/ox-beamer.el b/elpa/org-20150427/ox-beamer.el similarity index 98% rename from xemacs-packages/lisp/org-8.2.3c/ox-beamer.el rename to elpa/org-20150427/ox-beamer.el index 2868944c..abfd181c 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox-beamer.el +++ b/elpa/org-20150427/ox-beamer.el @@ -1,6 +1,6 @@ ;;; ox-beamer.el --- Beamer Back-End for Org Export Engine -;; Copyright (C) 2007-2013 Free Software Foundation, Inc. +;; Copyright (C) 2007-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Nicolas Goaziou @@ -36,10 +36,7 @@ (unless (assoc "beamer" org-latex-classes) (add-to-list 'org-latex-classes '("beamer" - "\\documentclass[presentation]{beamer} -\[DEFAULT-PACKAGES] -\[PACKAGES] -\[EXTRA]" + "\\documentclass[presentation]{beamer}" ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}")))) @@ -647,11 +644,11 @@ contextual information." (and (eq (org-element-type first-element) 'paragraph) (org-beamer--element-has-overlay-p first-element)))) (output (org-export-with-backend 'latex item contents info))) - (if (not action) output + (if (or (not action) (not (string-match "\\\\item" output))) output ;; If the item starts with a paragraph and that paragraph starts ;; with an export snippet specifying an overlay, insert it after ;; \item command. - (replace-regexp-in-string "\\\\item" (concat "\\\\item" action) output)))) + (replace-match (concat "\\\\item" action) nil nil output)))) ;;;; Keyword @@ -690,11 +687,12 @@ used as a communication channel." (cond ((equal type "radio") (let ((destination (org-export-resolve-radio-link link info))) - (when destination + (if (not destination) contents (format "\\hyperlink%s{%s}{%s}" (or (org-beamer--element-has-overlay-p link) "") - (org-export-solidify-link-text path) - (org-export-data (org-element-contents destination) info))))) + (org-export-solidify-link-text + (org-element-property :value destination)) + contents)))) ((and (member type '("custom-id" "fuzzy" "id")) (let ((destination (if (string= type "fuzzy") (org-export-resolve-fuzzy-link link info) @@ -779,7 +777,7 @@ contextual information." "Transcode a TARGET object into Beamer code. CONTENTS is nil. INFO is a plist holding contextual information." - (format "\\hypertarget{%s}{}" + (format "\\label{%s}" (org-export-solidify-link-text (org-element-property :value target)))) @@ -1094,6 +1092,8 @@ aid, but the tag does not have any semantic meaning." envs) '((:endgroup)) '(("BMCOL" . ?|)))) + (org-tag-persistent-alist nil) + (org-use-fast-tag-selection t) (org-fast-tag-selection-single-key t)) (org-set-tags) (let ((tags (or (ignore-errors (org-get-tags-string)) ""))) @@ -1168,7 +1168,9 @@ Return output file name." ;; working directory and then moved to publishing directory. (org-publish-attachment plist - (org-latex-compile (org-publish-org-to 'beamer filename ".tex" plist)) + (org-latex-compile + (org-publish-org-to + 'beamer filename ".tex" plist (file-name-directory filename))) pub-dir)) diff --git a/xemacs-packages/lisp/org-8.2.3c/ox-html.el b/elpa/org-20150427/ox-html.el similarity index 94% rename from xemacs-packages/lisp/org-8.2.3c/ox-html.el rename to elpa/org-20150427/ox-html.el index 5f387915..23498b26 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox-html.el +++ b/elpa/org-20150427/ox-html.el @@ -1,6 +1,6 @@ ;;; ox-html.el --- HTML Back-End for Org Export Engine -;; Copyright (C) 2011-2013 Free Software Foundation, Inc. +;; Copyright (C) 2011-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Jambunathan K @@ -130,7 +130,9 @@ (:infojs-opt "INFOJS_OPT" nil nil) ;; Redefine regular options. (:creator "CREATOR" nil org-html-creator-string) - (:with-latex nil "tex" org-html-with-latex))) + (:with-latex nil "tex" org-html-with-latex) + ;; Retrieve LaTeX header for fragments. + (:latex-header "LATEX_HEADER" nil nil newline))) ;;; Internal Variables @@ -153,7 +155,7 @@ \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">") ("xhtml-transitional" . "") - ("xhtml-framset" . "") ("xhtml-11" . "") @@ -168,10 +170,8 @@ "progress" "section" "video") "New elements in html5. -
is not included because it's currently impossible to -wrap special blocks around multiple headlines. For other blocks -that should contain headlines, use the HTML_CONTAINER property on -the headline itself.") +For blocks that should contain headlines, use the HTML_CONTAINER +property on the headline itself.") (defconst org-html-special-string-regexps '(("\\\\-" . "­") ; shy @@ -277,6 +277,8 @@ for the JavaScript code in this tag. pre.src-sql:before { content: 'SQL'; } table { border-collapse:collapse; } + caption.t-above { caption-side: top; } + caption.t-bottom { caption-side: bottom; } td, th { vertical-align:top; } th.right { text-align: center; } th.left { text-align: center; } @@ -453,6 +455,7 @@ export back-end currently used." (not org-html-use-infojs) (and (eq org-html-use-infojs 'when-configured) (or (not (plist-get exp-plist :infojs-opt)) + (string= "" (plist-get exp-plist :infojs-opt)) (string-match "\\" (plist-get exp-plist :infojs-opt))))) (let* ((template org-html-infojs-template) @@ -1980,7 +1983,8 @@ and value is its relative level, as an integer." (defun org-html--format-toc-headline (headline info) "Return an appropriate table of contents entry for HEADLINE. INFO is a plist used as a communication channel." - (let* ((todo (and (plist-get info :with-todo-keywords) + (let* ((headline-number (org-export-get-headline-number headline info)) + (todo (and (plist-get info :with-todo-keywords) (let ((todo (org-element-property :todo-keyword headline))) (and todo (org-export-data todo info))))) (todo-type (and todo (org-element-property :todo-type headline))) @@ -2001,19 +2005,23 @@ INFO is a plist used as a communication channel." (tags (and (eq (plist-get info :with-tags) t) (org-export-get-tags headline info)))) (format "%s" + ;; Label. (org-export-solidify-link-text (or (org-element-property :CUSTOM_ID headline) (concat "sec-" - (mapconcat - #'number-to-string - (org-export-get-headline-number headline info) - "-")))) - (apply (if (not (eq org-html-format-headline-function 'ignore)) - (lambda (todo todo-type priority text tags &rest ignore) - (funcall org-html-format-headline-function - todo todo-type priority text tags)) - #'org-html-format-headline) - todo todo-type priority text tags :section-number nil)))) + (mapconcat #'number-to-string headline-number "-")))) + ;; Body. + (concat + (and (not (org-export-low-level-p headline info)) + (org-export-numbered-headline-p headline info) + (concat (mapconcat #'number-to-string headline-number ".") + ". ")) + (apply (if (not (eq org-html-format-headline-function 'ignore)) + (lambda (todo todo-type priority text tags &rest ignore) + (funcall org-html-format-headline-function + todo todo-type priority text tags)) + #'org-html-format-headline) + todo todo-type priority text tags :section-number nil))))) (defun org-html-list-of-listings (info) "Build a list of listings. @@ -2267,83 +2275,70 @@ holding contextual information." "Transcode a HEADLINE element from Org to HTML. CONTENTS holds the contents of the headline. INFO is a plist holding contextual information." - ;; Empty contents? - (setq contents (or contents "")) - (let* ((numberedp (org-export-numbered-headline-p headline info)) - (level (org-export-get-relative-level headline info)) - (text (org-export-data (org-element-property :title headline) info)) - (todo (and (plist-get info :with-todo-keywords) - (let ((todo (org-element-property :todo-keyword headline))) - (and todo (org-export-data todo info))))) - (todo-type (and todo (org-element-property :todo-type headline))) - (tags (and (plist-get info :with-tags) - (org-export-get-tags headline info))) - (priority (and (plist-get info :with-priority) - (org-element-property :priority headline))) - (section-number (and (org-export-numbered-headline-p headline info) - (mapconcat 'number-to-string - (org-export-get-headline-number - headline info) "."))) - ;; Create the headline text. - (full-text (org-html-format-headline--wrap headline info))) - (cond - ;; Case 1: This is a footnote section: ignore it. - ((org-element-property :footnote-section-p headline) nil) - ;; Case 2. This is a deep sub-tree: export it as a list item. - ;; Also export as items headlines for which no section - ;; format has been found. - ((org-export-low-level-p headline info) - ;; Build the real contents of the sub-tree. - (let* ((type (if numberedp 'ordered 'unordered)) - (itemized-body (org-html-format-list-item - contents type nil info nil full-text))) - (concat - (and (org-export-first-sibling-p headline info) - (org-html-begin-plain-list type)) - itemized-body - (and (org-export-last-sibling-p headline info) - (org-html-end-plain-list type))))) - ;; Case 3. Standard headline. Export it as a section. - (t - (let* ((section-number (mapconcat 'number-to-string - (org-export-get-headline-number - headline info) "-")) - (ids (remove 'nil - (list (org-element-property :CUSTOM_ID headline) - (concat "sec-" section-number) - (org-element-property :ID headline)))) - (preferred-id (car ids)) - (extra-ids (cdr ids)) - (extra-class (org-element-property :HTML_CONTAINER_CLASS headline)) - (level1 (+ level (1- org-html-toplevel-hlevel))) - (first-content (car (org-element-contents headline)))) - (format "<%s id=\"%s\" class=\"%s\">%s%s\n" - (org-html--container headline info) - (format "outline-container-%s" - (or (org-element-property :CUSTOM_ID headline) - (concat "sec-" section-number))) - (concat (format "outline-%d" level1) (and extra-class " ") - extra-class) - (format "\n%s%s\n" - level1 - preferred-id - (mapconcat - (lambda (x) - (let ((id (org-export-solidify-link-text - (if (org-uuidgen-p x) (concat "ID-" x) - x)))) - (org-html--anchor id))) - extra-ids "") - full-text - level1) - ;; When there is no section, pretend there is an empty - ;; one to get the correct
%s%s\n" + (org-html--container headline info) + (format "outline-container-%s" + (or (org-element-property :CUSTOM_ID headline) + (concat "sec-" section-number))) + (concat (format "outline-%d" level1) (and extra-class " ") + extra-class) + (format "\n%s%s\n" + level1 preferred-id extra-ids full-text level1) + ;; When there is no section, pretend there is an + ;; empty one to get the correct
(incf link-count) 1) - (not (org-html-inline-image-p obj info)))) - (otherwise t))) - info 'first-match 'link)))))) + (catch 'exit + (let ((link-count 0)) + (org-element-map (org-element-contents paragraph) + (cons 'plain-text org-element-all-objects) + #'(lambda (obj) + (when (case (org-element-type obj) + (plain-text (org-string-nw-p obj)) + (link (or (> (incf link-count) 1) + (not (org-html-inline-image-p obj info)))) + (otherwise t)) + (throw 'exit nil))) + info nil 'link) + (= link-count 1)))))) (defun org-html-link (link desc info) "Transcode a LINK object from Org to HTML. @@ -2634,19 +2648,20 @@ INFO is a plist holding contextual information. See (path (cond ((member type '("http" "https" "ftp" "mailto")) - (concat type ":" raw-path)) + (org-link-escape + (org-link-unescape + (concat type ":" raw-path)) org-link-escape-chars-browser)) ((string= type "file") ;; Treat links to ".org" files as ".html", if needed. (setq raw-path (funcall link-org-files-as-html-maybe raw-path info)) ;; If file path is absolute, prepend it with protocol - ;; component - "file://". - (cond ((file-name-absolute-p raw-path) - (setq raw-path - (concat "file://" (expand-file-name - raw-path)))) - ((and home use-abs-url) - (setq raw-path (concat (file-name-as-directory home) raw-path)))) + ;; component - "file:". + (cond + ((file-name-absolute-p raw-path) + (setq raw-path (concat "file:" raw-path))) + ((and home use-abs-url) + (setq raw-path (concat (file-name-as-directory home) raw-path)))) ;; Add search option, if any. A search option can be ;; relative to a custom-id or a headline title. Any other ;; option is ignored. @@ -2692,11 +2707,11 @@ INFO is a plist holding contextual information. See ;; link's description. ((string= type "radio") (let ((destination (org-export-resolve-radio-link link info))) - (when destination + (if (not destination) desc (format "%s" - (org-export-solidify-link-text path) - attributes - (org-export-data (org-element-contents destination) info))))) + (org-export-solidify-link-text + (org-element-property :value destination)) + attributes desc)))) ;; Links pointing to a headline: Find destination and build ;; appropriate referencing command. ((member type '("custom-id" "fuzzy" "id")) @@ -3078,7 +3093,7 @@ CONTENTS is the contents of the object. INFO is a plist holding contextual information." (format "%s" contents)) -;;;; Tabel Cell +;;;; Table Cell (defun org-html-table-cell (table-cell contents info) "Transcode a TABLE-CELL element from Org to HTML. @@ -3230,8 +3245,8 @@ contextual information." (if (equal attributes "") "" (concat " " attributes)) (if (not caption) "" (format (if org-html-table-caption-above - "%s" - "%s") + "%s" + "%s") (concat "" (format (org-html--translate "Table %d:" info) number) @@ -3413,21 +3428,6 @@ Return output file name." org-html-extension "html")) plist pub-dir)) - -;;; FIXME - -;;;; org-format-table-html -;;;; org-format-org-table-html -;;;; org-format-table-table-html -;;;; org-table-number-fraction -;;;; org-table-number-regexp -;;;; org-html-inline-image-extensions -;;;; org-export-preferred-target-alist -;;;; class for anchors -;;;; org-export-mark-todo-in-toc -;;;; org-html-format-org-link -;;;; (caption (and caption (org-xml-encode-org-text caption))) -;;;; alt = (file-name-nondirectory path) (provide 'ox-html) diff --git a/xemacs-packages/lisp/org-8.2.3c/ox-icalendar.el b/elpa/org-20150427/ox-icalendar.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ox-icalendar.el rename to elpa/org-20150427/ox-icalendar.el index 7c4b4bfb..cd48bbf9 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox-icalendar.el +++ b/elpa/org-20150427/ox-icalendar.el @@ -1,6 +1,6 @@ ;;; ox-icalendar.el --- iCalendar Back-End for Org Export Engine -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Nicolas Goaziou @@ -174,8 +174,7 @@ The anniversaries are defined in the BBDB database." (defcustom org-icalendar-include-sexps t "Non-nil means export to iCalendar files should also cover sexp entries. -These are entries like in the diary, but directly in an Org mode -file." +These are entries like in the diary, but directly in an Org file." :group 'org-export-icalendar :type 'boolean) @@ -302,14 +301,14 @@ which will be updated." INFO is a plist used as a communication channel. -a headline is blocked when either: +A headline is blocked when either - - It has children which are not all in a completed state. + - it has children which are not all in a completed state; - - It has a parent with the property :ORDERED:, and there are - siblings prior to it with incomplete status. + - it has a parent with the property :ORDERED:, and there are + siblings prior to it with incomplete status; - - Its parent is blocked because it has siblings that should be + - its parent is blocked because it has siblings that should be done first or is a child of a blocked grandparent entry." (or ;; Check if any child is not done. @@ -478,10 +477,10 @@ or subject for the event." ;;; Filters (defun org-icalendar-clear-blank-lines (headline back-end info) - "Remove trailing blank lines in HEADLINE export. + "Remove blank lines in HEADLINE export. HEADLINE is a string representing a transcoded headline. BACK-END and INFO are ignored." - (replace-regexp-in-string "^\\(?:[ \t]*\n\\)*" "" headline)) + (replace-regexp-in-string "^\\(?:[ \t]*\n\\)+" "" headline)) @@ -570,13 +569,19 @@ inlinetask within the section." ;; happen once ENTRY is one of them. (let ((counter 0)) (mapconcat - 'identity + #'identity (org-element-map (cons (org-element-property :title entry) (org-element-contents inside)) 'timestamp (lambda (ts) - (let ((uid (format "TS%d-%s" (incf counter) uid))) - (org-icalendar--vevent entry ts uid summary loc desc cat))) + (when (let ((type (org-element-property :type ts))) + (case (plist-get info :with-timestamps) + (active (memq type '(active active-range))) + (inactive (memq type '(inactive inactive-range))) + ((t) t))) + (let ((uid (format "TS%d-%s" (incf counter) uid))) + (org-icalendar--vevent + entry ts uid summary loc desc cat)))) info nil (and (eq type 'headline) 'inlinetask)) "")) ;; Task: First check if it is appropriate to export it. @@ -589,7 +594,7 @@ inlinetask within the section." (and (eq type 'headline) (not (org-icalendar-blocked-headline-p entry info)))) - ('t (eq todo-type 'todo)))) + ((t) (eq todo-type 'todo)))) (org-icalendar--vtodo entry uid summary loc desc cat)) ;; Diary-sexp: Collect every diary-sexp element within ;; ENTRY and its title, and transcode them. If ENTRY is @@ -597,7 +602,7 @@ inlinetask within the section." ;; separately. (when org-icalendar-include-sexps (let ((counter 0)) - (mapconcat 'identity + (mapconcat #'identity (org-element-map (cons (org-element-property :title entry) (org-element-contents inside)) @@ -613,7 +618,7 @@ inlinetask within the section." ;; inlinetask within it. In agenda export, this is independent ;; from the mark (or lack thereof) on the entry. (when (eq type 'headline) - (mapconcat 'identity + (mapconcat #'identity (org-element-map inside 'inlinetask (lambda (task) (org-icalendar-entry task nil info)) info) "")) @@ -964,9 +969,7 @@ files to build the calendar from." ;; BBDB anniversaries. (when (and org-icalendar-include-bbdb-anniversaries (require 'org-bbdb nil t)) - (with-temp-buffer - (org-bbdb-anniv-export-ical) - (buffer-string))))))) + (with-output-to-string (org-bbdb-anniv-export-ical))))))) (run-hook-with-args 'org-icalendar-after-save-hook org-icalendar-combined-agenda-file)) (org-release-buffers org-agenda-new-buffers))) diff --git a/xemacs-packages/lisp/org-8.2.3c/ox-latex.el b/elpa/org-20150427/ox-latex.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ox-latex.el rename to elpa/org-20150427/ox-latex.el index 014ed266..2c71f7d7 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox-latex.el +++ b/elpa/org-20150427/ox-latex.el @@ -1,6 +1,6 @@ ;;; ox-latex.el --- LaTeX Back-End for Org Export Engine -;; Copyright (C) 2011-2013 Free Software Foundation, Inc. +;; Copyright (C) 2011-2014 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp @@ -524,7 +524,7 @@ When nil, no transformation is made." :package-version '(Org . "8.0") :type '(choice (string :tag "Format string") - (const :tag "No formatting"))) + (const :tag "No formatting" nil))) ;;;; Text markup @@ -689,9 +689,9 @@ These options are supplied as a comma-separated list to the a list containing two strings: the name of the option, and the value. For example, - (setq org-latex-listings-options + \(setq org-latex-listings-options '((\"basicstyle\" \"\\\\small\") - (\"keywordstyle\" \"\\\\color{black}\\\\bfseries\\\\underbar\"))) + \(\"keywordstyle\" \"\\\\color{black}\\\\bfseries\\\\underbar\"))) will typeset the code in a small size font with underlined, bold black keywords. @@ -998,7 +998,9 @@ See `org-latex-text-markup-alist' for details." ;; and use "\\verb" command. ((eq 'verb fmt) (let ((separator (org-latex--find-verb-separator text))) - (concat "\\verb" separator text separator))) + (concat "\\verb" separator + (replace-regexp-in-string "\n" " " text) + separator))) ;; Handle the `protectedtexttt' special case: Protect some ;; special chars and use "\texttt{%s}" format string. ((eq 'protectedtexttt fmt) @@ -1319,13 +1321,13 @@ holding contextual information." (let* ((class (plist-get info :latex-class)) (level (org-export-get-relative-level headline info)) (numberedp (org-export-numbered-headline-p headline info)) - (class-sectionning (assoc class org-latex-classes)) + (class-sectioning (assoc class org-latex-classes)) ;; Section formatting will set two placeholders: one for ;; the title and the other for the contents. (section-fmt - (let ((sec (if (functionp (nth 2 class-sectionning)) - (funcall (nth 2 class-sectionning) level numberedp) - (nth (1+ level) class-sectionning)))) + (let ((sec (if (functionp (nth 2 class-sectioning)) + (funcall (nth 2 class-sectioning) level numberedp) + (nth (1+ level) class-sectioning)))) (cond ;; No section available for that LEVEL. ((not sec) nil) @@ -1342,7 +1344,16 @@ holding contextual information." ((= (length sec) 4) (if numberedp (concat (car sec) "\n%s" (nth 1 sec)) (concat (nth 2 sec) "\n%s" (nth 3 sec))))))) - (text (org-export-data (org-element-property :title headline) info)) + ;; Create a temporary export back-end that hard-codes + ;; "\underline" within "\section" and alike. + (section-back-end + (org-export-create-backend + :parent 'latex + :transcoders + '((underline . (lambda (o c i) (format "\\underline{%s}" c)))))) + (text + (org-export-data-with-backend + (org-element-property :title headline) section-back-end info)) (todo (and (plist-get info :with-todo-keywords) (let ((todo (org-element-property :todo-keyword headline))) @@ -1374,7 +1385,13 @@ holding contextual information." (when (org-export-first-sibling-p headline info) (format "\\begin{%s}\n" (if numberedp 'enumerate 'itemize))) ;; Itemize headline - "\\item " full-text "\n" headline-label pre-blanks contents))) + "\\item" + (and full-text (org-string-match-p "\\`[ \t]*\\[" full-text) + "\\relax") + " " full-text "\n" + headline-label + pre-blanks + contents))) ;; If headline is not the last sibling simply return ;; LOW-LEVEL-BODY. Otherwise, also close the list, before ;; any blank line. @@ -1389,8 +1406,9 @@ holding contextual information." (let ((opt-title (funcall org-latex-format-headline-function todo todo-type priority - (org-export-data - (org-export-get-alt-title headline info) info) + (org-export-data-with-backend + (org-export-get-alt-title headline info) + section-back-end info) (and (eq (plist-get info :with-tags) t) tags)))) (if (and numberedp opt-title (not (equal opt-title full-text)) @@ -1458,7 +1476,7 @@ contextual information." (let* ((org-lang (org-element-property :language inline-src-block)) (mint-lang (or (cadr (assq (intern org-lang) org-latex-minted-langs)) - org-lang)) + (downcase org-lang))) (options (org-latex--make-option-string org-latex-minted-options))) (concat (format "\\mint%s{%s}" @@ -1508,17 +1526,16 @@ holding contextual information." (when priority (format "\\framebox{\\#%c} " priority)) title (when tags (format "\\hfill{}\\textsc{:%s:}" - (mapconcat 'identity tags ":")))))) - (format (concat "\\begin{center}\n" - "\\fbox{\n" - "\\begin{minipage}[c]{.6\\textwidth}\n" - "%s\n\n" - "\\rule[.8em]{\\textwidth}{2pt}\n\n" - "%s" - "\\end{minipage}\n" - "}\n" - "\\end{center}") - full-title contents)))))) + (mapconcat #'identity tags ":")))))) + (concat "\\begin{center}\n" + "\\fbox{\n" + "\\begin{minipage}[c]{.6\\textwidth}\n" + full-title "\n\n" + (and (org-string-nw-p contents) + (concat "\\rule[.8em]{\\textwidth}{2pt}\n\n" contents)) + "\\end{minipage}\n" + "}\n" + "\\end{center}")))))) ;;;; Italic @@ -1564,7 +1581,25 @@ contextual information." (and tag (format "[{%s}] " (concat checkbox (org-export-data tag info))))))) - (concat counter "\\item" (or tag (concat " " checkbox)) + (concat counter + "\\item" + (cond + (tag) + (checkbox (concat " " checkbox)) + ;; Without a tag or a check-box, if CONTENTS starts with + ;; an opening square bracket, add "\relax" to "\item", + ;; unless the brackets comes from an initial export + ;; snippet (i.e. it is inserted willingly by the user). + ((and contents + (org-string-match-p "\\`[ \t]*\\[" contents) + (not (let ((e (car (org-element-contents item)))) + (and (eq (org-element-type e) 'paragraph) + (let ((o (car (org-element-contents e)))) + (and (eq (org-element-type o) 'export-snippet) + (eq (org-export-snippet-backend o) + 'latex))))))) + "\\relax ") + (t " ")) (and contents (org-trim contents)) ;; If there are footnotes references in tag, be sure to ;; add their definition at the end of the item. This @@ -1616,7 +1651,7 @@ CONTENTS is nil. INFO is a plist holding contextual information." (value (org-remove-indentation (org-element-property :value latex-environment)))) (if (not (org-string-nw-p label)) value - ;; Environment is labelled: label must be within the environment + ;; Environment is labeled: label must be within the environment ;; (otherwise, a reference pointing to that element will count ;; the section instead). (with-temp-buffer @@ -1754,7 +1789,8 @@ DESC is the description part of the link, or the empty string. INFO is a plist holding contextual information. See `org-export-data'." (let* ((type (org-element-property :type link)) - (raw-path (org-element-property :path link)) + (raw-path (replace-regexp-in-string + "%" "\\%" (org-element-property :path link) nil t)) ;; Ensure DESC really exists, or set it to nil. (desc (and (not (string= desc "")) desc)) (imagep (org-export-inline-image-p @@ -1762,9 +1798,8 @@ INFO is a plist holding contextual information. See (path (cond ((member type '("http" "https" "ftp" "mailto")) (concat type ":" raw-path)) - ((string= type "file") - (if (not (file-name-absolute-p raw-path)) raw-path - (concat "file://" (expand-file-name raw-path)))) + ((and (string= type "file") (file-name-absolute-p raw-path)) + (concat "file:" raw-path)) (t raw-path))) protocol) (cond @@ -1774,10 +1809,11 @@ INFO is a plist holding contextual information. See ;; description. ((string= type "radio") (let ((destination (org-export-resolve-radio-link link info))) - (when destination + (if (not destination) desc (format "\\hyperref[%s]{%s}" - (org-export-solidify-link-text path) - (org-export-data (org-element-contents destination) info))))) + (org-export-solidify-link-text + (org-element-property :value destination)) + desc)))) ;; Links pointing to a headline: Find destination and build ;; appropriate referencing command. ((member type '("custom-id" "fuzzy" "id")) @@ -1806,7 +1842,8 @@ INFO is a plist holding contextual information. See 'number-to-string (org-export-get-headline-number destination info) "-")))) - (if (and (plist-get info :section-numbers) (not desc)) + (if (and (not desc) + (org-export-numbered-headline-p destination info)) (format "\\ref{%s}" label) (format "\\hyperref[%s]{%s}" label (or desc @@ -1853,18 +1890,13 @@ contextual information." (latex-type (let ((env (plist-get attr :environment))) (cond (env (format "%s" env)) ((eq type 'ordered) "enumerate") - ((eq type 'unordered) "itemize") - ((eq type 'descriptive) "description"))))) + ((eq type 'descriptive) "description") + (t "itemize"))))) (org-latex--wrap-label plain-list (format "\\begin{%s}%s\n%s\\end{%s}" latex-type - ;; Put optional arguments, if any inside square brackets - ;; when necessary. - (let ((options (format "%s" (or (plist-get attr :options) "")))) - (cond ((equal options "") "") - ((string-match "\\`\\[.*\\]\\'" options) options) - (t (format "[%s]" options)))) + (or (plist-get attr :options) "") contents latex-type)))) @@ -2083,7 +2115,8 @@ contextual information." ("firstnumber" ,(number-to-string (1+ num-start)))) org-latex-minted-options))) ;; Language. - (or (cadr (assq (intern lang) org-latex-minted-langs)) lang) + (or (cadr (assq (intern lang) org-latex-minted-langs)) + (downcase lang)) ;; Source code. (let* ((code-info (org-export-unravel-code src-block)) (max-width @@ -2132,8 +2165,8 @@ contextual information." ((and float (not (assoc "float" org-latex-listings-options))) `(("float" ,org-latex-default-figure-position)))) `(("language" ,lst-lang)) - (when label `(("label" ,label))) - (when caption-str `(("caption" ,caption-str))) + (if label `(("label" ,label)) '(("label" " "))) + (if caption-str `(("caption" ,caption-str)) '(("caption" " "))) (cond ((assoc "numbers" org-latex-listings-options) nil) ((not num-start) '(("numbers" "none"))) ((zerop num-start) '(("numbers" "left"))) @@ -2903,7 +2936,9 @@ Return output file name." ;; in working directory and then moved to publishing directory. (org-publish-attachment plist - (org-latex-compile (org-publish-org-to 'latex filename ".tex" plist)) + (org-latex-compile + (org-publish-org-to + 'latex filename ".tex" plist (file-name-directory filename))) pub-dir)) diff --git a/xemacs-packages/lisp/org-8.2.3c/ox-man.el b/elpa/org-20150427/ox-man.el similarity index 99% rename from xemacs-packages/lisp/org-8.2.3c/ox-man.el rename to elpa/org-20150427/ox-man.el index a160e4cf..7407c9b6 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox-man.el +++ b/elpa/org-20150427/ox-man.el @@ -1,6 +1,6 @@ ;; ox-man.el --- Man Back-End for Org Export Engine -;; Copyright (C) 2011-2013 Free Software Foundation, Inc. +;; Copyright (C) 2011-2014 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Luis R Anaya @@ -102,7 +102,7 @@ (verse-block . org-man-verse-block)) :export-block "MAN" :menu-entry - '(?m "Export to MAN" + '(?M "Export to MAN" ((?m "As MAN file" org-man-export-to-man) (?p "As PDF file" org-man-export-to-pdf) (?o "As PDF file and open" @@ -638,21 +638,15 @@ CONTENTS is nil. INFO is a plist holding contextual information." DESC is the description part of the link, or the empty string. INFO is a plist holding contextual information. See `org-export-data'." - (let* ((type (org-element-property :type link)) (raw-path (org-element-property :path link)) ;; Ensure DESC really exists, or set it to nil. (desc (and (not (string= desc "")) desc)) - (path (cond ((member type '("http" "https" "ftp" "mailto")) (concat type ":" raw-path)) - ((string= type "file") - (when (string-match "\\(.+\\)::.+" raw-path) - (setq raw-path (match-string 1 raw-path))) - (if (file-name-absolute-p raw-path) - (concat "file://" (expand-file-name raw-path)) - (concat "file://" raw-path))) + ((and (string= type "file") (file-name-absolute-p raw-path)) + (concat "file:" raw-path)) (t raw-path))) protocol) (cond diff --git a/xemacs-packages/lisp/org-8.2.3c/ox-md.el b/elpa/org-20150427/ox-md.el similarity index 73% rename from xemacs-packages/lisp/org-8.2.3c/ox-md.el rename to elpa/org-20150427/ox-md.el index 811c4e58..c8dc484b 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox-md.el +++ b/elpa/org-20150427/ox-md.el @@ -1,6 +1,6 @@ ;;; ox-md.el --- Markdown Back-End for Org Export Engine -;; Copyright (C) 2012-2013 Free Software Foundation, Inc. +;; Copyright (C) 2012-2014 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: org, wp, markdown @@ -22,7 +22,7 @@ ;;; Commentary: -;; This library implements a Markdown back-end (vanilla flavour) for +;; This library implements a Markdown back-end (vanilla flavor) for ;; Org exporter, based on `html' back-end. See Org manual for more ;; information. @@ -72,11 +72,10 @@ This variable can be set to either `atx' or `setext'." (comment-block . (lambda (&rest args) "")) (example-block . org-md-example-block) (fixed-width . org-md-example-block) - (footnote-definition . ignore) - (footnote-reference . ignore) (headline . org-md-headline) (horizontal-rule . org-md-horizontal-rule) (inline-src-block . org-md-verbatim) + (inner-template . org-md-inner-template) (italic . org-md-italic) (item . org-md-item) (line-break . org-md-line-break) @@ -96,19 +95,31 @@ This variable can be set to either `atx' or `setext'." ;;; Filters (defun org-md-separate-elements (tree backend info) - "Make sure elements are separated by at least one blank line. + "Fix blank lines between elements. TREE is the parse tree being exported. BACKEND is the export back-end used. INFO is a plist used as a communication channel. +Enforce a blank line between elements. There are two exceptions +to this rule: + + 1. Preserve blank lines between sibling items in a plain list, + + 2. In an item, remove any blank line before the very first + paragraph and the next sub-list. + Assume BACKEND is `md'." - (org-element-map tree org-element-all-elements - (lambda (elem) - (unless (eq (org-element-type elem) 'org-data) - (org-element-put-property - elem :post-blank - (let ((post-blank (org-element-property :post-blank elem))) - (if (not post-blank) 1 (max 1 post-blank))))))) + (org-element-map tree (remq 'item org-element-all-elements) + (lambda (e) + (org-element-put-property + e :post-blank + (if (and (eq (org-element-type e) 'paragraph) + (eq (org-element-type (org-element-property :parent e)) 'item) + (eq (org-element-type (org-export-get-next-element e info)) + 'plain-list) + (not (org-export-get-previous-element e info))) + 0 + 1)))) ;; Return updated tree. tree) @@ -149,7 +160,7 @@ channel." (replace-regexp-in-string "^" " " (org-remove-indentation - (org-element-property :value example-block)))) + (org-export-format-code-default example-block info)))) ;;;; Headline @@ -174,6 +185,14 @@ a communication channel." (and (plist-get info :with-priority) (let ((char (org-element-property :priority headline))) (and char (format "[#%c] " char))))) + (anchor + (when (plist-get info :with-toc) + (org-html--anchor + (or (org-element-property :CUSTOM_ID headline) + (concat "sec-" + (mapconcat 'number-to-string + (org-export-get-headline-number + headline info) "-")))))) ;; Headline text without tags. (heading (concat todo priority title))) (cond @@ -194,12 +213,12 @@ a communication channel." (replace-regexp-in-string "^" " " contents))))) ;; Use "Setext" style. ((eq org-md-headline-style 'setext) - (concat heading tags "\n" + (concat heading tags anchor "\n" (make-string (length heading) (if (= level 1) ?= ?-)) "\n\n" contents)) ;; Use "atx" style. - (t (concat (make-string level ?#) " " heading tags "\n\n" contents)))))) + (t (concat (make-string level ?#) " " heading tags anchor "\n\n" contents)))))) ;;;; Horizontal Rule @@ -244,7 +263,8 @@ a communication channel." (off "[ ] ")) (let ((tag (org-element-property :tag item))) (and tag (format "**%s:** "(org-export-data tag info)))) - (org-trim (replace-regexp-in-string "^" " " contents))))) + (and contents + (org-trim (replace-regexp-in-string "^" " " contents)))))) ;;;; Line Break @@ -262,75 +282,73 @@ channel." "Transcode LINE-BREAK object into Markdown format. CONTENTS is the link's description. INFO is a plist used as a communication channel." - (let ((--link-org-files-as-html-maybe + (let ((link-org-files-as-md (function - (lambda (raw-path info) - ;; Treat links to `file.org' as links to `file.html', if - ;; needed. See `org-html-link-org-files-as-html'. - (cond - ((and org-html-link-org-files-as-html - (string= ".org" - (downcase (file-name-extension raw-path ".")))) - (concat (file-name-sans-extension raw-path) "." - (plist-get info :html-extension))) - (t raw-path))))) + (lambda (raw-path) + ;; Treat links to `file.org' as links to `file.md'. + (if (string= ".org" (downcase (file-name-extension raw-path "."))) + (concat (file-name-sans-extension raw-path) ".md") + raw-path)))) (type (org-element-property :type link))) - (cond ((member type '("custom-id" "id")) - (let ((destination (org-export-resolve-id-link link info))) - (if (stringp destination) ; External file. - (let ((path (funcall --link-org-files-as-html-maybe - destination info))) - (if (not contents) (format "<%s>" path) - (format "[%s](%s)" contents path))) - (concat - (and contents (concat contents " ")) - (format "(%s)" - (format (org-export-translate "See section %s" :html info) - (mapconcat 'number-to-string - (org-export-get-headline-number - destination info) - "."))))))) - ((org-export-inline-image-p link org-html-inline-image-rules) - (let ((path (let ((raw-path (org-element-property :path link))) - (if (not (file-name-absolute-p raw-path)) raw-path - (expand-file-name raw-path))))) - (format "![%s](%s)" - (let ((caption (org-export-get-caption - (org-export-get-parent-element link)))) - (when caption (org-export-data caption info))) - path))) - ((string= type "coderef") - (let ((ref (org-element-property :path link))) - (format (org-export-get-coderef-format ref contents) - (org-export-resolve-coderef ref info)))) - ((equal type "radio") - (let ((destination (org-export-resolve-radio-link link info))) - (org-export-data (org-element-contents destination) info))) - ((equal type "fuzzy") - (let ((destination (org-export-resolve-fuzzy-link link info))) - (if (org-string-nw-p contents) contents - (when destination - (let ((number (org-export-get-ordinal destination info))) - (when number - (if (atom number) (number-to-string number) - (mapconcat 'number-to-string number ".")))))))) - (t (let* ((raw-path (org-element-property :path link)) - (path (cond - ((member type '("http" "https" "ftp")) - (concat type ":" raw-path)) - ((equal type "file") - ;; Treat links to ".org" files as ".html", - ;; if needed. - (setq raw-path - (funcall --link-org-files-as-html-maybe - raw-path info)) - ;; If file path is absolute, prepend it - ;; with protocol component - "file://". - (if (not (file-name-absolute-p raw-path)) raw-path - (concat "file://" (expand-file-name raw-path)))) - (t raw-path)))) - (if (not contents) (format "<%s>" path) - (format "[%s](%s)" contents path))))))) + (cond + ((member type '("custom-id" "id")) + (let ((destination (org-export-resolve-id-link link info))) + (if (stringp destination) ; External file. + (let ((path (funcall link-org-files-as-md destination))) + (if (not contents) (format "<%s>" path) + (format "[%s](%s)" contents path))) + (concat + (and contents (concat contents " ")) + (format "(%s)" + (format (org-export-translate "See section %s" :html info) + (mapconcat 'number-to-string + (org-export-get-headline-number + destination info) + "."))))))) + ((org-export-inline-image-p link org-html-inline-image-rules) + (let ((path (let ((raw-path (org-element-property :path link))) + (if (not (file-name-absolute-p raw-path)) raw-path + (expand-file-name raw-path)))) + (caption (org-export-data + (org-export-get-caption + (org-export-get-parent-element link)) info))) + (format "![img](%s)" + (if (not (org-string-nw-p caption)) path + (format "%s \"%s\"" path caption))))) + ((string= type "coderef") + (let ((ref (org-element-property :path link))) + (format (org-export-get-coderef-format ref contents) + (org-export-resolve-coderef ref info)))) + ((equal type "radio") contents) + ((equal type "fuzzy") + (let ((destination (org-export-resolve-fuzzy-link link info))) + (if (org-string-nw-p contents) contents + (when destination + (let ((number (org-export-get-ordinal destination info))) + (when number + (if (atom number) (number-to-string number) + (mapconcat 'number-to-string number ".")))))))) + ;; Link type is handled by a special function. + ((let ((protocol (nth 2 (assoc type org-link-protocols)))) + (and (functionp protocol) + (funcall protocol + (org-link-unescape (org-element-property :path link)) + contents + 'md)))) + (t (let* ((raw-path (org-element-property :path link)) + (path + (cond + ((member type '("http" "https" "ftp")) + (concat type ":" raw-path)) + ((string= type "file") + (let ((path (funcall link-org-files-as-md raw-path))) + (if (not (file-name-absolute-p path)) path + ;; If file path is absolute, prepend it + ;; with "file:" component. + (concat "file:" path)))) + (t raw-path)))) + (if (not contents) (format "<%s>" path) + (format "[%s](%s)" contents path))))))) ;;;; Paragraph @@ -403,6 +421,14 @@ a communication channel." ;;;; Template +(defun org-md-inner-template (contents info) + "Return body of document after converting it to Markdown syntax. +CONTENTS is the transcoded contents string. INFO is a plist +holding export options." + ;; Make sure CONTENTS is separated from table of contents and + ;; footnotes with at least a blank line. + (org-trim (org-html-inner-template (concat "\n" contents "\n") info))) + (defun org-md-template (contents info) "Return complete document string after Markdown conversion. CONTENTS is the transcoded contents string. INFO is a plist used diff --git a/xemacs-packages/lisp/org-8.2.3c/ox-odt.el b/elpa/org-20150427/ox-odt.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ox-odt.el rename to elpa/org-20150427/ox-odt.el index 99c1353c..95e73f54 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox-odt.el +++ b/elpa/org-20150427/ox-odt.el @@ -1,6 +1,6 @@ ;;; ox-odt.el --- OpenDocument Text Exporter for Org Mode -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Jambunathan K ;; Keywords: outlines, hypermedia, calendar, wp @@ -597,7 +597,7 @@ INPUT-FMT-LIST in to a single class. Note that this variable inherently captures how LibreOffice based converters work. LibreOffice maps documents of various formats to classes like Text, Web, Spreadsheet, Presentation etc and -allow document of a given class (irrespective of it's source +allow document of a given class (irrespective of its source format) to be converted to any of the export formats associated with that class. @@ -920,7 +920,7 @@ Specifically, locale-dependent specifiers like \"%c\", \"%x\" are formatted as canonical Org timestamps. For finer control, avoid these %-specifiers. -Textutal specifiers like \"%b\", \"%h\", \"%B\", \"%a\", \"%A\" +Textual specifiers like \"%b\", \"%h\", \"%B\", \"%a\", \"%A\" etc., are displayed by the application in the default language and country specified in `org-odt-styles-file'. Note that the default styles file uses language \"en\" and country \"GB\". You @@ -998,7 +998,9 @@ See `org-odt--build-date-styles' for implementation details." (if width (format " svg:width=\"%0.2fcm\"" width) "") (if height (format " svg:height=\"%0.2fcm\"" height) "") extra - (format " text:anchor-type=\"%s\"" (or anchor-type "paragraph"))))) + (format " text:anchor-type=\"%s\"" (or anchor-type "paragraph")) + (format " draw:name=\"%s\"" + (car (org-odt-add-automatic-style "Frame")))))) (format "\n\n%s\n" style frame-attrs @@ -1439,7 +1441,7 @@ original parsed data. INFO is a plist holding export options." ;; Update content.xml. (let* ( ;; `org-display-custom-times' should be accessed right - ;; within the context of the Org buffer. So obtain it's + ;; within the context of the Org buffer. So obtain its ;; value before moving on to temp-buffer context down below. (custom-time-fmts (if org-display-custom-times @@ -1500,7 +1502,7 @@ original parsed data. INFO is a plist holding export options." (email (and (plist-get info :with-email) email))) (concat ;; Title. - (when title + (when (org-string-nw-p title) (concat (format "\n%s" "OrgTitle" (format "\n%s" title)) @@ -1720,7 +1722,7 @@ CONTENTS is nil. INFO is a plist holding contextual information." (and (eq (org-element-type prev) 'footnote-reference) (format "%s" "OrgSuperscript" ","))) - ;; Trancode footnote reference. + ;; Transcode footnote reference. (let ((n (org-export-get-footnote-number footnote-reference info))) (cond ((not (org-export-footnote-first-reference-p footnote-reference info)) @@ -1739,7 +1741,8 @@ CONTENTS is nil. INFO is a plist holding contextual information." :transcoders '((paragraph . (lambda (p c i) (org-odt--format-paragraph - p c "Footnote" + p c i + "Footnote" "OrgFootnoteCenter" "OrgFootnoteQuotations"))))) info)))) @@ -2120,45 +2123,9 @@ SHORT-CAPTION are strings." ;; Get label and caption. (label (org-element-property :name caption-from)) (caption (org-export-get-caption caption-from)) - (short-caption (org-export-get-caption caption-from t)) - ;; Transcode captions. (caption (and caption (org-export-data caption info))) - ;; Currently short caption are sneaked in as object names. - ;; - ;; The advantages are: - ;; - ;; - Table Of Contents: Currently, there is no support for - ;; building TOC for figures, listings and tables. See - ;; `org-odt-keyword'. User instead has to rely on - ;; external application for building such indices. Within - ;; LibreOffice, building an "Illustration Index" or "Index - ;; of Tables" will create a table with long captions (only) - ;; and building a table with "Object names" will create a - ;; table with short captions. - ;; - ;; - Easy navigation: In LibreOffice, object names are - ;; offered via the navigation bar. This way one can - ;; quickly locate and jump to object of his choice in the - ;; exported document. - ;; - ;; The main disadvantage is that there cannot be any markups - ;; within object names i.e., one cannot embolden, italicize - ;; or underline text within short caption. So suppress - ;; generation of ... and other - ;; markups by overriding the default translators. We - ;; probably shouldn't be suppressing translators for all - ;; elements in `org-element-all-objects', but for now this - ;; will do. - (short-caption - (let ((short-caption (or short-caption caption)) - (backend (org-export-create-backend - :parent (org-export-backend-name - (plist-get info :back-end)) - :transcoders - (mapcar (lambda (type) (cons type (lambda (o c i) c))) - org-element-all-objects)))) - (when short-caption - (org-export-data-with-backend short-caption backend info))))) + ;; FIXME: We don't use short-caption for now + (short-caption nil)) (when (or label caption) (let* ((default-category (case (org-element-type element) @@ -2194,7 +2161,7 @@ SHORT-CAPTION are strings." (concat ;; Sneak in a bookmark. The bookmark is used when the ;; labeled element is referenced with a link that - ;; provides it's own description. + ;; provides its own description. (format "\n" label) ;; Label definition: Typically formatted as below: ;; CATEGORY SEQ-NO: LONG CAPTION @@ -2341,7 +2308,6 @@ used as a communication channel." (user-frame-params (list user-frame-style user-frame-attrs user-frame-anchor)) ;; (embed-as (or embed-as user-frame-anchor "paragraph")) - ;; extrac ;; ;; Handle `:width', `:height' and `:scale' properties. Read ;; them as numbers since we need them for computations. @@ -2371,7 +2337,7 @@ used as a communication channel." (title (and replaces (capitalize (symbol-name (org-element-type replaces))))) - ;; If yes, note down it's contents. It will go in to frame + ;; If yes, note down its contents. It will go in to frame ;; description. This quite useful for debugging. (desc (and replaces (org-element-property :value replaces)))) (org-odt--render-image/formula entity href width height @@ -2409,7 +2375,7 @@ used as a communication channel." (title (and replaces (capitalize (symbol-name (org-element-type replaces))))) - ;; If yes, note down it's contents. It will go in to frame + ;; If yes, note down its contents. It will go in to frame ;; description. This quite useful for debugging. (desc (and replaces (org-element-property :value replaces))) width height) @@ -2613,12 +2579,12 @@ used as a communication channel." INFO is a plist holding contextual information. Return non-nil, if ELEMENT is of type paragraph satisfying -PARAGRAPH-PREDICATE and it's sole content, save for whitespaces, +PARAGRAPH-PREDICATE and its sole content, save for whitespaces, is a link that satisfies LINK-PREDICATE. Return non-nil, if ELEMENT is of type link satisfying -LINK-PREDICATE and it's containing paragraph satisfies -PARAGRAPH-PREDICATE inaddtion to having no other content save for +LINK-PREDICATE and its containing paragraph satisfies +PARAGRAPH-PREDICATE in addition to having no other content save for leading and trailing whitespaces. Return nil, otherwise." @@ -2644,11 +2610,12 @@ Return nil, otherwise." (t nil)))))))) (defun org-odt-link--infer-description (destination info) - ;; DESTINATION is a HEADLINE, a "<>" or an element (like - ;; paragraph, verse-block etc) to which a "#+NAME: label" can be - ;; attached. Note that labels that are attached to captioned - ;; entities - inline images, math formulae and tables - get resolved - ;; as part of `org-odt-format-label' and `org-odt--enumerate'. + ;; DESTINATION is a headline or an element (like paragraph, + ;; verse-block etc) to which a "#+NAME: label" can be attached. + + ;; Note that labels that are attached to captioned entities - inline + ;; images, math formulae and tables - get resolved as part of + ;; `org-odt-format-label' and `org-odt--enumerate'. ;; Create a cross-reference to DESTINATION but make best-efforts to ;; create a *meaningful* description. Check item numbers, section @@ -2707,7 +2674,7 @@ Return nil, otherwise." (concat (number-to-string n) "."))) item-numbers ""))))) ;; Case 2: Locate a regular and numbered headline in the - ;; hierarchy. Display it's section number. + ;; hierarchy. Display its section number. (let ((headline (loop for el in (cons destination genealogy) when (and (eq (org-element-type el) 'headline) (not (org-export-low-level-p el info)) @@ -2720,7 +2687,7 @@ Return nil, otherwise." (mapconcat 'number-to-string (org-export-get-headline-number headline info) ".")))) ;; Case 4: Locate a regular headline in the hierarchy. Display - ;; it's title. + ;; its title. (let ((headline (loop for el in (cons destination genealogy) when (and (eq (org-element-type el) 'headline) (not (org-export-low-level-p el info))) @@ -2748,10 +2715,8 @@ INFO is a plist holding contextual information. See (path (cond ((member type '("http" "https" "ftp" "mailto")) (concat type ":" raw-path)) - ((string= type "file") - (if (file-name-absolute-p raw-path) - (concat "file://" (expand-file-name raw-path)) - (concat "file://" raw-path))) + ((and (string= type "file") (file-name-absolute-p raw-path)) + (concat "file:" raw-path)) (t raw-path))) ;; Convert & to & for correct XML representation (path (replace-regexp-in-string "&" "&" path)) @@ -2769,12 +2734,12 @@ INFO is a plist holding contextual information. See ;; link's description. ((string= type "radio") (let ((destination (org-export-resolve-radio-link link info))) - (when destination - (let ((desc (org-export-data (org-element-contents destination) info)) - (href (org-export-solidify-link-text path))) - (format - "%s" - href desc))))) + (if (not destination) desc + (format + "%s" + (org-export-solidify-link-text + (org-element-property :value destination)) + desc)))) ;; Links pointing to a headline: Find destination and build ;; appropriate referencing command. ((member type '("custom-id" "fuzzy" "id")) @@ -2806,11 +2771,10 @@ INFO is a plist holding contextual information. See (target ;; If there's a description, create a hyperlink. ;; Otherwise, try to provide a meaningful description. - (if (not desc) (org-odt-link--infer-description destination info) - (let ((label (org-element-property :value destination))) - (format "%s" - (org-export-solidify-link-text label) - desc)))) + (let ((label (org-element-property :value destination))) + (format "%s" + (org-export-solidify-link-text label) + (or desc (org-export-get-ordinal destination info))))) ;; Case 4: Fuzzy link points to some element (e.g., an ;; inline image, a math formula or a table). (otherwise @@ -2869,33 +2833,44 @@ INFO is a plist holding contextual information. See ;;;; Paragraph -(defun org-odt--format-paragraph (paragraph contents default center quote) +(defun org-odt--paragraph-style (paragraph) + "Return style of PARAGRAPH. +Style is a symbol among `quoted', `centered' and nil." + (let ((up paragraph)) + (while (and (setq up (org-element-property :parent up)) + (not (memq (org-element-type up) + '(center-block quote-block section))))) + (case (org-element-type up) + (center-block 'centered) + (quote-block 'quoted)))) + +(defun org-odt--format-paragraph (paragraph contents info default center quote) "Format paragraph according to given styles. PARAGRAPH is a paragraph type element. CONTENTS is the -transcoded contents of that paragraph, as a string. DEFAULT, -CENTER and QUOTE are, respectively, style to use when paragraph -belongs to no special environment, a center block, or a quote -block." - (let* ((parent (org-export-get-parent paragraph)) - (parent-type (org-element-type parent)) - (style (case parent-type - (quote-block quote) - (center-block center) - (t default)))) - ;; If this paragraph is a leading paragraph in an item and the - ;; item has a checkbox, splice the checkbox and paragraph contents - ;; together. - (when (and (eq (org-element-type parent) 'item) - (eq paragraph (car (org-element-contents parent)))) - (setq contents (concat (org-odt--checkbox parent) contents))) - (format "\n%s" style contents))) +transcoded contents of that paragraph, as a string. INFO is +a plist used as a communication channel. DEFAULT, CENTER and +QUOTE are, respectively, style to use when paragraph belongs to +no special environment, a center block, or a quote block." + (format "\n%s" + (case (org-odt--paragraph-style paragraph) + (quoted quote) + (centered center) + (otherwise default)) + ;; If PARAGRAPH is a leading paragraph in an item that has + ;; a checkbox, splice checkbox and paragraph contents + ;; together. + (concat (let ((parent (org-element-property :parent paragraph))) + (and (eq (org-element-type parent) 'item) + (not (org-export-get-previous-element paragraph info)) + (org-odt--checkbox parent))) + contents))) (defun org-odt-paragraph (paragraph contents info) "Transcode a PARAGRAPH element from Org to ODT. CONTENTS is the contents of the paragraph, as a string. INFO is the plist used as a communication channel." (org-odt--format-paragraph - paragraph contents + paragraph contents info (or (org-element-property :style paragraph) "Text_20_body") "OrgCenter" "Quotations")) @@ -3100,9 +3075,9 @@ holding contextual information." (defun org-odt-hfy-face-to-css (fn) "Create custom style for face FN. -When FN is the default face, use it's foreground and background +When FN is the default face, use its foreground and background properties to create \"OrgSrcBlock\" paragraph style. Otherwise -use it's color attribute to create a character style whose name +use its color attribute to create a character style whose name is obtained from FN. Currently all attributes of FN other than color are ignored. diff --git a/xemacs-packages/lisp/org-8.2.3c/ox-org.el b/elpa/org-20150427/ox-org.el similarity index 81% rename from xemacs-packages/lisp/org-8.2.3c/ox-org.el rename to elpa/org-20150427/ox-org.el index cecad563..195b9d76 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox-org.el +++ b/elpa/org-20150427/ox-org.el @@ -1,6 +1,6 @@ ;;; ox-org.el --- Org Back-End for Org Export Engine -;; Copyright (C) 2013 Free Software Foundation, Inc. +;; Copyright (C) 2013-2014 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: org, wp @@ -22,15 +22,8 @@ ;;; Commentary: -;; This library implements an Org back-end for Org exporter. -;; -;; It introduces two interactive functions, `org-org-export-as-org' -;; and `org-org-export-to-org', which export, respectively, to -;; a temporary buffer and to a file. -;; -;; A publishing function is also provided: `org-org-publish-to-org'. - ;;; Code: + (require 'ox) (declare-function htmlize-buffer "htmlize" (&optional buffer)) @@ -72,7 +65,7 @@ setting of `org-html-htmlize-output-type' is 'css." (entity . org-org-identity) (example-block . org-org-identity) (fixed-width . org-org-identity) - (footnote-definition . org-org-identity) + (footnote-definition . ignore) (footnote-reference . org-org-identity) (headline . org-org-headline) (horizontal-rule . org-org-identity) @@ -94,7 +87,7 @@ setting of `org-html-htmlize-output-type' is 'css." (quote-block . org-org-identity) (quote-section . org-org-identity) (radio-target . org-org-identity) - (section . org-org-identity) + (section . org-org-section) (special-block . org-org-identity) (src-block . org-org-identity) (statistics-cookie . org-org-identity) @@ -121,20 +114,24 @@ setting of `org-html-htmlize-output-type' is 'css." (defun org-org-identity (blob contents info) "Transcode BLOB element or object back into Org syntax. CONTENTS is its contents, as a string or nil. INFO is ignored." - (org-export-expand blob contents t)) + (let ((case-fold-search t)) + (replace-regexp-in-string + "^[ \t]*#\\+ATTR_[-_A-Za-z0-9]+:\\(?: .*\\)?\n" "" + (org-export-expand blob contents t)))) (defun org-org-headline (headline contents info) "Transcode HEADLINE element back into Org syntax. CONTENTS is its contents, as a string or nil. INFO is ignored." - (unless (plist-get info :with-todo-keywords) - (org-element-put-property headline :todo-keyword nil)) - (unless (plist-get info :with-tags) - (org-element-put-property headline :tags nil)) - (unless (plist-get info :with-priority) - (org-element-put-property headline :priority nil)) - (org-element-put-property headline :level - (org-export-get-relative-level headline info)) - (org-element-headline-interpreter headline contents)) + (unless (org-element-property :footnote-section-p headline) + (unless (plist-get info :with-todo-keywords) + (org-element-put-property headline :todo-keyword nil)) + (unless (plist-get info :with-tags) + (org-element-put-property headline :tags nil)) + (unless (plist-get info :with-priority) + (org-element-put-property headline :priority nil)) + (org-element-put-property headline :level + (org-export-get-relative-level headline info)) + (org-element-headline-interpreter headline contents))) (defun org-org-keyword (keyword contents info) "Transcode KEYWORD element back into Org syntax. @@ -148,6 +145,33 @@ keywords targeted at other export back-ends." org-element-block-name-alist)) (org-element-keyword-interpreter keyword nil))) +(defun org-org-section (section contents info) + "Transcode SECTION element back into Org syntax. +CONTENTS is the contents of the section. INFO is a plist used as +a communication channel." + (concat + (org-element-normalize-string contents) + ;; Insert footnote definitions appearing for the first time in this + ;; section. Indeed, some of them may not be available to narrowing + ;; so we make sure all of them are included in the result. + (let ((footnotes-alist + (org-element-map section 'footnote-reference + (lambda (fn) + (and (eq (org-element-property :type fn) 'standard) + (org-export-footnote-first-reference-p fn info) + (cons (org-element-property :label fn) + (org-export-get-footnote-definition fn info)))) + info))) + (and footnotes-alist + (concat "\n" + (mapconcat + (lambda (d) + (org-element-normalize-string + (concat (format "[%s] "(car d)) + (org-export-data (cdr d) info)))) + footnotes-alist "\n")))) + (make-string (or (org-element-property :post-blank section) 0) ?\n))) + ;;;###autoload (defun org-org-export-as-org (&optional async subtreep visible-only ext-plist) "Export current buffer to an Org buffer. diff --git a/xemacs-packages/lisp/org-8.2.3c/ox-publish.el b/elpa/org-20150427/ox-publish.el similarity index 96% rename from xemacs-packages/lisp/org-8.2.3c/ox-publish.el rename to elpa/org-20150427/ox-publish.el index 67a57fa3..180764ee 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox-publish.el +++ b/elpa/org-20150427/ox-publish.el @@ -1,5 +1,5 @@ ;;; ox-publish.el --- Publish Related Org Mode Files as a Website -;; Copyright (C) 2006-2013 Free Software Foundation, Inc. +;; Copyright (C) 2006-2014 Free Software Foundation, Inc. ;; Author: David O'Toole ;; Maintainer: Carsten Dominik @@ -805,10 +805,16 @@ Default for SITEMAP-FILENAME is 'sitemap.org'." (visiting (find-buffer-visiting file)) (buffer (or visiting (find-file-noselect file)))) (with-current-buffer buffer - (org-mode) (let ((title - (let ((property (plist-get (org-export-get-environment) :title))) - (if property (org-element-interpret-data property) + (let ((property + (plist-get + ;; protect local variables in open buffers + (if visiting + (org-export-with-buffer-copy (org-export-get-environment)) + (org-export-get-environment)) + :title))) + (if property + (org-no-properties (org-element-interpret-data property)) (file-name-nondirectory (file-name-sans-extension file)))))) (unless visiting (kill-buffer buffer)) (org-publish-cache-set-file-property file :title title) @@ -821,12 +827,14 @@ If FILE is an Org file and provides a DATE keyword use it. In any other case use the file system's modification time. Return time in `current-time' format." (if (file-directory-p file) (nth 5 (file-attributes file)) - (let* ((visiting (find-buffer-visiting file)) + (let* ((org-inhibit-startup t) + (visiting (find-buffer-visiting file)) (file-buf (or visiting (find-file-noselect file nil))) (date (plist-get (with-current-buffer file-buf - (let ((org-inhibit-startup t)) (org-mode)) - (org-export-get-environment)) + (if visiting + (org-export-with-buffer-copy (org-export-get-environment)) + (org-export-get-environment))) :date))) (unless visiting (kill-buffer file-buf)) ;; DATE is either a timestamp object or a secondary string. If it @@ -862,25 +870,28 @@ When optional argument FORCE is non-nil, force publishing all files in PROJECT. With a non-nil optional argument ASYNC, publishing will be done asynchronously, in another process." (interactive - (list - (assoc (org-icompleting-read - "Publish project: " - org-publish-project-alist nil t) - org-publish-project-alist) - current-prefix-arg)) - (let ((project-alist (if (not (stringp project)) (list project) - ;; If this function is called in batch mode, - ;; project is still a string here. - (list (assoc project org-publish-project-alist))))) - (if async - (org-export-async-start 'ignore - `(let ((org-publish-use-timestamps-flag - (if ',force nil ,org-publish-use-timestamps-flag))) - (org-publish-projects ',project-alist))) - (save-window-excursion - (let* ((org-publish-use-timestamps-flag - (if force nil org-publish-use-timestamps-flag))) - (org-publish-projects project-alist)))))) + (list (assoc (org-icompleting-read "Publish project: " + org-publish-project-alist nil t) + org-publish-project-alist) + current-prefix-arg)) + (let ((project (if (not (stringp project)) project + ;; If this function is called in batch mode, + ;; PROJECT is still a string here. + (assoc project org-publish-project-alist)))) + (cond + ((not project)) + (async + (org-export-async-start (lambda (results) nil) + `(let ((org-publish-use-timestamps-flag + ,(and (not force) org-publish-use-timestamps-flag))) + ;; Expand components right now as external process may not + ;; be aware of complete `org-publish-project-alist'. + (org-publish-projects + ',(org-publish-expand-projects (list project)))))) + (t (save-window-excursion + (let ((org-publish-use-timestamps-flag + (and (not force) org-publish-use-timestamps-flag))) + (org-publish-projects (list project)))))))) ;;;###autoload (defun org-publish-all (&optional force async) @@ -891,7 +902,7 @@ optional argument ASYNC, publishing will be done asynchronously, in another process." (interactive "P") (if async - (org-export-async-start 'ignore + (org-export-async-start (lambda (results) nil) `(progn (when ',force (org-publish-remove-all-timestamps)) (let ((org-publish-use-timestamps-flag @@ -913,7 +924,7 @@ asynchronously, in another process." (interactive "P") (let ((file (buffer-file-name (buffer-base-buffer)))) (if async - (org-export-async-start 'ignore + (org-export-async-start (lambda (results) nil) `(let ((org-publish-use-timestamps-flag (if ',force nil ,org-publish-use-timestamps-flag))) (org-publish-file ,file))) @@ -1072,7 +1083,7 @@ publishing directory." Return value is a list of numbers, or nil. This function allows to resolve external fuzzy links like: - [[file.org::*fuzzy][description]" + [[file.org::*fuzzy][description]]" (when org-publish-cache (cdr (assoc (org-split-string (if (eq (aref fuzzy 0) ?*) (substring fuzzy 1) fuzzy)) @@ -1225,8 +1236,9 @@ Returns value on success, else nil." (let ((attr (file-attributes (expand-file-name (or (file-symlink-p file) file) (file-name-directory file))))) - (+ (lsh (car (nth 5 attr)) 16) - (cadr (nth 5 attr))))) + (if (not attr) (error "No such file: \"%s\"" file) + (+ (lsh (car (nth 5 attr)) 16) + (cadr (nth 5 attr)))))) (provide 'ox-publish) diff --git a/xemacs-packages/lisp/org-8.2.3c/ox-texinfo.el b/elpa/org-20150427/ox-texinfo.el similarity index 58% rename from xemacs-packages/lisp/org-8.2.3c/ox-texinfo.el rename to elpa/org-20150427/ox-texinfo.el index 0df660da..37841d77 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox-texinfo.el +++ b/elpa/org-20150427/ox-texinfo.el @@ -1,6 +1,6 @@ ;;; ox-texinfo.el --- Texinfo Back-End for Org Export Engine -;; Copyright (C) 2012-2013 Free Software Foundation, Inc. +;; Copyright (C) 2012-2014 Free Software Foundation, Inc. ;; Author: Jonathan Leech-Pepin ;; Keywords: outlines, hypermedia, calendar, wp @@ -21,38 +21,7 @@ ;;; Commentary: ;; -;; This library implements a Texinfo back-end for Org generic -;; exporter. -;; -;; To test it, run -;; -;; M-: (org-export-to-buffer 'texinfo "*Test Texinfo*") RET -;; -;; in an Org mode buffer then switch to the buffer to see the Texinfo -;; export. See ox.el for more details on how this exporter works. -;; - -;; It introduces nine new buffer keywords: "TEXINFO_CLASS", -;; "TEXINFO_FILENAME", "TEXINFO_HEADER", "TEXINFO_POST_HEADER", -;; "TEXINFO_DIR_CATEGORY", "TEXINFO_DIR_TITLE", "TEXINFO_DIR_DESC" -;; "SUBTITLE" and "SUBAUTHOR". - -;; -;; It introduces 1 new headline property keywords: -;; "TEXINFO_MENU_TITLE" for optional menu titles. -;; -;; To include inline code snippets (for example for generating @kbd{} -;; and @key{} commands), the following export-snippet keys are -;; accepted: -;; -;; texinfo -;; info -;; -;; You can add them for export snippets via any of the below: -;; -;; (add-to-list 'org-export-snippet-translation-alist -;; '("info" . "texinfo")) -;; +;; See Org manual for details. ;;; Code: @@ -70,8 +39,8 @@ (center-block . org-texinfo-center-block) (clock . org-texinfo-clock) (code . org-texinfo-code) - (comment . org-texinfo-comment) - (comment-block . org-texinfo-comment-block) + (comment . (lambda (&rest args) "")) + (comment-block . (lambda (&rest args) "")) (drawer . org-texinfo-drawer) (dynamic-block . org-texinfo-dynamic-block) (entity . org-texinfo-entity) @@ -114,13 +83,14 @@ :export-block "TEXINFO" :filters-alist '((:filter-headline . org-texinfo-filter-section-blank-lines) + (:filter-parse-tree . org-texinfo--normalize-headlines) (:filter-section . org-texinfo-filter-section-blank-lines)) :menu-entry '(?i "Export to Texinfo" ((?t "As TEXI file" org-texinfo-export-to-texinfo) (?i "As INFO file" org-texinfo-export-to-info))) :options-alist - '((:texinfo-filename "TEXINFO_FILENAME" nil org-texinfo-filename t) + '((:texinfo-filename "TEXINFO_FILENAME" nil nil t) (:texinfo-class "TEXINFO_CLASS" nil org-texinfo-default-class t) (:texinfo-header "TEXINFO_HEADER" nil nil newline) (:texinfo-post-header "TEXINFO_POST_HEADER" nil nil newline) @@ -128,7 +98,8 @@ (:subauthor "SUBAUTHOR" nil nil newline) (:texinfo-dircat "TEXINFO_DIR_CATEGORY" nil nil t) (:texinfo-dirtitle "TEXINFO_DIR_TITLE" nil nil t) - (:texinfo-dirdesc "TEXINFO_DIR_DESC" nil nil t))) + (:texinfo-dirdesc "TEXINFO_DIR_DESC" nil nil t) + (:texinfo-printed-title "TEXINFO_PRINTED_TITLE" nil nil t))) @@ -141,12 +112,7 @@ :package-version '(Org . "8.0") :group 'org-export) -;;; Preamble - -(defcustom org-texinfo-filename "" - "Default filename for Texinfo output." - :group 'org-export-texinfo - :type '(string :tag "Export Filename")) +;;;; Preamble (defcustom org-texinfo-coding-system nil "Default document encoding for Texinfo output. @@ -162,19 +128,42 @@ If `nil' it will default to `buffer-file-coding-system'." (defcustom org-texinfo-classes '(("info" - "\\input texinfo @c -*- texinfo -*-" + "@documentencoding AUTO\n@documentlanguage AUTO" ("@chapter %s" . "@unnumbered %s") ("@section %s" . "@unnumberedsec %s") ("@subsection %s" . "@unnumberedsubsec %s") ("@subsubsection %s" . "@unnumberedsubsubsec %s"))) "Alist of Texinfo classes and associated header and structure. -If #+Texinfo_CLASS is set in the buffer, use its value and the +If #+TEXINFO_CLASS is set in the buffer, use its value and the associated information. Here is the structure of each cell: \(class-name header-string - \(numbered-section . unnumbered-section\) - ...\) + \(numbered-section . unnumbered-section) + ...) + + +The header string +----------------- + +The header string is inserted in the header of the generated +document, right after \"@setfilename\" and \"@settitle\" +commands. + +If it contains the special string + + \"@documentencoding AUTO\" + +\"AUTO\" will be replaced with an appropriate coding system. See +`org-texinfo-coding-system' for more information. Likewise, if +the string contains the special string + + \"@documentlanguage AUTO\" + +\"AUTO\" will be replaced with the language defined in the +buffer, through #+LANGUAGE keyword, or globally, with +`org-export-default-language', which see. + The sectioning structure ------------------------ @@ -186,10 +175,12 @@ section string and will be replaced by the title of the section. Instead of a list of sectioning commands, you can also specify a function name. That function will be called with two -parameters, the \(reduced) level of the headline, and a predicate +parameters, the reduced) level of the headline, and a predicate non-nil when the headline should be numbered. It must return a format string in which the section title will be added." :group 'org-export-texinfo + :version "24.4" + :package-version '(Org . "8.2") :type '(repeat (list (string :tag "Texinfo class") (string :tag "Texinfo header") @@ -200,7 +191,7 @@ a format string in which the section title will be added." (string :tag "unnumbered")) (function :tag "Hook computing sectioning")))))) -;;; Headline +;;;; Headline (defcustom org-texinfo-format-headline-function 'ignore "Function to format headline text. @@ -230,22 +221,16 @@ order to reproduce the default set-up: :group 'org-export-texinfo :type 'function) -;;; Node listing (menu) +;;;; Node listing (menu) (defcustom org-texinfo-node-description-column 32 - "Column at which to start the description in the node - listings. - + "Column at which to start the description in the node listings. If a node title is greater than this length, the description will be placed after the end of the title." :group 'org-export-texinfo :type 'integer) -;;; Footnotes -;; -;; Footnotes are inserted directly - -;;; Timestamps +;;;; Timestamps (defcustom org-texinfo-active-timestamp-format "@emph{%s}" "A printf format string to be applied to active timestamps." @@ -262,14 +247,14 @@ be placed after the end of the title." :group 'org-export-texinfo :type 'string) -;;; Links +;;;; Links (defcustom org-texinfo-link-with-unknown-path-format "@indicateurl{%s}" "Format string for links with unknown path type." :group 'org-export-texinfo :type 'string) -;;; Tables +;;;; Tables (defcustom org-texinfo-tables-verbatim nil "When non-nil, tables are exported verbatim." @@ -285,12 +270,14 @@ When nil, no transformation is made." :group 'org-export-texinfo :type '(choice (string :tag "Format string") - (const :tag "No formatting"))) + (const :tag "No formatting" nil))) (defcustom org-texinfo-def-table-markup "@samp" - "Default setting for @table environments.") + "Default setting for @table environments." + :group 'org-export-texinfo + :type 'string) -;;; Text markup +;;;; Text markup (defcustom org-texinfo-text-markup-alist '((bold . "@strong{%s}") (code . code) @@ -314,7 +301,7 @@ returned as-is." :type 'alist :options '(bold code italic verbatim comment)) -;;; Drawers +;;;; Drawers (defcustom org-texinfo-format-drawer-function (lambda (name contents) contents) @@ -329,10 +316,10 @@ The function should return the string to be exported. The default function simply returns the value of CONTENTS." :group 'org-export-texinfo :version "24.4" - :package-version '(Org . "8.3") + :package-version '(Org . "8.2") :type 'function) -;;; Inlinetasks +;;;; Inlinetasks (defcustom org-texinfo-format-inlinetask-function 'ignore "Function called to format an inlinetask in Texinfo code. @@ -348,7 +335,7 @@ The function must accept six parameters: The function should return the string to be exported. For example, the variable could be set to the following function -in order to mimic default behaviour: +in order to mimic default behavior: \(defun org-texinfo-format-inlinetask \(todo type priority name tags contents\) \"Format an inline task element for Texinfo export.\" @@ -368,18 +355,13 @@ in order to mimic default behaviour: :group 'org-export-texinfo :type 'function) -;;; Src blocks -;; -;; Src Blocks are example blocks, except for LISP +;;;; Compilation -;;; Compilation - -(defcustom org-texinfo-info-process - '("makeinfo %f") +(defcustom org-texinfo-info-process '("makeinfo %f") "Commands to process a Texinfo file to an INFO file. This is list of strings, each of them will be given to the shell as a command. %f in the command will be replaced by the full -file name, %b by the file base name \(i.e without extension) and +file name, %b by the file base name (i.e without extension) and %o by the base directory of the file." :group 'org-export-texinfo :type '(repeat :tag "Shell command sequence" @@ -401,12 +383,13 @@ set `org-texinfo-logfiles-extensions'." :group 'org-export-latex :type 'boolean) - ;;; Constants + (defconst org-texinfo-max-toc-depth 4 - "Maximum depth for creation of detailed menu listings. Beyond - this depth Texinfo will not recognize the nodes and will cause - errors. Left as a constant in case this value ever changes.") + "Maximum depth for creation of detailed menu listings. +Beyond this depth, Texinfo will not recognize the nodes and will +cause errors. Left as a constant in case this value ever +changes.") (defconst org-texinfo-supported-coding-systems '("US-ASCII" "UTF-8" "ISO-8859-15" "ISO-8859-1" "ISO-8859-2" "koi8-r" "koi8-u") @@ -423,6 +406,31 @@ If two strings share the same prefix (e.g. \"ISO-8859-1\" and (let ((blanks (make-string 2 ?\n))) (replace-regexp-in-string "\n\\(?:\n[ \t]*\\)*\\'" blanks headline))) +(defun org-texinfo--normalize-headlines (tree back-end info) + "Normalize headlines in TREE. + +BACK-END is the symbol specifying back-end used for export. INFO +is a plist used as a communication channel. + +Make sure every headline in TREE contains a section, since those +are required to install a menu. Also put exactly one blank line +at the end of each section. + +Return new tree." + (org-element-map tree 'headline + (lambda (hl) + (org-element-put-property hl :post-blank 1) + (let ((contents (org-element-contents hl))) + (when contents + (let ((first (org-element-map contents '(headline section) + #'identity info t))) + (unless (eq (org-element-type first) 'section) + (apply #'org-element-set-contents + hl + (cons `(section (:parent ,hl)) contents))))))) + info) + tree) + (defun org-texinfo--find-verb-separator (s) "Return a character not used in string S. This is used to choose a separator for constructs like \\verb." @@ -431,18 +439,6 @@ This is used to choose a separator for constructs like \\verb." when (not (string-match (regexp-quote (char-to-string c)) s)) return (char-to-string c)))) -(defun org-texinfo--make-option-string (options) - "Return a comma separated string of keywords and values. -OPTIONS is an alist where the key is the options keyword as -a string, and the value a list containing the keyword value, or -nil." - (mapconcat (lambda (pair) - (concat (first pair) - (when (> (length (second pair)) 0) - (concat "=" (second pair))))) - options - ",")) - (defun org-texinfo--text-markup (text markup) "Format TEXT depending on MARKUP text markup. See `org-texinfo-text-markup-alist' for details." @@ -470,207 +466,44 @@ See `org-texinfo-text-markup-alist' for details." ;; Else use format string. (t (format fmt text))))) -(defun org-texinfo--get-node (headline info) - "Return node entry associated to HEADLINE. -INFO is a plist used as a communication channel." - (let ((menu-title (org-export-get-alt-title headline info))) - (org-texinfo--sanitize-menu - (replace-regexp-in-string - "%" "%%" - (if menu-title (org-export-data menu-title info) - (org-texinfo--sanitize-headline - (org-element-property :title headline) info)))))) - -;;; Headline sanitizing - -(defun org-texinfo--sanitize-headline (headline info) - "Remove all formatting from the text of a headline for use in - node and menu listing." - (mapconcat 'identity - (org-texinfo--sanitize-headline-contents headline info) " ")) - -(defun org-texinfo--sanitize-headline-contents (headline info) - "Retrieve the content of the headline. - -Any content that can contain further formatting is checked -recursively, to ensure that nested content is also properly -retrieved." - (loop for contents in headline append - (cond - ;; already a string - ((stringp contents) - (list (replace-regexp-in-string " $" "" contents))) - ;; Is exported as-is (value) - ((org-element-map contents '(verbatim code) - (lambda (value) (org-element-property :value value)) info)) - ;; Has content and recurse into the content - ((org-element-contents contents) - (org-texinfo--sanitize-headline-contents - (org-element-contents contents) info))))) - -;;; Menu sanitizing - -(defun org-texinfo--sanitize-menu (title) - "Remove invalid characters from TITLE for use in menus and -nodes. - -Based on Texinfo specifications, the following must be removed: -@ { } ( ) : . ," - (replace-regexp-in-string "[@{}():,.]" "" title)) - -;;; Content sanitizing +(defun org-texinfo--get-node (blob info) + "Return node or anchor associated to BLOB. +BLOB is an element or object. INFO is a plist used as +a communication channel. The function guarantees the node or +anchor name is unique." + (let ((cache (plist-get info :texinfo-node-cache))) + (or (cdr (assq blob cache)) + (let ((name + (org-texinfo--sanitize-node + (case (org-element-type blob) + (headline + (org-export-data (org-export-get-alt-title blob info) info)) + ((radio-target target) (org-element-property :value blob)) + (otherwise (or (org-element-property :name blob) "")))))) + ;; Ensure NAME is unique. + (while (rassoc name cache) (setq name (concat name "x"))) + (plist-put info :texinfo-node-cache (cons (cons blob name) cache)) + name)))) + +;;;; Menu sanitizing + +(defun org-texinfo--sanitize-node (title) + "Bend string TITLE to node line requirements. +Trim string and collapse multiple whitespace characters as they +are not significant. Also remove the following characters: @ +{ } ( ) : . ," + (replace-regexp-in-string + "[:,.]" "" + (replace-regexp-in-string + "\\`(\\(.*)\\)" "[\\1" + (org-trim (replace-regexp-in-string "[ \t]\\{2,\\}" " " title))))) + +;;;; Content sanitizing (defun org-texinfo--sanitize-content (text) - "Ensure characters are properly escaped when used in headlines or blocks. - -Escape characters are: @ { }" - (replace-regexp-in-string "\\\([@{}]\\\)" "@\\1" text)) - -;;; Menu creation - -(defun org-texinfo--build-menu (tree level info &optional detailed) - "Create the @menu/@end menu information from TREE at headline -level LEVEL. - -TREE contains the parse-tree to work with, either of the entire -document or of a specific parent headline. LEVEL indicates what -level of headlines to look at when generating the menu. INFO is -a plist containing contextual information. - -Detailed determines whether to build a single level of menu, or -recurse into all children as well." - (let ((menu (org-texinfo--generate-menu-list tree level info)) - output text-menu) - (cond - (detailed - ;; Looping is done within the menu generation. - (setq text-menu (org-texinfo--generate-detailed menu level info))) - (t - (setq text-menu (org-texinfo--generate-menu-items menu info)))) - (when text-menu - (setq output (org-texinfo--format-menu text-menu)) - (mapconcat 'identity output "\n")))) - -(defun org-texinfo--generate-detailed (menu level info) - "Generate a detailed listing of all subheadings within MENU starting at LEVEL. - -MENU is the parse-tree to work with. LEVEL is the starting level -for the menu headlines and from which recursion occurs. INFO is -a plist containing contextual information." - (when level - (let ((max-depth (min org-texinfo-max-toc-depth - (plist-get info :headline-levels)))) - (when (> max-depth level) - (loop for headline in menu append - (let* ((title (org-texinfo--menu-headlines headline info)) - ;; Create list of menu entries for the next level - (sublist (org-texinfo--generate-menu-list - headline (1+ level) info)) - ;; Generate the menu items for that level. If - ;; there are none omit that heading completely, - ;; otherwise join the title to it's related entries. - (submenu (if (org-texinfo--generate-menu-items sublist info) - (append (list title) - (org-texinfo--generate-menu-items sublist info)) - 'nil)) - ;; Start the process over the next level down. - (recursion (org-texinfo--generate-detailed sublist (1+ level) info))) - (setq recursion (append submenu recursion)) - recursion)))))) - -(defun org-texinfo--generate-menu-list (tree level info) - "Generate the list of headlines that are within a given level -of the tree for further formatting. - -TREE is the parse-tree containing the headlines. LEVEL is the -headline level to generate a list of. INFO is a plist holding -contextual information." - (org-element-map tree 'headline - (lambda (head) - (and (= (org-export-get-relative-level head info) level) - ;; Do not take note of footnotes or copying headlines. - (not (org-element-property :COPYING head)) - (not (org-element-property :footnote-section-p head)) - ;; Collect headline. - head)) - info)) - -(defun org-texinfo--generate-menu-items (items info) - "Generate a list of headline information from the listing ITEMS. - -ITEMS is a list of the headlines to be converted into entries. -INFO is a plist containing contextual information. - -Returns a list containing the following information from each -headline: length, title, description. This is used to format the -menu using `org-texinfo--format-menu'." - (loop for headline in items collect - (let* ((menu-title (org-texinfo--sanitize-menu - (org-export-data - (org-export-get-alt-title headline info) - info))) - (title (org-texinfo--sanitize-menu - (org-texinfo--sanitize-headline - (org-element-property :title headline) info))) - (descr (org-export-data - (org-element-property :DESCRIPTION headline) - info)) - (menu-entry (if (string= "" menu-title) title menu-title)) - (len (length menu-entry)) - (output (list len menu-entry descr))) - output))) - -(defun org-texinfo--menu-headlines (headline info) - "Retrieve the title from HEADLINE. - -INFO is a plist holding contextual information. - -Return the headline as a list of (length title description) with -length of -1 and nil description. This is used in -`org-texinfo--format-menu' to identify headlines as opposed to -entries." - (let ((title (org-export-data - (org-element-property :title headline) info))) - (list -1 title 'nil))) - -(defun org-texinfo--format-menu (text-menu) - "Format the TEXT-MENU items to be properly printed in the menu. - -Each entry in the menu should be provided as (length title -description). - -Headlines in the detailed menu are given length -1 to ensure they -are never confused with other entries. They also have no -description. - -Other menu items are output as: - Title:: description - -With the spacing between :: and description based on the length -of the longest menu entry." - - (let (output) - (setq output - (mapcar (lambda (name) - (let* ((title (nth 1 name)) - (desc (nth 2 name)) - (length (nth 0 name)) - (column (max - ;;6 is "* " ":: " for inserted text - length - (- - org-texinfo-node-description-column - 6))) - (spacing (- column length) - )) - (if (> length -1) - (concat "* " title ":: " - (make-string spacing ?\s) - (if desc - (concat desc))) - (concat "\n" title "\n")))) - text-menu)) - output)) + "Escape special characters in string TEXT. +Special characters are: @ { }" + (replace-regexp-in-string "[@{}]" "@\\&" text)) ;;; Template @@ -678,145 +511,127 @@ of the longest menu entry." "Return complete document string after Texinfo conversion. CONTENTS is the transcoded contents string. INFO is a plist holding export options." - (let* ((title (org-export-data (plist-get info :title) info)) - (info-filename (or (plist-get info :texinfo-filename) - (file-name-nondirectory - (org-export-output-file-name ".info")))) - (author (org-export-data (plist-get info :author) info)) - (lang (org-export-data (plist-get info :language) info)) - (texinfo-header (plist-get info :texinfo-header)) - (texinfo-post-header (plist-get info :texinfo-post-header)) - (subtitle (plist-get info :subtitle)) - (subauthor (plist-get info :subauthor)) - (class (plist-get info :texinfo-class)) - (header (nth 1 (assoc class org-texinfo-classes))) - (copying - (org-element-map (plist-get info :parse-tree) 'headline - (lambda (hl) (and (org-element-property :COPYING hl) hl)) info t)) - (dircat (plist-get info :texinfo-dircat)) - (dirtitle (plist-get info :texinfo-dirtitle)) - (dirdesc (plist-get info :texinfo-dirdesc)) - ;; Spacing to align description (column 32 - 3 for `* ' and - ;; `.' in text. - (dirspacing (- 29 (length dirtitle))) - (menu (org-texinfo-make-menu info 'main)) - (detail-menu (org-texinfo-make-menu info 'detailed))) + (let ((title (org-export-data (plist-get info :title) info)) + ;; Copying data is the contents of the first headline in + ;; parse tree with a non-nil copying property. + (copying (org-element-map (plist-get info :parse-tree) 'headline + (lambda (hl) + (and (org-not-nil (org-element-property :COPYING hl)) + (org-element-contents hl))) + info t))) (concat - ;; Header - header "\n" + "\\input texinfo @c -*- texinfo -*-\n" "@c %**start of header\n" - ;; Filename and Title - "@setfilename " info-filename "\n" - "@settitle " title "\n" - ;; Coding system. - (format - "@documentencoding %s\n" - (catch 'coding-system - (let ((case-fold-search t) - (name (symbol-name (or org-texinfo-coding-system - buffer-file-coding-system)))) - (dolist (system org-texinfo-supported-coding-systems "UTF-8") - (when (org-string-match-p (regexp-quote system) name) - (throw 'coding-system system)))))) - "\n" - (format "@documentlanguage %s\n" lang) - "\n\n" - "@c Version and Contact Info\n" - "@set AUTHOR " author "\n" - - ;; Additional Header Options set by `#+TEXINFO_HEADER - (if texinfo-header - (concat "\n" - texinfo-header - "\n")) - - "@c %**end of header\n" - "@finalout\n" - "\n\n" - - ;; Additional Header Options set by #+TEXINFO_POST_HEADER - (if texinfo-post-header - (concat "\n" - texinfo-post-header - "\n")) - - ;; Copying - "@copying\n" - ;; Only export the content of the headline, do not need the - ;; initial headline. - (org-export-data (nth 2 copying) info) - "@end copying\n" - "\n\n" - - ;; Info directory information - ;; Only supply if both title and category are provided - (if (and dircat dirtitle) + (let ((file (or (plist-get info :texinfo-filename) + (let ((f (plist-get info :output-file))) + (and f (concat (file-name-sans-extension f) ".info")))))) + (and file (format "@setfilename %s\n" file))) + (format "@settitle %s\n" title) + ;; Insert class-defined header. + (org-element-normalize-string + (let ((header (nth 1 (assoc (plist-get info :texinfo-class) + org-texinfo-classes))) + (coding + (catch 'coding-system + (let ((case-fold-search t) + (name (symbol-name (or org-texinfo-coding-system + buffer-file-coding-system)))) + (dolist (system org-texinfo-supported-coding-systems "UTF-8") + (when (org-string-match-p (regexp-quote system) name) + (throw 'coding-system system)))))) + (language (plist-get info :language)) + (case-fold-search nil)) + ;; Auto coding system. + (replace-regexp-in-string + "^@documentencoding \\(AUTO\\)$" + coding + (replace-regexp-in-string + "^@documentlanguage \\(AUTO\\)$" language header t nil 1) t nil 1))) + ;; Additional header options set by #+TEXINFO_HEADER. + (let ((texinfo-header (plist-get info :texinfo-header))) + (and texinfo-header (org-element-normalize-string texinfo-header))) + "@c %**end of header\n\n" + ;; Additional options set by #+TEXINFO_POST_HEADER. + (let ((texinfo-post-header (plist-get info :texinfo-post-header))) + (and texinfo-post-header + (org-element-normalize-string texinfo-post-header))) + ;; Copying. + (and copying + (format "@copying\n%s@end copying\n\n" + (org-element-normalize-string + (org-export-data copying info)))) + ;; Info directory information. Only supply if both title and + ;; category are provided. + (let ((dircat (plist-get info :texinfo-dircat)) + (dirtitle + (let ((title (plist-get info :texinfo-dirtitle))) + (and title + (string-match "^\\(?:\\* \\)?\\(.*?\\)\\(\\.\\)?$" title) + (format "* %s." (match-string 1 title)))))) + (when (and dircat dirtitle) (concat "@dircategory " dircat "\n" "@direntry\n" - "* " dirtitle "." - (make-string dirspacing ?\s) - dirdesc "\n" - "@end direntry\n")) - "\n\n" - + (let ((dirdesc + (let ((desc (plist-get info :texinfo-dirdesc))) + (cond ((not desc) nil) + ((org-string-match-p "\\.$" desc) desc) + (t (concat desc ".")))))) + (if dirdesc (format "%-23s %s" dirtitle dirdesc) dirtitle)) + "\n" + "@end direntry\n\n"))) ;; Title + "@finalout\n" "@titlepage\n" - "@title " title "\n\n" - (if subtitle - (concat "@subtitle " subtitle "\n")) - "@author " author "\n" - (if subauthor - (concat subauthor "\n")) - "\n" - "@c The following two commands start the copyright page.\n" - "@page\n" - "@vskip 0pt plus 1filll\n" - "@insertcopying\n" + (format "@title %s\n" (or (plist-get info :texinfo-printed-title) title)) + (let ((subtitle (plist-get info :subtitle))) + (and subtitle + (org-element-normalize-string + (replace-regexp-in-string "^" "@subtitle " subtitle)))) + (when (plist-get info :with-author) + (concat + ;; Primary author. + (let ((author (org-string-nw-p + (org-export-data (plist-get info :author) info))) + (email (and (plist-get info :with-email) + (org-string-nw-p + (org-export-data (plist-get info :email) info))))) + (cond ((and author email) + (format "@author %s (@email{%s})\n" author email)) + (author (format "@author %s\n" author)) + (email (format "@author @email{%s}\n" email)))) + ;; Other authors. + (let ((subauthor (plist-get info :subauthor))) + (and subauthor + (org-element-normalize-string + (replace-regexp-in-string "^" "@author " subauthor)))))) + (and copying "@page\n@vskip 0pt plus 1filll\n@insertcopying\n") "@end titlepage\n\n" - "@c Output the table of contents at the beginning.\n" - "@contents\n\n" - + ;; Table of contents. + (and (plist-get info :with-toc) "@contents\n\n") ;; Configure Top Node when not for Tex "@ifnottex\n" "@node Top\n" - "@top " title " Manual\n" - "@insertcopying\n" + (format "@top %s\n" title) + (and copying "@insertcopying\n") "@end ifnottex\n\n" - - ;; Do not output menus if they are empty - (if menu - ;; Menu - (concat "@menu\n" - menu - "\n\n" - ;; Detailed Menu - (if detail-menu - (concat "@detailmenu\n" - " --- The Detailed Node Listing ---\n" - detail-menu - "\n\n" - "@end detailmenu\n")) - "@end menu\n")) - "\n\n" - - ;; Document's body. - contents + ;; Menu. + (org-texinfo-make-menu (plist-get info :parse-tree) info 'master) "\n" + ;; Document's body. + contents "\n" ;; Creator. - (let ((creator-info (plist-get info :with-creator))) - (cond - ((not creator-info) "") - ((eq creator-info 'comment) - (format "@c %s\n" (plist-get info :creator))) - (t (concat (plist-get info :creator) "\n")))) + (case (plist-get info :with-creator) + ((nil) nil) + (comment (format "@c %s\n" (plist-get info :creator))) + (otherwise (concat (plist-get info :creator) "\n"))) ;; Document end. - "\n@bye"))) + "@bye"))) ;;; Transcode Functions -;;; Bold +;;;; Bold (defun org-texinfo-bold (bold contents info) "Transcode BOLD from Org to Texinfo. @@ -824,7 +639,7 @@ CONTENTS is the text with bold markup. INFO is a plist holding contextual information." (org-texinfo--text-markup contents 'bold)) -;;; Center Block +;;;; Center Block (defun org-texinfo-center-block (center-block contents info) "Transcode a CENTER-BLOCK element from Org to Texinfo. @@ -832,7 +647,7 @@ CONTENTS holds the contents of the block. INFO is a plist used as a communication channel." contents) -;;; Clock +;;;; Clock (defun org-texinfo-clock (clock contents info) "Transcode a CLOCK element from Org to Texinfo. @@ -849,7 +664,7 @@ information." (and time (format " (%s)" time))))) "@*")) -;;; Code +;;;; Code (defun org-texinfo-code (code contents info) "Transcode a CODE object from Org to Texinfo. @@ -857,23 +672,7 @@ CONTENTS is nil. INFO is a plist used as a communication channel." (org-texinfo--text-markup (org-element-property :value code) 'code)) -;;; Comment - -(defun org-texinfo-comment (comment contents info) - "Transcode a COMMENT object from Org to Texinfo. -CONTENTS is the text in the comment. INFO is a plist holding -contextual information." - (org-texinfo--text-markup (org-element-property :value comment) 'comment)) - -;;; Comment Block - -(defun org-texinfo-comment-block (comment-block contents info) - "Transcode a COMMENT-BLOCK object from Org to Texinfo. -CONTENTS is the text within the block. INFO is a plist holding -contextual information." - (format "@ignore\n%s@end ignore" (org-element-property :value comment-block))) - -;;; Drawer +;;;; Drawer (defun org-texinfo-drawer (drawer contents info) "Transcode a DRAWER element from Org to Texinfo. @@ -884,15 +683,15 @@ holding contextual information." name contents))) output)) -;;; Dynamic Block +;;;; Dynamic Block (defun org-texinfo-dynamic-block (dynamic-block contents info) "Transcode a DYNAMIC-BLOCK element from Org to Texinfo. CONTENTS holds the contents of the block. INFO is a plist -holding contextual information. See `org-export-data'." +holding contextual information." contents) -;;; Entity +;;;; Entity (defun org-texinfo-entity (entity contents info) "Transcode an ENTITY object from Org to Texinfo. @@ -901,7 +700,7 @@ contextual information." (let ((ent (org-element-property :latex entity))) (if (org-element-property :latex-math-p entity) (format "@math{%s}" ent) ent))) -;;; Example Block +;;;; Example Block (defun org-texinfo-example-block (example-block contents info) "Transcode an EXAMPLE-BLOCK element from Org to Texinfo. @@ -910,7 +709,7 @@ information." (format "@verbatim\n%s@end verbatim" (org-export-format-code-default example-block info))) -;;; Export Block +;;;; Export Block (defun org-texinfo-export-block (export-block contents info) "Transcode a EXPORT-BLOCK element from Org to Texinfo. @@ -918,7 +717,7 @@ CONTENTS is nil. INFO is a plist holding contextual information." (when (string= (org-element-property :type export-block) "TEXINFO") (org-remove-indentation (org-element-property :value export-block)))) -;;; Export Snippet +;;;; Export Snippet (defun org-texinfo-export-snippet (export-snippet contents info) "Transcode a EXPORT-SNIPPET object from Org to Texinfo. @@ -926,7 +725,7 @@ CONTENTS is nil. INFO is a plist holding contextual information." (when (eq (org-export-snippet-backend export-snippet) 'texinfo) (org-element-property :value export-snippet))) -;;; Fixed Width +;;;; Fixed Width (defun org-texinfo-fixed-width (fixed-width contents info) "Transcode a FIXED-WIDTH element from Org to Texinfo. @@ -936,8 +735,7 @@ CONTENTS is nil. INFO is a plist holding contextual information." (org-texinfo--sanitize-content (org-element-property :value fixed-width))))) -;;; Footnote Reference -;; +;;;; Footnote Reference (defun org-texinfo-footnote-reference (footnote contents info) "Create a footnote reference for FOOTNOTE. @@ -948,7 +746,7 @@ plist holding contextual information." (format "@footnote{%s}" (org-trim (org-export-data def info))))) -;;; Headline +;;;; Headline (defun org-texinfo-headline (headline contents info) "Transcode a HEADLINE element from Org to Texinfo. @@ -957,67 +755,30 @@ holding contextual information." (let* ((class (plist-get info :texinfo-class)) (level (org-export-get-relative-level headline info)) (numberedp (org-export-numbered-headline-p headline info)) - (class-sectionning (assoc class org-texinfo-classes)) - ;; Find the index type, if any + (class-sectioning (assoc class org-texinfo-classes)) + ;; Find the index type, if any. (index (org-element-property :INDEX headline)) - ;; Check if it is an appendix - (appendix (org-element-property :APPENDIX headline)) - ;; Retrieve headline text - (text (org-texinfo--sanitize-headline - (org-element-property :title headline) info)) ;; Create node info, to insert it before section formatting. - ;; Use custom menu title if present + ;; Use custom menu title if present. (node (format "@node %s\n" (org-texinfo--get-node headline info))) - ;; Menus must be generated with first child, otherwise they - ;; will not nest properly - (menu (let* ((first (org-export-first-sibling-p headline info)) - (parent (org-export-get-parent-headline headline)) - (title (org-texinfo--sanitize-headline - (org-element-property :title parent) info)) - heading listing - (tree (plist-get info :parse-tree))) - (if first - (org-element-map (plist-get info :parse-tree) 'headline - (lambda (ref) - (if (member title (org-element-property :title ref)) - (push ref heading))) - info t)) - (setq listing (org-texinfo--build-menu - (car heading) level info)) - (if listing - (setq listing (replace-regexp-in-string - "%" "%%" listing) - listing (format - "\n@menu\n%s\n@end menu\n\n" listing)) - 'nil))) ;; Section formatting will set two placeholders: one for the ;; title and the other for the contents. (section-fmt - (let ((sec (if (and (symbolp (nth 2 class-sectionning)) - (fboundp (nth 2 class-sectionning))) - (funcall (nth 2 class-sectionning) level numberedp) - (nth (1+ level) class-sectionning)))) - (cond - ;; No section available for that LEVEL. - ((not sec) nil) - ;; Section format directly returned by a function. - ((stringp sec) sec) - ;; (numbered-section . unnumbered-section) - ((not (consp (cdr sec))) + (if (org-not-nil (org-element-property :APPENDIX headline)) + "@appendix %s\n%s" + (let ((sec (if (and (symbolp (nth 2 class-sectioning)) + (fboundp (nth 2 class-sectioning))) + (funcall (nth 2 class-sectioning) level numberedp) + (nth (1+ level) class-sectioning)))) (cond - ;;If an index, always unnumbered - (index - (concat menu node (cdr sec) "\n%s")) - (appendix - (concat menu node (replace-regexp-in-string - "unnumbered" - "appendix" - (cdr sec)) "\n%s")) - ;; Otherwise number as needed. - (t - (concat menu node - (funcall - (if numberedp #'car #'cdr) sec) "\n%s"))))))) + ;; No section available for that LEVEL. + ((not sec) nil) + ;; Section format directly returned by a function. + ((stringp sec) sec) + ;; (numbered-section . unnumbered-section) + ((not (consp (cdr sec))) + (concat (if (or index (not numberedp)) (cdr sec) (car sec)) + "\n%s")))))) (todo (and (plist-get info :with-todo-keywords) (let ((todo (org-element-property :todo-keyword headline))) @@ -1027,100 +788,54 @@ holding contextual information." (org-export-get-tags headline info))) (priority (and (plist-get info :with-priority) (org-element-property :priority headline))) - ;; Create the headline text along with a no-tag version. The - ;; latter is required to remove tags from table of contents. - (full-text (org-texinfo--sanitize-content - (if (not (eq org-texinfo-format-headline-function 'ignore)) - ;; User-defined formatting function. - (funcall org-texinfo-format-headline-function - todo todo-type priority text tags) - ;; Default formatting. - (concat - (when todo - (format "@strong{%s} " todo)) - (when priority (format "@emph{#%s} " priority)) - text - (when tags - (format " :%s:" - (mapconcat 'identity tags ":"))))))) - (full-text-no-tag - (org-texinfo--sanitize-content - (if (not (eq org-texinfo-format-headline-function 'ignore)) - ;; User-defined formatting function. - (funcall org-texinfo-format-headline-function - todo todo-type priority text nil) - ;; Default formatting. - (concat - (when todo (format "@strong{%s} " todo)) - (when priority (format "@emph{#%c} " priority)) - text)))) - (pre-blanks - (make-string (org-element-property :pre-blank headline) 10))) + (text (org-export-data (org-element-property :title headline) info)) + (full-text (if (not (eq org-texinfo-format-headline-function 'ignore)) + ;; User-defined formatting function. + (funcall org-texinfo-format-headline-function + todo todo-type priority text tags) + ;; Default formatting. + (concat + (when todo + (format "@strong{%s} " todo)) + (when priority (format "@emph{#%s} " priority)) + text + (when tags + (format " :%s:" + (mapconcat 'identity tags ":")))))) + (contents (if (org-string-nw-p contents) (concat "\n" contents) ""))) (cond ;; Case 1: This is a footnote section: ignore it. ((org-element-property :footnote-section-p headline) nil) ;; Case 2: This is the `copying' section: ignore it ;; This is used elsewhere. - ((org-element-property :COPYING headline) nil) + ((org-not-nil (org-element-property :COPYING headline)) nil) ;; Case 3: An index. If it matches one of the known indexes, ;; print it as such following the contents, otherwise ;; print the contents and leave the index up to the user. (index - (format - section-fmt full-text - (concat pre-blanks contents "\n" - (if (member index '("cp" "fn" "ky" "pg" "tp" "vr")) - (concat "@printindex " index))))) + (concat node + (format + section-fmt + full-text + (concat contents + (and (member index '("cp" "fn" "ky" "pg" "tp" "vr")) + (concat "\n@printindex " index)))))) ;; Case 4: This is a deep sub-tree: export it as a list item. ;; Also export as items headlines for which no section ;; format has been found. ((or (not section-fmt) (org-export-low-level-p headline info)) ;; Build the real contents of the sub-tree. - (let ((low-level-body - (concat - ;; If the headline is the first sibling, start a list. - (when (org-export-first-sibling-p headline info) - (format "@%s\n" (if numberedp 'enumerate 'itemize))) - ;; Itemize headline - "@item\n" full-text "\n" pre-blanks contents))) - ;; If headline is not the last sibling simply return - ;; LOW-LEVEL-BODY. Otherwise, also close the list, before any - ;; blank line. - (if (not (org-export-last-sibling-p headline info)) low-level-body - (replace-regexp-in-string - "[ \t\n]*\\'" - (format "\n@end %s" (if numberedp 'enumerate 'itemize)) - low-level-body)))) + (concat (and (org-export-first-sibling-p headline info) + (format "@%s\n" (if numberedp 'enumerate 'itemize))) + "@item\n" full-text "\n" + contents + (if (org-export-last-sibling-p headline info) + (format "@end %s" (if numberedp 'enumerate 'itemize)) + "\n"))) ;; Case 5: Standard headline. Export it as a section. - (t - (cond - ((not (and tags (eq (plist-get info :with-tags) 'not-in-toc))) - ;; Regular section. Use specified format string. - (format (replace-regexp-in-string "%]" "%%]" section-fmt) full-text - (concat pre-blanks contents))) - ((string-match "\\`@\\(.*?\\){" section-fmt) - ;; If tags should be removed from table of contents, insert - ;; title without tags as an alternative heading in sectioning - ;; command. - (format (replace-match (concat (match-string 1 section-fmt) "[%s]") - nil nil section-fmt 1) - ;; Replace square brackets with parenthesis since - ;; square brackets are not supported in optional - ;; arguments. - (replace-regexp-in-string - "\\[" "(" - (replace-regexp-in-string - "\\]" ")" - full-text-no-tag)) - full-text - (concat pre-blanks contents))) - (t - ;; Impossible to add an alternative heading. Fallback to - ;; regular sectioning format string. - (format (replace-regexp-in-string "%]" "%%]" section-fmt) full-text - (concat pre-blanks contents)))))))) - -;;; Inline Src Block + (t (concat node (format section-fmt full-text contents)))))) + +;;;; Inline Src Block (defun org-texinfo-inline-src-block (inline-src-block contents info) "Transcode an INLINE-SRC-BLOCK element from Org to Texinfo. @@ -1130,7 +845,7 @@ contextual information." (separator (org-texinfo--find-verb-separator code))) (concat "@verb{" separator code separator "}"))) -;;; Inlinetask +;;;; Inlinetask (defun org-texinfo-inlinetask (inlinetask contents info) "Transcode an INLINETASK element from Org to Texinfo. @@ -1163,7 +878,7 @@ holding contextual information." "\n") full-title contents))))) -;;; Italic +;;;; Italic (defun org-texinfo-italic (italic contents info) "Transcode ITALIC from Org to Texinfo. @@ -1171,18 +886,18 @@ CONTENTS is the text with italic markup. INFO is a plist holding contextual information." (org-texinfo--text-markup contents 'italic)) -;;; Item +;;;; Item (defun org-texinfo-item (item contents info) "Transcode an ITEM element from Org to Texinfo. CONTENTS holds the contents of the item. INFO is a plist holding contextual information." - (let* ((tag (org-element-property :tag item)) - (desc (org-export-data tag info))) - (concat "\n@item " (if tag desc) "\n" - (and contents (org-trim contents)) "\n"))) + (format "@item%s\n%s" + (let ((tag (org-element-property :tag item))) + (if tag (concat " " (org-export-data tag info)) "")) + (or contents ""))) -;;; Keyword +;;;; Keyword (defun org-texinfo-keyword (keyword contents info) "Transcode a KEYWORD element from Org to Texinfo. @@ -1198,14 +913,14 @@ CONTENTS is nil. INFO is a plist holding contextual information." ((string= key "TINDEX") (format "@tindex %s" value)) ((string= key "VINDEX") (format "@vindex %s" value))))) -;;; Line Break +;;;; Line Break (defun org-texinfo-line-break (line-break contents info) "Transcode a LINE-BREAK object from Org to Texinfo. CONTENTS is nil. INFO is a plist holding contextual information." "@*\n") -;;; Link +;;;; Link (defun org-texinfo-link (link desc info) "Transcode a LINK object from Org to Texinfo. @@ -1220,60 +935,72 @@ INFO is a plist holding contextual information. See (path (cond ((member type '("http" "https" "ftp")) (concat type ":" raw-path)) - ((string= type "file") - (if (file-name-absolute-p raw-path) - (concat "file://" (expand-file-name raw-path)) - (concat "file://" raw-path))) + ((and (string= type "file") (file-name-absolute-p raw-path)) + (concat "file:" raw-path)) (t raw-path))) - (email (if (string= type "mailto") - (let ((text (replace-regexp-in-string - "@" "@@" raw-path))) - (concat text (if desc (concat "," desc)))))) protocol) (cond - ;; Links pointing to a headline: Find destination and build - ;; appropriate referencing command. - ((member type '("custom-id" "id")) - (let ((destination (org-export-resolve-id-link link info))) + ((equal type "radio") + (let ((destination (org-export-resolve-radio-link link info))) + (if (not destination) desc + (format "@ref{%s,,%s}" + (org-texinfo--get-node destination info) + desc)))) + ((member type '("custom-id" "id" "fuzzy")) + (let ((destination + (if (equal type "fuzzy") + (org-export-resolve-fuzzy-link link info) + (org-export-resolve-id-link link info)))) (case (org-element-type destination) + ((nil) + (format org-texinfo-link-with-unknown-path-format + (org-texinfo--sanitize-content path))) ;; Id link points to an external file. (plain-text (if desc (format "@uref{file://%s,%s}" destination desc) (format "@uref{file://%s}" destination))) - ;; LINK points to a headline. Use the headline as the NODE target (headline (format "@ref{%s,%s}" (org-texinfo--get-node destination info) - (or desc ""))) + (cond + (desc) + ((org-export-numbered-headline-p destination info) + (org-export-data + (org-element-property :title destination) info)) + (t + (mapconcat + #'number-to-string + (org-export-get-headline-number destination info) "."))))) (otherwise - (let ((path (org-export-solidify-link-text path))) - (if (not desc) (format "@ref{%s}" path) - (format "@ref{%s,,%s}" path desc))))))) - ((member type '("info")) + (let ((topic + (or desc + (if (and (eq (org-element-type destination) 'headline) + (not (org-export-numbered-headline-p + destination info))) + (org-export-data + (org-element-property :title destination) info)) + (let ((n (org-export-get-ordinal destination info))) + (cond + ((not n) nil) + ((integerp n) n) + (t (mapconcat #'number-to-string n "."))))))) + (when topic + (format "@ref{%s,,%s}" + (org-texinfo--get-node destination info) + topic))))))) + ((equal type "info") (let* ((info-path (split-string path "[:#]")) (info-manual (car info-path)) (info-node (or (cadr info-path) "top")) (title (or desc ""))) (format "@ref{%s,%s,,%s,}" info-node title info-manual))) - ((member type '("fuzzy")) - (let ((destination (org-export-resolve-fuzzy-link link info))) - (case (org-element-type destination) - ;; Id link points to an external file. - (plain-text - (if desc (format "@uref{file://%s,%s}" destination desc) - (format "@uref{file://%s}" destination))) - ;; LINK points to a headline. Use the headline as the NODE target - (headline - (format "@ref{%s,%s}" - (org-texinfo--get-node destination info) - (or desc ""))) - (otherwise - (let ((path (org-export-solidify-link-text path))) - (if (not desc) (format "@ref{%s}" path) - (format "@ref{%s,,%s}" path desc))))))) - ;; Special case for email addresses - (email - (format "@email{%s}" email)) + ((string= type "mailto") + (format "@email{%s}" + (concat (org-texinfo--sanitize-content path) + (and desc (concat "," desc))))) + ((let ((protocol (nth 2 (assoc type org-link-protocols)))) + (and (functionp protocol) + (funcall protocol (org-link-unescape path) desc 'texinfo)))) ;; External link with a description part. ((and path desc) (format "@uref{%s,%s}" path desc)) ;; External link without a description part. @@ -1282,27 +1009,97 @@ INFO is a plist holding contextual information. See (t (format org-texinfo-link-with-unknown-path-format desc))))) -;;; Menu - -(defun org-texinfo-make-menu (info level) - "Create the menu for inclusion in the texifo document. - -INFO is the parsed buffer that contains the headlines. LEVEL -determines whether to make the main menu, or the detailed menu. - -This is only used for generating the primary menu. In-Node menus -are generated directly." - (let ((parse (plist-get info :parse-tree))) - (cond - ;; Generate the main menu - ((eq level 'main) (org-texinfo--build-menu parse 1 info)) - ;; Generate the detailed (recursive) menu - ((eq level 'detailed) - ;; Requires recursion - ;;(org-texinfo--build-detailed-menu parse top info) - (org-texinfo--build-menu parse 1 info 'detailed))))) - -;;; Paragraph +;;;; Menu + +(defun org-texinfo-make-menu (scope info &optional master) + "Create the menu for inclusion in the Texinfo document. + +SCOPE is a headline or a full parse tree. INFO is the +communication channel, as a plist. + +When optional argument MASTER is non-nil, generate a master menu, +including detailed node listing." + (let ((menu (org-texinfo--build-menu scope info))) + (when (org-string-nw-p menu) + (org-element-normalize-string + (format + "@menu\n%s@end menu" + (concat menu + (when master + (let ((detailmenu + (org-texinfo--build-menu + scope info + (let ((toc-depth (plist-get info :with-toc))) + (if (wholenump toc-depth) toc-depth + org-texinfo-max-toc-depth))))) + (when (org-string-nw-p detailmenu) + (concat "\n@detailmenu\n" + "--- The Detailed Node Listing ---\n\n" + detailmenu + "@end detailmenu\n")))))))))) + +(defun org-texinfo--build-menu (scope info &optional level) + "Build menu for entries within SCOPE. +SCOPE is a headline or a full parse tree. INFO is a plist +containing contextual information. When optional argument LEVEL +is an integer, build the menu recursively, down to this depth." + (cond + ((not level) + (org-texinfo--format-entries (org-texinfo--menu-entries scope info) info)) + ((zerop level) nil) + (t + (org-element-normalize-string + (mapconcat + (lambda (h) + (let ((entries (org-texinfo--menu-entries h info))) + (when entries + (concat + (format "%s\n\n%s\n" + (org-export-data (org-export-get-alt-title h info) info) + (org-texinfo--format-entries entries info)) + (org-texinfo--build-menu h info (1- level)))))) + (org-texinfo--menu-entries scope info) ""))))) + +(defun org-texinfo--format-entries (entries info) + "Format all direct menu entries in SCOPE, as a string. +SCOPE is either a headline or a full Org document. INFO is +a plist containing contextual information." + (org-element-normalize-string + (mapconcat + (lambda (h) + (let* ((title (org-export-data + (org-export-get-alt-title h info) info)) + (node (org-texinfo--get-node h info)) + (entry (concat "* " title ":" + (if (string= title node) ":" + (concat " " node ". ")))) + (desc (org-element-property :DESCRIPTION h))) + (if (not desc) entry + (format (format "%%-%ds %%s" org-texinfo-node-description-column) + entry desc)))) + entries "\n"))) + +(defun org-texinfo--menu-entries (scope info) + "List direct children in SCOPE needing a menu entry. +SCOPE is a headline or a full parse tree. INFO is a plist +holding contextual information." + (let* ((cache (or (plist-get info :texinfo-entries-cache) + (plist-get (plist-put info :texinfo-entries-cache + (make-hash-table :test #'eq)) + :texinfo-entries-cache))) + (cached-entries (gethash scope cache 'no-cache))) + (if (not (eq cached-entries 'no-cache)) cached-entries + (puthash scope + (org-element-map (org-element-contents scope) 'headline + (lambda (h) + (and (not (org-not-nil (org-element-property :COPYING h))) + (not (org-element-property :footnote-section-p h)) + (not (org-export-low-level-p h info)) + h)) + info nil 'headline) + cache)))) + +;;;; Paragraph (defun org-texinfo-paragraph (paragraph contents info) "Transcode a PARAGRAPH element from Org to Texinfo. @@ -1310,32 +1107,27 @@ CONTENTS is the contents of the paragraph, as a string. INFO is the plist used as a communication channel." contents) -;;; Plain List +;;;; Plain List (defun org-texinfo-plain-list (plain-list contents info) "Transcode a PLAIN-LIST element from Org to Texinfo. CONTENTS is the contents of the list. INFO is a plist holding contextual information." (let* ((attr (org-export-read-attribute :attr_texinfo plain-list)) - (indic (or (plist-get attr :indic) - org-texinfo-def-table-markup)) - (type (org-element-property :type plain-list)) + (indic (or (plist-get attr :indic) org-texinfo-def-table-markup)) (table-type (plist-get attr :table-type)) - ;; Ensure valid texinfo table type. - (table-type (if (member table-type '("ftable" "vtable")) table-type - "table")) + (type (org-element-property :type plain-list)) (list-type (cond ((eq type 'ordered) "enumerate") ((eq type 'unordered) "itemize") - ((eq type 'descriptive) table-type)))) - (format "@%s%s\n@end %s" - (if (eq type 'descriptive) - (concat list-type " " indic) - list-type) + ((member table-type '("ftable" "vtable")) table-type) + (t "table")))) + (format "@%s\n%s@end %s" + (if (eq type 'descriptive) (concat list-type " " indic) list-type) contents list-type))) -;;; Plain Text +;;;; Plain Text (defun org-texinfo-plain-text (text info) "Transcode a TEXT string from Org to Texinfo. @@ -1366,7 +1158,7 @@ contextual information." ;; Return value. output)) -;;; Planning +;;;; Planning (defun org-texinfo-planning (planning contents info) "Transcode a PLANNING element from Org to Texinfo. @@ -1402,7 +1194,7 @@ information." " ") "@*")) -;;; Property Drawer +;;;; Property Drawer (defun org-texinfo-property-drawer (property-drawer contents info) "Transcode a PROPERTY-DRAWER element from Org to Texinfo. @@ -1412,7 +1204,7 @@ information." ;; lines nonetheless. "") -;;; Quote Block +;;;; Quote Block (defun org-texinfo-quote-block (quote-block contents info) "Transcode a QUOTE-BLOCK element from Org to Texinfo. @@ -1424,7 +1216,7 @@ holding contextual information." (format " %s" title))))) (format "%s\n%s@end quotation" start-quote contents))) -;;; Quote Section +;;;; Quote Section (defun org-texinfo-quote-section (quote-section contents info) "Transcode a QUOTE-SECTION element from Org to Texinfo. @@ -1433,7 +1225,7 @@ CONTENTS is nil. INFO is a plist holding contextual information." (org-element-property :value quote-section)))) (when value (format "@verbatim\n%s@end verbatim" value)))) -;;; Radio Target +;;;; Radio Target (defun org-texinfo-radio-target (radio-target text info) "Transcode a RADIO-TARGET object from Org to Texinfo. @@ -1444,15 +1236,17 @@ contextual information." (org-element-property :value radio-target)) text)) -;;; Section +;;;; Section (defun org-texinfo-section (section contents info) "Transcode a SECTION element from Org to Texinfo. CONTENTS holds the contents of the section. INFO is a plist holding contextual information." - contents) + (concat contents + (let ((parent (org-export-get-parent-headline section))) + (and parent (org-texinfo-make-menu parent info))))) -;;; Special Block +;;;; Special Block (defun org-texinfo-special-block (special-block contents info) "Transcode a SPECIAL-BLOCK element from Org to Texinfo. @@ -1460,34 +1254,26 @@ CONTENTS holds the contents of the block. INFO is a plist used as a communication channel." contents) -;;; Src Block +;;;; Src Block (defun org-texinfo-src-block (src-block contents info) "Transcode a SRC-BLOCK element from Org to Texinfo. CONTENTS holds the contents of the item. INFO is a plist holding contextual information." - (let* ((lang (org-element-property :language src-block)) - (lisp-p (string-match-p "lisp" lang)) - (src-contents (org-texinfo--sanitize-content - (org-export-format-code-default src-block info)))) - (cond - ;; Case 1. Lisp Block - (lisp-p - (format "@lisp\n%s@end lisp" - src-contents)) - ;; Case 2. Other blocks - (t - (format "@example\n%s@end example" - src-contents))))) + (let ((lispp (org-string-match-p "lisp" + (org-element-property :language src-block))) + (code (org-texinfo--sanitize-content + (org-export-format-code-default src-block info)))) + (format (if lispp "@lisp\n%s@end lisp" "@example\n%s@end example") code))) -;;; Statistics Cookie +;;;; Statistics Cookie (defun org-texinfo-statistics-cookie (statistics-cookie contents info) "Transcode a STATISTICS-COOKIE object from Org to Texinfo. CONTENTS is nil. INFO is a plist holding contextual information." (org-element-property :value statistics-cookie)) -;;; Subscript +;;;; Subscript (defun org-texinfo-subscript (subscript contents info) "Transcode a SUBSCRIPT object from Org to Texinfo. @@ -1495,7 +1281,7 @@ CONTENTS is the contents of the object. INFO is a plist holding contextual information." (format "@math{_%s}" contents)) -;;; Superscript +;;;; Superscript (defun org-texinfo-superscript (superscript contents info) "Transcode a SUPERSCRIPT object from Org to Texinfo. @@ -1503,96 +1289,47 @@ CONTENTS is the contents of the object. INFO is a plist holding contextual information." (format "@math{^%s}" contents)) -;;; Table -;; -;; `org-texinfo-table' is the entry point for table transcoding. It -;; takes care of tables with a "verbatim" attribute. Otherwise, it -;; delegates the job to either `org-texinfo-table--table.el-table' or -;; `org-texinfo-table--org-table' functions, depending of the type of -;; the table. -;; -;; `org-texinfo-table--align-string' is a subroutine used to build -;; alignment string for Org tables. +;;;; Table (defun org-texinfo-table (table contents info) "Transcode a TABLE element from Org to Texinfo. CONTENTS is the contents of the table. INFO is a plist holding contextual information." - (cond - ;; Case 1: verbatim table. - ((or org-texinfo-tables-verbatim - (let ((attr (mapconcat 'identity - (org-element-property :attr_latex table) - " "))) - (and attr (string-match "\\" attr)))) - (format "@verbatim \n%s\n@end verbatim" - ;; Re-create table, without affiliated keywords. - (org-trim - (org-element-interpret-data - `(table nil ,@(org-element-contents table)))))) - ;; Case 2: table.el table. Convert it using appropriate tools. - ((eq (org-element-property :type table) 'table.el) - (org-texinfo-table--table.el-table table contents info)) - ;; Case 3: Standard table. - (t (org-texinfo-table--org-table table contents info)))) + (if (eq (org-element-property :type table) 'table.el) + (format "@verbatim\n%s@end verbatim" + (org-element-normalize-string + (org-element-property :value table))) + (let* ((col-width (org-export-read-attribute :attr_texinfo table :columns)) + (columns + (if col-width (format "@columnfractions %s" col-width) + (org-texinfo-table-column-widths table info)))) + (format "@multitable %s\n%s@end multitable" + columns + contents)))) (defun org-texinfo-table-column-widths (table info) "Determine the largest table cell in each column to process alignment. - TABLE is the table element to transcode. INFO is a plist used as a communication channel." - (let* ((rows (org-element-map table 'table-row 'identity info)) - (collected (loop for row in rows collect - (org-element-map row 'table-cell 'identity info))) - (number-cells (length (car collected))) - cells counts) - (loop for row in collected do - (push (mapcar (lambda (ref) - (let* ((start (org-element-property :contents-begin ref)) - (end (org-element-property :contents-end ref)) - (length (- end start))) - length)) row) cells)) - (setq cells (org-remove-if 'null cells)) - (push (loop for count from 0 to (- number-cells 1) collect - (loop for item in cells collect - (nth count item))) counts) - (mapconcat (lambda (size) - (make-string size ?a)) (mapcar (lambda (ref) - (apply 'max `(,@ref))) (car counts)) - "} {"))) - -(defun org-texinfo-table--org-table (table contents info) - "Return appropriate Texinfo code for an Org table. - -TABLE is the table type element to transcode. CONTENTS is its -contents, as a string. INFO is a plist used as a communication -channel. - -This function assumes TABLE has `org' as its `:type' attribute." - (let* ((attr (org-export-read-attribute :attr_texinfo table)) - (col-width (plist-get attr :columns)) - (columns (if col-width - (format "@columnfractions %s" - col-width) - (format "{%s}" - (org-texinfo-table-column-widths - table info))))) - ;; Prepare the final format string for the table. - (cond - ;; Longtable. - ;; Others. - (t (concat - (format "@multitable %s\n%s@end multitable" - columns - contents)))))) - -(defun org-texinfo-table--table.el-table (table contents info) - "Returns nothing. - -Rather than return an invalid table, nothing is returned." - 'nil) - -;;; Table Cell + (let ((widths (make-vector (cdr (org-export-table-dimensions table info)) 0))) + (org-element-map table 'table-row + (lambda (row) + (let ((idx 0)) + (org-element-map row 'table-cell + (lambda (cell) + ;; Length of the cell in the original buffer is only an + ;; approximation of the length of the cell in the + ;; output. It can sometimes fail (e.g. it considers + ;; "/a/" being larger than "ab"). + (let ((w (- (org-element-property :contents-end cell) + (org-element-property :contents-begin cell)))) + (aset widths idx (max w (aref widths idx)))) + (incf idx)) + info))) + info) + (format "{%s}" (mapconcat (lambda (w) (make-string w ?a)) widths "} {")))) + +;;;; Table Cell (defun org-texinfo-table-cell (table-cell contents info) "Transcode a TABLE-CELL element from Org to Texinfo. @@ -1609,7 +1346,7 @@ a communication channel." contents) (when (org-export-get-next-element table-cell info) "\n@tab "))) -;;; Table Row +;;;; Table Row (defun org-texinfo-table-row (table-row contents info) "Transcode a TABLE-ROW element from Org to Texinfo. @@ -1618,21 +1355,15 @@ a communication channel." ;; Rules are ignored since table separators are deduced from ;; borders of the current row. (when (eq (org-element-property :type table-row) 'standard) - (let ((rowgroup-tag - (cond - ;; Case 1: Belongs to second or subsequent rowgroup. - ((not (= 1 (org-export-table-row-group table-row info))) - "@item ") - ;; Case 2: Row is from first rowgroup. Table has >=1 rowgroups. - ((org-export-table-has-header-p - (org-export-get-parent-table table-row) info) - "@headitem ") - ;; Case 3: Row is from first and only row group. - (t "@item ")))) - (when (eq (org-element-property :type table-row) 'standard) - (concat rowgroup-tag contents "\n"))))) - -;;; Target + (let ((rowgroup-tag + (if (and (= 1 (org-export-table-row-group table-row info)) + (org-export-table-has-header-p + (org-export-get-parent-table table-row) info)) + "@headitem " + "@item "))) + (concat rowgroup-tag contents "\n")))) + +;;;; Target (defun org-texinfo-target (target contents info) "Transcode a TARGET object from Org to Texinfo. @@ -1641,7 +1372,7 @@ information." (format "@anchor{%s}" (org-export-solidify-link-text (org-element-property :value target)))) -;;; Timestamp +;;;; Timestamp (defun org-texinfo-timestamp (timestamp contents info) "Transcode a TIMESTAMP object from Org to Texinfo. @@ -1656,7 +1387,7 @@ information." (format org-texinfo-inactive-timestamp-format value)) (t (format org-texinfo-diary-timestamp-format value))))) -;;; Verbatim +;;;; Verbatim (defun org-texinfo-verbatim (verbatim contents info) "Transcode a VERBATIM object from Org to Texinfo. @@ -1664,26 +1395,13 @@ CONTENTS is nil. INFO is a plist used as a communication channel." (org-texinfo--text-markup (org-element-property :value verbatim) 'verbatim)) -;;; Verse Block +;;;; Verse Block (defun org-texinfo-verse-block (verse-block contents info) "Transcode a VERSE-BLOCK element from Org to Texinfo. CONTENTS is verse block contents. INFO is a plist holding contextual information." - ;; In a verse environment, add a line break to each newline - ;; character and change each white space at beginning of a line - ;; into a space of 1 em. Also change each blank line with - ;; a vertical space of 1 em. - (progn - (setq contents (replace-regexp-in-string - "^ *\\\\\\\\$" "\\\\vspace*{1em}" - (replace-regexp-in-string - "\\(\\\\\\\\\\)?[ \t]*\n" " \\\\\\\\\n" contents))) - (while (string-match "^[ \t]+" contents) - (let ((new-str (format "\\hspace*{%dem}" - (length (match-string 0 contents))))) - (setq contents (replace-match new-str nil t contents)))) - (format "\\begin{verse}\n%s\\end{verse}" contents))) + (format "@display\n%s@end display" contents)) ;;; Interactive functions @@ -1797,29 +1515,21 @@ Return INFO file name or an error if it couldn't be produced." errors) (message (format "Processing Texinfo file %s..." file)) (save-window-excursion - (cond - ;; A function is provided: Apply it. - ((functionp org-texinfo-info-process) - (funcall org-texinfo-info-process (shell-quote-argument file))) - ;; A list is provided: Replace %b, %f and %o with appropriate - ;; values in each command before applying it. Output is - ;; redirected to "*Org INFO Texinfo Output*" buffer. - ((consp org-texinfo-info-process) - (let ((outbuf (get-buffer-create "*Org INFO Texinfo Output*"))) - (mapc - (lambda (command) - (shell-command - (replace-regexp-in-string - "%b" (shell-quote-argument base-name) - (replace-regexp-in-string - "%f" (shell-quote-argument full-name) - (replace-regexp-in-string - "%o" (shell-quote-argument out-dir) command t t) t t) t t) - outbuf)) - org-texinfo-info-process) - ;; Collect standard errors from output buffer. - (setq errors (org-texinfo-collect-errors outbuf)))) - (t (error "No valid command to process to Info"))) + ;; Replace %b, %f and %o with appropriate values in each command + ;; before applying it. Output is redirected to "*Org INFO + ;; Texinfo Output*" buffer. + (let ((outbuf (get-buffer-create "*Org INFO Texinfo Output*"))) + (dolist (command org-texinfo-info-process) + (shell-command + (replace-regexp-in-string + "%b" (shell-quote-argument base-name) + (replace-regexp-in-string + "%f" (shell-quote-argument full-name) + (replace-regexp-in-string + "%o" (shell-quote-argument out-dir) command t t) t t) t t) + outbuf)) + ;; Collect standard errors from output buffer. + (setq errors (org-texinfo-collect-errors outbuf))) (let ((infofile (concat out-dir base-name ".info"))) ;; Check for process failure. Provide collected errors if ;; possible. diff --git a/xemacs-packages/lisp/org-8.2.3c/ox.el b/elpa/org-20150427/ox.el similarity index 97% rename from xemacs-packages/lisp/org-8.2.3c/ox.el rename to elpa/org-20150427/ox.el index 69dca685..72cf4006 100644 --- a/xemacs-packages/lisp/org-8.2.3c/ox.el +++ b/elpa/org-20150427/ox.el @@ -1,6 +1,6 @@ ;;; ox.el --- Generic Export Engine for Org Mode -;; Copyright (C) 2012-2013 Free Software Foundation, Inc. +;; Copyright (C) 2012-2014 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp @@ -143,7 +143,7 @@ "Alist between export properties and ways to set them. The CAR of the alist is the property name, and the CDR is a list -like (KEYWORD OPTION DEFAULT BEHAVIOUR) where: +like (KEYWORD OPTION DEFAULT BEHAVIOR) where: KEYWORD is a string representing a buffer keyword, or nil. Each property defined this way can also be set, during subtree @@ -152,7 +152,7 @@ KEYWORD is a string representing a buffer keyword, or nil. Each property). OPTION is a string that could be found in an #+OPTIONS: line. DEFAULT is the default value for the property. -BEHAVIOUR determines how Org should handle multiple keywords for +BEHAVIOR determines how Org should handle multiple keywords for the same property. It is a symbol among: nil Keep old value and discard the new one. t Replace old value with the new one. @@ -362,7 +362,7 @@ If the value is `comment' insert it as a comment." :group 'org-export-general :type '(choice (const :tag "No creator sentence" nil) - (const :tag "Sentence as a comment" 'comment) + (const :tag "Sentence as a comment" comment) (const :tag "Insert the sentence" t))) (defcustom org-export-with-date t @@ -626,11 +626,20 @@ e.g. \"stat:nil\"" (defcustom org-export-with-sub-superscripts t "Non-nil means interpret \"_\" and \"^\" for export. +If you want to control how Org displays those characters, see +`org-use-sub-superscripts'. `org-export-with-sub-superscripts' +used to be an alias for `org-use-sub-superscripts' in Org <8.0, +it is not anymore. + When this option is turned on, you can use TeX-like syntax for -sub- and superscripts. Several characters after \"_\" or \"^\" -will be considered as a single item - so grouping with {} is -normally not needed. For example, the following things will be -parsed as single sub- or superscripts. +sub- and superscripts and see them exported correctly. + +You can also set the option with #+OPTIONS: ^:t + +Several characters after \"_\" or \"^\" will be considered as a +single item - so grouping with {} is normally not needed. For +example, the following things will be parsed as single sub- or +superscripts: 10^24 or 10^tau several digits will be considered 1 item. 10^-12 or 10^-tau a leading sign with digits or a word @@ -638,15 +647,14 @@ parsed as single sub- or superscripts. terminated by almost any nonword/nondigit char. x_{i^2} or x^(2-i) braces or parenthesis do grouping. -Still, ambiguity is possible - so when in doubt use {} to enclose -the sub/superscript. If you set this variable to the symbol -`{}', the braces are *required* in order to trigger -interpretations as sub/superscript. This can be helpful in -documents that need \"_\" frequently in plain text. - -This option can also be set with the OPTIONS keyword, -e.g. \"^:nil\"." +Still, ambiguity is possible. So when in doubt, use {} to enclose +the sub/superscript. If you set this variable to the symbol `{}', +the braces are *required* in order to trigger interpretations as +sub/superscript. This can be helpful in documents that need \"_\" +frequently in plain text." :group 'org-export-general + :version "24.4" + :package-version '(Org . "8.0") :type '(choice (const :tag "Interpret them" t) (const :tag "Curly brackets only" {}) @@ -787,7 +795,8 @@ HTML code while every other back-end will ignore it." :type 'coding-system) (defcustom org-export-copy-to-kill-ring 'if-interactive - "Should we push exported content to the kill ring?" + "Non-nil means pushing export output to the kill ring. +This variable is ignored during asynchronous export." :group 'org-export-general :version "24.3" :type '(choice @@ -805,7 +814,7 @@ This variable can be either set to `buffer' or `subtree'." (defcustom org-export-show-temporary-export-buffer t "Non-nil means show buffer after exporting to temp buffer. -When Org exports to a file, the buffer visiting that file is ever +When Org exports to a file, the buffer visiting that file is never shown, but remains buried. However, when exporting to a temporary buffer, that buffer is popped up in a second window. When this variable is nil, the buffer remains buried also in @@ -1308,6 +1317,10 @@ The back-end could then be called with, for example: ;; - category :: tree ;; - type :: list of elements and objects ;; +;; + `:input-buffer' :: Name of input buffer. +;; - category :: option +;; - type :: string +;; ;; + `:input-file' :: Full path to input file, if any. ;; - category :: option ;; - type :: string or nil @@ -1320,6 +1333,10 @@ The back-end could then be called with, for example: ;; - category :: option ;; - type :: string ;; +;; + `:output-file' :: Full path to output file, if any. +;; - category :: option +;; - type :: string or nil +;; ;; + `:parse-tree' :: Whole parse tree, available at any time during ;; transcoding. ;; - category :: option @@ -1605,10 +1622,11 @@ for export. Return options as a plist." ;; Make sure point is at a heading. (if (org-at-heading-p) (org-up-heading-safe) (org-back-to-heading t)) ;; Take care of EXPORT_TITLE. If it isn't defined, use headline's - ;; title as its fallback value. + ;; title (with no todo keyword, priority cookie or tag) as its + ;; fallback value. (when (setq prop (or (org-entry-get (point) "EXPORT_TITLE") - (progn (looking-at org-todo-line-regexp) - (org-match-string-no-properties 3)))) + (progn (looking-at org-complex-heading-regexp) + (org-match-string-no-properties 4)))) (setq plist (plist-put plist :title @@ -1641,7 +1659,7 @@ for export. Return options as a plist." ((member keyword org-element-document-properties) (org-element-parse-secondary-string value (org-element-restriction 'keyword))) - ;; If BEHAVIOUR is `split' expected value is + ;; If BEHAVIOR is `split' expected value is ;; a list of strings, not a string. ((eq (nth 4 option) 'split) (org-split-string value)) (t value))))))))) @@ -1723,7 +1741,7 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored." (plist-put plist property ;; Handle value depending on specified - ;; BEHAVIOUR. + ;; BEHAVIOR. (case behaviour (space (if (not (plist-get plist property)) @@ -1755,17 +1773,19 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored." (when (stringp value) (setq plist (plist-put plist property - (org-element-parse-secondary-string - value (org-element-restriction 'keyword)))))))))) + (or (org-element-parse-secondary-string + value (org-element-restriction 'keyword)) + ;; When TITLE keyword sets an empty + ;; string, make sure it doesn't + ;; appear as nil in the plist. + (and (eq property :title) "")))))))))) (defun org-export--get-buffer-attributes () "Return properties related to buffer attributes, as a plist." ;; Store full path of input file name, or nil. For internal use. (let ((visited-file (buffer-file-name (buffer-base-buffer)))) (list :input-file visited-file - :title (if (not visited-file) (buffer-name (buffer-base-buffer)) - (file-name-sans-extension - (file-name-nondirectory visited-file)))))) + :input-buffer (buffer-name (buffer-base-buffer))))) (defun org-export--get-global-options (&optional backend) "Return global export options as a plist. @@ -1778,23 +1798,22 @@ process." (all (append (and backend (org-export-get-all-options backend)) org-export-options-alist))) (dolist (cell all plist) - (let ((prop (car cell)) - (default-value (nth 3 cell))) - (unless (or (not default-value) (plist-member plist prop)) + (let ((prop (car cell))) + (unless (plist-member plist prop) (setq plist (plist-put plist prop - ;; Eval default value provided. If keyword is + ;; Evaluate default value provided. If keyword is ;; a member of `org-element-document-properties', ;; parse it as a secondary string before storing it. (let ((value (eval (nth 3 cell)))) - (if (not (stringp value)) value - (let ((keyword (nth 1 cell))) - (if (member keyword org-element-document-properties) - (org-element-parse-secondary-string - value (org-element-restriction 'keyword)) - value))))))))))) + (if (and (stringp value) + (member (nth 1 cell) + org-element-document-properties)) + (org-element-parse-secondary-string + value (org-element-restriction 'keyword)) + value))))))))) (defun org-export--list-bound-variables () "Return variables bound from BIND keywords in current buffer. @@ -1833,6 +1852,13 @@ an alist where associations are (VARIABLE-NAME VALUE)." ;; Return value in appropriate order of appearance. (nreverse (funcall collect-bind nil nil))))) +;; defsubst org-export-get-parent must be defined before first use, +;; was originally defined in the topology section + +(defsubst org-export-get-parent (blob) + "Return BLOB parent or nil. +BLOB is the element or object considered." + (org-element-property :parent blob)) ;;;; Tree Properties ;; @@ -2136,9 +2162,8 @@ INFO is a plist containing export directives." DATA is a parse tree, an element or an object or a secondary string. INFO is a plist holding export options. -Return transcoded string." - (let ((memo (gethash data (plist-get info :exported-data) 'no-memo))) - (if (not (eq memo 'no-memo)) memo +Return a string." + (or (gethash data (plist-get info :exported-data)) (let* ((type (org-element-type data)) (results (cond @@ -2164,9 +2189,9 @@ Return transcoded string." ;; Secondary string. ((not type) (mapconcat (lambda (obj) (org-export-data obj info)) data "")) - ;; Element/Object without contents or, as a special case, - ;; headline with archive tag and archived trees restricted - ;; to title only. + ;; Element/Object without contents or, as a special + ;; case, headline with archive tag and archived trees + ;; restricted to title only. ((or (not (org-element-contents data)) (and (eq type 'headline) (eq (plist-get info :with-archived-trees) 'headline) @@ -2191,16 +2216,16 @@ Return transcoded string." (lambda (element) (org-export-data element info)) (org-element-contents (if (or greaterp objectp) data - ;; Elements directly containing objects - ;; must have their indentation normalized - ;; first. + ;; Elements directly containing + ;; objects must have their indentation + ;; normalized first. (org-element-normalize-contents data - ;; When normalizing contents of the first - ;; paragraph in an item or a footnote - ;; definition, ignore first line's - ;; indentation: there is none and it - ;; might be misleading. + ;; When normalizing contents of the + ;; first paragraph in an item or + ;; a footnote definition, ignore + ;; first line's indentation: there is + ;; none and it might be misleading. (when (eq type 'paragraph) (let ((parent (org-export-get-parent data))) (and @@ -2217,10 +2242,10 @@ Return transcoded string." (puthash data (cond - ((not results) nil) + ((not results) "") ((memq type '(org-data plain-text nil)) results) - ;; Append the same white space between elements or objects as in - ;; the original buffer, and call appropriate filters. + ;; Append the same white space between elements or objects + ;; as in the original buffer, and call appropriate filters. (t (let ((results (org-export-filter-apply-functions @@ -2230,10 +2255,10 @@ Return transcoded string." (if (memq type org-element-all-elements) (concat (org-element-normalize-string results) (make-string post-blank ?\n)) - (concat results (make-string post-blank ? )))) + (concat results (make-string post-blank ?\s)))) info))) results))) - (plist-get info :exported-data)))))) + (plist-get info :exported-data))))) (defun org-export-data-with-backend (data backend info) "Convert DATA into BACKEND format. @@ -2862,7 +2887,7 @@ The copy will preserve local variables, visibility, contents and narrowing of the original buffer. If a region was active in BUFFER, contents will be narrowed to that region instead. -The resulting function can be evaled at a later time, from +The resulting function can be evaluated at a later time, from another buffer, effectively cloning the original buffer there. The function assumes BUFFER's major mode is `org-mode'." @@ -3001,6 +3026,14 @@ Return code as a string." (org-export-install-filters (org-combine-plists info (org-export-get-environment backend subtreep ext-plist)))) + ;; Special case: provide original file name or buffer name as + ;; default value for :title property. + (unless (plist-get info :title) + (plist-put + info :title + (let ((file (plist-get info :input-file))) + (if file (file-name-sans-extension (file-name-nondirectory file)) + (plist-get info :input-buffer))))) ;; Expand export-specific set of macros: {{{author}}}, ;; {{{date}}}, {{{email}}} and {{{title}}}. It must be done ;; once regular macros have been expanded, since document @@ -3116,8 +3149,8 @@ locally for the subtree through node properties." ;; Populate OPTIONS and KEYWORDS. (dolist (entry (cond ((eq backend 'default) org-export-options-alist) ((org-export-backend-p backend) - (org-export-get-all-options backend)) - (t (org-export-get-all-options + (org-export-backend-options backend)) + (t (org-export-backend-options (org-export-get-backend backend))))) (let ((keyword (nth 1 entry)) (option (nth 2 entry))) @@ -4674,7 +4707,7 @@ INFO is a plist used as a communication channel." "Return TABLE-ROW number. INFO is a plist used as a communication channel. Return value is zero-based and ignores separators. The function returns nil for -special colums and separators." +special columns and separators." (when (and (eq (org-element-property :type table-row) 'standard) (not (org-export-table-row-is-special-p table-row info))) (let ((number 0)) @@ -4947,7 +4980,7 @@ If no translation is found, the quote character is left as-is.") (defconst org-export-smart-quotes-regexps (list ;; Possible opening quote at beginning of string. - "\\`\\([\"']\\)\\(\\w\\|\\s.\\|\\s_\\)" + "\\`\\([\"']\\)\\(\\w\\|\\s.\\|\\s_\\|\\s(\\)" ;; Possible closing quote at beginning of string. "\\`\\([\"']\\)\\(\\s-\\|\\s)\\|\\s.\\)" ;; Possible apostrophe at beginning of string. @@ -5085,7 +5118,7 @@ Return the new string." ;;;; Topology ;; ;; Here are various functions to retrieve information about the -;; neighbourhood of a given element or object. Neighbours of interest +;; neighborhood of a given element or object. Neighbors of interest ;; are direct parent (`org-export-get-parent'), parent headline ;; (`org-export-get-parent-headline'), first element containing an ;; object, (`org-export-get-parent-element'), parent table @@ -5096,11 +5129,7 @@ Return the new string." ;; `org-export-get-genealogy' returns the full genealogy of a given ;; element or object, from closest parent to full parse tree. -(defsubst org-export-get-parent (blob) - "Return BLOB parent or nil. -BLOB is the element or object considered." - (org-element-property :parent blob)) - +;; defsubst org-export-get-parent must be defined before first use (defun org-export-get-genealogy (blob) "Return full genealogy relative to a given element or object. @@ -5230,6 +5259,7 @@ them." ("nb" :default "Forfatter") ("nn" :default "Forfattar") ("pl" :default "Autor") + ("pt_BR" :default "Autor") ("ru" :html "Автор" :utf-8 "Автор") ("sv" :html "Författare") ("uk" :html "Автор" :utf-8 "Автор") @@ -5252,6 +5282,7 @@ them." ("nb" :default "Dato") ("nn" :default "Dato") ("pl" :default "Data") + ("pt_BR" :default "Data") ("ru" :html "Дата" :utf-8 "Дата") ("sv" :default "Datum") ("uk" :html "Дата" :utf-8 "Дата") @@ -5265,6 +5296,7 @@ them." ("no" :default "Ligning") ("nb" :default "Ligning") ("nn" :default "Likning") + ("pt_BR" :html "Equação" :default "Equação" :ascii "Equacao") ("sv" :default "Ekvation") ("zh-CN" :html "方程" :utf-8 "方程")) ("Figure" @@ -5275,6 +5307,7 @@ them." ("no" :default "Illustrasjon") ("nb" :default "Illustrasjon") ("nn" :default "Illustrasjon") + ("pt_BR" :default "Figura") ("sv" :default "Illustration") ("zh-CN" :html "图" :utf-8 "图")) ("Figure %d:" @@ -5286,6 +5319,7 @@ them." ("no" :default "Illustrasjon %d") ("nb" :default "Illustrasjon %d") ("nn" :default "Illustrasjon %d") + ("pt_BR" :default "Figura %d:") ("sv" :default "Illustration %d") ("zh-CN" :html "图%d " :utf-8 "图%d ")) ("Footnotes" @@ -5306,6 +5340,7 @@ them." ("nb" :default "Fotnoter") ("nn" :default "Fotnotar") ("pl" :default "Przypis") + ("pt_BR" :html "Notas de Rodapé" :default "Notas de Rodapé" :ascii "Notas de Rodape") ("ru" :html "Сноски" :utf-8 "Сноски") ("sv" :default "Fotnoter") ("uk" :html "Примітки" @@ -5328,6 +5363,7 @@ them." ("no" :default "Tabeller") ("nb" :default "Tabeller") ("nn" :default "Tabeller") + ("pt_BR" :default "Índice de Tabelas" :ascii "Indice de Tabelas") ("sv" :default "Tabeller") ("zh-CN" :html "表格目录" :utf-8 "表格目录")) ("Listing %d:" @@ -5337,18 +5373,21 @@ them." ("fr" :default "Programme %d :" :html "Programme %d :") ("no" :default "Dataprogram") ("nb" :default "Dataprogram") + ("pt_BR" :default "Listagem %d") ("zh-CN" :html "代码%d " :utf-8 "代码%d ")) ("See section %s" ("da" :default "jævnfør afsnit %s") ("de" :default "siehe Abschnitt %s") ("es" :default "vea seccion %s") ("fr" :default "cf. section %s") + ("pt_BR" :html "Veja a seção %s" :default "Veja a seção %s" :ascii "Veja a secao %s") ("zh-CN" :html "参见第%d节" :utf-8 "参见第%s节")) ("Table" ("de" :default "Tabelle") ("es" :default "Tabla") ("fr" :default "Tableau") ("ja" :html "表" :utf-8 "表") + ("pt_BR" :default "Tabela") ("zh-CN" :html "表" :utf-8 "表")) ("Table %d:" ("da" :default "Tabel %d") @@ -5359,6 +5398,7 @@ them." ("no" :default "Tabell %d") ("nb" :default "Tabell %d") ("nn" :default "Tabell %d") + ("pt_BR" :default "Tabela %d") ("sv" :default "Tabell %d") ("zh-CN" :html "表%d " :utf-8 "表%d ")) ("Table of Contents" @@ -5379,6 +5419,7 @@ them." ("nb" :default "Innhold") ("nn" :default "Innhald") ("pl" :html "Spis treści") + ("pt_BR" :html "Índice" :utf8 "Índice" :ascii "Indice") ("ru" :html "Содержание" :utf-8 "Содержание") ("sv" :html "Innehåll") @@ -5390,6 +5431,7 @@ them." ("de" :default "Unbekannter Verweis") ("es" :default "referencia desconocida") ("fr" :ascii "Destination inconnue" :default "Référence inconnue") + ("pt_BR" :default "Referência desconhecida" :ascii "Referencia desconhecida") ("zh-CN" :html "未知引用" :utf-8 "未知引用"))) "Dictionary for export engine. @@ -5450,8 +5492,9 @@ to `:default' encoding. If it fails, return S." (defmacro org-export-async-start (fun &rest body) "Call function FUN on the results returned by BODY evaluation. -BODY evaluation happens in an asynchronous process, from a buffer -which is an exact copy of the current one. +FUN is an anonymous function of one argument. BODY evaluation +happens in an asynchronous process, from a buffer which is an +exact copy of the current one. Use `org-export-add-to-stack' in FUN in order to register results in the stack. @@ -5604,7 +5647,7 @@ a registered back-end. FILE is the name of the output file, as a string. A non-nil optional argument ASYNC means the process should happen -asynchronously. The resulting buffer file then be accessible +asynchronously. The resulting buffer will then be accessible through the `org-export-stack' interface. Optional arguments SUBTREEP, VISIBLE-ONLY, BODY-ONLY and @@ -5628,7 +5671,8 @@ The function returns either a file name returned by POST-PROCESS, or FILE." (declare (indent 2)) (if (not (file-writable-p file)) (error "Output file not writable") - (let ((encoding (or org-export-coding-system buffer-file-coding-system))) + (let ((ext-plist (org-combine-plists `(:output-file ,file) ext-plist)) + (encoding (or org-export-coding-system buffer-file-coding-system))) (if async (org-export-async-start `(lambda (file) @@ -5866,7 +5910,7 @@ files or buffers, only the display. "Export dispatcher for Org mode. It provides an access to common export related tasks in a buffer. -Its interface comes in two flavours: standard and expert. +Its interface comes in two flavors: standard and expert. While both share the same set of bindings, only the former displays the valid keys associations in a dedicated buffer. @@ -5874,7 +5918,7 @@ Scrolling (resp. line-wise motion) in this buffer is done with SPC and DEL (resp. C-n and C-p) keys. Set variable `org-export-dispatch-use-expert-ui' to switch to one -flavour or the other. +flavor or the other. When ARG is \\[universal-argument], repeat the last export action, with the same set of options used back then, on the current buffer. diff --git a/elpa/pkg-info-20140610.630/pkg-info-autoloads.el b/elpa/pkg-info-20140610.630/pkg-info-autoloads.el new file mode 100644 index 00000000..ff8870b1 --- /dev/null +++ b/elpa/pkg-info-20140610.630/pkg-info-autoloads.el @@ -0,0 +1,131 @@ +;;; pkg-info-autoloads.el --- automatically extracted autoloads +;; +;;; Code: + + +;;;### (autoloads (pkg-info-version-info pkg-info-package-version +;;;;;; pkg-info-defining-library-version pkg-info-defining-library-original-version +;;;;;; pkg-info-library-version pkg-info-library-original-version) +;;;;;; "pkg-info" "pkg-info.el" (21695 37112 0 0)) +;;; Generated autoloads from pkg-info.el + +(autoload 'pkg-info-library-original-version "pkg-info" "\ +Get the original version in the header of LIBRARY. + +The original version is stored in the X-Original-Version header. +This header is added by the MELPA package archive to preserve +upstream version numbers. + +LIBRARY is either a symbol denoting a named feature, or a library +name as string. + +If SHOW is non-nil, show the version in the minibuffer. + +Return the version from the header of LIBRARY as list. Signal an +error if the LIBRARY was not found or had no X-Original-Version +header. + +See Info node `(elisp)Library Headers' for more information +about library headers. + +\(fn LIBRARY &optional SHOW)" t nil) + +(autoload 'pkg-info-library-version "pkg-info" "\ +Get the version in the header of LIBRARY. + +LIBRARY is either a symbol denoting a named feature, or a library +name as string. + +If SHOW is non-nil, show the version in the minibuffer. + +Return the version from the header of LIBRARY as list. Signal an +error if the LIBRARY was not found or had no proper header. + +See Info node `(elisp)Library Headers' for more information +about library headers. + +\(fn LIBRARY &optional SHOW)" t nil) + +(autoload 'pkg-info-defining-library-original-version "pkg-info" "\ +Get the original version of the library defining FUNCTION. + +The original version is stored in the X-Original-Version header. +This header is added by the MELPA package archive to preserve +upstream version numbers. + +If SHOW is non-nil, show the version in mini-buffer. + +This function is mainly intended to find the version of a major +or minor mode, i.e. + + (pkg-info-defining-library-version 'flycheck-mode) + +Return the version of the library defining FUNCTION. Signal an +error if FUNCTION is not a valid function, if its defining +library was not found, or if the library had no proper version +header. + +\(fn FUNCTION &optional SHOW)" t nil) + +(autoload 'pkg-info-defining-library-version "pkg-info" "\ +Get the version of the library defining FUNCTION. + +If SHOW is non-nil, show the version in mini-buffer. + +This function is mainly intended to find the version of a major +or minor mode, i.e. + + (pkg-info-defining-library-version 'flycheck-mode) + +Return the version of the library defining FUNCTION. Signal an +error if FUNCTION is not a valid function, if its defining +library was not found, or if the library had no proper version +header. + +\(fn FUNCTION &optional SHOW)" t nil) + +(autoload 'pkg-info-package-version "pkg-info" "\ +Get the version of an installed PACKAGE. + +If SHOW is non-nil, show the version in the minibuffer. + +Return the version as list, or nil if PACKAGE is not installed. + +\(fn PACKAGE &optional SHOW)" t nil) + +(autoload 'pkg-info-version-info "pkg-info" "\ +Obtain complete version info for LIBRARY and PACKAGE. + +LIBRARY is a symbol denoting a named feature, or a library name +as string. PACKAGE is a symbol denoting an ELPA package. If +omitted or nil, default to LIBRARY. + +If SHOW is non-nil, show the version in the minibuffer. + +When called interactively, prompt for LIBRARY. When called +interactively with prefix argument, prompt for PACKAGE as well. + +Return a string with complete version information for LIBRARY. +This version information contains the version from the headers of +LIBRARY, and the version of the installed PACKAGE, the LIBRARY is +part of. If PACKAGE is not installed, or if the PACKAGE version +is the same as the LIBRARY version, do not include a package +version. + +\(fn LIBRARY &optional PACKAGE SHOW)" t nil) + +;;;*** + +;;;### (autoloads nil nil ("pkg-info-pkg.el") (21695 37112 672123 +;;;;;; 0)) + +;;;*** + +(provide 'pkg-info-autoloads) +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; coding: utf-8 +;; End: +;;; pkg-info-autoloads.el ends here diff --git a/elpa/pkg-info-20140610.630/pkg-info-pkg.el b/elpa/pkg-info-20140610.630/pkg-info-pkg.el new file mode 100644 index 00000000..9e603b6d --- /dev/null +++ b/elpa/pkg-info-20140610.630/pkg-info-pkg.el @@ -0,0 +1 @@ +(define-package "pkg-info" "20140610.630" "Information about packages" (quote ((epl "0.4")))) diff --git a/elpa/pkg-info-20140610.630/pkg-info.el b/elpa/pkg-info-20140610.630/pkg-info.el new file mode 100644 index 00000000..5c36a81d --- /dev/null +++ b/elpa/pkg-info-20140610.630/pkg-info.el @@ -0,0 +1,279 @@ +;;; pkg-info.el --- Information about packages -*- lexical-binding: t; -*- + +;; Copyright (C) 2013, 2014 Sebastian Wiesner + +;; Author: Sebastian Wiesner +;; URL: https://github.com/lunaryorn/pkg-info.el +;; Keywords: convenience +;; Version: 20140610.630 +;; X-Original-Version: 0.6-cvs +;; Package-Requires: ((epl "0.4")) + +;; This file is not part of GNU Emacs. + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: + +;; This library extracts information from installed packages. + +;;;; Functions: + +;; `pkg-info-library-version' extracts the version from the header of a library. +;; +;; `pkg-info-defining-library-version' extracts the version from the header of a +;; library defining a function. +;; +;; `pkg-info-package-version' gets the version of an installed package. +;; +;; `pkg-info-format-version' formats a version list as human readable string. +;; +;; `pkg-info-version-info' returns complete version information for a specific +;; package. + +;;; Code: + +(require 'epl) + +(require 'lisp-mnt) +(require 'find-func) + + +;;; Version information +(defun pkg-info-format-version (version) + "Format VERSION as human-readable string. + +Return a human-readable string representing VERSION." + ;; XXX: Find a better, more flexible way of formatting? + (package-version-join version)) + +(defsubst pkg-info--show-version-and-return (version show) + "Show and return VERSION. + +When SHOW is non-nil, show VERSION in minibuffer. + +Return VERSION." + (when show + (message (if (listp version) (pkg-info-format-version version) version))) + version) + +(defun pkg-info--read-library () + "Read a library from minibuffer." + (completing-read "Load library: " + (apply-partially 'locate-file-completion-table + load-path + (get-load-suffixes)))) + +(defun pkg-info--read-function () + "Read a function name from minibuffer." + (let ((input (completing-read "Function: " obarray #'boundp :require-match))) + (if (string= input "") nil (intern input)))) + +(defun pkg-info--read-package () + "Read a package name from minibuffer." + (let* ((installed (epl-installed-packages)) + (names (sort (mapcar (lambda (pkg) + (symbol-name (epl-package-name pkg))) + installed) + #'string<)) + (default (car names))) + (completing-read "Installed package: " names nil 'require-match + nil nil default))) + +(defun pkg-info-library-source (library) + "Get the source file of LIBRARY. + +LIBRARY is either a symbol denoting a named feature, or a library +name as string. + +Return the source file of LIBRARY as string." + (find-library-name (if (symbolp library) (symbol-name library) library))) + +(defun pkg-info-defining-library (function) + "Get the source file of the library defining FUNCTION. + +FUNCTION is a function symbol. + +Return the file name of the library as string. Signal an error +if the library does not exist, or if the definition of FUNCTION +was not found." + (unless (functionp function) + (signal 'wrong-type-argument (list 'functionp function))) + (let ((library (symbol-file function 'defun))) + (unless library + (error "Can't find definition of %s" function)) + library)) + +(defun pkg-info-x-original-version (file) + "Read the X-Original-Version header from FILE. + +Return the value as version list, or return nil if FILE lacks +this header. Signal an error, if the value of the header is not +a valid version." + (let ((version-str (with-temp-buffer + (insert-file-contents file) + (lm-header "X-Original-Version")))) + (when version-str + (version-to-list version-str)))) + +;;;###autoload +(defun pkg-info-library-original-version (library &optional show) + "Get the original version in the header of LIBRARY. + +The original version is stored in the X-Original-Version header. +This header is added by the MELPA package archive to preserve +upstream version numbers. + +LIBRARY is either a symbol denoting a named feature, or a library +name as string. + +If SHOW is non-nil, show the version in the minibuffer. + +Return the version from the header of LIBRARY as list. Signal an +error if the LIBRARY was not found or had no X-Original-Version +header. + +See Info node `(elisp)Library Headers' for more information +about library headers." + (interactive (list (pkg-info--read-library) t)) + (let ((version (pkg-info-x-original-version + (pkg-info-library-source library)))) + (if version + (pkg-info--show-version-and-return version show) + (error "Library %s has no original version" library)))) + +;;;###autoload +(defun pkg-info-library-version (library &optional show) + "Get the version in the header of LIBRARY. + +LIBRARY is either a symbol denoting a named feature, or a library +name as string. + +If SHOW is non-nil, show the version in the minibuffer. + +Return the version from the header of LIBRARY as list. Signal an +error if the LIBRARY was not found or had no proper header. + +See Info node `(elisp)Library Headers' for more information +about library headers." + (interactive (list (pkg-info--read-library) t)) + (let* ((source (pkg-info-library-source library)) + (version (epl-package-version (epl-package-from-file source)))) + (pkg-info--show-version-and-return version show))) + +;;;###autoload +(defun pkg-info-defining-library-original-version (function &optional show) + "Get the original version of the library defining FUNCTION. + +The original version is stored in the X-Original-Version header. +This header is added by the MELPA package archive to preserve +upstream version numbers. + +If SHOW is non-nil, show the version in mini-buffer. + +This function is mainly intended to find the version of a major +or minor mode, i.e. + + (pkg-info-defining-library-version 'flycheck-mode) + +Return the version of the library defining FUNCTION. Signal an +error if FUNCTION is not a valid function, if its defining +library was not found, or if the library had no proper version +header." + (interactive (list (pkg-info--read-function) t)) + (pkg-info-library-original-version (pkg-info-defining-library function) show)) + +;;;###autoload +(defun pkg-info-defining-library-version (function &optional show) + "Get the version of the library defining FUNCTION. + +If SHOW is non-nil, show the version in mini-buffer. + +This function is mainly intended to find the version of a major +or minor mode, i.e. + + (pkg-info-defining-library-version 'flycheck-mode) + +Return the version of the library defining FUNCTION. Signal an +error if FUNCTION is not a valid function, if its defining +library was not found, or if the library had no proper version +header." + (interactive (list (pkg-info--read-function) t)) + (pkg-info-library-version (pkg-info-defining-library function) show)) + +;;;###autoload +(defun pkg-info-package-version (package &optional show) + "Get the version of an installed PACKAGE. + +If SHOW is non-nil, show the version in the minibuffer. + +Return the version as list, or nil if PACKAGE is not installed." + (interactive (list (pkg-info--read-package) t)) + (let* ((name (if (stringp package) (intern package) package)) + (package (epl-find-installed-package name))) + (unless package + (error "Can't find installed package %s" name)) + (pkg-info--show-version-and-return (epl-package-version package) show))) + +;;;###autoload +(defun pkg-info-version-info (library &optional package show) + "Obtain complete version info for LIBRARY and PACKAGE. + +LIBRARY is a symbol denoting a named feature, or a library name +as string. PACKAGE is a symbol denoting an ELPA package. If +omitted or nil, default to LIBRARY. + +If SHOW is non-nil, show the version in the minibuffer. + +When called interactively, prompt for LIBRARY. When called +interactively with prefix argument, prompt for PACKAGE as well. + +Return a string with complete version information for LIBRARY. +This version information contains the version from the headers of +LIBRARY, and the version of the installed PACKAGE, the LIBRARY is +part of. If PACKAGE is not installed, or if the PACKAGE version +is the same as the LIBRARY version, do not include a package +version." + (interactive (list (pkg-info--read-library) + (when current-prefix-arg + (pkg-info--read-package)) + t)) + (let* ((package (or package (if (stringp library) (intern library) library))) + (orig-version (condition-case nil + (pkg-info-library-original-version library) + (error nil))) + ;; If we have X-Original-Version, we assume that MELPA replaced the + ;; library version with its generated version, so we use the + ;; X-Original-Version header instead, and ignore the library version + ;; header + (lib-version (or orig-version (pkg-info-library-version library))) + (pkg-version (condition-case nil + (pkg-info-package-version package) + (error nil))) + (version (if (and pkg-version + (not (version-list-= lib-version pkg-version))) + (format "%s (package: %s)" + (pkg-info-format-version lib-version) + (pkg-info-format-version pkg-version)) + (pkg-info-format-version lib-version)))) + (pkg-info--show-version-and-return version show))) + +(provide 'pkg-info) + +;; Local Variables: +;; indent-tabs-mode: nil +;; coding: utf-8 +;; End: + +;;; pkg-info.el ends here diff --git a/xemacs-packages/lisp/org-8.2.3c/Makefile b/xemacs-packages/lisp/org-8.2.3c/Makefile deleted file mode 100644 index 89f504db..00000000 --- a/xemacs-packages/lisp/org-8.2.3c/Makefile +++ /dev/null @@ -1,93 +0,0 @@ -.NOTPARALLEL: # always run this make serially -.SUFFIXES: # we don't need default suffix rules -ifeq ($(MAKELEVEL), 0) - $(error This make needs to be started as a sub-make from the toplevel directory.) -endif - -ifneq ($(ORG_ADD_CONTRIB),) - _ORG_ADD_EL_ := \ - $(notdir \ - $(wildcard \ - $(addsuffix .el, \ - $(addprefix ../contrib/lisp/, \ - $(basename \ - $(notdir $(ORG_ADD_CONTRIB))))))) -endif - -LISPV := org-version.el -LISPI := org-loaddefs.el -LISPA := $(LISPV) $(LISPI) -LISPB := $(LISPA:%el=%elc) org-install.elc -LISPF := $(filter-out $(LISPA),$(sort $(wildcard *.el) $(_ORG_ADD_EL_))) -LISPC := $(filter-out $(LISPB) $(LISPN:%el=%elc),$(LISPF:%el=%elc)) -_ORGCM_ := dirall single source slint1 slint2 --include local.mk - -.PHONY: all compile compile-dirty \ - $(_ORGCM_) $(_ORGCM_:%=compile-%) \ - autoloads addcontrib \ - install clean cleanauto cleanall cleanelc clean-install - -# do not clean here, done in toplevel make -all compile compile-dirty:: autoloads -ifeq ($(filter-out $(_ORGCM_),$(ORGCM)),) - $(MAKE) compile-$(ORGCM) -else - $(error ORGCM has illegal value $(ORGCM) (valid: $(_ORGCM_))) -endif - -compile-dirall: dirall -compile-single: single $(LISPC) -compile-source: source dirall -compile-slint1: dirall slint1 -compile-slint2: source dirall slint1 - -# internal -dirall: - @$(info ==================== $@ ====================) - @$(ELCDIR) -single: - @$(info ==================== $@ ====================) -source: cleanelc - @$(info ==================== $@ ====================) - @$(foreach elc,$(LISPC),$(MAKE) $(elc) && $(RM) $(elc);) -slint1: - @$(info ==================== $@ ====================) - @$(foreach elc,$(LISPC),$(RM) $(elc); $(MAKE) $(elc);) - -%.elc: %.el - @$(info Compiling single $(abspath $<)...) - -@$(ELC) $< - -addcontrib: -ifneq ($(ORG_ADD_CONTRIB),) - $(CP) $(addprefix ../contrib/lisp/,$(_ORG_ADD_EL_)) . -endif - -autoloads: cleanauto addcontrib $(LISPI) $(LISPV) - -$(LISPV): $(LISPF) - @echo "org-version: $(ORGVERSION) ($(GITVERSION))" - @$(RM) $(@) - @$(MAKE_ORG_VERSION) - -$(LISPI): $(LISPV) $(LISPF) - @echo "org-loaddefs: $(ORGVERSION) ($(GITVERSION))" - @$(RM) $(@) - @$(MAKE_ORG_INSTALL) - -install: compile $(LISPF) - if [ ! -d $(DESTDIR)$(lispdir) ] ; then \ - $(MKDIR) $(DESTDIR)$(lispdir) ; \ - fi ; - $(CP) $(LISPC) $(LISPF) $(LISPA) $(DESTDIR)$(lispdir) - -cleanauto clean cleanall:: - $(RM) $(LISPA) $(LISPB) -clean cleanall cleanelc:: - $(RM) *.elc - -clean-install: - if [ -d $(DESTDIR)$(lispdir) ] ; then \ - $(RM) $(DESTDIR)$(lispdir)/org*.el* $(DESTDIR)$(lispdir)/ob*.el* $(DESTDIR)$(lispdir)/ox*.el* ; \ - fi ; -- 2.47.3