From 3e22ac022b866fb2bc9f151d77edbdebd3b08d2c Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Mon, 8 Aug 2016 20:39:13 +0200 Subject: [PATCH] updating org-mode to 20160711 --- elpa/org-20160530/org-pkg.el | 3 - elpa/org-20160711.signed | 1 + elpa/{org-20160530 => org-20160711}/COPYING | 0 .../README_ELPA | 0 elpa/{org-20160530 => org-20160711}/dir | 0 .../etc/ORG-NEWS | 0 .../etc/styles/OrgOdtContentTemplate.xml | 0 .../etc/styles/OrgOdtStyles.xml | 0 .../etc/styles/README | 0 elpa/{org-20160530 => org-20160711}/ob-C.el | 0 elpa/{org-20160530 => org-20160711}/ob-J.el | 0 elpa/{org-20160530 => org-20160711}/ob-R.el | 0 elpa/{org-20160530 => org-20160711}/ob-abc.el | 0 .../ob-asymptote.el | 0 elpa/{org-20160530 => org-20160711}/ob-awk.el | 0 .../{org-20160530 => org-20160711}/ob-calc.el | 0 .../ob-clojure.el | 0 .../ob-comint.el | 0 elpa/{org-20160530 => org-20160711}/ob-coq.el | 0 .../{org-20160530 => org-20160711}/ob-core.el | 0 elpa/{org-20160530 => org-20160711}/ob-css.el | 0 .../ob-ditaa.el | 0 elpa/{org-20160530 => org-20160711}/ob-dot.el | 0 .../{org-20160530 => org-20160711}/ob-ebnf.el | 0 .../ob-emacs-lisp.el | 0 .../{org-20160530 => org-20160711}/ob-eval.el | 0 elpa/{org-20160530 => org-20160711}/ob-exp.el | 8 +- .../ob-forth.el | 0 .../ob-fortran.el | 0 .../ob-gnuplot.el | 0 .../ob-groovy.el | 0 .../ob-haskell.el | 0 elpa/{org-20160530 => org-20160711}/ob-io.el | 0 .../{org-20160530 => org-20160711}/ob-java.el | 0 elpa/{org-20160530 => org-20160711}/ob-js.el | 0 .../{org-20160530 => org-20160711}/ob-keys.el | 0 .../ob-latex.el | 0 .../ob-ledger.el | 0 .../ob-lilypond.el | 0 .../{org-20160530 => org-20160711}/ob-lisp.el | 0 elpa/{org-20160530 => org-20160711}/ob-lob.el | 0 .../ob-makefile.el | 0 .../ob-matlab.el | 0 .../ob-maxima.el | 0 .../ob-mscgen.el | 0 .../ob-ocaml.el | 0 .../ob-octave.el | 0 elpa/{org-20160530 => org-20160711}/ob-org.el | 0 .../{org-20160530 => org-20160711}/ob-perl.el | 0 .../ob-picolisp.el | 0 .../ob-plantuml.el | 0 .../ob-processing.el | 0 .../ob-python.el | 0 elpa/{org-20160530 => org-20160711}/ob-ref.el | 0 .../{org-20160530 => org-20160711}/ob-ruby.el | 0 .../{org-20160530 => org-20160711}/ob-sass.el | 0 .../ob-scala.el | 0 .../ob-scheme.el | 0 .../ob-screen.el | 0 elpa/{org-20160530 => org-20160711}/ob-sed.el | 0 .../ob-shell.el | 0 .../{org-20160530 => org-20160711}/ob-shen.el | 0 elpa/{org-20160530 => org-20160711}/ob-sql.el | 22 +- .../ob-sqlite.el | 0 .../{org-20160530 => org-20160711}/ob-stan.el | 0 .../ob-table.el | 0 .../ob-tangle.el | 0 elpa/{org-20160530 => org-20160711}/ob.el | 0 elpa/{org-20160530 => org-20160711}/org | 1068 ++++++++--------- .../org-agenda.el | 0 .../org-archive.el | 0 .../org-attach.el | 0 .../org-autoloads.el | 18 +- .../org-bbdb.el | 0 .../org-bibtex.el | 0 .../org-capture.el | 0 .../org-clock.el | 0 .../org-colview.el | 0 .../org-compat.el | 0 .../org-crypt.el | 0 .../org-ctags.el | 0 .../org-datetree.el | 0 .../org-docview.el | 0 .../org-element.el | 2 +- .../org-entities.el | 4 +- .../org-eshell.el | 0 .../org-faces.el | 0 .../org-feed.el | 0 .../org-footnote.el | 0 .../org-gnus.el | 0 .../org-habit.el | 0 elpa/{org-20160530 => org-20160711}/org-id.el | 0 .../org-indent.el | 0 .../org-info.el | 0 .../org-inlinetask.el | 0 .../org-install.el | 0 .../{org-20160530 => org-20160711}/org-irc.el | 0 .../org-lint.el | 0 .../org-list.el | 0 .../org-loaddefs.el | 12 +- .../org-macro.el | 0 .../org-macs.el | 0 .../{org-20160530 => org-20160711}/org-mhe.el | 0 .../org-mobile.el | 0 .../org-mouse.el | 0 .../org-pcomplete.el | 0 elpa/org-20160711/org-pkg.el | 3 + .../org-plot.el | 0 .../org-protocol.el | 0 .../org-rmail.el | 0 .../{org-20160530 => org-20160711}/org-src.el | 0 .../org-table.el | 0 .../org-timer.el | 0 .../org-version.el | 2 +- .../{org-20160530 => org-20160711}/org-w3m.el | 0 elpa/{org-20160530 => org-20160711}/org.el | 247 ++-- .../orgcard.pdf | Bin 124864 -> 124864 bytes .../ox-ascii.el | 0 .../ox-beamer.el | 0 .../{org-20160530 => org-20160711}/ox-html.el | 4 +- .../ox-icalendar.el | 0 .../ox-latex.el | 0 elpa/{org-20160530 => org-20160711}/ox-man.el | 0 elpa/{org-20160530 => org-20160711}/ox-md.el | 0 elpa/{org-20160530 => org-20160711}/ox-odt.el | 0 elpa/{org-20160530 => org-20160711}/ox-org.el | 0 .../ox-publish.el | 0 .../ox-texinfo.el | 0 elpa/{org-20160530 => org-20160711}/ox.el | 325 ++--- init.el | 4 +- snippets/org-mode/results | 2 +- snippets/org-mode/sqlmysql | 2 +- snippets/org-mode/sqlvertica | 5 +- 133 files changed, 901 insertions(+), 831 deletions(-) delete mode 100644 elpa/org-20160530/org-pkg.el create mode 100644 elpa/org-20160711.signed rename elpa/{org-20160530 => org-20160711}/COPYING (100%) rename elpa/{org-20160530 => org-20160711}/README_ELPA (100%) rename elpa/{org-20160530 => org-20160711}/dir (100%) rename elpa/{org-20160530 => org-20160711}/etc/ORG-NEWS (100%) rename elpa/{org-20160530 => org-20160711}/etc/styles/OrgOdtContentTemplate.xml (100%) rename elpa/{org-20160530 => org-20160711}/etc/styles/OrgOdtStyles.xml (100%) rename elpa/{org-20160530 => org-20160711}/etc/styles/README (100%) rename elpa/{org-20160530 => org-20160711}/ob-C.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-J.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-R.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-abc.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-asymptote.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-awk.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-calc.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-clojure.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-comint.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-coq.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-core.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-css.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-ditaa.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-dot.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-ebnf.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-emacs-lisp.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-eval.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-exp.el (98%) rename elpa/{org-20160530 => org-20160711}/ob-forth.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-fortran.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-gnuplot.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-groovy.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-haskell.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-io.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-java.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-js.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-keys.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-latex.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-ledger.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-lilypond.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-lisp.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-lob.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-makefile.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-matlab.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-maxima.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-mscgen.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-ocaml.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-octave.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-org.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-perl.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-picolisp.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-plantuml.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-processing.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-python.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-ref.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-ruby.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-sass.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-scala.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-scheme.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-screen.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-sed.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-shell.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-shen.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-sql.el (89%) rename elpa/{org-20160530 => org-20160711}/ob-sqlite.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-stan.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-table.el (100%) rename elpa/{org-20160530 => org-20160711}/ob-tangle.el (100%) rename elpa/{org-20160530 => org-20160711}/ob.el (100%) rename elpa/{org-20160530 => org-20160711}/org (98%) rename elpa/{org-20160530 => org-20160711}/org-agenda.el (100%) rename elpa/{org-20160530 => org-20160711}/org-archive.el (100%) rename elpa/{org-20160530 => org-20160711}/org-attach.el (100%) rename elpa/{org-20160530 => org-20160711}/org-autoloads.el (97%) rename elpa/{org-20160530 => org-20160711}/org-bbdb.el (100%) rename elpa/{org-20160530 => org-20160711}/org-bibtex.el (100%) rename elpa/{org-20160530 => org-20160711}/org-capture.el (100%) rename elpa/{org-20160530 => org-20160711}/org-clock.el (100%) rename elpa/{org-20160530 => org-20160711}/org-colview.el (100%) rename elpa/{org-20160530 => org-20160711}/org-compat.el (100%) rename elpa/{org-20160530 => org-20160711}/org-crypt.el (100%) rename elpa/{org-20160530 => org-20160711}/org-ctags.el (100%) rename elpa/{org-20160530 => org-20160711}/org-datetree.el (100%) rename elpa/{org-20160530 => org-20160711}/org-docview.el (100%) rename elpa/{org-20160530 => org-20160711}/org-element.el (99%) rename elpa/{org-20160530 => org-20160711}/org-entities.el (99%) rename elpa/{org-20160530 => org-20160711}/org-eshell.el (100%) rename elpa/{org-20160530 => org-20160711}/org-faces.el (100%) rename elpa/{org-20160530 => org-20160711}/org-feed.el (100%) rename elpa/{org-20160530 => org-20160711}/org-footnote.el (100%) rename elpa/{org-20160530 => org-20160711}/org-gnus.el (100%) rename elpa/{org-20160530 => org-20160711}/org-habit.el (100%) rename elpa/{org-20160530 => org-20160711}/org-id.el (100%) rename elpa/{org-20160530 => org-20160711}/org-indent.el (100%) rename elpa/{org-20160530 => org-20160711}/org-info.el (100%) rename elpa/{org-20160530 => org-20160711}/org-inlinetask.el (100%) rename elpa/{org-20160530 => org-20160711}/org-install.el (100%) rename elpa/{org-20160530 => org-20160711}/org-irc.el (100%) rename elpa/{org-20160530 => org-20160711}/org-lint.el (100%) rename elpa/{org-20160530 => org-20160711}/org-list.el (100%) rename elpa/{org-20160530 => org-20160711}/org-loaddefs.el (99%) rename elpa/{org-20160530 => org-20160711}/org-macro.el (100%) rename elpa/{org-20160530 => org-20160711}/org-macs.el (100%) rename elpa/{org-20160530 => org-20160711}/org-mhe.el (100%) rename elpa/{org-20160530 => org-20160711}/org-mobile.el (100%) rename elpa/{org-20160530 => org-20160711}/org-mouse.el (100%) rename elpa/{org-20160530 => org-20160711}/org-pcomplete.el (100%) create mode 100644 elpa/org-20160711/org-pkg.el rename elpa/{org-20160530 => org-20160711}/org-plot.el (100%) rename elpa/{org-20160530 => org-20160711}/org-protocol.el (100%) rename elpa/{org-20160530 => org-20160711}/org-rmail.el (100%) rename elpa/{org-20160530 => org-20160711}/org-src.el (100%) rename elpa/{org-20160530 => org-20160711}/org-table.el (100%) rename elpa/{org-20160530 => org-20160711}/org-timer.el (100%) rename elpa/{org-20160530 => org-20160711}/org-version.el (92%) rename elpa/{org-20160530 => org-20160711}/org-w3m.el (100%) rename elpa/{org-20160530 => org-20160711}/org.el (99%) rename elpa/{org-20160530 => org-20160711}/orgcard.pdf (99%) rename elpa/{org-20160530 => org-20160711}/ox-ascii.el (100%) rename elpa/{org-20160530 => org-20160711}/ox-beamer.el (100%) rename elpa/{org-20160530 => org-20160711}/ox-html.el (99%) rename elpa/{org-20160530 => org-20160711}/ox-icalendar.el (100%) rename elpa/{org-20160530 => org-20160711}/ox-latex.el (100%) rename elpa/{org-20160530 => org-20160711}/ox-man.el (100%) rename elpa/{org-20160530 => org-20160711}/ox-md.el (100%) rename elpa/{org-20160530 => org-20160711}/ox-odt.el (100%) rename elpa/{org-20160530 => org-20160711}/ox-org.el (100%) rename elpa/{org-20160530 => org-20160711}/ox-publish.el (100%) rename elpa/{org-20160530 => org-20160711}/ox-texinfo.el (100%) rename elpa/{org-20160530 => org-20160711}/ox.el (97%) diff --git a/elpa/org-20160530/org-pkg.el b/elpa/org-20160530/org-pkg.el deleted file mode 100644 index 00eb37d9..00000000 --- a/elpa/org-20160530/org-pkg.el +++ /dev/null @@ -1,3 +0,0 @@ -(define-package "org" - "20160530" "Outline-based notes management and organizer" ( )) -;; no-byte-compile: t diff --git a/elpa/org-20160711.signed b/elpa/org-20160711.signed new file mode 100644 index 00000000..708d25be --- /dev/null +++ b/elpa/org-20160711.signed @@ -0,0 +1 @@ +Good signature from 474F05837FBDEF9B GNU ELPA Signing Agent (trust undefined) created at 2016-07-11T10:05:01+0100 using DSA \ No newline at end of file diff --git a/elpa/org-20160530/COPYING b/elpa/org-20160711/COPYING similarity index 100% rename from elpa/org-20160530/COPYING rename to elpa/org-20160711/COPYING diff --git a/elpa/org-20160530/README_ELPA b/elpa/org-20160711/README_ELPA similarity index 100% rename from elpa/org-20160530/README_ELPA rename to elpa/org-20160711/README_ELPA diff --git a/elpa/org-20160530/dir b/elpa/org-20160711/dir similarity index 100% rename from elpa/org-20160530/dir rename to elpa/org-20160711/dir diff --git a/elpa/org-20160530/etc/ORG-NEWS b/elpa/org-20160711/etc/ORG-NEWS similarity index 100% rename from elpa/org-20160530/etc/ORG-NEWS rename to elpa/org-20160711/etc/ORG-NEWS diff --git a/elpa/org-20160530/etc/styles/OrgOdtContentTemplate.xml b/elpa/org-20160711/etc/styles/OrgOdtContentTemplate.xml similarity index 100% rename from elpa/org-20160530/etc/styles/OrgOdtContentTemplate.xml rename to elpa/org-20160711/etc/styles/OrgOdtContentTemplate.xml diff --git a/elpa/org-20160530/etc/styles/OrgOdtStyles.xml b/elpa/org-20160711/etc/styles/OrgOdtStyles.xml similarity index 100% rename from elpa/org-20160530/etc/styles/OrgOdtStyles.xml rename to elpa/org-20160711/etc/styles/OrgOdtStyles.xml diff --git a/elpa/org-20160530/etc/styles/README b/elpa/org-20160711/etc/styles/README similarity index 100% rename from elpa/org-20160530/etc/styles/README rename to elpa/org-20160711/etc/styles/README diff --git a/elpa/org-20160530/ob-C.el b/elpa/org-20160711/ob-C.el similarity index 100% rename from elpa/org-20160530/ob-C.el rename to elpa/org-20160711/ob-C.el diff --git a/elpa/org-20160530/ob-J.el b/elpa/org-20160711/ob-J.el similarity index 100% rename from elpa/org-20160530/ob-J.el rename to elpa/org-20160711/ob-J.el diff --git a/elpa/org-20160530/ob-R.el b/elpa/org-20160711/ob-R.el similarity index 100% rename from elpa/org-20160530/ob-R.el rename to elpa/org-20160711/ob-R.el diff --git a/elpa/org-20160530/ob-abc.el b/elpa/org-20160711/ob-abc.el similarity index 100% rename from elpa/org-20160530/ob-abc.el rename to elpa/org-20160711/ob-abc.el diff --git a/elpa/org-20160530/ob-asymptote.el b/elpa/org-20160711/ob-asymptote.el similarity index 100% rename from elpa/org-20160530/ob-asymptote.el rename to elpa/org-20160711/ob-asymptote.el diff --git a/elpa/org-20160530/ob-awk.el b/elpa/org-20160711/ob-awk.el similarity index 100% rename from elpa/org-20160530/ob-awk.el rename to elpa/org-20160711/ob-awk.el diff --git a/elpa/org-20160530/ob-calc.el b/elpa/org-20160711/ob-calc.el similarity index 100% rename from elpa/org-20160530/ob-calc.el rename to elpa/org-20160711/ob-calc.el diff --git a/elpa/org-20160530/ob-clojure.el b/elpa/org-20160711/ob-clojure.el similarity index 100% rename from elpa/org-20160530/ob-clojure.el rename to elpa/org-20160711/ob-clojure.el diff --git a/elpa/org-20160530/ob-comint.el b/elpa/org-20160711/ob-comint.el similarity index 100% rename from elpa/org-20160530/ob-comint.el rename to elpa/org-20160711/ob-comint.el diff --git a/elpa/org-20160530/ob-coq.el b/elpa/org-20160711/ob-coq.el similarity index 100% rename from elpa/org-20160530/ob-coq.el rename to elpa/org-20160711/ob-coq.el diff --git a/elpa/org-20160530/ob-core.el b/elpa/org-20160711/ob-core.el similarity index 100% rename from elpa/org-20160530/ob-core.el rename to elpa/org-20160711/ob-core.el diff --git a/elpa/org-20160530/ob-css.el b/elpa/org-20160711/ob-css.el similarity index 100% rename from elpa/org-20160530/ob-css.el rename to elpa/org-20160711/ob-css.el diff --git a/elpa/org-20160530/ob-ditaa.el b/elpa/org-20160711/ob-ditaa.el similarity index 100% rename from elpa/org-20160530/ob-ditaa.el rename to elpa/org-20160711/ob-ditaa.el diff --git a/elpa/org-20160530/ob-dot.el b/elpa/org-20160711/ob-dot.el similarity index 100% rename from elpa/org-20160530/ob-dot.el rename to elpa/org-20160711/ob-dot.el diff --git a/elpa/org-20160530/ob-ebnf.el b/elpa/org-20160711/ob-ebnf.el similarity index 100% rename from elpa/org-20160530/ob-ebnf.el rename to elpa/org-20160711/ob-ebnf.el diff --git a/elpa/org-20160530/ob-emacs-lisp.el b/elpa/org-20160711/ob-emacs-lisp.el similarity index 100% rename from elpa/org-20160530/ob-emacs-lisp.el rename to elpa/org-20160711/ob-emacs-lisp.el diff --git a/elpa/org-20160530/ob-eval.el b/elpa/org-20160711/ob-eval.el similarity index 100% rename from elpa/org-20160530/ob-eval.el rename to elpa/org-20160711/ob-eval.el diff --git a/elpa/org-20160530/ob-exp.el b/elpa/org-20160711/ob-exp.el similarity index 98% rename from elpa/org-20160530/ob-exp.el rename to elpa/org-20160711/ob-exp.el index 21d9056d..e8249923 100644 --- a/elpa/org-20160530/ob-exp.el +++ b/elpa/org-20160711/ob-exp.el @@ -34,12 +34,11 @@ (declare-function org-babel-lob-get-info "ob-lob" ()) (declare-function org-babel-eval-wipe-error-buffer "ob-eval" ()) -(declare-function org-between-regexps-p "org" - (start-re end-re &optional lim-up lim-down)) +(declare-function org-between-regexps-p "ob-eval" (start-re end-re &optional lim-up lim-down)) (declare-function org-get-indentation "org" (&optional line)) (declare-function org-heading-components "org" ()) -(declare-function org-in-commented-heading-p "org" (&optional no-inheritance)) (declare-function org-in-block-p "org" (names)) +(declare-function org-in-commented-heading-p "org" (&optional no-inheritance)) (declare-function org-in-verbatim-emphasis "org" ()) (declare-function org-link-search "org" (s &optional avoid-pos stealth)) (declare-function org-fill-template "org" (template alist)) @@ -49,7 +48,6 @@ (declare-function org-element-property "org-element" (property element)) (declare-function org-element-type "org-element" (element)) (declare-function org-id-get "org-id" (&optional pom create prefix)) -(declare-function org-escape-code-in-string "org-src" (s)) (defcustom org-export-babel-evaluate t "Switch controlling code evaluation during export. @@ -387,7 +385,7 @@ replaced with its value." org-babel-exp-inline-code-template org-babel-exp-code-template) `(("lang" . ,(nth 0 info)) - ("body" . ,(org-escape-code-in-string (nth 1 info))) + ("body" . ,(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)))) diff --git a/elpa/org-20160530/ob-forth.el b/elpa/org-20160711/ob-forth.el similarity index 100% rename from elpa/org-20160530/ob-forth.el rename to elpa/org-20160711/ob-forth.el diff --git a/elpa/org-20160530/ob-fortran.el b/elpa/org-20160711/ob-fortran.el similarity index 100% rename from elpa/org-20160530/ob-fortran.el rename to elpa/org-20160711/ob-fortran.el diff --git a/elpa/org-20160530/ob-gnuplot.el b/elpa/org-20160711/ob-gnuplot.el similarity index 100% rename from elpa/org-20160530/ob-gnuplot.el rename to elpa/org-20160711/ob-gnuplot.el diff --git a/elpa/org-20160530/ob-groovy.el b/elpa/org-20160711/ob-groovy.el similarity index 100% rename from elpa/org-20160530/ob-groovy.el rename to elpa/org-20160711/ob-groovy.el diff --git a/elpa/org-20160530/ob-haskell.el b/elpa/org-20160711/ob-haskell.el similarity index 100% rename from elpa/org-20160530/ob-haskell.el rename to elpa/org-20160711/ob-haskell.el diff --git a/elpa/org-20160530/ob-io.el b/elpa/org-20160711/ob-io.el similarity index 100% rename from elpa/org-20160530/ob-io.el rename to elpa/org-20160711/ob-io.el diff --git a/elpa/org-20160530/ob-java.el b/elpa/org-20160711/ob-java.el similarity index 100% rename from elpa/org-20160530/ob-java.el rename to elpa/org-20160711/ob-java.el diff --git a/elpa/org-20160530/ob-js.el b/elpa/org-20160711/ob-js.el similarity index 100% rename from elpa/org-20160530/ob-js.el rename to elpa/org-20160711/ob-js.el diff --git a/elpa/org-20160530/ob-keys.el b/elpa/org-20160711/ob-keys.el similarity index 100% rename from elpa/org-20160530/ob-keys.el rename to elpa/org-20160711/ob-keys.el diff --git a/elpa/org-20160530/ob-latex.el b/elpa/org-20160711/ob-latex.el similarity index 100% rename from elpa/org-20160530/ob-latex.el rename to elpa/org-20160711/ob-latex.el diff --git a/elpa/org-20160530/ob-ledger.el b/elpa/org-20160711/ob-ledger.el similarity index 100% rename from elpa/org-20160530/ob-ledger.el rename to elpa/org-20160711/ob-ledger.el diff --git a/elpa/org-20160530/ob-lilypond.el b/elpa/org-20160711/ob-lilypond.el similarity index 100% rename from elpa/org-20160530/ob-lilypond.el rename to elpa/org-20160711/ob-lilypond.el diff --git a/elpa/org-20160530/ob-lisp.el b/elpa/org-20160711/ob-lisp.el similarity index 100% rename from elpa/org-20160530/ob-lisp.el rename to elpa/org-20160711/ob-lisp.el diff --git a/elpa/org-20160530/ob-lob.el b/elpa/org-20160711/ob-lob.el similarity index 100% rename from elpa/org-20160530/ob-lob.el rename to elpa/org-20160711/ob-lob.el diff --git a/elpa/org-20160530/ob-makefile.el b/elpa/org-20160711/ob-makefile.el similarity index 100% rename from elpa/org-20160530/ob-makefile.el rename to elpa/org-20160711/ob-makefile.el diff --git a/elpa/org-20160530/ob-matlab.el b/elpa/org-20160711/ob-matlab.el similarity index 100% rename from elpa/org-20160530/ob-matlab.el rename to elpa/org-20160711/ob-matlab.el diff --git a/elpa/org-20160530/ob-maxima.el b/elpa/org-20160711/ob-maxima.el similarity index 100% rename from elpa/org-20160530/ob-maxima.el rename to elpa/org-20160711/ob-maxima.el diff --git a/elpa/org-20160530/ob-mscgen.el b/elpa/org-20160711/ob-mscgen.el similarity index 100% rename from elpa/org-20160530/ob-mscgen.el rename to elpa/org-20160711/ob-mscgen.el diff --git a/elpa/org-20160530/ob-ocaml.el b/elpa/org-20160711/ob-ocaml.el similarity index 100% rename from elpa/org-20160530/ob-ocaml.el rename to elpa/org-20160711/ob-ocaml.el diff --git a/elpa/org-20160530/ob-octave.el b/elpa/org-20160711/ob-octave.el similarity index 100% rename from elpa/org-20160530/ob-octave.el rename to elpa/org-20160711/ob-octave.el diff --git a/elpa/org-20160530/ob-org.el b/elpa/org-20160711/ob-org.el similarity index 100% rename from elpa/org-20160530/ob-org.el rename to elpa/org-20160711/ob-org.el diff --git a/elpa/org-20160530/ob-perl.el b/elpa/org-20160711/ob-perl.el similarity index 100% rename from elpa/org-20160530/ob-perl.el rename to elpa/org-20160711/ob-perl.el diff --git a/elpa/org-20160530/ob-picolisp.el b/elpa/org-20160711/ob-picolisp.el similarity index 100% rename from elpa/org-20160530/ob-picolisp.el rename to elpa/org-20160711/ob-picolisp.el diff --git a/elpa/org-20160530/ob-plantuml.el b/elpa/org-20160711/ob-plantuml.el similarity index 100% rename from elpa/org-20160530/ob-plantuml.el rename to elpa/org-20160711/ob-plantuml.el diff --git a/elpa/org-20160530/ob-processing.el b/elpa/org-20160711/ob-processing.el similarity index 100% rename from elpa/org-20160530/ob-processing.el rename to elpa/org-20160711/ob-processing.el diff --git a/elpa/org-20160530/ob-python.el b/elpa/org-20160711/ob-python.el similarity index 100% rename from elpa/org-20160530/ob-python.el rename to elpa/org-20160711/ob-python.el diff --git a/elpa/org-20160530/ob-ref.el b/elpa/org-20160711/ob-ref.el similarity index 100% rename from elpa/org-20160530/ob-ref.el rename to elpa/org-20160711/ob-ref.el diff --git a/elpa/org-20160530/ob-ruby.el b/elpa/org-20160711/ob-ruby.el similarity index 100% rename from elpa/org-20160530/ob-ruby.el rename to elpa/org-20160711/ob-ruby.el diff --git a/elpa/org-20160530/ob-sass.el b/elpa/org-20160711/ob-sass.el similarity index 100% rename from elpa/org-20160530/ob-sass.el rename to elpa/org-20160711/ob-sass.el diff --git a/elpa/org-20160530/ob-scala.el b/elpa/org-20160711/ob-scala.el similarity index 100% rename from elpa/org-20160530/ob-scala.el rename to elpa/org-20160711/ob-scala.el diff --git a/elpa/org-20160530/ob-scheme.el b/elpa/org-20160711/ob-scheme.el similarity index 100% rename from elpa/org-20160530/ob-scheme.el rename to elpa/org-20160711/ob-scheme.el diff --git a/elpa/org-20160530/ob-screen.el b/elpa/org-20160711/ob-screen.el similarity index 100% rename from elpa/org-20160530/ob-screen.el rename to elpa/org-20160711/ob-screen.el diff --git a/elpa/org-20160530/ob-sed.el b/elpa/org-20160711/ob-sed.el similarity index 100% rename from elpa/org-20160530/ob-sed.el rename to elpa/org-20160711/ob-sed.el diff --git a/elpa/org-20160530/ob-shell.el b/elpa/org-20160711/ob-shell.el similarity index 100% rename from elpa/org-20160530/ob-shell.el rename to elpa/org-20160711/ob-shell.el diff --git a/elpa/org-20160530/ob-shen.el b/elpa/org-20160711/ob-shen.el similarity index 100% rename from elpa/org-20160530/ob-shen.el rename to elpa/org-20160711/ob-shen.el diff --git a/elpa/org-20160530/ob-sql.el b/elpa/org-20160711/ob-sql.el similarity index 89% rename from elpa/org-20160530/ob-sql.el rename to elpa/org-20160711/ob-sql.el index f096572e..044da623 100644 --- a/elpa/org-20160530/ob-sql.el +++ b/elpa/org-20160711/ob-sql.el @@ -99,6 +99,16 @@ Pass nil to omit that arg." (when user (concat "-U" user)) (when database (concat "-d" database)))))) +(defun org-babel-sql-dbstring-vertica (host port user password database) + "Make Vertica command line args for database connection. Pass nil to omit that arg." + (combine-and-quote-strings + (delq nil + (list (when host (concat "-h" host)) + (when port (format "-p%d" port)) + (when user (concat "-U" user)) + (when password (concat "-w" password)) + (when database (concat "-d" database)))))) + (defun org-babel-execute:sql (body params) "Execute a block of Sql code with Babel. This function is called by `org-babel-execute-src-block'." @@ -137,12 +147,19 @@ This function is called by `org-babel-execute-src-block'." (org-babel-process-file-name in-file) (org-babel-process-file-name out-file))) ('postgresql (format - "psql --set=\"ON_ERROR_STOP=1\" %s -A -P footer=off -F \"\t\" %s -f %s -o %s %s" + "%s psql --set=\"ON_ERROR_STOP=1\" %s -A -P footer=off -F \"\t\" %s -f %s -o %s %s" + (if dbpassword (concat "PGPASSWORD='" dbpassword "'") "") (if colnames-p "" "-t") (org-babel-sql-dbstring-postgresql dbhost dbuser database) (org-babel-process-file-name in-file) (org-babel-process-file-name out-file) (or cmdline ""))) + ('vertica (format "vsql %s -f %s -o %s %s" + (org-babel-sql-dbstring-vertica + dbhost dbport dbuser dbpassword database) + (org-babel-process-file-name in-file) + (org-babel-process-file-name out-file) + (or cmdline ""))) (t (error "No support for the %s SQL engine" engine))))) (with-temp-file in-file (insert @@ -159,7 +176,8 @@ This function is called by `org-babel-execute-src-block'." (cond ((or (eq (intern engine) 'mysql) (eq (intern engine) 'dbi) - (eq (intern engine) 'postgresql)) + (eq (intern engine) 'postgresql) + (eq (intern engine) 'vertica)) ;; Add header row delimiter after column-names header in first line (cond (colnames-p diff --git a/elpa/org-20160530/ob-sqlite.el b/elpa/org-20160711/ob-sqlite.el similarity index 100% rename from elpa/org-20160530/ob-sqlite.el rename to elpa/org-20160711/ob-sqlite.el diff --git a/elpa/org-20160530/ob-stan.el b/elpa/org-20160711/ob-stan.el similarity index 100% rename from elpa/org-20160530/ob-stan.el rename to elpa/org-20160711/ob-stan.el diff --git a/elpa/org-20160530/ob-table.el b/elpa/org-20160711/ob-table.el similarity index 100% rename from elpa/org-20160530/ob-table.el rename to elpa/org-20160711/ob-table.el diff --git a/elpa/org-20160530/ob-tangle.el b/elpa/org-20160711/ob-tangle.el similarity index 100% rename from elpa/org-20160530/ob-tangle.el rename to elpa/org-20160711/ob-tangle.el diff --git a/elpa/org-20160530/ob.el b/elpa/org-20160711/ob.el similarity index 100% rename from elpa/org-20160530/ob.el rename to elpa/org-20160711/ob.el diff --git a/elpa/org-20160530/org b/elpa/org-20160711/org similarity index 98% rename from elpa/org-20160530/org rename to elpa/org-20160711/org index c4407f11..d61cd477 100644 --- a/elpa/org-20160530/org +++ b/elpa/org-20160711/org @@ -1,6 +1,6 @@ This is org, produced by makeinfo version 4.13 from org.texi. -This manual is for Org version 8.3.4 (release_8.3.4-72-gddd58f). +This manual is for Org version 8.3.4 (release_8.3.4-102-gebe7aa). Copyright (C) 2004-2016 Free Software Foundation, Inc. @@ -26,7 +26,7 @@ File: org, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) Org Mode Manual *************** -This manual is for Org version 8.3.4 (release_8.3.4-72-gddd58f). +This manual is for Org version 8.3.4 (release_8.3.4-102-gebe7aa). Copyright (C) 2004-2016 Free Software Foundation, Inc. @@ -21682,538 +21682,538 @@ org-customize ' and then click yourself through the tree.  Tag Table: -Node: Top893 -Node: Introduction23740 -Node: Summary24181 -Node: Installation26877 -Node: Activation29559 -Ref: Activation-Footnote-131364 -Node: Feedback31486 -Ref: Feedback-Footnote-135194 -Node: Conventions35321 -Ref: Conventions-Footnote-137387 -Node: Document structure37479 -Node: Outlines38470 -Node: Headlines39099 -Ref: Headlines-Footnote-140301 -Ref: Headlines-Footnote-240477 -Node: Visibility cycling40548 -Node: Global and local cycling40927 -Ref: Global and local cycling-Footnote-143587 -Ref: Global and local cycling-Footnote-243645 -Ref: Global and local cycling-Footnote-343695 -Node: Initial visibility43964 -Ref: Initial visibility-Footnote-145216 -Node: Catching invisible edits45397 -Node: Motion45862 -Node: Structure editing47197 -Node: Sparse trees54199 -Ref: Sparse trees-Footnote-156698 -Ref: Sparse trees-Footnote-256809 -Ref: Sparse trees-Footnote-356880 -Node: Plain lists56995 -Ref: Plain lists-Footnote-164407 -Ref: Plain lists-Footnote-264761 -Ref: Plain lists-Footnote-364857 -Ref: Plain lists-Footnote-465104 -Ref: Plain lists-Footnote-565275 -Ref: Plain lists-Footnote-665338 -Ref: Plain lists-Footnote-765514 -Ref: Plain lists-Footnote-865614 -Ref: Plain lists-Footnote-965716 -Node: Drawers65782 -Node: Blocks67605 -Node: Footnotes68164 -Ref: Footnotes-Footnote-172786 -Ref: Footnotes-Footnote-272883 -Node: Orgstruct mode72960 -Node: Org syntax74590 -Node: Tables75494 -Node: Built-in table editor76135 -Ref: Built-in table editor-Footnote-185889 -Node: Column width and alignment85989 -Ref: Column width and alignment-Footnote-188552 -Ref: Column width and alignment-Footnote-288598 -Node: Column groups88695 -Node: Orgtbl mode90267 -Node: The spreadsheet91076 -Node: References92536 -Ref: References-Footnote-199254 -Ref: References-Footnote-299476 -Ref: References-Footnote-399745 -Ref: References-Footnote-499858 -Node: Formula syntax for Calc100148 -Ref: Formula syntax for Calc-Footnote-1105295 -Node: Formula syntax for Lisp105619 -Node: Durations and time values107354 -Node: Field and range formulas108432 -Node: Column formulas110829 -Node: Lookup functions112917 -Node: Editing and debugging formulas114840 -Ref: Using multiple #+TBLFM lines119099 -Node: Updating the table120312 -Node: Advanced features121668 -Ref: Advanced features-Footnote-1126149 -Node: Org-Plot126255 -Node: Hyperlinks130449 -Node: Link format131206 -Node: Internal links132465 -Ref: Internal links-Footnote-1134760 -Ref: Internal links-Footnote-2135000 -Node: Radio targets135138 -Node: External links135805 -Ref: External links-Footnote-1139877 -Ref: External links-Footnote-2140295 -Node: Handling links140552 -Ref: Handling links-Footnote-1148457 -Ref: Handling links-Footnote-2148616 -Ref: Handling links-Footnote-3148791 -Ref: Handling links-Footnote-4149086 -Ref: Handling links-Footnote-5149332 -Ref: Handling links-Footnote-6149409 -Ref: Handling links-Footnote-7149481 -Node: Using links outside Org149565 -Node: Link abbreviations150050 -Node: Search options152732 -Ref: Search options-Footnote-1154614 -Node: Custom searches154695 -Node: TODO items155705 -Ref: TODO items-Footnote-1156813 -Node: TODO basics156927 -Node: TODO extensions159773 -Node: Workflow states160803 -Ref: Workflow states-Footnote-1162104 -Node: TODO types162197 -Ref: TODO types-Footnote-1163795 -Node: Multiple sets in one file163877 -Node: Fast access to TODO states165731 -Ref: Fast access to TODO states-Footnote-1166604 -Ref: Fast access to TODO states-Footnote-2166688 -Node: Per-file keywords166981 -Ref: Per-file keywords-Footnote-1168352 -Node: Faces for TODO keywords168553 -Node: TODO dependencies169594 -Node: Progress logging171929 -Node: Closing items172641 -Ref: Closing items-Footnote-1173846 -Ref: Closing items-Footnote-2173915 -Node: Tracking TODO state changes173989 -Ref: Tracking TODO state changes-Footnote-1177025 -Ref: Tracking TODO state changes-Footnote-2177080 -Ref: Tracking TODO state changes-Footnote-3177220 -Node: Tracking your habits177508 -Node: Priorities181742 -Ref: Priorities-Footnote-1183732 -Node: Breaking down tasks183801 -Ref: Breaking down tasks-Footnote-1185780 -Node: Checkboxes185876 -Ref: Checkboxes-Footnote-1190402 -Ref: Checkboxes-Footnote-2190526 -Ref: Checkboxes-Footnote-3190700 -Node: Tags190814 -Node: Tag inheritance191870 -Ref: Tag inheritance-Footnote-1193681 -Ref: Tag inheritance-Footnote-2193781 -Node: Setting tags193907 -Ref: Setting tags-Footnote-1200214 -Node: Tag hierarchy200297 -Node: Tag searches203688 -Node: Properties and columns204983 -Node: Property syntax206419 -Node: Special properties210761 -Node: Property searches212418 -Node: Property inheritance213853 -Node: Column view215669 -Node: Defining columns216904 -Node: Scope of column definitions217282 -Node: Column attributes218187 -Ref: Column attributes-Footnote-1223011 -Node: Using column view223144 -Node: Capturing column view226005 -Ref: Capturing column view-Footnote-1229001 -Node: Property API229137 -Node: Dates and times229491 -Node: Timestamps230398 -Ref: Timestamps-Footnote-1232817 -Ref: Timestamps-Footnote-2233003 -Ref: Timestamps-Footnote-3233134 -Node: Creating timestamps233903 -Node: The date/time prompt236727 -Ref: The date/time prompt-Footnote-1241308 -Ref: The date/time prompt-Footnote-2241471 -Ref: The date/time prompt-Footnote-3241577 -Node: Custom time format241671 -Node: Deadlines and scheduling243393 -Ref: Deadlines and scheduling-Footnote-1246775 -Node: Inserting deadline/schedule246930 -Ref: Inserting deadline/schedule-Footnote-1248887 -Ref: Inserting deadline/schedule-Footnote-2249039 -Ref: Inserting deadline/schedule-Footnote-3249147 -Node: Repeated tasks249255 -Ref: Repeated tasks-Footnote-1253125 -Ref: Repeated tasks-Footnote-2253374 -Node: Clocking work time253573 -Ref: Clocking work time-Footnote-1254758 -Ref: Clocking work time-Footnote-2254902 -Node: Clocking commands255040 -Ref: Clocking commands-Footnote-1259986 -Ref: Clocking commands-Footnote-2260093 -Ref: Clocking commands-Footnote-3260143 -Ref: Clocking commands-Footnote-4260201 -Node: The clock table260279 -Ref: The clock table-Footnote-1267729 -Ref: The clock table-Footnote-2267823 -Node: Resolving idle time267948 -Ref: Resolving idle time-Footnote-1271795 -Node: Effort estimates272263 -Ref: Effort estimates-Footnote-1275016 -Node: Timers275123 -Node: Capture - Refile - Archive277413 -Node: Capture278403 -Node: Setting up capture279471 -Ref: Setting up capture-Footnote-1279880 -Node: Using capture279946 -Node: Capture templates282353 -Node: Template elements284314 -Ref: Template elements-Footnote-1290186 -Node: Template expansion290361 -Ref: Template expansion-Footnote-1294351 -Ref: Template expansion-Footnote-2294438 -Ref: Template expansion-Footnote-3294620 -Node: Templates in contexts294718 -Node: Attachments295540 -Ref: Attachments-Footnote-1298922 -Node: RSS feeds299072 -Node: Protocols300549 -Node: Refile and copy301264 -Ref: Refile and copy-Footnote-1303686 -Node: Archiving303782 -Node: Moving subtrees304482 -Node: Internal archiving306506 -Node: Agenda views309136 -Node: Agenda files311327 -Ref: Agenda files-Footnote-1314130 -Ref: Agenda files-Footnote-2314279 -Node: Agenda dispatcher314472 -Ref: Agenda dispatcher-Footnote-1317381 -Ref: Agenda dispatcher-Footnote-2317475 -Node: Built-in agenda views317577 -Node: Weekly/daily agenda318226 -Ref: Weekly/daily agenda-Footnote-1323571 -Ref: Weekly/daily agenda-Footnote-2323798 -Node: Global TODO list323973 -Node: Matching tags and properties326501 -Node: Timeline333489 -Node: Search view334181 -Node: Stuck projects335474 -Ref: Stuck projects-Footnote-1337534 -Node: Presentation and sorting337564 -Node: Categories338521 -Node: Time-of-day specifications339250 -Node: Sorting agenda items341219 -Node: Filtering/limiting agenda items342788 -Ref: Filtering/limiting agenda items-Footnote-1350016 -Node: Agenda commands350431 -Ref: Agenda commands-Footnote-1371952 -Ref: Agenda commands-Footnote-2372033 -Ref: Agenda commands-Footnote-3372152 -Ref: Agenda commands-Footnote-4372252 -Node: Custom agenda views372335 -Node: Storing searches372976 -Ref: Storing searches-Footnote-1375917 -Ref: Storing searches-Footnote-2376034 -Node: Block agenda376282 -Node: Setting options377520 -Node: Exporting agenda views381109 -Ref: Exporting agenda views-Footnote-1386010 -Ref: Exporting agenda views-Footnote-2386068 -Ref: Exporting agenda views-Footnote-3386224 -Ref: Exporting agenda views-Footnote-4386411 -Node: Agenda column view386493 -Node: Markup389567 -Node: Structural markup elements390599 -Node: Document title391254 -Node: Headings and sections391666 -Node: Table of contents392336 -Ref: Table of contents-Footnote-1394092 -Node: Lists394290 -Node: Paragraphs394581 -Node: Footnote markup395731 -Node: Emphasis and monospace396068 -Node: Horizontal rules396925 -Node: Comment lines397182 -Ref: Comment lines-Footnote-1397959 -Node: Images and tables398059 -Node: Literal examples399776 -Ref: Literal examples-Footnote-1403769 -Ref: Literal examples-Footnote-2404302 -Ref: Literal examples-Footnote-3404474 -Ref: Literal examples-Footnote-4404653 -Ref: Literal examples-Footnote-5404903 -Node: Include files404997 -Ref: Include files-Footnote-1407879 -Ref: Include files-Footnote-2408029 -Node: Index entries408195 -Node: Macro replacement408657 -Ref: Macro replacement-Footnote-1410614 -Node: Embedded LaTeX410844 -Ref: Embedded LaTeX-Footnote-1411808 -Node: Special symbols411998 -Ref: Special symbols-Footnote-1413599 -Node: Subscripts and superscripts413754 -Node: LaTeX fragments414859 -Ref: LaTeX fragments-Footnote-1417059 -Node: Previewing LaTeX fragments417263 -Ref: Previewing LaTeX fragments-Footnote-1418688 -Node: CDLaTeX mode418907 -Ref: CDLaTeX mode-Footnote-1421404 -Node: Special blocks421552 -Node: Exporting422483 -Node: The export dispatcher424438 -Ref: The export dispatcher-Footnote-1426478 -Node: Export back-ends426741 -Node: Export settings427651 -Ref: Export settings-Footnote-1434746 -Ref: Export settings-Footnote-2434848 -Ref: Export settings-Footnote-3434943 -Node: ASCII/Latin-1/UTF-8 export434986 -Node: Beamer export437758 -Node: Beamer export commands438481 -Node: Beamer specific export settings439156 -Node: Sectioning Frames and Blocks in Beamer440940 -Ref: Sectioning Frames and Blocks in Beamer-Footnote-1443896 -Ref: Sectioning Frames and Blocks in Beamer-Footnote-2444059 -Node: Beamer specific syntax444177 -Node: Editing support445809 -Node: A Beamer Example446240 -Node: HTML export447518 -Node: HTML Export commands448670 -Node: HTML Specific export settings449216 -Node: HTML doctypes451001 -Node: HTML preamble and postamble453248 -Node: Quoting HTML tags454296 -Node: Links in HTML export454926 -Node: Tables in HTML export456137 -Node: Images in HTML export457573 -Ref: Images in HTML export-Footnote-1458863 -Node: Math formatting in HTML export458918 -Ref: Math formatting in HTML export-Footnote-1460269 -Node: Text areas in HTML export460529 -Node: CSS support461311 -Ref: CSS support-Footnote-1464418 -Ref: CSS support-Footnote-2464590 -Node: JavaScript support464832 -Node: LaTeX and PDF export468213 -Ref: LaTeX and PDF export-Footnote-1469409 -Node: LaTeX export commands469699 -Node: LaTeX specific export settings470374 -Node: Header and sectioning472462 -Ref: Header and sectioning-Footnote-1474083 -Ref: Header and sectioning-Footnote-2474195 -Node: Quoting LaTeX code474358 -Node: LaTeX specific attributes474953 -Ref: LaTeX specific attributes-Footnote-1484350 -Ref: LaTeX specific attributes-Footnote-2484428 -Ref: LaTeX specific attributes-Footnote-3484502 -Ref: LaTeX specific attributes-Footnote-4484586 -Node: Markdown export484740 -Ref: Markdown export-Footnote-1486044 -Node: OpenDocument Text export486130 -Ref: OpenDocument Text export-Footnote-1487320 -Ref: OpenDocument Text export-Footnote-2487350 -Node: Pre-requisites for ODT export487494 -Node: ODT export commands487820 -Ref: x-export-to-odt488022 -Ref: ODT export commands-Footnote-1489021 -Ref: ODT export commands-Footnote-2489081 -Node: ODT specific export settings489132 -Node: Extending ODT export489972 -Ref: x-export-to-other-formats490958 -Ref: x-convert-to-other-formats491468 -Node: Applying custom styles491925 -Node: Links in ODT export494047 -Node: Tables in ODT export494692 -Ref: Tables in ODT export-Footnote-1496826 -Node: Images in ODT export496919 -Ref: Images in ODT export-Footnote-1499643 -Node: Math formatting in ODT export499876 -Node: Working with LaTeX math snippets500338 -Ref: Working with LaTeX math snippets-Footnote-1502504 -Ref: Working with LaTeX math snippets-Footnote-2502580 -Node: Working with MathML or OpenDocument formula files502625 -Node: Labels and captions in ODT export503179 -Node: Literal examples in ODT export504635 -Ref: Literal examples in ODT export-Footnote-1505536 -Node: Advanced topics in ODT export505647 -Node: Configuring a document converter506401 -Ref: x-odt-converter-capabilities507173 -Node: Working with OpenDocument style files507754 -Ref: x-factory-styles508230 -Ref: x-orgodtstyles-xml508468 -Ref: x-orgodtcontenttemplate-xml508795 -Ref: x-overriding-factory-styles509451 -Ref: x-org-odt-styles-file509731 -Ref: x-org-odt-content-template-file510612 -Node: Creating one-off styles510753 -Node: Customizing tables in ODT export512954 -Ref: Customizing tables in ODT export-Footnote-1517931 -Ref: Customizing tables in ODT export-Footnote-2518035 -Ref: Customizing tables in ODT export-Footnote-3518123 -Node: Validating OpenDocument XML518438 -Ref: Validating OpenDocument XML-Footnote-1519437 -Node: Org export519489 -Node: Texinfo export520253 -Node: Texinfo export commands520942 -Ref: Texinfo export commands-Footnote-1521477 -Node: Texinfo specific export settings521585 -Node: Document preamble522687 -Ref: Document preamble-Footnote-1525976 -Node: Headings and sectioning structure526038 -Node: Indices527492 -Node: Quoting Texinfo code528285 -Node: Texinfo specific attributes528769 -Ref: Texinfo specific attributes-Footnote-1530291 -Node: An example530357 -Node: iCalendar export532348 -Ref: iCalendar export-Footnote-1535080 -Ref: iCalendar export-Footnote-2535170 -Ref: iCalendar export-Footnote-3535270 -Node: Other built-in back-ends535407 -Node: Export in foreign buffers536000 -Node: Advanced configuration536990 -Node: Publishing543932 -Node: Configuration544800 -Node: Project alist545563 -Node: Sources and destinations546704 -Node: Selecting files548222 -Node: Publishing action549223 -Ref: Publishing action-Footnote-1551052 -Node: Publishing options551209 -Node: Publishing links563936 -Node: Sitemap564903 -Node: Generating an index568122 -Node: Uploading files568709 -Node: Sample configuration570473 -Node: Simple example570962 -Node: Complex example571609 -Node: Triggering publication573660 -Node: Working with source code574656 -Node: Structure of code blocks576348 -Ref: Structure of code blocks-Footnote-1578181 -Node: Editing source code578275 -Node: Exporting code blocks580398 -Node: Extracting source code582899 -Node: Evaluating code blocks585134 -Ref: Evaluating code blocks-Footnote-1588571 -Ref: Evaluating code blocks-Footnote-2588868 -Ref: Evaluating code blocks-Footnote-3588994 -Node: Library of Babel589180 -Node: Languages590153 -Node: Header arguments592586 -Node: Using header arguments593071 -Node: System-wide header arguments594101 -Node: Language-specific header arguments594908 -Node: Header arguments in Org mode properties595417 -Ref: Header arguments in Org mode properties-Footnote-1597146 -Node: Language-specific header arguments in Org mode properties597418 -Node: Code block specific header arguments598434 -Node: Header arguments in function calls600280 -Node: Specific header arguments601029 -Node: var603803 -Node: results610594 -Node: file615447 -Node: file-desc616359 -Node: file-ext616829 -Node: output-dir617327 -Node: dir617865 -Node: exports620800 -Node: tangle621538 -Node: mkdirp622349 -Node: comments622682 -Node: padline623817 -Node: no-expand624349 -Node: session624988 -Node: noweb626023 -Node: noweb-ref628200 -Ref: noweb-ref-Footnote-1629666 -Node: noweb-sep629795 -Node: cache630089 -Node: sep631821 -Node: hlines632393 -Node: colnames633895 -Node: rownames635198 -Node: shebang636373 -Node: tangle-mode636776 -Node: eval637527 -Node: wrap638565 -Node: post639005 -Node: prologue640897 -Node: epilogue641469 -Node: Results of evaluation641724 -Node: Noweb reference syntax645492 -Node: Key bindings and useful functions647143 -Node: Batch execution649888 -Node: Miscellaneous650922 -Node: Completion651751 -Node: Easy templates653705 -Node: Speed keys655114 -Node: Code evaluation security655938 -Node: Customization658648 -Node: In-buffer settings659243 -Ref: In-buffer settings-Footnote-1668983 -Node: The very busy C-c C-c key669031 -Node: Clean view671015 -Ref: Clean view-Footnote-1675000 -Ref: Clean view-Footnote-2675061 -Ref: Clean view-Footnote-3675245 -Ref: Clean view-Footnote-4675306 -Ref: Clean view-Footnote-5675418 -Ref: Clean view-Footnote-6675473 -Node: TTY keys675598 -Node: Interaction677364 -Node: Cooperation677758 -Node: Conflicts681536 -Node: org-crypt686505 -Node: Hacking687816 -Node: Hooks688802 -Node: Add-on packages689202 -Node: Adding hyperlink types689756 -Node: Adding export back-ends693676 -Node: Context-sensitive commands695116 -Ref: Context-sensitive commands-Footnote-1696693 -Node: Tables in arbitrary syntax696827 -Node: Radio tables698239 -Node: A LaTeX example700826 -Ref: A LaTeX example-Footnote-1704818 -Ref: A LaTeX example-Footnote-2704975 -Node: Translator functions705410 -Node: Radio lists707841 -Node: Dynamic blocks708970 -Node: Special agenda views711168 -Ref: x-agenda-skip-entry-regexp714631 -Ref: Special agenda views-Footnote-1715434 -Ref: Special agenda views-Footnote-2715629 -Node: Speeding up your agendas715764 -Node: Extracting agenda information716867 -Node: Using the property API720945 -Node: Using the mapping API724315 -Node: MobileOrg728737 -Node: Setting up the staging area730431 -Ref: Setting up the staging area-Footnote-1731512 -Ref: Setting up the staging area-Footnote-2731813 -Node: Pushing to MobileOrg732075 -Ref: Pushing to MobileOrg-Footnote-1733075 -Ref: Pushing to MobileOrg-Footnote-2733162 -Ref: Pushing to MobileOrg-Footnote-3733578 -Node: Pulling from MobileOrg733649 -Ref: Pulling from MobileOrg-Footnote-1736070 -Ref: Pulling from MobileOrg-Footnote-2736130 -Node: History and acknowledgments736505 -Node: GNU Free Documentation License751660 -Node: Main Index776850 -Node: Key Index865951 -Node: Command and Function Index918540 -Node: Variable Index953565 +Node: Top894 +Node: Introduction23742 +Node: Summary24183 +Node: Installation26879 +Node: Activation29561 +Ref: Activation-Footnote-131366 +Node: Feedback31488 +Ref: Feedback-Footnote-135196 +Node: Conventions35323 +Ref: Conventions-Footnote-137389 +Node: Document structure37481 +Node: Outlines38472 +Node: Headlines39101 +Ref: Headlines-Footnote-140303 +Ref: Headlines-Footnote-240479 +Node: Visibility cycling40550 +Node: Global and local cycling40929 +Ref: Global and local cycling-Footnote-143589 +Ref: Global and local cycling-Footnote-243647 +Ref: Global and local cycling-Footnote-343697 +Node: Initial visibility43966 +Ref: Initial visibility-Footnote-145218 +Node: Catching invisible edits45399 +Node: Motion45864 +Node: Structure editing47199 +Node: Sparse trees54201 +Ref: Sparse trees-Footnote-156700 +Ref: Sparse trees-Footnote-256811 +Ref: Sparse trees-Footnote-356882 +Node: Plain lists56997 +Ref: Plain lists-Footnote-164409 +Ref: Plain lists-Footnote-264763 +Ref: Plain lists-Footnote-364859 +Ref: Plain lists-Footnote-465106 +Ref: Plain lists-Footnote-565277 +Ref: Plain lists-Footnote-665340 +Ref: Plain lists-Footnote-765516 +Ref: Plain lists-Footnote-865616 +Ref: Plain lists-Footnote-965718 +Node: Drawers65784 +Node: Blocks67607 +Node: Footnotes68166 +Ref: Footnotes-Footnote-172788 +Ref: Footnotes-Footnote-272885 +Node: Orgstruct mode72962 +Node: Org syntax74592 +Node: Tables75496 +Node: Built-in table editor76137 +Ref: Built-in table editor-Footnote-185891 +Node: Column width and alignment85991 +Ref: Column width and alignment-Footnote-188554 +Ref: Column width and alignment-Footnote-288600 +Node: Column groups88697 +Node: Orgtbl mode90269 +Node: The spreadsheet91078 +Node: References92538 +Ref: References-Footnote-199256 +Ref: References-Footnote-299478 +Ref: References-Footnote-399747 +Ref: References-Footnote-499860 +Node: Formula syntax for Calc100150 +Ref: Formula syntax for Calc-Footnote-1105297 +Node: Formula syntax for Lisp105621 +Node: Durations and time values107356 +Node: Field and range formulas108434 +Node: Column formulas110831 +Node: Lookup functions112919 +Node: Editing and debugging formulas114842 +Ref: Using multiple #+TBLFM lines119101 +Node: Updating the table120314 +Node: Advanced features121670 +Ref: Advanced features-Footnote-1126151 +Node: Org-Plot126257 +Node: Hyperlinks130451 +Node: Link format131208 +Node: Internal links132467 +Ref: Internal links-Footnote-1134762 +Ref: Internal links-Footnote-2135002 +Node: Radio targets135140 +Node: External links135807 +Ref: External links-Footnote-1139879 +Ref: External links-Footnote-2140297 +Node: Handling links140554 +Ref: Handling links-Footnote-1148459 +Ref: Handling links-Footnote-2148618 +Ref: Handling links-Footnote-3148793 +Ref: Handling links-Footnote-4149088 +Ref: Handling links-Footnote-5149334 +Ref: Handling links-Footnote-6149411 +Ref: Handling links-Footnote-7149483 +Node: Using links outside Org149567 +Node: Link abbreviations150052 +Node: Search options152734 +Ref: Search options-Footnote-1154616 +Node: Custom searches154697 +Node: TODO items155707 +Ref: TODO items-Footnote-1156815 +Node: TODO basics156929 +Node: TODO extensions159775 +Node: Workflow states160805 +Ref: Workflow states-Footnote-1162106 +Node: TODO types162199 +Ref: TODO types-Footnote-1163797 +Node: Multiple sets in one file163879 +Node: Fast access to TODO states165733 +Ref: Fast access to TODO states-Footnote-1166606 +Ref: Fast access to TODO states-Footnote-2166690 +Node: Per-file keywords166983 +Ref: Per-file keywords-Footnote-1168354 +Node: Faces for TODO keywords168555 +Node: TODO dependencies169596 +Node: Progress logging171931 +Node: Closing items172643 +Ref: Closing items-Footnote-1173848 +Ref: Closing items-Footnote-2173917 +Node: Tracking TODO state changes173991 +Ref: Tracking TODO state changes-Footnote-1177027 +Ref: Tracking TODO state changes-Footnote-2177082 +Ref: Tracking TODO state changes-Footnote-3177222 +Node: Tracking your habits177510 +Node: Priorities181744 +Ref: Priorities-Footnote-1183734 +Node: Breaking down tasks183803 +Ref: Breaking down tasks-Footnote-1185782 +Node: Checkboxes185878 +Ref: Checkboxes-Footnote-1190404 +Ref: Checkboxes-Footnote-2190528 +Ref: Checkboxes-Footnote-3190702 +Node: Tags190816 +Node: Tag inheritance191872 +Ref: Tag inheritance-Footnote-1193683 +Ref: Tag inheritance-Footnote-2193783 +Node: Setting tags193909 +Ref: Setting tags-Footnote-1200216 +Node: Tag hierarchy200299 +Node: Tag searches203690 +Node: Properties and columns204985 +Node: Property syntax206421 +Node: Special properties210763 +Node: Property searches212420 +Node: Property inheritance213855 +Node: Column view215671 +Node: Defining columns216906 +Node: Scope of column definitions217284 +Node: Column attributes218189 +Ref: Column attributes-Footnote-1223013 +Node: Using column view223146 +Node: Capturing column view226007 +Ref: Capturing column view-Footnote-1229003 +Node: Property API229139 +Node: Dates and times229493 +Node: Timestamps230400 +Ref: Timestamps-Footnote-1232819 +Ref: Timestamps-Footnote-2233005 +Ref: Timestamps-Footnote-3233136 +Node: Creating timestamps233905 +Node: The date/time prompt236729 +Ref: The date/time prompt-Footnote-1241310 +Ref: The date/time prompt-Footnote-2241473 +Ref: The date/time prompt-Footnote-3241579 +Node: Custom time format241673 +Node: Deadlines and scheduling243395 +Ref: Deadlines and scheduling-Footnote-1246777 +Node: Inserting deadline/schedule246932 +Ref: Inserting deadline/schedule-Footnote-1248889 +Ref: Inserting deadline/schedule-Footnote-2249041 +Ref: Inserting deadline/schedule-Footnote-3249149 +Node: Repeated tasks249257 +Ref: Repeated tasks-Footnote-1253127 +Ref: Repeated tasks-Footnote-2253376 +Node: Clocking work time253575 +Ref: Clocking work time-Footnote-1254760 +Ref: Clocking work time-Footnote-2254904 +Node: Clocking commands255042 +Ref: Clocking commands-Footnote-1259988 +Ref: Clocking commands-Footnote-2260095 +Ref: Clocking commands-Footnote-3260145 +Ref: Clocking commands-Footnote-4260203 +Node: The clock table260281 +Ref: The clock table-Footnote-1267731 +Ref: The clock table-Footnote-2267825 +Node: Resolving idle time267950 +Ref: Resolving idle time-Footnote-1271797 +Node: Effort estimates272265 +Ref: Effort estimates-Footnote-1275018 +Node: Timers275125 +Node: Capture - Refile - Archive277415 +Node: Capture278405 +Node: Setting up capture279473 +Ref: Setting up capture-Footnote-1279882 +Node: Using capture279948 +Node: Capture templates282355 +Node: Template elements284316 +Ref: Template elements-Footnote-1290188 +Node: Template expansion290363 +Ref: Template expansion-Footnote-1294353 +Ref: Template expansion-Footnote-2294440 +Ref: Template expansion-Footnote-3294622 +Node: Templates in contexts294720 +Node: Attachments295542 +Ref: Attachments-Footnote-1298924 +Node: RSS feeds299074 +Node: Protocols300551 +Node: Refile and copy301266 +Ref: Refile and copy-Footnote-1303688 +Node: Archiving303784 +Node: Moving subtrees304484 +Node: Internal archiving306508 +Node: Agenda views309138 +Node: Agenda files311329 +Ref: Agenda files-Footnote-1314132 +Ref: Agenda files-Footnote-2314281 +Node: Agenda dispatcher314474 +Ref: Agenda dispatcher-Footnote-1317383 +Ref: Agenda dispatcher-Footnote-2317477 +Node: Built-in agenda views317579 +Node: Weekly/daily agenda318228 +Ref: Weekly/daily agenda-Footnote-1323573 +Ref: Weekly/daily agenda-Footnote-2323800 +Node: Global TODO list323975 +Node: Matching tags and properties326503 +Node: Timeline333491 +Node: Search view334183 +Node: Stuck projects335476 +Ref: Stuck projects-Footnote-1337536 +Node: Presentation and sorting337566 +Node: Categories338523 +Node: Time-of-day specifications339252 +Node: Sorting agenda items341221 +Node: Filtering/limiting agenda items342790 +Ref: Filtering/limiting agenda items-Footnote-1350018 +Node: Agenda commands350433 +Ref: Agenda commands-Footnote-1371954 +Ref: Agenda commands-Footnote-2372035 +Ref: Agenda commands-Footnote-3372154 +Ref: Agenda commands-Footnote-4372254 +Node: Custom agenda views372337 +Node: Storing searches372978 +Ref: Storing searches-Footnote-1375919 +Ref: Storing searches-Footnote-2376036 +Node: Block agenda376284 +Node: Setting options377522 +Node: Exporting agenda views381111 +Ref: Exporting agenda views-Footnote-1386012 +Ref: Exporting agenda views-Footnote-2386070 +Ref: Exporting agenda views-Footnote-3386226 +Ref: Exporting agenda views-Footnote-4386413 +Node: Agenda column view386495 +Node: Markup389569 +Node: Structural markup elements390601 +Node: Document title391256 +Node: Headings and sections391668 +Node: Table of contents392338 +Ref: Table of contents-Footnote-1394094 +Node: Lists394292 +Node: Paragraphs394583 +Node: Footnote markup395733 +Node: Emphasis and monospace396070 +Node: Horizontal rules396927 +Node: Comment lines397184 +Ref: Comment lines-Footnote-1397961 +Node: Images and tables398061 +Node: Literal examples399778 +Ref: Literal examples-Footnote-1403771 +Ref: Literal examples-Footnote-2404304 +Ref: Literal examples-Footnote-3404476 +Ref: Literal examples-Footnote-4404655 +Ref: Literal examples-Footnote-5404905 +Node: Include files404999 +Ref: Include files-Footnote-1407881 +Ref: Include files-Footnote-2408031 +Node: Index entries408197 +Node: Macro replacement408659 +Ref: Macro replacement-Footnote-1410616 +Node: Embedded LaTeX410846 +Ref: Embedded LaTeX-Footnote-1411810 +Node: Special symbols412000 +Ref: Special symbols-Footnote-1413601 +Node: Subscripts and superscripts413756 +Node: LaTeX fragments414861 +Ref: LaTeX fragments-Footnote-1417061 +Node: Previewing LaTeX fragments417265 +Ref: Previewing LaTeX fragments-Footnote-1418690 +Node: CDLaTeX mode418909 +Ref: CDLaTeX mode-Footnote-1421406 +Node: Special blocks421554 +Node: Exporting422485 +Node: The export dispatcher424440 +Ref: The export dispatcher-Footnote-1426480 +Node: Export back-ends426743 +Node: Export settings427653 +Ref: Export settings-Footnote-1434748 +Ref: Export settings-Footnote-2434850 +Ref: Export settings-Footnote-3434945 +Node: ASCII/Latin-1/UTF-8 export434988 +Node: Beamer export437760 +Node: Beamer export commands438483 +Node: Beamer specific export settings439158 +Node: Sectioning Frames and Blocks in Beamer440942 +Ref: Sectioning Frames and Blocks in Beamer-Footnote-1443898 +Ref: Sectioning Frames and Blocks in Beamer-Footnote-2444061 +Node: Beamer specific syntax444179 +Node: Editing support445811 +Node: A Beamer Example446242 +Node: HTML export447520 +Node: HTML Export commands448672 +Node: HTML Specific export settings449218 +Node: HTML doctypes451003 +Node: HTML preamble and postamble453250 +Node: Quoting HTML tags454298 +Node: Links in HTML export454928 +Node: Tables in HTML export456139 +Node: Images in HTML export457575 +Ref: Images in HTML export-Footnote-1458865 +Node: Math formatting in HTML export458920 +Ref: Math formatting in HTML export-Footnote-1460271 +Node: Text areas in HTML export460531 +Node: CSS support461313 +Ref: CSS support-Footnote-1464420 +Ref: CSS support-Footnote-2464592 +Node: JavaScript support464834 +Node: LaTeX and PDF export468215 +Ref: LaTeX and PDF export-Footnote-1469411 +Node: LaTeX export commands469701 +Node: LaTeX specific export settings470376 +Node: Header and sectioning472464 +Ref: Header and sectioning-Footnote-1474085 +Ref: Header and sectioning-Footnote-2474197 +Node: Quoting LaTeX code474360 +Node: LaTeX specific attributes474955 +Ref: LaTeX specific attributes-Footnote-1484352 +Ref: LaTeX specific attributes-Footnote-2484430 +Ref: LaTeX specific attributes-Footnote-3484504 +Ref: LaTeX specific attributes-Footnote-4484588 +Node: Markdown export484742 +Ref: Markdown export-Footnote-1486046 +Node: OpenDocument Text export486132 +Ref: OpenDocument Text export-Footnote-1487322 +Ref: OpenDocument Text export-Footnote-2487352 +Node: Pre-requisites for ODT export487496 +Node: ODT export commands487822 +Ref: x-export-to-odt488024 +Ref: ODT export commands-Footnote-1489023 +Ref: ODT export commands-Footnote-2489083 +Node: ODT specific export settings489134 +Node: Extending ODT export489974 +Ref: x-export-to-other-formats490960 +Ref: x-convert-to-other-formats491470 +Node: Applying custom styles491927 +Node: Links in ODT export494049 +Node: Tables in ODT export494694 +Ref: Tables in ODT export-Footnote-1496828 +Node: Images in ODT export496921 +Ref: Images in ODT export-Footnote-1499645 +Node: Math formatting in ODT export499878 +Node: Working with LaTeX math snippets500340 +Ref: Working with LaTeX math snippets-Footnote-1502506 +Ref: Working with LaTeX math snippets-Footnote-2502582 +Node: Working with MathML or OpenDocument formula files502627 +Node: Labels and captions in ODT export503181 +Node: Literal examples in ODT export504637 +Ref: Literal examples in ODT export-Footnote-1505538 +Node: Advanced topics in ODT export505649 +Node: Configuring a document converter506403 +Ref: x-odt-converter-capabilities507175 +Node: Working with OpenDocument style files507756 +Ref: x-factory-styles508232 +Ref: x-orgodtstyles-xml508470 +Ref: x-orgodtcontenttemplate-xml508797 +Ref: x-overriding-factory-styles509453 +Ref: x-org-odt-styles-file509733 +Ref: x-org-odt-content-template-file510614 +Node: Creating one-off styles510755 +Node: Customizing tables in ODT export512956 +Ref: Customizing tables in ODT export-Footnote-1517933 +Ref: Customizing tables in ODT export-Footnote-2518037 +Ref: Customizing tables in ODT export-Footnote-3518125 +Node: Validating OpenDocument XML518440 +Ref: Validating OpenDocument XML-Footnote-1519439 +Node: Org export519491 +Node: Texinfo export520255 +Node: Texinfo export commands520944 +Ref: Texinfo export commands-Footnote-1521479 +Node: Texinfo specific export settings521587 +Node: Document preamble522689 +Ref: Document preamble-Footnote-1525978 +Node: Headings and sectioning structure526040 +Node: Indices527494 +Node: Quoting Texinfo code528287 +Node: Texinfo specific attributes528771 +Ref: Texinfo specific attributes-Footnote-1530293 +Node: An example530359 +Node: iCalendar export532350 +Ref: iCalendar export-Footnote-1535082 +Ref: iCalendar export-Footnote-2535172 +Ref: iCalendar export-Footnote-3535272 +Node: Other built-in back-ends535409 +Node: Export in foreign buffers536002 +Node: Advanced configuration536992 +Node: Publishing543934 +Node: Configuration544802 +Node: Project alist545565 +Node: Sources and destinations546706 +Node: Selecting files548224 +Node: Publishing action549225 +Ref: Publishing action-Footnote-1551054 +Node: Publishing options551211 +Node: Publishing links563938 +Node: Sitemap564905 +Node: Generating an index568124 +Node: Uploading files568711 +Node: Sample configuration570475 +Node: Simple example570964 +Node: Complex example571611 +Node: Triggering publication573662 +Node: Working with source code574658 +Node: Structure of code blocks576350 +Ref: Structure of code blocks-Footnote-1578183 +Node: Editing source code578277 +Node: Exporting code blocks580400 +Node: Extracting source code582901 +Node: Evaluating code blocks585136 +Ref: Evaluating code blocks-Footnote-1588573 +Ref: Evaluating code blocks-Footnote-2588870 +Ref: Evaluating code blocks-Footnote-3588996 +Node: Library of Babel589182 +Node: Languages590155 +Node: Header arguments592588 +Node: Using header arguments593073 +Node: System-wide header arguments594103 +Node: Language-specific header arguments594910 +Node: Header arguments in Org mode properties595419 +Ref: Header arguments in Org mode properties-Footnote-1597148 +Node: Language-specific header arguments in Org mode properties597420 +Node: Code block specific header arguments598436 +Node: Header arguments in function calls600282 +Node: Specific header arguments601031 +Node: var603805 +Node: results610596 +Node: file615449 +Node: file-desc616361 +Node: file-ext616831 +Node: output-dir617329 +Node: dir617867 +Node: exports620802 +Node: tangle621540 +Node: mkdirp622351 +Node: comments622684 +Node: padline623819 +Node: no-expand624351 +Node: session624990 +Node: noweb626025 +Node: noweb-ref628202 +Ref: noweb-ref-Footnote-1629668 +Node: noweb-sep629797 +Node: cache630091 +Node: sep631823 +Node: hlines632395 +Node: colnames633897 +Node: rownames635200 +Node: shebang636375 +Node: tangle-mode636778 +Node: eval637529 +Node: wrap638567 +Node: post639007 +Node: prologue640899 +Node: epilogue641471 +Node: Results of evaluation641726 +Node: Noweb reference syntax645494 +Node: Key bindings and useful functions647145 +Node: Batch execution649890 +Node: Miscellaneous650924 +Node: Completion651753 +Node: Easy templates653707 +Node: Speed keys655116 +Node: Code evaluation security655940 +Node: Customization658650 +Node: In-buffer settings659245 +Ref: In-buffer settings-Footnote-1668985 +Node: The very busy C-c C-c key669033 +Node: Clean view671017 +Ref: Clean view-Footnote-1675002 +Ref: Clean view-Footnote-2675063 +Ref: Clean view-Footnote-3675247 +Ref: Clean view-Footnote-4675308 +Ref: Clean view-Footnote-5675420 +Ref: Clean view-Footnote-6675475 +Node: TTY keys675600 +Node: Interaction677366 +Node: Cooperation677760 +Node: Conflicts681538 +Node: org-crypt686507 +Node: Hacking687818 +Node: Hooks688804 +Node: Add-on packages689204 +Node: Adding hyperlink types689758 +Node: Adding export back-ends693678 +Node: Context-sensitive commands695118 +Ref: Context-sensitive commands-Footnote-1696695 +Node: Tables in arbitrary syntax696829 +Node: Radio tables698241 +Node: A LaTeX example700828 +Ref: A LaTeX example-Footnote-1704820 +Ref: A LaTeX example-Footnote-2704977 +Node: Translator functions705412 +Node: Radio lists707843 +Node: Dynamic blocks708972 +Node: Special agenda views711170 +Ref: x-agenda-skip-entry-regexp714633 +Ref: Special agenda views-Footnote-1715436 +Ref: Special agenda views-Footnote-2715631 +Node: Speeding up your agendas715766 +Node: Extracting agenda information716869 +Node: Using the property API720947 +Node: Using the mapping API724317 +Node: MobileOrg728739 +Node: Setting up the staging area730433 +Ref: Setting up the staging area-Footnote-1731514 +Ref: Setting up the staging area-Footnote-2731815 +Node: Pushing to MobileOrg732077 +Ref: Pushing to MobileOrg-Footnote-1733077 +Ref: Pushing to MobileOrg-Footnote-2733164 +Ref: Pushing to MobileOrg-Footnote-3733580 +Node: Pulling from MobileOrg733651 +Ref: Pulling from MobileOrg-Footnote-1736072 +Ref: Pulling from MobileOrg-Footnote-2736132 +Node: History and acknowledgments736507 +Node: GNU Free Documentation License751662 +Node: Main Index776852 +Node: Key Index865953 +Node: Command and Function Index918542 +Node: Variable Index953567  End Tag Table diff --git a/elpa/org-20160530/org-agenda.el b/elpa/org-20160711/org-agenda.el similarity index 100% rename from elpa/org-20160530/org-agenda.el rename to elpa/org-20160711/org-agenda.el diff --git a/elpa/org-20160530/org-archive.el b/elpa/org-20160711/org-archive.el similarity index 100% rename from elpa/org-20160530/org-archive.el rename to elpa/org-20160711/org-archive.el diff --git a/elpa/org-20160530/org-attach.el b/elpa/org-20160711/org-attach.el similarity index 100% rename from elpa/org-20160530/org-attach.el rename to elpa/org-20160711/org-attach.el diff --git a/elpa/org-20160530/org-autoloads.el b/elpa/org-20160711/org-autoloads.el similarity index 97% rename from elpa/org-20160530/org-autoloads.el rename to elpa/org-20160711/org-autoloads.el index c662e03d..e8122942 100644 --- a/elpa/org-20160530/org-autoloads.el +++ b/elpa/org-20160711/org-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "org" "org.el" (22348 35265 0 0)) +;;;### (autoloads nil "org" "org.el" (22404 54361 0 0)) ;;; Generated autoloads from org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -224,7 +224,7 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "org-agenda" "org-agenda.el" (22348 35264 0 +;;;### (autoloads nil "org-agenda" "org-agenda.el" (22404 54361 0 ;;;;;; 0)) ;;; Generated autoloads from org-agenda.el @@ -498,7 +498,7 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-capture" "org-capture.el" (22348 35264 +;;;### (autoloads nil "org-capture" "org-capture.el" (22404 54361 ;;;;;; 0 0)) ;;; Generated autoloads from org-capture.el @@ -541,7 +541,7 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;*** -;;;### (autoloads nil "org-colview" "org-colview.el" (22348 35264 +;;;### (autoloads nil "org-colview" "org-colview.el" (22404 54361 ;;;;;; 0 0)) ;;; Generated autoloads from org-colview.el @@ -605,7 +605,7 @@ Turn on or update column view in the agenda. ;;;*** -;;;### (autoloads nil "org-compat" "org-compat.el" (22348 35264 0 +;;;### (autoloads nil "org-compat" "org-compat.el" (22404 54361 0 ;;;;;; 0)) ;;; Generated autoloads from org-compat.el @@ -616,7 +616,7 @@ Try very hard to provide sensible version strings. ;;;*** -;;;### (autoloads nil "org-lint" "org-lint.el" (22348 35265 0 0)) +;;;### (autoloads nil "org-lint" "org-lint.el" (22404 54361 0 0)) ;;; Generated autoloads from org-lint.el (autoload 'org-lint "org-lint" "\ @@ -632,7 +632,7 @@ ARG can also be a list of checker names, as symbols, to run. ;;;*** -;;;### (autoloads nil "org-macs" "org-macs.el" (22348 35265 0 0)) +;;;### (autoloads nil "org-macs" "org-macs.el" (22404 54361 0 0)) ;;; Generated autoloads from org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -642,7 +642,7 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. Drop the MUSTSUFFIX a ;;;*** -;;;### (autoloads nil "org-version" "org-version.el" (22348 35265 +;;;### (autoloads nil "org-version" "org-version.el" (22404 54361 ;;;;;; 0 0)) ;;; Generated autoloads from org-version.el @@ -688,7 +688,7 @@ The location of ODT styles.") ;;;;;; "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") (22348 35265 95008 +;;;;;; "ox-publish.el" "ox-texinfo.el" "ox.el") (22404 54361 225471 ;;;;;; 0)) ;;;*** diff --git a/elpa/org-20160530/org-bbdb.el b/elpa/org-20160711/org-bbdb.el similarity index 100% rename from elpa/org-20160530/org-bbdb.el rename to elpa/org-20160711/org-bbdb.el diff --git a/elpa/org-20160530/org-bibtex.el b/elpa/org-20160711/org-bibtex.el similarity index 100% rename from elpa/org-20160530/org-bibtex.el rename to elpa/org-20160711/org-bibtex.el diff --git a/elpa/org-20160530/org-capture.el b/elpa/org-20160711/org-capture.el similarity index 100% rename from elpa/org-20160530/org-capture.el rename to elpa/org-20160711/org-capture.el diff --git a/elpa/org-20160530/org-clock.el b/elpa/org-20160711/org-clock.el similarity index 100% rename from elpa/org-20160530/org-clock.el rename to elpa/org-20160711/org-clock.el diff --git a/elpa/org-20160530/org-colview.el b/elpa/org-20160711/org-colview.el similarity index 100% rename from elpa/org-20160530/org-colview.el rename to elpa/org-20160711/org-colview.el diff --git a/elpa/org-20160530/org-compat.el b/elpa/org-20160711/org-compat.el similarity index 100% rename from elpa/org-20160530/org-compat.el rename to elpa/org-20160711/org-compat.el diff --git a/elpa/org-20160530/org-crypt.el b/elpa/org-20160711/org-crypt.el similarity index 100% rename from elpa/org-20160530/org-crypt.el rename to elpa/org-20160711/org-crypt.el diff --git a/elpa/org-20160530/org-ctags.el b/elpa/org-20160711/org-ctags.el similarity index 100% rename from elpa/org-20160530/org-ctags.el rename to elpa/org-20160711/org-ctags.el diff --git a/elpa/org-20160530/org-datetree.el b/elpa/org-20160711/org-datetree.el similarity index 100% rename from elpa/org-20160530/org-datetree.el rename to elpa/org-20160711/org-datetree.el diff --git a/elpa/org-20160530/org-docview.el b/elpa/org-20160711/org-docview.el similarity index 100% rename from elpa/org-20160530/org-docview.el rename to elpa/org-20160711/org-docview.el diff --git a/elpa/org-20160530/org-element.el b/elpa/org-20160711/org-element.el similarity index 99% rename from elpa/org-20160530/org-element.el rename to elpa/org-20160711/org-element.el index 2576c3fa..bf76bd40 100644 --- a/elpa/org-20160530/org-element.el +++ b/elpa/org-20160711/org-element.el @@ -2591,7 +2591,7 @@ containing `:begin', `:end', `:contents-begin', `:contents-end', "Interpret TABLE-ROW element as Org syntax. CONTENTS is the contents of the table row." (if (eq (org-element-property :type table-row) 'rule) "|-" - (concat "| " contents))) + (concat "|" contents))) ;;;; Verse Block diff --git a/elpa/org-20160530/org-entities.el b/elpa/org-20160711/org-entities.el similarity index 99% rename from elpa/org-20160530/org-entities.el rename to elpa/org-20160711/org-entities.el index 89c59629..ccac29a0 100644 --- a/elpa/org-20160530/org-entities.el +++ b/elpa/org-20160711/org-entities.el @@ -208,8 +208,8 @@ packages to be loaded, add these packages to `org-latex-packages-alist'." ("upsih" "\\Upsilon" t "ϒ" "upsilon" "upsilon" "ϒ") ("upsilon" "\\upsilon" t "υ" "upsilon" "upsilon" "υ") ("Phi" "\\Phi" t "Φ" "Phi" "Phi" "Φ") - ("phi" "\\phi" t "φ" "phi" "phi" "φ") - ("varphi" "\\varphi" t "ϕ" "varphi" "varphi" "ɸ") + ("phi" "\\phi" t "φ" "phi" "phi" "ɸ") + ("varphi" "\\varphi" t "ϕ" "varphi" "varphi" "φ") ("Chi" "X" nil "Χ" "Chi" "Chi" "Χ") ("chi" "\\chi" t "χ" "chi" "chi" "χ") ("acutex" "\\acute x" t "´x" "'x" "'x" "𝑥́") diff --git a/elpa/org-20160530/org-eshell.el b/elpa/org-20160711/org-eshell.el similarity index 100% rename from elpa/org-20160530/org-eshell.el rename to elpa/org-20160711/org-eshell.el diff --git a/elpa/org-20160530/org-faces.el b/elpa/org-20160711/org-faces.el similarity index 100% rename from elpa/org-20160530/org-faces.el rename to elpa/org-20160711/org-faces.el diff --git a/elpa/org-20160530/org-feed.el b/elpa/org-20160711/org-feed.el similarity index 100% rename from elpa/org-20160530/org-feed.el rename to elpa/org-20160711/org-feed.el diff --git a/elpa/org-20160530/org-footnote.el b/elpa/org-20160711/org-footnote.el similarity index 100% rename from elpa/org-20160530/org-footnote.el rename to elpa/org-20160711/org-footnote.el diff --git a/elpa/org-20160530/org-gnus.el b/elpa/org-20160711/org-gnus.el similarity index 100% rename from elpa/org-20160530/org-gnus.el rename to elpa/org-20160711/org-gnus.el diff --git a/elpa/org-20160530/org-habit.el b/elpa/org-20160711/org-habit.el similarity index 100% rename from elpa/org-20160530/org-habit.el rename to elpa/org-20160711/org-habit.el diff --git a/elpa/org-20160530/org-id.el b/elpa/org-20160711/org-id.el similarity index 100% rename from elpa/org-20160530/org-id.el rename to elpa/org-20160711/org-id.el diff --git a/elpa/org-20160530/org-indent.el b/elpa/org-20160711/org-indent.el similarity index 100% rename from elpa/org-20160530/org-indent.el rename to elpa/org-20160711/org-indent.el diff --git a/elpa/org-20160530/org-info.el b/elpa/org-20160711/org-info.el similarity index 100% rename from elpa/org-20160530/org-info.el rename to elpa/org-20160711/org-info.el diff --git a/elpa/org-20160530/org-inlinetask.el b/elpa/org-20160711/org-inlinetask.el similarity index 100% rename from elpa/org-20160530/org-inlinetask.el rename to elpa/org-20160711/org-inlinetask.el diff --git a/elpa/org-20160530/org-install.el b/elpa/org-20160711/org-install.el similarity index 100% rename from elpa/org-20160530/org-install.el rename to elpa/org-20160711/org-install.el diff --git a/elpa/org-20160530/org-irc.el b/elpa/org-20160711/org-irc.el similarity index 100% rename from elpa/org-20160530/org-irc.el rename to elpa/org-20160711/org-irc.el diff --git a/elpa/org-20160530/org-lint.el b/elpa/org-20160711/org-lint.el similarity index 100% rename from elpa/org-20160530/org-lint.el rename to elpa/org-20160711/org-lint.el diff --git a/elpa/org-20160530/org-list.el b/elpa/org-20160711/org-list.el similarity index 100% rename from elpa/org-20160530/org-list.el rename to elpa/org-20160711/org-list.el diff --git a/elpa/org-20160530/org-loaddefs.el b/elpa/org-20160711/org-loaddefs.el similarity index 99% rename from elpa/org-20160530/org-loaddefs.el rename to elpa/org-20160711/org-loaddefs.el index 33822631..dbfd669b 100644 --- a/elpa/org-20160530/org-loaddefs.el +++ b/elpa/org-20160711/org-loaddefs.el @@ -923,7 +923,7 @@ tree can be found. ;;;### (autoloads (org-element-context org-element-at-point org-element-cache-refresh ;;;;;; org-element-cache-reset org-element-interpret-data org-element-update-syntax) -;;;;;; "org-element" "org-element.el" "54a3a77d31b0c99c7ce9827c94b05491") +;;;;;; "org-element" "org-element.el" "8eac9a703a05497197f8757b0bf91021") ;;; Generated autoloads from org-element.el (autoload 'org-element-update-syntax "org-element" "\ @@ -2003,7 +2003,7 @@ using three `C-u' prefix arguments. ;;;*** ;;;### (autoloads (org-git-version org-release) "org-version" "org-version.el" -;;;;;; (22347 51413)) +;;;;;; (22403 10198)) ;;; Generated autoloads from org-version.el (autoload 'org-release "org-version" "\ @@ -2029,7 +2029,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" (22329 21459)) +;;;;;; "org" "org.el" (22395 16682)) ;;; Generated autoloads from org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -2250,7 +2250,7 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "ox" "ox.el" "b179c517456780a4806f9b43dc76c0dd") +;;;### (autoloads nil "ox" "ox.el" "1e064981fa88f34a7ac4acf52b6417d7") ;;; Generated autoloads from ox.el (autoload 'org-export-as "ox" "\ @@ -2660,7 +2660,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" "bf5ed80a1ca861d6cdc19fd513514c2e") +;;;;;; "ox-html" "ox-html.el" "8828ae87fd70d75413d144fa6f4f2db6") ;;; Generated autoloads from ox-html.el (put 'org-html-head-include-default-style 'safe-local-variable 'booleanp) @@ -3233,7 +3233,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" "b179c517456780a4806f9b43dc76c0dd") +;;;;;; org-export-string-as org-export-as) "ox" "ox.el" "1e064981fa88f34a7ac4acf52b6417d7") ;;; Generated autoloads from ox.el (autoload 'org-export-as "ox" "\ diff --git a/elpa/org-20160530/org-macro.el b/elpa/org-20160711/org-macro.el similarity index 100% rename from elpa/org-20160530/org-macro.el rename to elpa/org-20160711/org-macro.el diff --git a/elpa/org-20160530/org-macs.el b/elpa/org-20160711/org-macs.el similarity index 100% rename from elpa/org-20160530/org-macs.el rename to elpa/org-20160711/org-macs.el diff --git a/elpa/org-20160530/org-mhe.el b/elpa/org-20160711/org-mhe.el similarity index 100% rename from elpa/org-20160530/org-mhe.el rename to elpa/org-20160711/org-mhe.el diff --git a/elpa/org-20160530/org-mobile.el b/elpa/org-20160711/org-mobile.el similarity index 100% rename from elpa/org-20160530/org-mobile.el rename to elpa/org-20160711/org-mobile.el diff --git a/elpa/org-20160530/org-mouse.el b/elpa/org-20160711/org-mouse.el similarity index 100% rename from elpa/org-20160530/org-mouse.el rename to elpa/org-20160711/org-mouse.el diff --git a/elpa/org-20160530/org-pcomplete.el b/elpa/org-20160711/org-pcomplete.el similarity index 100% rename from elpa/org-20160530/org-pcomplete.el rename to elpa/org-20160711/org-pcomplete.el diff --git a/elpa/org-20160711/org-pkg.el b/elpa/org-20160711/org-pkg.el new file mode 100644 index 00000000..90802185 --- /dev/null +++ b/elpa/org-20160711/org-pkg.el @@ -0,0 +1,3 @@ +(define-package "org" + "20160711" "Outline-based notes management and organizer" ( )) +;; no-byte-compile: t diff --git a/elpa/org-20160530/org-plot.el b/elpa/org-20160711/org-plot.el similarity index 100% rename from elpa/org-20160530/org-plot.el rename to elpa/org-20160711/org-plot.el diff --git a/elpa/org-20160530/org-protocol.el b/elpa/org-20160711/org-protocol.el similarity index 100% rename from elpa/org-20160530/org-protocol.el rename to elpa/org-20160711/org-protocol.el diff --git a/elpa/org-20160530/org-rmail.el b/elpa/org-20160711/org-rmail.el similarity index 100% rename from elpa/org-20160530/org-rmail.el rename to elpa/org-20160711/org-rmail.el diff --git a/elpa/org-20160530/org-src.el b/elpa/org-20160711/org-src.el similarity index 100% rename from elpa/org-20160530/org-src.el rename to elpa/org-20160711/org-src.el diff --git a/elpa/org-20160530/org-table.el b/elpa/org-20160711/org-table.el similarity index 100% rename from elpa/org-20160530/org-table.el rename to elpa/org-20160711/org-table.el diff --git a/elpa/org-20160530/org-timer.el b/elpa/org-20160711/org-timer.el similarity index 100% rename from elpa/org-20160530/org-timer.el rename to elpa/org-20160711/org-timer.el diff --git a/elpa/org-20160530/org-version.el b/elpa/org-20160711/org-version.el similarity index 92% rename from elpa/org-20160530/org-version.el rename to elpa/org-20160711/org-version.el index 0a4a64eb..c13fbf0a 100644 --- a/elpa/org-20160530/org-version.el +++ b/elpa/org-20160711/org-version.el @@ -11,7 +11,7 @@ (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.3.4-72-gddd58f-elpa")) + (let ((org-git-version "8.3.4-102-gebe7aa-elpa")) org-git-version)) ;;;###autoload (defvar org-odt-data-dir "/usr/share/emacs/etc/org" diff --git a/elpa/org-20160530/org-w3m.el b/elpa/org-20160711/org-w3m.el similarity index 100% rename from elpa/org-20160530/org-w3m.el rename to elpa/org-20160711/org-w3m.el diff --git a/elpa/org-20160530/org.el b/elpa/org-20160711/org.el similarity index 99% rename from elpa/org-20160530/org.el rename to elpa/org-20160711/org.el index e4edcf49..9e6f1296 100644 --- a/elpa/org-20160530/org.el +++ b/elpa/org-20160711/org.el @@ -7753,7 +7753,6 @@ command. When optional argument TOP-LEVEL is non-nil, insert a level 1 heading, unconditionally." (interactive "P") - (if (org-called-interactively-p 'any) (org-reveal)) (let ((itemp (and (not top-level) (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 @@ -7918,20 +7917,21 @@ When NO-TAGS is non-nil, don't include tags. When NO-TODO is non-nil, don't include TODO keywords." (save-excursion (org-back-to-heading t) - (cond - ((and no-tags no-todo) - (looking-at org-complex-heading-regexp) - (match-string 4)) - (no-tags - (looking-at (concat org-outline-regexp - "\\(.*?\\)" - "\\(?:[ \t]+:[[:alnum:]:_@#%]+:\\)?[ \t]*$")) - (match-string 1)) - (no-todo - (looking-at org-todo-line-regexp) - (match-string 3)) - (t (looking-at org-heading-regexp) - (match-string 2))))) + (let ((case-fold-search nil)) + (cond + ((and no-tags no-todo) + (looking-at org-complex-heading-regexp) + (match-string 4)) + (no-tags + (looking-at (concat org-outline-regexp + "\\(.*?\\)" + "\\(?:[ \t]+:[[:alnum:]:_@#%]+:\\)?[ \t]*$")) + (match-string 1)) + (no-todo + (looking-at org-todo-line-regexp) + (match-string 3)) + (t (looking-at org-heading-regexp) + (match-string 2)))))) (defvar orgstruct-mode) ; defined below @@ -10707,7 +10707,8 @@ link in a property drawer line." ((memq type '(comment comment-block keyword node-property)) (cond ((org-in-regexp org-any-link-re) (org-open-link-from-string (match-string-no-properties 0))) - ((or (org-at-timestamp-p t) (org-at-date-range-p t)) + ((or (org-in-regexp org-ts-regexp-both nil t) + (org-in-regexp org-tsr-regexp-both nil t)) (org-follow-timestamp-link)) (t (user-error "No link found")))) ;; On a headline or an inlinetask, but not on a timestamp, @@ -10735,13 +10736,12 @@ link in a property drawer line." (>= (point) (org-element-property :begin value)) (<= (point) (org-element-property :end value))) (org-follow-timestamp-link)) - ;; Do nothing on white spaces after an object, unless point - ;; is right after it. - ((> (point) - (save-excursion - (goto-char (org-element-property :end context)) - (skip-chars-backward " \t") - (point))) + ;; Do nothing on white spaces after an object. + ((>= (point) + (save-excursion + (goto-char (org-element-property :end context)) + (skip-chars-backward " \t") + (point))) (user-error "No link found")) ((eq type 'timestamp) (org-follow-timestamp-link)) ;; On tags within a headline or an inlinetask. @@ -11921,7 +11921,8 @@ prefix argument (`C-u C-u C-u C-c C-w')." (replace-regexp-in-string org-bracket-link-regexp "\\3" - (nth 4 (org-heading-components))))) + (or (nth 4 (org-heading-components)) + "")))) (org-refile-get-location (cond ((and arg (listp arg)) "Goto") (regionp (concat actionmsg " region to")) @@ -14922,7 +14923,7 @@ If ONOFF is `on' or `off', don't toggle but set to this state." (if (and (looking-at (org-re ".*?\\([ \t]+\\)\\(:[[:alnum:]_@#%:]+:\\)[ \t]*$")) (< pos (match-beginning 2))) (progn - (setq tags-l (- (match-end 2) (match-beginning 2))) + (setq tags-l (string-width (match-string 2))) (goto-char (match-beginning 1)) (insert " ") (delete-region (point) (1+ (match-beginning 2))) @@ -15700,8 +15701,8 @@ When INCREMENT is non-nil, set the property to the next allowed value." (t (let (org-completion-use-ido org-completion-use-iswitchb) (org-completing-read - (concat "Effort " (if (and cur (string-match "\\S-" cur)) - (concat "[" cur "]") "") + (concat "Effort" (and cur (string-match "\\S-" cur) + (concat " [" cur "]")) ": ") existing nil nil "" nil cur)))))) (unless (equal (org-entry-get nil prop) val) @@ -15710,7 +15711,7 @@ When INCREMENT is non-nil, set the property to the next allowed value." '((effort . identity) (effort-minutes . org-duration-string-to-minutes)) val) - (when (string= heading org-clock-current-task) + (when (equal heading (org-bound-and-true-p org-clock-current-task)) (setq org-clock-effort (get-text-property (point-at-bol) 'effort)) (org-clock-update-mode-line)) (message "%s is now %s" prop val))) @@ -17461,7 +17462,7 @@ If SECONDS is non-nil, return the difference in seconds." (defun org-deadline-close (timestamp-string &optional ndays) "Is the time in TIMESTAMP-STRING close to the current date?" (setq ndays (or ndays (org-get-wdays timestamp-string))) - (and (< (org-time-stamp-to-now timestamp-string) ndays) + (and (<= (org-time-stamp-to-now timestamp-string) ndays) (not (org-entry-is-done-p)))) (defun org-get-wdays (ts &optional delay zero-delay) @@ -19073,66 +19074,65 @@ for all fragments in the buffer." (when (display-graphic-p) (catch 'exit (save-excursion - (let ((window-start (window-start)) msg) - (save-restriction - (cond - ((or (equal arg '(16)) - (and (equal arg '(4)) - (org-with-limited-levels (org-before-first-heading-p)))) - (if (org-remove-latex-fragment-image-overlays) - (progn (message "LaTeX fragments images removed from buffer") - (throw 'exit nil)) - (setq msg "Creating images for buffer..."))) - ((equal arg '(4)) - (org-with-limited-levels (org-back-to-heading t)) - (let ((beg (point)) - (end (progn (org-end-of-subtree t) (point)))) - (if (org-remove-latex-fragment-image-overlays beg end) - (progn - (message "LaTeX fragment images removed from subtree") - (throw 'exit nil)) - (setq msg "Creating images for subtree...") - (narrow-to-region beg end)))) - ((let ((datum (org-element-context))) - (when (memq (org-element-type datum) - '(latex-environment latex-fragment)) - (let* ((beg (org-element-property :begin datum)) - (end (org-element-property :end datum))) - (if (org-remove-latex-fragment-image-overlays beg end) - (progn (message "LaTeX fragment image removed") - (throw 'exit nil)) - (narrow-to-region beg end) - (setq msg "Creating image...")))))) - (t - (org-with-limited-levels - (let ((beg (if (org-at-heading-p) (line-beginning-position) - (outline-previous-heading) - (point))) - (end (progn (outline-next-heading) (point)))) - (if (org-remove-latex-fragment-image-overlays beg end) - (progn - (message "LaTeX fragment images removed from section") + (let (beg end msg) + (cond + ((or (equal arg '(16)) + (and (equal arg '(4)) + (org-with-limited-levels (org-before-first-heading-p)))) + (if (org-remove-latex-fragment-image-overlays) + (progn (message "LaTeX fragments images removed from buffer") (throw 'exit nil)) - (setq msg "Creating images for section...") - (narrow-to-region beg end)))))) - (let ((file (buffer-file-name (buffer-base-buffer)))) - (org-format-latex - (concat org-latex-preview-ltxpng-directory - (file-name-sans-extension (file-name-nondirectory file))) - ;; Emacs cannot overlay images from remote hosts. - ;; Create it in `temporary-file-directory' instead. - (if (file-remote-p file) temporary-file-directory - default-directory) - 'overlays msg 'forbuffer - org-latex-create-formula-image-program))) - ;; Work around a bug that doesn't restore window's start - ;; when widening back the buffer. - (set-window-start nil window-start) + (setq msg "Creating images for buffer..."))) + ((equal arg '(4)) + (org-with-limited-levels (org-back-to-heading t)) + (setq beg (point)) + (setq end (progn (org-end-of-subtree t) (point))) + (if (org-remove-latex-fragment-image-overlays beg end) + (progn + (message "LaTeX fragment images removed from subtree") + (throw 'exit nil)) + (setq msg "Creating images for subtree..."))) + ((let ((datum (org-element-context))) + (when (memq (org-element-type datum) + '(latex-environment latex-fragment)) + (setq beg (org-element-property :begin datum)) + (setq end (org-element-property :end datum)) + (if (org-remove-latex-fragment-image-overlays beg end) + (progn (message "LaTeX fragment image removed") + (throw 'exit nil)) + (setq msg "Creating image..."))))) + (t + (org-with-limited-levels + (setq beg (if (org-at-heading-p) (line-beginning-position) + (outline-previous-heading) + (point))) + (setq end (progn (outline-next-heading) (point))) + (if (org-remove-latex-fragment-image-overlays beg end) + (progn + (message "LaTeX fragment images removed from section") + (throw 'exit nil)) + (setq msg "Creating images for section..."))))) + (let ((file (buffer-file-name (buffer-base-buffer)))) + (org-format-latex + (concat org-latex-preview-ltxpng-directory + (file-name-sans-extension (file-name-nondirectory file))) + beg end + ;; Emacs cannot overlay images from remote hosts. Create + ;; it in `temporary-file-directory' instead. + (if (file-remote-p file) temporary-file-directory + default-directory) + 'overlays msg 'forbuffer + org-latex-create-formula-image-program)) (message (concat msg "done"))))))) (defun org-format-latex - (prefix &optional dir overlays msg forbuffer processing-type) - "Replace LaTeX fragments with links to an image, and produce images. + (prefix &optional beg end dir overlays msg forbuffer processing-type) + "Replace LaTeX fragments with links to an image. + +The function takes care of creating the replacement image. + +Only consider fragments between BEG and END when those are +provided. When optional argument OVERLAYS is non-nil, display the image on top of the fragment instead of replacing it. @@ -19146,11 +19146,11 @@ Some of the options can be changed using the variable (let* ((math-regexp "\\$\\|\\\\[([]\\|^[ \t]*\\\\begin{[A-Za-z0-9*]+}") (cnt 0) checkdir-flag) - (goto-char (point-min)) + (goto-char (or beg (point-min))) ;; Optimize overlay creation: (info "(elisp) Managing Overlays"). (when (and overlays (memq processing-type '(dvipng imagemagick))) - (overlay-recenter (point-max))) - (while (re-search-forward math-regexp nil t) + (overlay-recenter (or end (point-max)))) + (while (re-search-forward math-regexp end t) (unless (and overlays (eq (get-char-property (point) 'org-overlay-type) 'org-latex-overlay)) @@ -21380,13 +21380,13 @@ object (e.g., within a comment). In these case, you need to use (org-element-lineage context '(table-row table-cell) t)) (org-table-justify-field-maybe) (call-interactively #'org-table-next-row)) - ;; On a link or a timestamp, call `org-open-line' if + ;; On a link or a timestamp, call `org-open-at-point' if ;; `org-return-follows-link' allows it. Tolerate fuzzy - ;; locations, e.g., in a comment, as `org-open-line'. + ;; locations, e.g., in a comment, as `org-open-at-point'. ((and org-return-follows-link - (or (org-at-timestamp-p t) - (org-at-date-range-p t) - (org-in-regexp org-any-link-re))) + (or (org-in-regexp org-ts-regexp-both nil t) + (org-in-regexp org-tsr-regexp-both nil t) + (org-in-regexp org-any-link-re nil t))) (call-interactively #'org-open-at-point)) ;; Insert newline in heading, but preserve tags. ((and (not (bolp)) @@ -21532,8 +21532,6 @@ With a prefix argument ARG, change the region in a single item." ((org-at-heading-p) (let* ((bul (org-list-bullet-string "-")) (bul-len (length bul)) - (done (org-entry-is-done-p)) - (todo (org-entry-is-todo-p)) ;; Indentation of the first heading. It should be ;; relative to the indentation of its parent, if any. (start-ind (save-excursion @@ -21544,22 +21542,30 @@ With a prefix argument ARG, change the region in a single item." ;; Level of first heading. Further headings will be ;; compared to it to determine hierarchy in the list. (ref-level (org-reduced-level (org-outline-level)))) - (when (or done todo) (org-todo "")) (while (< (point) end) (let* ((level (org-reduced-level (org-outline-level))) - (delta (max 0 (- level ref-level)))) + (delta (max 0 (- level ref-level))) + (todo-state (org-get-todo-state))) ;; If current headline is less indented than the first ;; one, set it as reference, in order to preserve ;; subtrees. (when (< level ref-level) (setq ref-level level)) - (replace-match bul t t) + ;; Remove stars and TODO keyword. + (looking-at org-todo-line-regexp) + (delete-region (point) (or (match-beginning 3) + (line-end-position))) + (insert bul) (org-indent-line-to (+ start-ind (* delta bul-len))) - (when (or done todo) + ;; Turn TODO keyword into a check box. + (when todo-state (let* ((struct (org-list-struct)) (old (copy-tree struct))) - (org-list-set-checkbox (line-beginning-position) - struct - (if done "[X]" "[ ]")) + (org-list-set-checkbox + (line-beginning-position) + struct + (if (member todo-state org-done-keywords) + "[X]" + "[ ]")) (org-list-write-struct struct (org-list-parents-alist struct) old))) @@ -21945,9 +21951,7 @@ on context. See the individual commands for more information." ["Insert math symbol" cdlatex-math-symbol (fboundp 'cdlatex-math-symbol)] ["Modify math symbol" org-cdlatex-math-modify (org-inside-LaTeX-fragment-p)] - ["Insert citation" org-reftex-citation t] - "--" - ["Template for BEAMER" (org-beamer-insert-options-template) t]) + ["Insert citation" org-reftex-citation t]) "--" ("MobileOrg" ["Push Files and Views" org-mobile-push t] @@ -22557,23 +22561,27 @@ and :keyword." (setq clist (nreverse (delq nil clist))) clist)) -(defun org-in-regexp (re &optional nlines visually) - "Check if point is inside a match of RE. +(defun org-in-regexp (regexp &optional nlines visually) + "Check if point is inside a match of REGEXP. Normally only the current line is checked, but you can include -NLINES extra lines after point into the search. If VISUALLY is +NLINES extra lines around point into the search. If VISUALLY is set, require that the cursor is not after the match but really -on, so that the block visually is on the match." - (catch 'exit +on, so that the block visually is on the match. + +Return nil or a cons cell (BEG . END) where BEG and END are, +respectively, the positions at the beginning and the end of the +match." + (catch :exit (let ((pos (point)) - (eol (point-at-eol (+ 1 (or nlines 0)))) - (inc (if visually 1 0))) + (eol (line-end-position (if nlines (1+ nlines) 1)))) (save-excursion (beginning-of-line (- 1 (or nlines 0))) - (while (re-search-forward re eol t) - (if (and (<= (match-beginning 0) pos) - (>= (+ inc (match-end 0)) pos)) - (throw 'exit (cons (match-beginning 0) (match-end 0))))))))) + (while (and (re-search-forward regexp eol t) + (<= (match-beginning 0) pos)) + (let ((end (match-end 0))) + (when (or (> end pos) (and (= end pos) (not visually))) + (throw :exit (cons (match-beginning 0) (match-end 0)))))))))) (define-obsolete-function-alias 'org-at-regexp-p 'org-in-regexp "Org mode 8.3") @@ -22718,7 +22726,9 @@ The function returns the new ALIST." rtn)) (defun org-delete-all (elts list) - "Remove all elements in ELTS from LIST." + "Remove all elements in ELTS from LIST. +Comparison is done with `equal'. It is a destructive operation +that may remove elements by altering the list structure." (while elts (setq list (delete (pop elts) list))) list) @@ -25048,7 +25058,8 @@ when non-nil, is a regexp matching keywords names." "Produce the index for Imenu." (mapc (lambda (x) (move-marker x nil)) org-imenu-markers) (setq org-imenu-markers nil) - (let* ((n org-imenu-depth) + (let* ((case-fold-search nil) + (n org-imenu-depth) (re (concat "^" (org-get-limited-outline-regexp))) (subs (make-vector (1+ n) nil)) (last-level 0) diff --git a/elpa/org-20160530/orgcard.pdf b/elpa/org-20160711/orgcard.pdf similarity index 99% rename from elpa/org-20160530/orgcard.pdf rename to elpa/org-20160711/orgcard.pdf index 1d7825d0ddc0149b89ed2522b9c92d27bcc266e6..97ca8a80b2472a362bcabee09edcce5f15aa4d5f 100644 GIT binary patch delta 159 zcmX?bp8ddi_J%EtGLLo44Gj%Iz(m);RNcTpU6V`SH$TNCu_RSN!^O(Tz|hP9u4KE% zV@3&<1Y>7&6H5bAM<*j^19M|@XGbSf3m0RcGGjAyCksncI|UnpN@5l4?6`_c5{pVI Vic-_K42_H}%*?n{RbBnvxBv;{C&K^$ delta 159 zcmX?bp8ddi_J%EtGLLmkjSaxSSl7T*-M~OylS|(>KgA`nBvnDf#mdOQ(98g?WV^>> zMhTV#OJgT97b7DJ3u6~^Ge;*Qb0ZfQ6GtOUODAU+V-qJQI|UnpN@5l4?6`_c5{pVI Vic-_K42_H}%*?n{RbBnvxBw$rC_w-K diff --git a/elpa/org-20160530/ox-ascii.el b/elpa/org-20160711/ox-ascii.el similarity index 100% rename from elpa/org-20160530/ox-ascii.el rename to elpa/org-20160711/ox-ascii.el diff --git a/elpa/org-20160530/ox-beamer.el b/elpa/org-20160711/ox-beamer.el similarity index 100% rename from elpa/org-20160530/ox-beamer.el rename to elpa/org-20160711/ox-beamer.el diff --git a/elpa/org-20160530/ox-html.el b/elpa/org-20160711/ox-html.el similarity index 99% rename from elpa/org-20160530/ox-html.el rename to elpa/org-20160711/ox-html.el index dd88d92a..f6042119 100644 --- a/elpa/org-20160530/ox-html.el +++ b/elpa/org-20160711/ox-html.el @@ -2691,8 +2691,8 @@ a plist containing export properties." (setq latex-frag (concat latex-header latex-frag)))) (with-temp-buffer (insert latex-frag) - (org-format-latex cache-relpath cache-dir nil "Creating LaTeX Image..." - nil processing-type) + (org-format-latex cache-relpath nil nil cache-dir nil + "Creating LaTeX Image..." nil processing-type) (buffer-string)))) (defun org-html-latex-environment (latex-environment contents info) diff --git a/elpa/org-20160530/ox-icalendar.el b/elpa/org-20160711/ox-icalendar.el similarity index 100% rename from elpa/org-20160530/ox-icalendar.el rename to elpa/org-20160711/ox-icalendar.el diff --git a/elpa/org-20160530/ox-latex.el b/elpa/org-20160711/ox-latex.el similarity index 100% rename from elpa/org-20160530/ox-latex.el rename to elpa/org-20160711/ox-latex.el diff --git a/elpa/org-20160530/ox-man.el b/elpa/org-20160711/ox-man.el similarity index 100% rename from elpa/org-20160530/ox-man.el rename to elpa/org-20160711/ox-man.el diff --git a/elpa/org-20160530/ox-md.el b/elpa/org-20160711/ox-md.el similarity index 100% rename from elpa/org-20160530/ox-md.el rename to elpa/org-20160711/ox-md.el diff --git a/elpa/org-20160530/ox-odt.el b/elpa/org-20160711/ox-odt.el similarity index 100% rename from elpa/org-20160530/ox-odt.el rename to elpa/org-20160711/ox-odt.el diff --git a/elpa/org-20160530/ox-org.el b/elpa/org-20160711/ox-org.el similarity index 100% rename from elpa/org-20160530/ox-org.el rename to elpa/org-20160711/ox-org.el diff --git a/elpa/org-20160530/ox-publish.el b/elpa/org-20160711/ox-publish.el similarity index 100% rename from elpa/org-20160530/ox-publish.el rename to elpa/org-20160711/ox-publish.el diff --git a/elpa/org-20160530/ox-texinfo.el b/elpa/org-20160711/ox-texinfo.el similarity index 100% rename from elpa/org-20160530/ox-texinfo.el rename to elpa/org-20160711/ox-texinfo.el diff --git a/elpa/org-20160530/ox.el b/elpa/org-20160711/ox.el similarity index 97% rename from elpa/org-20160530/ox.el rename to elpa/org-20160711/ox.el index 6f5ebf47..685fb35c 100644 --- a/elpa/org-20160530/ox.el +++ b/elpa/org-20160711/ox.el @@ -2660,7 +2660,21 @@ from tree." ;; Move into secondary string, if any. (dolist (p (cdr (assq type org-element-secondary-value-alist))) - (mapc walk-data (org-element-property p data))))))))) + (mapc walk-data (org-element-property p data)))))))) + (definitions + ;; Collect definitions before possibly pruning them so as + ;; to avoid parsing them again if they are required. + (org-element-map data '(footnote-definition footnote-reference) + (lambda (f) + (cond + ((eq (org-element-type f) 'footnote-definition) f) + ((eq (org-element-property :type f) 'standard) nil) + (t (let ((label (org-element-property :label f))) + (when label ;Skip anonymous references. + (apply + #'org-element-create + 'footnote-definition `(:label ,label :post-blank 1) + (org-element-contents f)))))))))) ;; If a select tag is active, also ignore the section before the ;; first headline, if any. (when selected @@ -2669,16 +2683,157 @@ from tree." (org-element-extract-element first-element)))) ;; Prune tree and communication channel. (funcall walk-data data) - (dolist (entry - (append - ;; Priority is given to back-end specific options. - (org-export-get-all-options (plist-get info :back-end)) - org-export-options-alist)) + (dolist (entry (append + ;; Priority is given to back-end specific options. + (org-export-get-all-options (plist-get info :back-end)) + org-export-options-alist)) (when (eq (nth 4 entry) 'parse) (funcall walk-data (plist-get info (car entry))))) + (let ((missing (org-export--missing-definitions data definitions))) + (funcall walk-data missing) + (org-export--install-footnote-definitions missing data)) ;; Eventually set `:ignore-list'. (plist-put info :ignore-list ignore))) +(defun org-export--missing-definitions (tree definitions) + "List footnote definitions missing from TREE. +Missing definitions are searched within DEFINITIONS, which is +a list of footnote definitions or in the widened buffer." + (let* ((list-labels + (lambda (data) + ;; List all footnote labels encountered in DATA. Inline + ;; footnote references are ignored. + (org-element-map data 'footnote-reference + (lambda (reference) + (and (eq (org-element-property :type reference) 'standard) + (org-element-property :label reference)))))) + defined undefined) + ;; Partition DIRECT-REFERENCES between DEFINED and UNDEFINED + ;; references. + (let ((known-definitions + (org-element-map tree '(footnote-reference footnote-definition) + (lambda (f) + (and (or (eq (org-element-type f) 'footnote-definition) + (eq (org-element-property :type f) 'inline)) + (org-element-property :label f))))) + seen) + (dolist (l (funcall list-labels tree)) + (cond ((member l seen)) + ((member l known-definitions) (push l defined)) + (t (push l undefined))))) + ;; Complete MISSING-DEFINITIONS by finding the definition of every + ;; undefined label, first by looking into DEFINITIONS, then by + ;; searching the widened buffer. This is a recursive process + ;; since definitions found can themselves contain an undefined + ;; reference. + (let (missing-definitions) + (while undefined + (let* ((label (pop undefined)) + (definition + (cond + ((catch :found + (dolist (d definitions) + (when (equal (org-element-property :label d) label) + (throw :found d))))) + ((let ((def (org-footnote-get-definition label))) + (when def + (org-with-wide-buffer + (goto-char (nth 1 def)) + (let* ((datum (org-element-context))) + (if (eq (org-element-type datum) 'footnote-reference) + datum + ;; Parse definition with contents. + (save-restriction + (narrow-to-region + (org-element-property :begin datum) + (org-element-property :end datum)) + (org-element-map (org-element-parse-buffer) + 'footnote-definition #'identity nil t)))))))) + (t (user-error "Definition not found for footnote %s" + label))))) + (push label defined) + (push definition missing-definitions) + ;; Look for footnote references within DEFINITION, since + ;; we may need to also find their definition. + (dolist (label (funcall list-labels definition)) + (unless (or (member label defined) ;Known label + (member label undefined)) ;Processed later + (push label undefined))))) + ;; MISSING-DEFINITIONS may contain footnote references with + ;; inline definitions. Make sure those are changed into real + ;; footnote definitions. + (mapcar (lambda (d) + (if (eq (org-element-type d) 'footnote-definition) d + (let ((label (org-element-property :label d))) + (apply #'org-element-create + 'footnote-definition `(:label ,label :post-blank 1) + (org-element-contents d))))) + missing-definitions)))) + +(defun org-export--install-footnote-definitions (definitions tree) + "Install footnote definitions in tree. + +DEFINITIONS is the list of footnote definitions to install. TREE +is the parse tree. + +If there is a footnote section in TREE, definitions found are +appended to it. If `org-footnote-section' is non-nil, a new +footnote section containing all definitions is inserted in TREE. +Otherwise, definitions are appended at the end of the section +containing their first reference." + (cond + ((null definitions)) + ;; If there is a footnote section, insert definitions there. + ((let ((footnote-section + (org-element-map tree 'headline + (lambda (h) (and (org-element-property :footnote-section-p h) h)) + nil t))) + (and footnote-section + (apply #'org-element-adopt-elements + footnote-section + (nreverse definitions))))) + ;; If there should be a footnote section, create one containing all + ;; the definitions at the end of the tree. + (org-footnote-section + (org-element-adopt-elements + tree + (org-element-create 'headline + (list :footnote-section-p t + :level 1 + :title org-footnote-section) + (apply #'org-element-create + 'section + nil + (nreverse definitions))))) + ;; Otherwise add each definition at the end of the section where it + ;; is first referenced. + (t + (let* ((seen) + (insert-definitions) ; For byte-compiler. + (insert-definitions + (lambda (data) + ;; Insert footnote definitions in the same section as + ;; their first reference in DATA. + (org-element-map tree 'footnote-reference + (lambda (reference) + (when (eq (org-element-property :type reference) 'standard) + (let ((label (org-element-property :label reference))) + (unless (member label seen) + (push label seen) + (let ((definition + (catch :found + (dolist (d definitions) + (when (equal (org-element-property :label d) + label) + (throw :found d)))))) + (org-element-adopt-elements + (org-element-lineage reference '(section)) + definition) + ;; Also insert definitions for nested + ;; references, if any. + (funcall insert-definitions definition)))))))))) + (funcall insert-definitions tree))))) + (defun org-export--remove-uninterpreted-data (data info) "Change uninterpreted elements back into Org syntax. DATA is the parse tree. INFO is a plist containing export @@ -2762,130 +2917,6 @@ returned by the function." ;; Return modified parse tree. data) -(defun org-export--merge-external-footnote-definitions (tree) - "Insert footnote definitions outside parsing scope in TREE. - -If there is a footnote section in TREE, definitions found are -appended to it. If `org-footnote-section' is non-nil, a new -footnote section containing all definitions is inserted in TREE. -Otherwise, definitions are appended at the end of the section -containing their first reference. - -Only definitions actually referred to within TREE, directly or -not, are considered." - (let* ((collect-labels - (lambda (data) - (org-element-map data 'footnote-reference - (lambda (f) - (and (eq (org-element-property :type f) 'standard) - (org-element-property :label f)))))) - (referenced-labels (funcall collect-labels tree))) - (when referenced-labels - (let* ((definitions) - (push-definition - (lambda (datum) - (case (org-element-type datum) - (footnote-definition - (push (save-restriction - (narrow-to-region (org-element-property :begin datum) - (org-element-property :end datum)) - (org-element-map (org-element-parse-buffer) - 'footnote-definition #'identity nil t)) - definitions)) - (footnote-reference - (let ((label (org-element-property :label datum)) - (cbeg (org-element-property :contents-begin datum))) - (when (and label cbeg - (eq (org-element-property :type datum) 'inline)) - (push - (apply #'org-element-create - 'footnote-definition - (list :label label :post-blank 1) - (org-element-parse-secondary-string - (buffer-substring - cbeg (org-element-property :contents-end datum)) - (org-element-restriction 'footnote-reference))) - definitions)))))))) - ;; Collect all out of scope definitions. - (save-excursion - (goto-char (point-min)) - (org-with-wide-buffer - (while (re-search-backward org-footnote-re nil t) - (funcall push-definition (org-element-context)))) - (goto-char (point-max)) - (org-with-wide-buffer - (while (re-search-forward org-footnote-re nil t) - (funcall push-definition (org-element-context))))) - ;; Filter out definitions referenced neither in the original - ;; tree nor in the external definitions. - (let* ((directly-referenced - (org-remove-if-not - (lambda (d) - (member (org-element-property :label d) referenced-labels)) - definitions)) - (all-labels - (append (funcall collect-labels directly-referenced) - referenced-labels))) - (setq definitions - (org-remove-if-not - (lambda (d) - (member (org-element-property :label d) all-labels)) - definitions))) - ;; Install definitions in subtree. - (cond - ((null definitions)) - ;; If there is a footnote section, insert them here. - ((let ((footnote-section - (org-element-map tree 'headline - (lambda (h) - (and (org-element-property :footnote-section-p h) h)) - nil t))) - (and footnote-section - (apply #'org-element-adopt-elements (nreverse definitions))))) - ;; If there should be a footnote section, create one containing - ;; all the definitions at the end of the tree. - (org-footnote-section - (org-element-adopt-elements - tree - (org-element-create 'headline - (list :footnote-section-p t - :level 1 - :title org-footnote-section) - (apply #'org-element-create - 'section - nil - (nreverse definitions))))) - ;; Otherwise add each definition at the end of the section where - ;; it is first referenced. - (t - (let* ((seen) - (insert-definitions) ; For byte-compiler. - (insert-definitions - (lambda (data) - ;; Insert definitions in the same section as their - ;; first reference in DATA. - (org-element-map tree 'footnote-reference - (lambda (f) - (when (eq (org-element-property :type f) 'standard) - (let ((label (org-element-property :label f))) - (unless (member label seen) - (push label seen) - (let ((definition - (catch 'found - (dolist (d definitions) - (when (equal - (org-element-property :label d) - label) - (setq definitions - (delete d definitions)) - (throw 'found d)))))) - (when definition - (org-element-adopt-elements - (org-element-lineage f '(section)) - definition) - (funcall insert-definitions - definition))))))))))) - (funcall insert-definitions tree)))))))) ;;;###autoload (defun org-export-as @@ -3013,8 +3044,6 @@ Return code as a string." parsed-keywords) ;; Parse buffer. (setq tree (org-element-parse-buffer nil visible-only)) - ;; Merge footnote definitions outside scope into parse tree. - (org-export--merge-external-footnote-definitions tree) ;; Prune tree from non-exported elements and transform ;; uninterpreted elements or objects in both parse tree and ;; communication channel. @@ -3666,16 +3695,28 @@ definition can be found, raise an error." (let ((hash (make-hash-table :test #'equal))) (plist-put info :footnote-definition-cache hash) hash)))) - (or (gethash label cache) - (puthash label - (org-element-map (plist-get info :parse-tree) - '(footnote-definition footnote-reference) - (lambda (f) - (and (equal (org-element-property :label f) label) - (org-element-contents f))) - info t) - cache) - (error "Definition not found for footnote %s" label)))))) + (or + (gethash label cache) + (puthash label + (org-element-map (plist-get info :parse-tree) + '(footnote-definition footnote-reference) + (lambda (f) + (cond + ;; Skip any footnote with a different label. + ;; Also skip any standard footnote reference + ;; with the same label since those cannot + ;; contain a definition. + ((not (equal (org-element-property :label f) label)) nil) + ((eq (org-element-property :type f) 'standard) nil) + ((org-element-contents f)) + ;; Even if the contents are empty, we can not + ;; return nil since that would eventually raise + ;; the error. Instead, return the equivalent + ;; empty string. + (t ""))) + info t) + cache) + (error "Definition not found for footnote %s" label)))))) (defun org-export--footnote-reference-map (function data info &optional body-first) diff --git a/init.el b/init.el index ff023d81..1b19ca71 100644 --- a/init.el +++ b/init.el @@ -1,10 +1,10 @@ (setq load-path (append - (list (expand-file-name "~/.emacs.d/lisp") (expand-file-name "~/.emacs.d/elpa/org-20160215")) + (list (expand-file-name "~/.emacs.d/lisp") (expand-file-name "~/.emacs.d/elpa/org-20160711")) load-path)) (setq org-use-extra-keys t) -(require 'org "~/.emacs.d/elpa/org-20160530/org.el") +(require 'org "~/.emacs.d/elpa/org-20160711/org.el") (require 'ob-tangle) (require 'ob-sql) (org-babel-load-file (expand-file-name "~/.emacs.d/bba.org")) diff --git a/snippets/org-mode/results b/snippets/org-mode/results index d216df99..805afd76 100644 --- a/snippets/org-mode/results +++ b/snippets/org-mode/results @@ -3,4 +3,4 @@ # key: :res # add results parameter to src block # -- -:results ${1:$$(yas-choose-value '("verbatim drawer" "table" "list" "silent"))} $0 \ No newline at end of file +:results ${1:$$(yas-choose-value '("verbatim drawer" "table" "list" "silent" "value code :wrap SRC sql"))} $0 \ No newline at end of file diff --git a/snippets/org-mode/sqlmysql b/snippets/org-mode/sqlmysql index e5c9c455..e1b1e461 100644 --- a/snippets/org-mode/sqlmysql +++ b/snippets/org-mode/sqlmysql @@ -15,6 +15,6 @@ (setq $3 "$5")$0 -#+BEGIN_SRC sql-mysql +#+BEGIN_SRC sql #+END_SRC diff --git a/snippets/org-mode/sqlvertica b/snippets/org-mode/sqlvertica index d8a396b1..46570dfd 100644 --- a/snippets/org-mode/sqlvertica +++ b/snippets/org-mode/sqlvertica @@ -10,10 +10,11 @@ :dbpassword: (concat ${3:bba-db}) :database: ${4:$2} :exports: both +:prologue: "\a" :END: (setq $3 "$5")$0 -#+BEGIN_SRC sql-vertica - +#+BEGIN_SRC sql +\a #+END_SRC -- 2.47.3